Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2013-04-24 11:40:55 +0400
committerCampbell Barton <ideasman42@gmail.com>2013-04-24 11:40:55 +0400
commit40c217cabd093220a94c8f8bd7131eab5c4a8146 (patch)
tree8e9c31c966c2ffe9d7682464dd62f75869333db6 /source/blender/makesrna/intern/rna_object_force.c
parent3b8221045f7421952010188049396abbdc5b9cc0 (diff)
fix for mistake in own recent commit r56249 with rna_EffectorWeight_path
Diffstat (limited to 'source/blender/makesrna/intern/rna_object_force.c')
-rw-r--r--source/blender/makesrna/intern/rna_object_force.c22
1 files changed, 14 insertions, 8 deletions
diff --git a/source/blender/makesrna/intern/rna_object_force.c b/source/blender/makesrna/intern/rna_object_force.c
index 2d3f2ddf699..06d8f4faf04 100644
--- a/source/blender/makesrna/intern/rna_object_force.c
+++ b/source/blender/makesrna/intern/rna_object_force.c
@@ -618,34 +618,38 @@ static char *rna_EffectorWeight_path(PointerRNA *ptr)
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 @@ static char *rna_EffectorWeight_path(PointerRNA *ptr)
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);