- enable snap to work for particle editmode so you can snap onto the emitter.

theeth: maybe there needs to be a new SnapMode for this? - SNAP_SELF?, like editmode but without setting t->editob

- dont run special_aftertrans_update on scene objects when after sequencer transform
This commit is contained in:
2009-10-19 17:20:09 +00:00
parent 5821e0ddf7
commit 031da438e4
2 changed files with 15 additions and 1 deletions

View File

@@ -4572,6 +4572,10 @@ void special_aftertrans_update(TransInfo *t)
}
}
}
else if (t->spacetype == SPACE_SEQ) {
/* freeSeqData in transform_conversions.c does this
* keep here so the else at the end wont run... */
}
else if (t->spacetype == SPACE_ACTION) {
SpaceAction *saction= (SpaceAction *)t->sa->spacedata.first;
Scene *scene;

View File

@@ -1453,9 +1453,19 @@ int snapObjects(Scene *scene, View3D *v3d, ARegion *ar, Object *obedit, float mv
if (mode == SNAP_ALL && obedit)
{
Object *ob = obedit;
retval |= snapObject(scene, ar, ob, 1, ob->obmat, ray_start, ray_normal, mval, loc, no, dist, &depth);
}
/* This isn't so great, particles only need to snap with the mesh object
* that emits them, but this doesnt fit into a current snap mode
* */
if(BASACT->object && BASACT->object->mode & OB_MODE_PARTICLE_EDIT)
{
Object *ob = BASACT->object;
retval |= snapObject(scene, ar, ob, 0, ob->obmat, ray_start, ray_normal, mval, loc, no, dist, &depth);
}
base= FIRSTBASE;
for ( base = FIRSTBASE; base != NULL; base = base->next ) {