[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [56257] trunk/blender/source/blender/ makesrna/intern/rna_object_force.c: fix for mistake in own recent commit r56249 with rna_EffectorWeight_path

Campbell Barton ideasman42 at gmail.com
Wed Apr 24 09:40:56 CEST 2013


Revision: 56257
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=56257
Author:   campbellbarton
Date:     2013-04-24 07:40:55 +0000 (Wed, 24 Apr 2013)
Log Message:
-----------
fix for mistake in own recent commit r56249 with rna_EffectorWeight_path

Revision Links:
--------------
    http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=56249

Modified Paths:
--------------
    trunk/blender/source/blender/makesrna/intern/rna_object_force.c

Modified: trunk/blender/source/blender/makesrna/intern/rna_object_force.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_object_force.c	2013-04-24 00:25:12 UTC (rev 56256)
+++ trunk/blender/source/blender/makesrna/intern/rna_object_force.c	2013-04-24 07:40:55 UTC (rev 56257)
@@ -618,34 +618,38 @@
 	else {
 		Object *ob = (Object *)ptr->id.data;
 		ModifierData *md;
-		char name_esc[sizeof(md->name) * 2];
 
-		BLI_strescape(name_esc, md->name, sizeof(name_esc));
-		
 		/* check softbody modifier */
 		md = (ModifierData *)modifiers_findByType(ob, eModifierType_Softbody);
 		if (md) {
 			/* no pointer from modifier data to actual softbody storage, would be good to add */
-			if (ob->soft->effector_weights == ew)
+			if (ob->soft->effector_weights == ew) {
+				char name_esc[sizeof(md->name) * 2];
+				BLI_strescape(name_esc, md->name, sizeof(name_esc));
 				return BLI_sprintfN("modifiers[\"%s\"].settings.effector_weights", name_esc);
+			}
 		}
 		
 		/* check cloth modifier */
 		md = (ModifierData *)modifiers_findByType(ob, eModifierType_Cloth);
 		if (md) {
 			ClothModifierData *cmd = (ClothModifierData *)md;
-			
-			if (cmd->sim_parms->effector_weights == ew)
+			if (cmd->sim_parms->effector_weights == ew) {
+				char name_esc[sizeof(md->name) * 2];
+				BLI_strescape(name_esc, md->name, sizeof(name_esc));
 				return BLI_sprintfN("modifiers[\"%s\"].settings.effector_weights", name_esc);
+			}
 		}
 		
 		/* check smoke modifier */
 		md = (ModifierData *)modifiers_findByType(ob, eModifierType_Smoke);
 		if (md) {
 			SmokeModifierData *smd = (SmokeModifierData *)md;
-			
-			if (smd->domain->effector_weights == ew)
+			if (smd->domain->effector_weights == ew) {
+				char name_esc[sizeof(md->name) * 2];
+				BLI_strescape(name_esc, md->name, sizeof(name_esc));
 				return BLI_sprintfN("modifiers[\"%s\"].settings.effector_weights", name_esc);
+			}
 		}
 
 		/* check dynamic paint modifier */
@@ -658,8 +662,10 @@
 
 				for (; surface; surface = surface->next) {
 					if (surface->effector_weights == ew) {
+						char name_esc[sizeof(md->name) * 2];
 						char name_esc_surface[sizeof(surface->name) * 2];
 
+						BLI_strescape(name_esc, md->name, sizeof(name_esc));
 						BLI_strescape(name_esc_surface, surface->name, sizeof(name_esc_surface));
 						return BLI_sprintfN("modifiers[\"%s\"].canvas_settings.canvas_surfaces[\"%s\"]"
 						                    ".effector_weights", name_esc, name_esc_surface);




More information about the Bf-blender-cvs mailing list