[Bf-blender-cvs] [781de74] master: Fix T40610. This is a critical bug caused by own bugfix that does not allow editing any object type without bounding boxes.

Antony Riakiotakis noreply at git.blender.org
Sat Jun 14 13:30:31 CEST 2014


Commit: 781de742eb116e8c3103f34b2f9fd5ccb2f812d6
Author: Antony Riakiotakis
Date:   Sat Jun 14 14:30:22 2014 +0300
https://developer.blender.org/rB781de742eb116e8c3103f34b2f9fd5ccb2f812d6

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!

===================================================================

M	source/blender/editors/transform/transform_snap.c

===================================================================

diff --git a/source/blender/editors/transform/transform_snap.c b/source/blender/editors/transform/transform_snap.c
index 2da6b92..67a68a3 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




More information about the Bf-blender-cvs mailing list