misc small changes:

- rename rna collection structs Main prefix to BlendData: eg, MainObjects --> BlendDataObjects
- printing python collection now prints its type (when available)
- renamed shadowed vars in bpy_rna.c.
- when making functions static I also made debugging/test functions static, reverse and add definitions to headers instead.

2 files changed, 75 insertions, 75 deletions

diff --git a/source/blender/makesrna/RNA_types.h b/source/blender/makesrna/RNA_types.h
index 59c81231afe..837464a9a23 100644
--- a/source/blender/makesrna/RNA_types.h
+++ b/source/blender/makesrna/RNA_types.h
@@ -350,31 +350,31 @@ typedef struct ExtensionRNA {
 
 /* fake struct definitions, needed otherwise collections end up owning the C
  * structs like 'Object' when defined first */
-#define MainActions		Main
-#define MainArmatures		Main
-#define MainBrushes		Main
-#define MainCameras		Main
-#define MainCurves		Main
-#define MainFonts		Main
-#define MainGreasePencils	Main
-#define MainGroups		Main
-#define MainImages		Main
-#define MainLamps		Main
-#define MainLattices		Main
-#define MainLibraries		Main
-#define MainMaterials		Main
-#define MainMeshes		Main
-#define MainMetaBalls		Main
-#define MainNodeTrees		Main
-#define MainObjects		Main
-#define MainParticles		Main
-#define MainScenes		Main
-#define MainScreens		Main
-#define MainSounds		Main
-#define MainTexts		Main
-#define MainTextures		Main
-#define MainWindowManagers	Main
-#define MainWorlds		Main
+#define BlendDataActions		Main
+#define BlendDataArmatures		Main
+#define BlendDataBrushes		Main
+#define BlendDataCameras		Main
+#define BlendDataCurves		Main
+#define BlendDataFonts		Main
+#define BlendDataGreasePencils	Main
+#define BlendDataGroups		Main
+#define BlendDataImages		Main
+#define BlendDataLamps		Main
+#define BlendDataLattices		Main
+#define BlendDataLibraries		Main
+#define BlendDataMaterials		Main
+#define BlendDataMeshes		Main
+#define BlendDataMetaBalls		Main
+#define BlendDataNodeTrees		Main
+#define BlendDataObjects		Main
+#define BlendDataParticles		Main
+#define BlendDataScenes		Main
+#define BlendDataScreens		Main
+#define BlendDataSounds		Main
+#define BlendDataTexts		Main
+#define BlendDataTextures		Main
+#define BlendDataWindowManagers	Main
+#define BlendDataWorlds		Main
 
 #ifdef __cplusplus
 }
diff --git a/source/blender/makesrna/intern/rna_main_api.c b/source/blender/makesrna/intern/rna_main_api.c
index c13bfaca8bb..56c2f44ed73 100644
--- a/source/blender/makesrna/intern/rna_main_api.c
+++ b/source/blender/makesrna/intern/rna_main_api.c
@@ -530,8 +530,8 @@ void RNA_def_main_cameras(BlenderRNA *brna, PropertyRNA *cprop)
 	FunctionRNA *func;
 	PropertyRNA *parm;
 
-	RNA_def_property_srna(cprop, "MainCameras");
-	srna= RNA_def_struct(brna, "MainCameras", NULL);
+	RNA_def_property_srna(cprop, "BlendDataCameras");
+	srna= RNA_def_struct(brna, "BlendDataCameras", NULL);
 	RNA_def_struct_ui_text(srna, "Main Cameras", "Collection of cameras");
 
 	func= RNA_def_function(srna, "new", "rna_Main_cameras_new");
@@ -559,8 +559,8 @@ void RNA_def_main_scenes(BlenderRNA *brna, PropertyRNA *cprop)
 	FunctionRNA *func;
 	PropertyRNA *parm;
 
-	RNA_def_property_srna(cprop, "MainScenes");
-	srna= RNA_def_struct(brna, "MainScenes", NULL);
+	RNA_def_property_srna(cprop, "BlendDataScenes");
+	srna= RNA_def_struct(brna, "BlendDataScenes", NULL);
 	RNA_def_struct_ui_text(srna, "Main Scenes", "Collection of scenes");
 
 	func= RNA_def_function(srna, "new", "rna_Main_scenes_new");
@@ -584,8 +584,8 @@ void RNA_def_main_objects(BlenderRNA *brna, PropertyRNA *cprop)
 	FunctionRNA *func;
 	PropertyRNA *parm;
 
-	RNA_def_property_srna(cprop, "MainObjects");
-	srna= RNA_def_struct(brna, "MainObjects", NULL);
+	RNA_def_property_srna(cprop, "BlendDataObjects");
+	srna= RNA_def_struct(brna, "BlendDataObjects", NULL);
 	RNA_def_struct_ui_text(srna, "Main Objects", "Collection of objects");
 
 	func= RNA_def_function(srna, "new", "rna_Main_objects_new");
@@ -617,8 +617,8 @@ void RNA_def_main_materials(BlenderRNA *brna, PropertyRNA *cprop)
 	FunctionRNA *func;
 	PropertyRNA *parm;
 
-	RNA_def_property_srna(cprop, "MainMaterials");
-	srna= RNA_def_struct(brna, "MainMaterials", NULL);
+	RNA_def_property_srna(cprop, "BlendDataMaterials");
+	srna= RNA_def_struct(brna, "BlendDataMaterials", NULL);
 	RNA_def_struct_ui_text(srna, "Main Material", "Collection of materials");
 
 	func= RNA_def_function(srna, "new", "rna_Main_materials_new");
@@ -651,8 +651,8 @@ void RNA_def_main_node_groups(BlenderRNA *brna, PropertyRNA *cprop)
 	{2, "TEXTURE",      0,    "Texture",      ""},
 	{0, NULL, 0, NULL, NULL}};
 
-	RNA_def_property_srna(cprop, "MainNodeTrees");
-	srna= RNA_def_struct(brna, "MainNodeTrees", NULL);
+	RNA_def_property_srna(cprop, "BlendDataNodeTrees");
+	srna= RNA_def_struct(brna, "BlendDataNodeTrees", NULL);
 	RNA_def_struct_ui_text(srna, "Main Node Trees", "Collection of node trees");
 
 	func= RNA_def_function(srna, "new", "rna_Main_nodetree_new");
@@ -681,8 +681,8 @@ void RNA_def_main_meshes(BlenderRNA *brna, PropertyRNA *cprop)
 	FunctionRNA *func;
 	PropertyRNA *parm;
 
-	RNA_def_property_srna(cprop, "MainMeshes");
-	srna= RNA_def_struct(brna, "MainMeshes", NULL);
+	RNA_def_property_srna(cprop, "BlendDataMeshes");
+	srna= RNA_def_struct(brna, "BlendDataMeshes", NULL);
 	RNA_def_struct_ui_text(srna, "Main Meshes", "Collection of meshes");
 
 	func= RNA_def_function(srna, "new", "rna_Main_meshes_new");
@@ -709,8 +709,8 @@ void RNA_def_main_lamps(BlenderRNA *brna, PropertyRNA *cprop)
 	FunctionRNA *func;
 	PropertyRNA *parm;
 
-	RNA_def_property_srna(cprop, "MainLamps");
-	srna= RNA_def_struct(brna, "MainLamps", NULL);
+	RNA_def_property_srna(cprop, "BlendDataLamps");
+	srna= RNA_def_struct(brna, "BlendDataLamps", NULL);
 	RNA_def_struct_ui_text(srna, "Main Lamps", "Collection of lamps");
 
 	func= RNA_def_function(srna, "new", "rna_Main_lamps_new");
@@ -740,8 +740,8 @@ void RNA_def_main_libraries(BlenderRNA *brna, PropertyRNA *cprop)
 	FunctionRNA *func;
 	PropertyRNA *parm;
 
-	RNA_def_property_srna(cprop, "MainLibraries");
-	srna= RNA_def_struct(brna, "MainLibraries", NULL);
+	RNA_def_property_srna(cprop, "BlendDataLibraries");
+	srna= RNA_def_struct(brna, "BlendDataLibraries", NULL);
 	RNA_def_struct_ui_text(srna, "Main Libraries", "Collection of libraries");
 
 	func= RNA_def_function(srna, "tag", "rna_Main_libraries_tag");
@@ -755,8 +755,8 @@ void RNA_def_main_screens(BlenderRNA *brna, PropertyRNA *cprop)
 	FunctionRNA *func;
 	PropertyRNA *parm;
 
-	RNA_def_property_srna(cprop, "MainScreens");
-	srna= RNA_def_struct(brna, "MainScreens", NULL);
+	RNA_def_property_srna(cprop, "BlendDataScreens");
+	srna= RNA_def_struct(brna, "BlendDataScreens", NULL);
 	RNA_def_struct_ui_text(srna, "Main Screens", "Collection of screens");
 
 	func= RNA_def_function(srna, "tag", "rna_Main_screens_tag");
@@ -770,8 +770,8 @@ void RNA_def_main_window_managers(BlenderRNA *brna, PropertyRNA *cprop)
 	FunctionRNA *func;
 	PropertyRNA *parm;
 
-	RNA_def_property_srna(cprop, "MainWindowManagers");
-	srna= RNA_def_struct(brna, "MainWindowManagers", NULL);
+	RNA_def_property_srna(cprop, "BlendDataWindowManagers");
+	srna= RNA_def_struct(brna, "BlendDataWindowManagers", NULL);
 	RNA_def_struct_ui_text(srna, "Main Window Managers", "Collection of window managers");
 
 	func= RNA_def_function(srna, "tag", "rna_Main_window_managers_tag");
@@ -784,8 +784,8 @@ void RNA_def_main_images(BlenderRNA *brna, PropertyRNA *cprop)
 	FunctionRNA *func;
 	PropertyRNA *parm;
 
-	RNA_def_property_srna(cprop, "MainImages");
-	srna= RNA_def_struct(brna, "MainImages", NULL);
+	RNA_def_property_srna(cprop, "BlendDataImages");
+	srna= RNA_def_struct(brna, "BlendDataImages", NULL);
 	RNA_def_struct_ui_text(srna, "Main Images", "Collection of images");
 
 	func= RNA_def_function(srna, "new", "rna_Main_images_new");
@@ -828,8 +828,8 @@ void RNA_def_main_lattices(BlenderRNA *brna, PropertyRNA *cprop)
 	FunctionRNA *func;
 	PropertyRNA *parm;
 
-	RNA_def_property_srna(cprop, "MainLattices");
-	srna= RNA_def_struct(brna, "MainLattices", NULL);
+	RNA_def_property_srna(cprop, "BlendDataLattices");
+	srna= RNA_def_struct(brna, "BlendDataLattices", NULL);
 	RNA_def_struct_ui_text(srna, "Main Lattices", "Collection of lattices");
 
 	func= RNA_def_function(srna, "new", "rna_Main_lattices_new");
@@ -856,8 +856,8 @@ void RNA_def_main_curves(BlenderRNA *brna, PropertyRNA *cprop)
 	FunctionRNA *func;
 	PropertyRNA *parm;
 
-	RNA_def_property_srna(cprop, "MainCurves");
-	srna= RNA_def_struct(brna, "MainCurves", NULL);
+	RNA_def_property_srna(cprop, "BlendDataCurves");
+	srna= RNA_def_struct(brna, "BlendDataCurves", NULL);
 	RNA_def_struct_ui_text(srna, "Main Curves", "Collection of curves");
 
 	func= RNA_def_function(srna, "new", "rna_Main_curves_new");
@@ -886,8 +886,8 @@ void RNA_def_main_metaballs(BlenderRNA *brna, PropertyRNA *cprop)
 	FunctionRNA *func;
 	PropertyRNA *parm;
 
-	RNA_def_property_srna(cprop, "MainMetaBalls");
-	srna= RNA_def_struct(brna, "MainMetaBalls", NULL);
+	RNA_def_property_srna(cprop, "BlendDataMetaBalls");
+	srna= RNA_def_struct(brna, "BlendDataMetaBalls", NULL);
 	RNA_def_struct_ui_text(srna, "Main MetaBall", "Collection of metaballs");
 
 	func= RNA_def_function(srna, "new", "rna_Main_metaballs_new");
@@ -914,8 +914,8 @@ void RNA_def_main_fonts(BlenderRNA *brna, PropertyRNA *cprop)
 	FunctionRNA *func;
 	PropertyRNA *parm;
 
-	RNA_def_property_srna(cprop, "MainFonts");
-	srna= RNA_def_struct(brna, "MainFonts", NULL);
+	RNA_def_property_srna(cprop, "BlendDataFonts");
+	srna= RNA_def_struct(brna, "BlendDataFonts", NULL);
 	RNA_def_struct_ui_text(srna, "Main Fonts", "Collection of fonts");
 
 	func= RNA_def_function(srna, "load", "rna_Main_fonts_load");
@@ -943,8 +943,8 @@ void RNA_def_main_textures(BlenderRNA *brna, PropertyRNA *cprop)
 	FunctionRNA *func;
 	PropertyRNA *parm;
 
-	RNA_def_property_srna(cprop, "MainTextures");
-	srna= RNA_def_struct(brna, "MainTextures", NULL);
+	RNA_def_property_srna(cprop, "BlendDataTextures");
+	srna= RNA_def_struct(brna, "BlendDataTextures", NULL);
 	RNA_def_struct_ui_text(srna, "Main Textures", "Collection of groups");
 
 	func= RNA_def_function(srna, "new", "rna_Main_textures_new");
@@ -973,8 +973,8 @@ void RNA_def_main_brushes(BlenderRNA *brna, PropertyRNA *cprop)
 	FunctionRNA *func;
 	PropertyRNA *parm;
 
-	RNA_def_property_srna(cprop, "MainBrushes");
-	srna= RNA_def_struct(brna, "MainBrushes", NULL);
+	RNA_def_property_srna(cprop, "BlendDataBrushes");
+	srna= RNA_def_struct(brna, "BlendDataBrushes", NULL);
 	RNA_def_struct_ui_text(srna, "Main Brushes", "Collection of brushes");
 
 	func= RNA_def_function(srna, "new", "rna_Main_brushes_new");
@@ -1002,8 +1002,8 @@ void RNA_def_main_worlds(BlenderRNA *brna, PropertyRNA *cprop)
 	FunctionRNA *func;
 	PropertyRNA *parm;
 
-	RNA_def_property_srna(cprop, "MainWorlds");
-	srna= RNA_def_struct(brna, "MainWorlds", NULL);
+	RNA_def_property_srna(cprop, "BlendDataWorlds");
+	srna= RNA_def_struct(brna, "BlendDataWorlds", NULL);
 	RNA_def_struct_ui_text(srna, "Main Worlds", "Collection of worlds");
 
 	func= RNA_def_function(srna, "new", "rna_Main_worlds_new");
@@ -1031,8 +1031,8 @@ void RNA_def_main_groups(BlenderRNA *brna, PropertyRNA *cprop)
 	FunctionRNA *func;
 	PropertyRNA *parm;
 
-	RNA_def_property_srna(cprop, "MainGroups");
-	srna= RNA_def_struct(brna, "MainGroups", NULL);
+	RNA_def_property_srna(cprop, "BlendDataGroups");
+	srna= RNA_def_struct(brna, "BlendDataGroups", NULL);
 	RNA_def_struct_ui_text(srna, "Main Groups", "Collection of groups");
 
 	func= RNA_def_function(srna, "new", "rna_Main_groups_new");
@@ -1059,8 +1059,8 @@ void RNA_def_main_texts(BlenderRNA *brna, PropertyRNA *cprop)
 	FunctionRNA *func;
 	PropertyRNA *parm;
 
-	RNA_def_property_srna(cprop, "MainTexts");
-	srna= RNA_def_struct(brna, "MainTexts", NULL);
+	RNA_def_property_srna(cprop, "BlendDataTexts");
+	srna= RNA_def_struct(brna, "BlendDataTexts", NULL);
 	RNA_def_struct_ui_text(srna, "Main Texts", "Collection of texts");
 
 	func= RNA_def_function(srna, "new", "rna_Main_texts_new");
@@ -1098,8 +1098,8 @@ void RNA_def_main_sounds(BlenderRNA *brna, PropertyRNA *cprop)
 	FunctionRNA *func;
 	PropertyRNA *parm;
 
-	RNA_def_property_srna(cprop, "MainSounds");
-	srna= RNA_def_struct(brna, "MainSounds", NULL);
+	RNA_def_property_srna(cprop, "BlendDataSounds");
+	srna= RNA_def_struct(brna, "BlendDataSounds", NULL);
 	RNA_def_struct_ui_text(srna, "Main Sounds", "Collection of sounds");
 
 	/* TODO, 'load' */
@@ -1115,8 +1115,8 @@ void RNA_def_main_armatures(BlenderRNA *brna, PropertyRNA *cprop)
 	FunctionRNA *func;
 	PropertyRNA *parm;
 
-	RNA_def_property_srna(cprop, "MainArmatures");
-	srna= RNA_def_struct(brna, "MainArmatures", NULL);
+	RNA_def_property_srna(cprop, "BlendDataArmatures");
+	srna= RNA_def_struct(brna, "BlendDataArmatures", NULL);
 	RNA_def_struct_ui_text(srna, "Main Armatures", "Collection of armatures");
 
 	func= RNA_def_function(srna, "new", "rna_Main_armatures_new");
@@ -1143,8 +1143,8 @@ void RNA_def_main_actions(BlenderRNA *brna, PropertyRNA *cprop)
 	FunctionRNA *func;
 	PropertyRNA *parm;
 
-	RNA_def_property_srna(cprop, "MainActions");
-	srna= RNA_def_struct(brna, "MainActions", NULL);
+	RNA_def_property_srna(cprop, "BlendDataActions");
+	srna= RNA_def_struct(brna, "BlendDataActions", NULL);
 	RNA_def_struct_ui_text(srna, "Main Actions", "Collection of actions");
 
 	func= RNA_def_function(srna, "new", "rna_Main_actions_new");
@@ -1171,8 +1171,8 @@ void RNA_def_main_particles(BlenderRNA *brna, PropertyRNA *cprop)
 	FunctionRNA *func;
 	PropertyRNA *parm;
 
-	RNA_def_property_srna(cprop, "MainParticles");
-	srna= RNA_def_struct(brna, "MainParticles", NULL);
+	RNA_def_property_srna(cprop, "BlendDataParticles");
+	srna= RNA_def_struct(brna, "BlendDataParticles", NULL);
 	RNA_def_struct_ui_text(srna, "Main Particle Settings", "Collection of particle settings");
 
 	func= RNA_def_function(srna, "new", "rna_Main_particles_new");
@@ -1200,8 +1200,8 @@ void RNA_def_main_gpencil(BlenderRNA *brna, PropertyRNA *cprop)
 	FunctionRNA *func;
 	PropertyRNA *parm;
 
-	RNA_def_property_srna(cprop, "MainGreasePencils");
-	srna= RNA_def_struct(brna, "MainGreasePencils", NULL);
+	RNA_def_property_srna(cprop, "BlendDataGreasePencils");
+	srna= RNA_def_struct(brna, "BlendDataGreasePencils", NULL);
 	RNA_def_struct_ui_text(srna, "Main Grease Pencils", "Collection of grease pencils");
 
 	func= RNA_def_function(srna, "tag", "rna_Main_gpencil_tag");