[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [34834] trunk/blender: misc small changes:
Campbell Barton
ideasman42 at gmail.com
Mon Feb 14 04:15:56 CET 2011
Revision: 34834
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=34834
Author: campbellbarton
Date: 2011-02-14 03:15:55 +0000 (Mon, 14 Feb 2011)
Log Message:
-----------
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.
Modified Paths:
--------------
trunk/blender/CMakeLists.txt
trunk/blender/source/blender/blenkernel/BKE_brush.h
trunk/blender/source/blender/blenkernel/intern/brush.c
trunk/blender/source/blender/editors/animation/anim_markers.c
trunk/blender/source/blender/editors/include/ED_markers.h
trunk/blender/source/blender/editors/space_view3d/view3d_edit.c
trunk/blender/source/blender/makesrna/RNA_types.h
trunk/blender/source/blender/makesrna/intern/rna_main_api.c
trunk/blender/source/blender/python/intern/bpy_rna.c
trunk/blender/source/blender/windowmanager/WM_api.h
trunk/blender/source/blender/windowmanager/intern/wm_files.c
trunk/blender/source/blender/windowmanager/intern/wm_init_exit.c
trunk/blender/source/blender/windowmanager/wm_files.h
Modified: trunk/blender/CMakeLists.txt
===================================================================
--- trunk/blender/CMakeLists.txt 2011-02-14 03:04:59 UTC (rev 34833)
+++ trunk/blender/CMakeLists.txt 2011-02-14 03:15:55 UTC (rev 34834)
@@ -227,6 +227,7 @@
# find_package(PythonLibs)
set(PYTHON /usr)
set(PYTHON_VERSION 3.1 CACHE STRING "")
+ mark_as_advanced(PYTHON_VERSION)
set(PYTHON_INCLUDE_DIRS "${PYTHON}/include/python${PYTHON_VERSION}" CACHE STRING "")
mark_as_advanced(PYTHON_INCLUDE_DIRS)
# set(PYTHON_BINARY python) # not used yet
Modified: trunk/blender/source/blender/blenkernel/BKE_brush.h
===================================================================
--- trunk/blender/source/blender/blenkernel/BKE_brush.h 2011-02-14 03:04:59 UTC (rev 34833)
+++ trunk/blender/source/blender/blenkernel/BKE_brush.h 2011-02-14 03:15:55 UTC (rev 34834)
@@ -109,5 +109,8 @@
float brush_alpha(struct Brush *brush);
void brush_set_alpha(struct Brush *brush, float value);
+/* debugging only */
+void brush_debug_print_state(struct Brush *br);
+
#endif
Modified: trunk/blender/source/blender/blenkernel/intern/brush.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/brush.c 2011-02-14 03:04:59 UTC (rev 34833)
+++ trunk/blender/source/blender/blenkernel/intern/brush.c 2011-02-14 03:15:55 UTC (rev 34834)
@@ -227,7 +227,7 @@
}
}
-static void brush_debug_print_state(Brush *br)
+void brush_debug_print_state(Brush *br)
{
/* create a fake brush and set it to the defaults */
Brush def= {{NULL}};
Modified: trunk/blender/source/blender/editors/animation/anim_markers.c
===================================================================
--- trunk/blender/source/blender/editors/animation/anim_markers.c 2011-02-14 03:04:59 UTC (rev 34833)
+++ trunk/blender/source/blender/editors/animation/anim_markers.c 2011-02-14 03:15:55 UTC (rev 34834)
@@ -269,7 +269,7 @@
/* Print debugging prints of list of markers
* BSI's: do NOT make static or put in if-defs as "unused code". That's too much trouble when we need to use for quick debuggging!
*/
-static void debug_markers_print_list(ListBase *markers)
+void debug_markers_print_list(ListBase *markers)
{
TimeMarker *marker;
Modified: trunk/blender/source/blender/editors/include/ED_markers.h
===================================================================
--- trunk/blender/source/blender/editors/include/ED_markers.h 2011-02-14 03:04:59 UTC (rev 34833)
+++ trunk/blender/source/blender/editors/include/ED_markers.h 2011-02-14 03:15:55 UTC (rev 34834)
@@ -64,6 +64,8 @@
/* called in screen_ops.c:ED_keymap_screen() */
void ED_marker_keymap(struct wmKeyConfig *keyconf);
+/* debugging only */
+void debug_markers_print_list(struct ListBase *markers);
#endif /* ED_MARKERS_H */
Modified: trunk/blender/source/blender/editors/space_view3d/view3d_edit.c
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/view3d_edit.c 2011-02-14 03:04:59 UTC (rev 34833)
+++ trunk/blender/source/blender/editors/space_view3d/view3d_edit.c 2011-02-14 03:15:55 UTC (rev 34834)
@@ -2776,7 +2776,7 @@
// speed and os, i changed the scaling values, but
// those are still not ok
-
+#if 0
static float ndof_axis_scale[6] = {
+0.01, // Tx
+0.01, // Tz
@@ -2799,7 +2799,6 @@
sbval[i]=0.0;
}
-#if 0
// statics for controlling rv3d->dist corrections.
// viewmoveNDOF zeros and adjusts rv3d->ofs.
// viewmove restores based on dz_flag state.
Modified: trunk/blender/source/blender/makesrna/RNA_types.h
===================================================================
--- trunk/blender/source/blender/makesrna/RNA_types.h 2011-02-14 03:04:59 UTC (rev 34833)
+++ trunk/blender/source/blender/makesrna/RNA_types.h 2011-02-14 03:15:55 UTC (rev 34834)
@@ -350,31 +350,31 @@
/* 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
}
Modified: trunk/blender/source/blender/makesrna/intern/rna_main_api.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_main_api.c 2011-02-14 03:04:59 UTC (rev 34833)
+++ trunk/blender/source/blender/makesrna/intern/rna_main_api.c 2011-02-14 03:15:55 UTC (rev 34834)
@@ -530,8 +530,8 @@
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 @@
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 @@
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 @@
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 @@
{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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list