archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Some cleanup for particle edit snap.

Browse Source 
Update comment to point at the root of the problem.
This commit is contained in:
Martin Poirier
2009-10-19 18:49:04 +00:00
parent 680e724e37
commit 45a21e4736
1 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
source/blender/editors/transform/transform_snap.c
View File

@@ -344,6 +344,7 @@ void initSnapping(TransInfo *t, wmOperator *op)
{
ToolSettings *ts = t->settings;
Object *obedit = t->obedit;
Scene *scene = t->scene;
int snapping = 0;
short snap_mode = t->settings->snap_target;
@@ -407,6 +408,15 @@ void initSnapping(TransInfo *t, wmOperator *op)
t->tsnap.mode = SNAP_ALL;
}
}
/* Particles edit mode*/
else if (t->tsnap.applySnap != NULL && // A snapping function actually exist
(snapping) && // Only if the snap flag is on
(obedit == NULL && BASACT->object && BASACT->object->mode & OB_MODE_PARTICLE_EDIT ))
{
t->tsnap.status |= SNAP_ON;
t->tsnap.modePoint = SNAP_GEO;
t->tsnap.mode = SNAP_ALL;
}
/* Object mode */
else if (t->tsnap.applySnap != NULL && // A snapping function actually exist
(snapping) && // Only if the snap flag is on
@@ -1457,13 +1467,14 @@ int snapObjects(Scene *scene, View3D *v3d, ARegion *ar, Object *obedit, float mv
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
/* Need an exception for particle edit because the base is flagged with BA_HAS_RECALC_DATA
* which makes the loop skip it, even the derived mesh will never change
*
* To solve that problem, we do it first as an exception.
* */
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);
}