[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [58982] trunk/blender: code cleanup: some structs were declaring data when only typedef's were intended, make local vars and functions static.

Campbell Barton ideasman42 at gmail.com
Wed Aug 7 05:44:06 CEST 2013


Revision: 58982
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=58982
Author:   campbellbarton
Date:     2013-08-07 03:44:05 +0000 (Wed, 07 Aug 2013)
Log Message:
-----------
code cleanup: some structs were declaring data when only typedef's were intended, make local vars and functions static.

Modified Paths:
--------------
    trunk/blender/intern/mikktspace/mikktspace.c
    trunk/blender/source/blender/blenloader/intern/readfile.c
    trunk/blender/source/blender/editors/interface/interface_ops.c
    trunk/blender/source/blender/editors/sculpt_paint/paint_utils.c
    trunk/blender/source/blender/editors/space_file/space_file.c
    trunk/blender/source/blender/editors/space_nla/nla_buttons.c
    trunk/blender/source/blender/editors/transform/transform.c
    trunk/blender/source/blender/python/bmesh/bmesh_py_ops.c
    trunk/blender/source/blender/python/bmesh/bmesh_py_types_meshdata.c
    trunk/blender/source/blender/python/intern/bpy_rna.c

Modified: trunk/blender/intern/mikktspace/mikktspace.c
===================================================================
--- trunk/blender/intern/mikktspace/mikktspace.c	2013-08-07 03:36:05 UTC (rev 58981)
+++ trunk/blender/intern/mikktspace/mikktspace.c	2013-08-07 03:44:05 UTC (rev 58982)
@@ -426,7 +426,7 @@
 	int index;
 } STmpVert;
 
-const int g_iCells = 2048;
+static const int g_iCells = 2048;
 
 #ifdef _MSC_VER
 	#define NOINLINE __declspec(noinline)

Modified: trunk/blender/source/blender/blenloader/intern/readfile.c
===================================================================
--- trunk/blender/source/blender/blenloader/intern/readfile.c	2013-08-07 03:36:05 UTC (rev 58981)
+++ trunk/blender/source/blender/blenloader/intern/readfile.c	2013-08-07 03:44:05 UTC (rev 58982)
@@ -7278,7 +7278,7 @@
 	}
 }
 
-void convert_tface_mt(FileData *fd, Main *main)
+static void convert_tface_mt(FileData *fd, Main *main)
 {
 	Main *gmain;
 	

Modified: trunk/blender/source/blender/editors/interface/interface_ops.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_ops.c	2013-08-07 03:36:05 UTC (rev 58981)
+++ trunk/blender/source/blender/editors/interface/interface_ops.c	2013-08-07 03:44:05 UTC (rev 58982)
@@ -704,12 +704,12 @@
 /* EditSource Utility funcs and operator,
  * note, this includes utility functions and button matching checks */
 
-struct uiEditSourceStore {
+typedef struct uiEditSourceStore {
 	uiBut but_orig;
 	GHash *hash;
 } uiEditSourceStore;
 
-struct uiEditSourceButStore {
+typedef struct uiEditSourceButStore {
 	char py_dbg_fn[FILE_MAX];
 	int py_dbg_ln;
 } uiEditSourceButStore;

Modified: trunk/blender/source/blender/editors/sculpt_paint/paint_utils.c
===================================================================
--- trunk/blender/source/blender/editors/sculpt_paint/paint_utils.c	2013-08-07 03:36:05 UTC (rev 58981)
+++ trunk/blender/source/blender/editors/sculpt_paint/paint_utils.c	2013-08-07 03:44:05 UTC (rev 58982)
@@ -412,7 +412,7 @@
 /* face-select ops */
 static int paint_select_linked_exec(bContext *C, wmOperator *UNUSED(op))
 {
-	paintface_select_linked(C, CTX_data_active_object(C), NULL, 2);
+	paintface_select_linked(C, CTX_data_active_object(C), NULL, true);
 	ED_region_tag_redraw(CTX_wm_region(C));
 	return OPERATOR_FINISHED;
 }

Modified: trunk/blender/source/blender/editors/space_file/space_file.c
===================================================================
--- trunk/blender/source/blender/editors/space_file/space_file.c	2013-08-07 03:36:05 UTC (rev 58981)
+++ trunk/blender/source/blender/editors/space_file/space_file.c	2013-08-07 03:44:05 UTC (rev 58982)
@@ -500,12 +500,14 @@
 	ED_region_panels(C, ar, 1, NULL, -1);
 }
 
-static void file_channel_area_listener(bScreen *UNUSED(sc), ScrArea *UNUSED(sa), ARegion *UNUSED(ar), wmNotifier *wmn)
+static void file_channel_area_listener(bScreen *UNUSED(sc), ScrArea *UNUSED(sa), ARegion *UNUSED(ar), wmNotifier *UNUSED(wmn))
 {
+#if 0
 	/* context changes */
 	switch (wmn->category) {
 		
 	}
+#endif
 }
 
 /* add handlers, stuff you only do once or on area/region changes */

Modified: trunk/blender/source/blender/editors/space_nla/nla_buttons.c
===================================================================
--- trunk/blender/source/blender/editors/space_nla/nla_buttons.c	2013-08-07 03:36:05 UTC (rev 58981)
+++ trunk/blender/source/blender/editors/space_nla/nla_buttons.c	2013-08-07 03:44:05 UTC (rev 58982)
@@ -68,14 +68,14 @@
 
 /* -------------- */
 
-static void do_nla_region_buttons(bContext *C, void *UNUSED(arg), int event)
+static void do_nla_region_buttons(bContext *C, void *UNUSED(arg), int UNUSED(event))
 {
 	//Scene *scene = CTX_data_scene(C);
-	
+#if 0
 	switch (event) {
 
 	}
-	
+#endif
 	/* default for now */
 	WM_event_add_notifier(C, NC_OBJECT | ND_TRANSFORM, NULL);
 	WM_event_add_notifier(C, NC_SCENE | ND_TRANSFORM, NULL);

Modified: trunk/blender/source/blender/editors/transform/transform.c
===================================================================
--- trunk/blender/source/blender/editors/transform/transform.c	2013-08-07 03:36:05 UTC (rev 58981)
+++ trunk/blender/source/blender/editors/transform/transform.c	2013-08-07 03:44:05 UTC (rev 58982)
@@ -5706,7 +5706,7 @@
 	return 0;
 }
 
-void drawEdgeSlide(const struct bContext *C, TransInfo *t)
+static void drawEdgeSlide(const struct bContext *C, TransInfo *t)
 {
 	if (t->mode == TFM_EDGE_SLIDE) {
 		EdgeSlideData *sld = (EdgeSlideData *)t->customData;

Modified: trunk/blender/source/blender/python/bmesh/bmesh_py_ops.c
===================================================================
--- trunk/blender/source/blender/python/bmesh/bmesh_py_ops.c	2013-08-07 03:36:05 UTC (rev 58981)
+++ trunk/blender/source/blender/python/bmesh/bmesh_py_ops.c	2013-08-07 03:44:05 UTC (rev 58982)
@@ -50,7 +50,7 @@
 
 /* bmesh operator 'bmesh.ops.*' callable types
  * ******************************************* */
-PyTypeObject bmesh_op_Type;
+static PyTypeObject bmesh_op_Type;
 
 static PyObject *bpy_bmesh_op_CreatePyObject(const char *opname)
 {
@@ -140,7 +140,7 @@
 /* Types
  * ===== */
 
-PyTypeObject bmesh_op_Type = {
+static PyTypeObject bmesh_op_Type = {
 	PyVarObject_HEAD_INIT(NULL, 0)
 	"BMeshOpFunc",              /* tp_name */
 	sizeof(BPy_BMeshOpFunc),    /* tp_basicsize */

Modified: trunk/blender/source/blender/python/bmesh/bmesh_py_types_meshdata.c
===================================================================
--- trunk/blender/source/blender/python/bmesh/bmesh_py_types_meshdata.c	2013-08-07 03:36:05 UTC (rev 58981)
+++ trunk/blender/source/blender/python/bmesh/bmesh_py_types_meshdata.c	2013-08-07 03:44:05 UTC (rev 58982)
@@ -310,7 +310,7 @@
 	return mathutils_bmloopcol_set(bmo, subtype);
 }
 
-Mathutils_Callback mathutils_bmloopcol_cb = {
+static Mathutils_Callback mathutils_bmloopcol_cb = {
 	mathutils_bmloopcol_check,
 	mathutils_bmloopcol_get,
 	mathutils_bmloopcol_set,

Modified: trunk/blender/source/blender/python/intern/bpy_rna.c
===================================================================
--- trunk/blender/source/blender/python/intern/bpy_rna.c	2013-08-07 03:36:05 UTC (rev 58981)
+++ trunk/blender/source/blender/python/intern/bpy_rna.c	2013-08-07 03:44:05 UTC (rev 58982)
@@ -5948,7 +5948,7 @@
 static void pyrna_prop_collection_iter_dealloc(BPy_PropertyCollectionIterRNA *self);
 static PyObject *pyrna_prop_collection_iter_next(BPy_PropertyCollectionIterRNA *self);
 
-PyTypeObject pyrna_prop_collection_iter_Type = {
+static PyTypeObject pyrna_prop_collection_iter_Type = {
 	PyVarObject_HEAD_INIT(NULL, 0)
 	"bpy_prop_collection_iter", /* tp_name */
 	sizeof(BPy_PropertyCollectionIterRNA), /* tp_basicsize */




More information about the Bf-blender-cvs mailing list