[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [24287] trunk/blender/source/blender/ makesrna/intern: Changed hand-generated RNA paths to quote strings used as collection indexes .
Matt Ebb
matt at mke3.net
Tue Nov 3 23:07:15 CET 2009
Revision: 24287
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=24287
Author: broken
Date: 2009-11-03 23:07:15 +0100 (Tue, 03 Nov 2009)
Log Message:
-----------
Changed hand-generated RNA paths to quote strings used as collection indexes.
Previous method worked fine for Blender animation system, but this is more convenient for Python.
Modified Paths:
--------------
trunk/blender/source/blender/makesrna/intern/rna_boid.c
trunk/blender/source/blender/makesrna/intern/rna_cloth.c
trunk/blender/source/blender/makesrna/intern/rna_fluidsim.c
trunk/blender/source/blender/makesrna/intern/rna_mesh.c
trunk/blender/source/blender/makesrna/intern/rna_object_force.c
trunk/blender/source/blender/makesrna/intern/rna_smoke.c
Modified: trunk/blender/source/blender/makesrna/intern/rna_boid.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_boid.c 2009-11-03 21:58:24 UTC (rev 24286)
+++ trunk/blender/source/blender/makesrna/intern/rna_boid.c 2009-11-03 22:07:15 UTC (rev 24287)
@@ -129,7 +129,7 @@
static char *rna_BoidRule_path(PointerRNA *ptr)
{
- return BLI_sprintfN("rules[%s]", ((BoidRule*)ptr->data)->name); // XXX not unique
+ return BLI_sprintfN("rules[\"%s\"]", ((BoidRule*)ptr->data)->name); // XXX not unique
}
static PointerRNA rna_BoidState_active_boid_rule_get(PointerRNA *ptr)
Modified: trunk/blender/source/blender/makesrna/intern/rna_cloth.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_cloth.c 2009-11-03 21:58:24 UTC (rev 24286)
+++ trunk/blender/source/blender/makesrna/intern/rna_cloth.c 2009-11-03 22:07:15 UTC (rev 24287)
@@ -152,7 +152,7 @@
Object *ob= (Object*)ptr->id.data;
ModifierData *md= modifiers_findByType(ob, eModifierType_Cloth);
- return md ? BLI_sprintfN("modifiers[%s].settings", md->name) : NULL;
+ return md ? BLI_sprintfN("modifiers[\"%s\"].settings", md->name) : NULL;
}
static char *rna_ClothCollisionSettings_path(PointerRNA *ptr)
@@ -160,7 +160,7 @@
Object *ob= (Object*)ptr->id.data;
ModifierData *md= modifiers_findByType(ob, eModifierType_Cloth);
- return md ? BLI_sprintfN("modifiers[%s].collision_settings", md->name) : NULL;
+ return md ? BLI_sprintfN("modifiers[\"%s\"].collision_settings", md->name) : NULL;
}
#else
Modified: trunk/blender/source/blender/makesrna/intern/rna_fluidsim.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_fluidsim.c 2009-11-03 21:58:24 UTC (rev 24286)
+++ trunk/blender/source/blender/makesrna/intern/rna_fluidsim.c 2009-11-03 22:07:15 UTC (rev 24287)
@@ -157,7 +157,7 @@
FluidsimSettings *fss = (FluidsimSettings*)ptr->data;
ModifierData *md= (ModifierData *)fss->fmd;
- return BLI_sprintfN("modifiers[%s].settings", md->name);
+ return BLI_sprintfN("modifiers[\"%s\"].settings", md->name);
}
#else
Modified: trunk/blender/source/blender/makesrna/intern/rna_mesh.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_mesh.c 2009-11-03 21:58:24 UTC (rev 24286)
+++ trunk/blender/source/blender/makesrna/intern/rna_mesh.c 2009-11-03 22:07:15 UTC (rev 24287)
@@ -798,7 +798,7 @@
static char *rna_MeshTextureFaceLayer_path(PointerRNA *ptr)
{
- return BLI_sprintfN("uv_textures[%s]", ((CustomDataLayer*)ptr->data)->name);
+ return BLI_sprintfN("uv_textures[\"%s\"]", ((CustomDataLayer*)ptr->data)->name);
}
static char *rna_CustomDataData_path(PointerRNA *ptr, char *collection, int type)
@@ -813,7 +813,7 @@
if(cdl->type == type) {
b= ((char*)ptr->data - ((char*)cdl->data))/CustomData_sizeof(type);
if(b >= 0 && b < me->totface)
- return BLI_sprintfN("%s[%s].data[%d]", collection, cdl->name, b);
+ return BLI_sprintfN("%s[\"%s\"].data[%d]", collection, cdl->name, b);
}
}
@@ -827,7 +827,7 @@
static char *rna_MeshColorLayer_path(PointerRNA *ptr)
{
- return BLI_sprintfN("vertex_colors[%s]", ((CustomDataLayer*)ptr->data)->name);
+ return BLI_sprintfN("vertex_colors[\"%s\"]", ((CustomDataLayer*)ptr->data)->name);
}
static char *rna_MeshColor_path(PointerRNA *ptr)
@@ -842,7 +842,7 @@
static char *rna_MeshIntPropertyLayer_path(PointerRNA *ptr)
{
- return BLI_sprintfN("int_layers[%s]", ((CustomDataLayer*)ptr->data)->name);
+ return BLI_sprintfN("int_layers[\"%s\"]", ((CustomDataLayer*)ptr->data)->name);
}
static char *rna_MeshIntProperty_path(PointerRNA *ptr)
@@ -852,7 +852,7 @@
static char *rna_MeshFloatPropertyLayer_path(PointerRNA *ptr)
{
- return BLI_sprintfN("float_layers[%s]", ((CustomDataLayer*)ptr->data)->name);
+ return BLI_sprintfN("float_layers[\"%s\"]", ((CustomDataLayer*)ptr->data)->name);
}
static char *rna_MeshFloatProperty_path(PointerRNA *ptr)
@@ -862,7 +862,7 @@
static char *rna_MeshStringPropertyLayer_path(PointerRNA *ptr)
{
- return BLI_sprintfN("string_layers[%s]", ((CustomDataLayer*)ptr->data)->name);
+ return BLI_sprintfN("string_layers[\"%s\"]", ((CustomDataLayer*)ptr->data)->name);
}
static char *rna_MeshStringProperty_path(PointerRNA *ptr)
Modified: trunk/blender/source/blender/makesrna/intern/rna_object_force.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_object_force.c 2009-11-03 21:58:24 UTC (rev 24286)
+++ trunk/blender/source/blender/makesrna/intern/rna_object_force.c 2009-11-03 22:07:15 UTC (rev 24287)
@@ -300,7 +300,7 @@
Object *ob= (Object*)ptr->id.data;
ModifierData *md = (ModifierData *)modifiers_findByType(ob, eModifierType_Collision);
- return BLI_sprintfN("modifiers[%s].settings", md->name);
+ return BLI_sprintfN("modifiers[\"%s\"].settings", md->name);
}
static int rna_SoftBodySettings_use_edges_get(PointerRNA *ptr)
@@ -417,7 +417,7 @@
Object *ob= (Object*)ptr->id.data;
ModifierData *md = (ModifierData *)modifiers_findByType(ob, eModifierType_Softbody);
- return BLI_sprintfN("modifiers[%s].settings", md->name);
+ return BLI_sprintfN("modifiers[\"%s\"].settings", md->name);
}
static int particle_id_check(PointerRNA *ptr)
@@ -575,7 +575,7 @@
if (md) {
/* no pointer from modifier data to actual softbody storage, would be good to add */
if (ob->soft->effector_weights == ew)
- return BLI_sprintfN("modifiers[%s].settings.effector_weights", md->name);
+ return BLI_sprintfN("modifiers[\"%s\"].settings.effector_weights", md->name);
}
/* check cloth modifier */
@@ -584,7 +584,7 @@
ClothModifierData *cmd = (ClothModifierData *)md;
if (cmd->sim_parms->effector_weights == ew)
- return BLI_sprintfN("modifiers[%s].settings.effector_weights", md->name);
+ return BLI_sprintfN("modifiers[\"%s\"].settings.effector_weights", md->name);
}
/* check smoke modifier */
@@ -593,7 +593,7 @@
SmokeModifierData *smd = (SmokeModifierData *)md;
if (smd->domain->effector_weights == ew)
- return BLI_sprintfN("modifiers[%s].settings.effector_weights", md->name);
+ return BLI_sprintfN("modifiers[\"%s\"].settings.effector_weights", md->name);
}
}
return NULL;
Modified: trunk/blender/source/blender/makesrna/intern/rna_smoke.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_smoke.c 2009-11-03 21:58:24 UTC (rev 24286)
+++ trunk/blender/source/blender/makesrna/intern/rna_smoke.c 2009-11-03 22:07:15 UTC (rev 24287)
@@ -83,7 +83,7 @@
SmokeDomainSettings *settings = (SmokeDomainSettings*)ptr->data;
ModifierData *md= (ModifierData *)settings->smd;
- return BLI_sprintfN("modifiers[%s].domain_settings", md->name);
+ return BLI_sprintfN("modifiers[\"%s\"].domain_settings", md->name);
}
static char *rna_SmokeFlowSettings_path(PointerRNA *ptr)
@@ -91,7 +91,7 @@
SmokeFlowSettings *settings = (SmokeFlowSettings*)ptr->data;
ModifierData *md= (ModifierData *)settings->smd;
- return BLI_sprintfN("modifiers[%s].flow_settings", md->name);
+ return BLI_sprintfN("modifiers[\"%s\"].flow_settings", md->name);
}
static char *rna_SmokeCollSettings_path(PointerRNA *ptr)
@@ -99,7 +99,7 @@
SmokeCollSettings *settings = (SmokeCollSettings*)ptr->data;
ModifierData *md= (ModifierData *)settings->smd;
- return BLI_sprintfN("modifiers[%s].coll_settings", md->name);
+ return BLI_sprintfN("modifiers[\"%s\"].coll_settings", md->name);
}
#else
More information about the Bf-blender-cvs
mailing list