[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [32908] trunk/blender: bugfix [#24574] setting location gained from a matrix_world.copy().translation_part() ( visual loc) after constraints causes NAN in object location after python script ends

[Campbell Barton]

Revision: 32908
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=32908
Author:   campbellbarton
Date:     2010-11-07 06:59:35 +0100 (Sun, 07 Nov 2010)

Log Message:
-----------
bugfix [#24574] setting location gained from a matrix_world.copy().translation_part() (visual loc) after constraints causes NAN in object location after python script ends
shrinkwrap constraint was dividing by zero. also the shrinkwrap UI was incorrectly trying to draw a subtarget.

Modified Paths:
--------------
    trunk/blender/release/scripts/ui/properties_object_constraint.py
    trunk/blender/source/blender/blenkernel/intern/constraint.c
    trunk/blender/source/blender/makesrna/intern/rna_cloth.c

Modified: trunk/blender/release/scripts/ui/properties_object_constraint.py
===================================================================
--- trunk/blender/release/scripts/ui/properties_object_constraint.py	2010-11-07 05:35:41 UTC (rev 32907)
+++ trunk/blender/release/scripts/ui/properties_object_constraint.py	2010-11-07 05:59:35 UTC (rev 32908)
@@ -624,7 +624,7 @@
         self.space_template(layout, con)
 
     def SHRINKWRAP(self, context, layout, con):
-        self.target_template(layout, con)
+        self.target_template(layout, con, False)
 
         layout.prop(con, "distance")
         layout.prop(con, "shrinkwrap_type")

Modified: trunk/blender/source/blender/blenkernel/intern/constraint.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/constraint.c	2010-11-07 05:35:41 UTC (rev 32907)
+++ trunk/blender/source/blender/blenkernel/intern/constraint.c	2010-11-07 05:59:35 UTC (rev 32908)
@@ -3462,7 +3462,9 @@
 					BLI_bvhtree_find_nearest(treeData.tree, co, &nearest, treeData.nearest_callback, &treeData);
 					
 					dist = len_v3v3(co, nearest.co);
-					interp_v3_v3v3(co, co, nearest.co, (dist - scon->dist)/dist);	/* linear interpolation */
+					if(dist != 0.0f) {
+						interp_v3_v3v3(co, co, nearest.co, (dist - scon->dist)/dist);	/* linear interpolation */
+					}
 					space_transform_invert(&transform, co);
 				break;
 				

Modified: trunk/blender/source/blender/makesrna/intern/rna_cloth.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_cloth.c	2010-11-07 05:35:41 UTC (rev 32907)
+++ trunk/blender/source/blender/makesrna/intern/rna_cloth.c	2010-11-07 05:59:35 UTC (rev 32908)
@@ -55,7 +55,7 @@
 static void rna_cloth_pinning_changed(Main *bmain, Scene *scene, PointerRNA *ptr)
 {
 	Object *ob= (Object*)ptr->id.data;
-	ClothSimSettings *settings = (ClothSimSettings*)ptr->data;
+//	ClothSimSettings *settings = (ClothSimSettings*)ptr->data;
 	ClothModifierData *clmd = (ClothModifierData*)modifiers_findByType(ob, eModifierType_Cloth);
 
 	cloth_free_modifier(clmd);