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.

6 files changed, 18 insertions, 18 deletions

diff --git a/source/blender/makesrna/intern/rna_boid.c b/source/blender/makesrna/intern/rna_boid.c
index 36a648c8a82..37b957a16ca 100644
--- a/source/blender/makesrna/intern/rna_boid.c
+++ b/source/blender/makesrna/intern/rna_boid.c
@@ -129,7 +129,7 @@ static StructRNA* rna_BoidRule_refine(struct PointerRNA *ptr)
 
 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)
diff --git a/source/blender/makesrna/intern/rna_cloth.c b/source/blender/makesrna/intern/rna_cloth.c
index d64e2c7119b..d78544634bc 100644
--- a/source/blender/makesrna/intern/rna_cloth.c
+++ b/source/blender/makesrna/intern/rna_cloth.c
@@ -152,7 +152,7 @@ static char *rna_ClothSettings_path(PointerRNA *ptr)
 	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 @@ static char *rna_ClothCollisionSettings_path(PointerRNA *ptr)
 	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
diff --git a/source/blender/makesrna/intern/rna_fluidsim.c b/source/blender/makesrna/intern/rna_fluidsim.c
index ae52c811c92..2517ee5c8ef 100644
--- a/source/blender/makesrna/intern/rna_fluidsim.c
+++ b/source/blender/makesrna/intern/rna_fluidsim.c
@@ -157,7 +157,7 @@ static char *rna_FluidSettings_path(PointerRNA *ptr)
 	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
diff --git a/source/blender/makesrna/intern/rna_mesh.c b/source/blender/makesrna/intern/rna_mesh.c
index 2f14ab0c98c..ab745394ce5 100644
--- a/source/blender/makesrna/intern/rna_mesh.c
+++ b/source/blender/makesrna/intern/rna_mesh.c
@@ -798,7 +798,7 @@ static char *rna_MeshVertex_path(PointerRNA *ptr)
 
 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 @@ static char *rna_CustomDataData_path(PointerRNA *ptr, char *collection, int type
 		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_MeshTextureFace_path(PointerRNA *ptr)
 
 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_MeshSticky_path(PointerRNA *ptr)
 
 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_MeshIntProperty_path(PointerRNA *ptr)
 
 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_MeshFloatProperty_path(PointerRNA *ptr)
 
 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)
diff --git a/source/blender/makesrna/intern/rna_object_force.c b/source/blender/makesrna/intern/rna_object_force.c
index 36a370e8561..9ecea76ab0d 100644
--- a/source/blender/makesrna/intern/rna_object_force.c
+++ b/source/blender/makesrna/intern/rna_object_force.c
@@ -300,7 +300,7 @@ static char *rna_CollisionSettings_path(PointerRNA *ptr)
 	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 @@ static char *rna_SoftBodySettings_path(PointerRNA *ptr)
 	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 @@ static char *rna_EffectorWeight_path(PointerRNA *ptr)
 		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 @@ static char *rna_EffectorWeight_path(PointerRNA *ptr)
 			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 @@ static char *rna_EffectorWeight_path(PointerRNA *ptr)
 			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;
diff --git a/source/blender/makesrna/intern/rna_smoke.c b/source/blender/makesrna/intern/rna_smoke.c
index c8193bb4005..e302ea90a8a 100644
--- a/source/blender/makesrna/intern/rna_smoke.c
+++ b/source/blender/makesrna/intern/rna_smoke.c
@@ -83,7 +83,7 @@ static char *rna_SmokeDomainSettings_path(PointerRNA *ptr)
 	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 @@ static char *rna_SmokeFlowSettings_path(PointerRNA *ptr)
 	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 @@ static char *rna_SmokeCollSettings_path(PointerRNA *ptr)
 	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