diff options
| author | Antony Riakiotakis <kalast@gmail.com> | 2014-06-14 15:30:22 +0400 |
|---|---|---|
| committer | Antony Riakiotakis <kalast@gmail.com> | 2014-06-14 15:30:22 +0400 |
| commit | 781de742eb116e8c3103f34b2f9fd5ccb2f812d6 (patch) | |
| tree | 382d50505fb22c28e5bc18759ef42f2c62a1a46c /source/blender/editors/transform/transform_snap.c | |
| parent | 9073a81bceaa9142c562bb5beecc453fbe92f73e (diff) | |
Fix T40610. This is a critical bug caused by own bugfix that does not
allow editing any object type without bounding boxes.
This should be included in the final release!
Diffstat (limited to 'source/blender/editors/transform/transform_snap.c')
| -rw-r--r-- | source/blender/editors/transform/transform_snap.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/source/blender/editors/transform/transform_snap.c b/source/blender/editors/transform/transform_snap.c index 2da6b92c9d0..67a68a3fd9c 100644 --- a/source/blender/editors/transform/transform_snap.c +++ b/source/blender/editors/transform/transform_snap.c @@ -507,6 +507,7 @@ static void initSnappingMode(TransInfo *t) if (t->tsnap.applySnap != NULL && // A snapping function actually exist (obedit != NULL && ELEM5(obedit->type, OB_MESH, OB_ARMATURE, OB_CURVE, OB_LATTICE, OB_MBALL)) ) // Temporary limited to edit mode meshes, armature, curves, mballs { + BoundBox *bb_init; /* Exclude editmesh if using proportional edit */ if ((obedit->type == OB_MESH) && (t->flag & T_PROP_EDIT)) { t->tsnap.modeSelect = SNAP_NOT_OBEDIT; @@ -517,7 +518,9 @@ static void initSnappingMode(TransInfo *t) /* store the original bounding box - * we could slightly increase the size in screen space but leaving as TODO */ - t->tsnap.BB_init = *BKE_object_boundbox_get(obedit); + bb_init = BKE_object_boundbox_get(obedit); + if (bb_init) + t->tsnap.BB_init = *bb_init; } /* Particles edit mode*/ else if (t->tsnap.applySnap != NULL && // A snapping function actually exist |