[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [18567] trunk/blender/source/blender/src/ transform_snap.c: Bugfix: Transform Snap

Martin Poirier theeth at yahoo.com
Sun Jan 18 23:09:30 CET 2009


Revision: 18567
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=18567
Author:   theeth
Date:     2009-01-18 23:09:29 +0100 (Sun, 18 Jan 2009)

Log Message:
-----------
Bugfix: Transform Snap

Would crash if snapping from a mesh in edit mode to a group instance including that same mesh.

Reported by UncleZeiv on IRC

Modified Paths:
--------------
    trunk/blender/source/blender/src/transform_snap.c

Modified: trunk/blender/source/blender/src/transform_snap.c
===================================================================
--- trunk/blender/source/blender/src/transform_snap.c	2009-01-18 21:36:38 UTC (rev 18566)
+++ trunk/blender/source/blender/src/transform_snap.c	2009-01-18 22:09:29 UTC (rev 18567)
@@ -1186,10 +1186,21 @@
 					Object *ob = dupli_ob->ob;
 					
 					if (ob->type == OB_MESH) {
-						DerivedMesh *dm = mesh_get_derived_final(ob, CD_MASK_BAREMESH);
+						DerivedMesh *dm;
+						int editmesh = 0;
 						int val;
 						
-						val = snapDerivedMesh(ob, dm, dupli_ob->mat, ray_start, ray_normal, mval, loc, no, dist, &depth, 0);
+						if (ob == G.obedit)
+						{
+							dm = editmesh_get_derived_cage(CD_MASK_BAREMESH);
+							editmesh = 1;
+						}
+						else
+						{
+							dm = mesh_get_derived_final(ob, CD_MASK_BAREMESH);
+						}
+						
+						val = snapDerivedMesh(ob, dm, dupli_ob->mat, ray_start, ray_normal, mval, loc, no, dist, &depth, editmesh);
 	
 						retval = retval || val;
 	





More information about the Bf-blender-cvs mailing list