bartvdbraak/blender
1
0
Fork 4
Code Issues 4 Pull Requests 1 Actions 1 Packages Projects Releases Wiki Activity

fix for mistake in own recent commit r56249 with rna_EffectorWeight_path

Browse Source
This commit is contained in:
Campbell Barton 2013-04-24 07:40:55 +00:00
parent 3b8221045f
commit 40c217cabd
1 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
source/blender/makesrna/intern/rna_object_force.c
View File

@ -618,34 +618,38 @@ static char *rna_EffectorWeight_path(PointerRNA *ptr)
else { else {
Object *ob = (Object *)ptr->id.data; Object *ob = (Object *)ptr->id.data;
ModifierData *md; ModifierData *md;
char name_esc[sizeof(md->name) * 2];
BLI_strescape(name_esc, md->name, sizeof(name_esc));
/* check softbody modifier */ /* check softbody modifier */
md = (ModifierData *)modifiers_findByType(ob, eModifierType_Softbody); md = (ModifierData *)modifiers_findByType(ob, eModifierType_Softbody);
if (md) { if (md) {
/* no pointer from modifier data to actual softbody storage, would be good to add */ /* 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); return BLI_sprintfN("modifiers[\"%s\"].settings.effector_weights", name_esc);
}
} }
/* check cloth modifier */ /* check cloth modifier */
md = (ModifierData *)modifiers_findByType(ob, eModifierType_Cloth); md = (ModifierData *)modifiers_findByType(ob, eModifierType_Cloth);
if (md) { if (md) {
ClothModifierData *cmd = (ClothModifierData *)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); return BLI_sprintfN("modifiers[\"%s\"].settings.effector_weights", name_esc);
}
} }
/* check smoke modifier */ /* check smoke modifier */
md = (ModifierData *)modifiers_findByType(ob, eModifierType_Smoke); md = (ModifierData *)modifiers_findByType(ob, eModifierType_Smoke);
if (md) { if (md) {
SmokeModifierData *smd = (SmokeModifierData *)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); return BLI_sprintfN("modifiers[\"%s\"].settings.effector_weights", name_esc);
}
} }
/* check dynamic paint modifier */ /* check dynamic paint modifier */
@ -658,8 +662,10 @@ static char *rna_EffectorWeight_path(PointerRNA *ptr)
for (; surface; surface = surface->next) { for (; surface; surface = surface->next) {
if (surface->effector_weights == ew) { if (surface->effector_weights == ew) {
char name_esc[sizeof(md->name) * 2];
char name_esc_surface[sizeof(surface->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)); BLI_strescape(name_esc_surface, surface->name, sizeof(name_esc_surface));
return BLI_sprintfN("modifiers[\"%s\"].canvas_settings.canvas_surfaces[\"%s\"]" return BLI_sprintfN("modifiers[\"%s\"].canvas_settings.canvas_surfaces[\"%s\"]"
".effector_weights", name_esc, name_esc_surface); ".effector_weights", name_esc, name_esc_surface);