[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [58696] trunk/blender/source/blender: use '_exec' suffix for operator execute callbacks, also picky change to sizeof( ) use in BLI_array.h

Campbell Barton ideasman42 at gmail.com
Sun Jul 28 19:06:31 CEST 2013


Revision: 58696
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=58696
Author:   campbellbarton
Date:     2013-07-28 17:06:31 +0000 (Sun, 28 Jul 2013)
Log Message:
-----------
use '_exec' suffix for operator execute callbacks, also picky change to sizeof() use in BLI_array.h

Modified Paths:
--------------
    trunk/blender/source/blender/blenlib/BLI_array.h
    trunk/blender/source/blender/editors/animation/anim_markers.c
    trunk/blender/source/blender/editors/armature/armature_select.c
    trunk/blender/source/blender/editors/armature/pose_select.c
    trunk/blender/source/blender/editors/mesh/editmesh_tools.c
    trunk/blender/source/blender/editors/object/object_edit.c
    trunk/blender/source/blender/editors/render/render_shading.c
    trunk/blender/source/blender/editors/screen/screen_ops.c
    trunk/blender/source/blender/editors/sculpt_paint/paint_ops.c
    trunk/blender/source/blender/editors/sculpt_paint/paint_vertex.c
    trunk/blender/source/blender/editors/sculpt_paint/sculpt.c
    trunk/blender/source/blender/editors/space_graph/graph_buttons.c
    trunk/blender/source/blender/editors/space_image/image_buttons.c
    trunk/blender/source/blender/editors/space_logic/logic_buttons.c
    trunk/blender/source/blender/editors/space_nla/nla_buttons.c
    trunk/blender/source/blender/editors/space_node/node_buttons.c
    trunk/blender/source/blender/editors/space_node/node_relationships.c
    trunk/blender/source/blender/editors/space_node/node_toolbar.c
    trunk/blender/source/blender/editors/space_node/node_view.c
    trunk/blender/source/blender/editors/space_sequencer/sequencer_buttons.c
    trunk/blender/source/blender/editors/space_view3d/view3d_buttons.c
    trunk/blender/source/blender/editors/space_view3d/view3d_snap.c
    trunk/blender/source/blender/editors/space_view3d/view3d_toolbar.c
    trunk/blender/source/blender/quicktime/apple/quicktime_export.c
    trunk/blender/source/blender/windowmanager/intern/wm_operators.c

Modified: trunk/blender/source/blender/blenlib/BLI_array.h
===================================================================
--- trunk/blender/source/blender/blenlib/BLI_array.h	2013-07-28 15:07:13 UTC (rev 58695)
+++ trunk/blender/source/blender/blenlib/BLI_array.h	2013-07-28 17:06:31 UTC (rev 58696)
@@ -40,11 +40,11 @@
 #define _bli_array_totalsize_dynamic(arr)  (                                  \
 	((arr) == NULL) ?                                                         \
 	    0 :                                                                   \
-	    MEM_allocN_len(arr) / sizeof(*arr)                                    \
+	    MEM_allocN_len(arr) / sizeof(*(arr))                                  \
 )
 
 #define _bli_array_totalsize_static(arr)  \
-	(sizeof(_##arr##_static) / sizeof(*arr))
+	(sizeof(_##arr##_static) / sizeof(*(arr)))
 
 #define _bli_array_totalsize(arr)  (                                          \
 	(size_t)                                                                  \
@@ -66,9 +66,9 @@
 /* -------------------------------------------------------------------- */
 /* public defines */
 
-/* use sizeof(*arr) to ensure the array exists and is an array */
+/* use sizeof(*(arr)) to ensure the array exists and is an array */
 #define BLI_array_declare(arr)                                                \
-	int   _##arr##_count = ((void)(sizeof(*arr)), 0);                         \
+	int   _##arr##_count = ((void)(sizeof(*(arr))), 0);                       \
 	void *_##arr##_static = NULL
 
 /* this will use stack space, up to maxstatic array elements, before
@@ -96,7 +96,7 @@
 	(LIKELY(_bli_array_totalsize(arr) >= _##arr##_count + num) ?              \
 	 (void)0 /* do nothing */ :                                               \
 	 _bli_array_grow_func((void **)&(arr), _##arr##_static,                   \
-	                       sizeof(*arr), _##arr##_count, num,                 \
+	                       sizeof(*(arr)), _##arr##_count, num,               \
 	                       "BLI_array." #arr),                                \
 	 (void)0)  /* msvc2008 needs this */                                      \
 	),                                                                        \

Modified: trunk/blender/source/blender/editors/animation/anim_markers.c
===================================================================
--- trunk/blender/source/blender/editors/animation/anim_markers.c	2013-07-28 15:07:13 UTC (rev 58695)
+++ trunk/blender/source/blender/editors/animation/anim_markers.c	2013-07-28 17:06:31 UTC (rev 58696)
@@ -553,7 +553,7 @@
 /* ************************** add markers *************************** */
 
 /* add TimeMarker at curent frame */
-static int ed_marker_add(bContext *C, wmOperator *UNUSED(op))
+static int ed_marker_add_exec(bContext *C, wmOperator *UNUSED(op))
 {
 	ListBase *markers = ED_context_get_markers(C);
 	TimeMarker *marker;
@@ -593,7 +593,7 @@
 	ot->idname = "MARKER_OT_add";
 	
 	/* api callbacks */
-	ot->exec = ed_marker_add;
+	ot->exec = ed_marker_add_exec;
 	ot->invoke = ed_markers_opwrap_invoke;
 	ot->poll = ED_operator_animview_active;
 	

Modified: trunk/blender/source/blender/editors/armature/armature_select.c
===================================================================
--- trunk/blender/source/blender/editors/armature/armature_select.c	2013-07-28 15:07:13 UTC (rev 58695)
+++ trunk/blender/source/blender/editors/armature/armature_select.c	2013-07-28 17:06:31 UTC (rev 58696)
@@ -244,7 +244,7 @@
 	ot->description = "Select bones related to selected ones by parent/child relationships";
 	
 	/* api callbacks */
-	ot->exec = NULL;
+	/* leave 'exec' unset */
 	ot->invoke = armature_select_linked_invoke;
 	ot->poll = armature_select_linked_poll;
 	

Modified: trunk/blender/source/blender/editors/armature/pose_select.c
===================================================================
--- trunk/blender/source/blender/editors/armature/pose_select.c	2013-07-28 15:07:13 UTC (rev 58695)
+++ trunk/blender/source/blender/editors/armature/pose_select.c	2013-07-28 17:06:31 UTC (rev 58696)
@@ -271,7 +271,7 @@
 	ot->description = "Select bones related to selected ones by parent/child relationships";
 	
 	/* api callbacks */
-	ot->exec = NULL;
+	/* leave 'exec' unset */
 	ot->invoke = pose_select_connected_invoke;
 	ot->poll = pose_select_linked_poll;
 	

Modified: trunk/blender/source/blender/editors/mesh/editmesh_tools.c
===================================================================
--- trunk/blender/source/blender/editors/mesh/editmesh_tools.c	2013-07-28 15:07:13 UTC (rev 58695)
+++ trunk/blender/source/blender/editors/mesh/editmesh_tools.c	2013-07-28 17:06:31 UTC (rev 58696)
@@ -635,7 +635,7 @@
 
 /* ************************* SEAMS AND EDGES **************** */
 
-static int edbm_mark_seam(bContext *C, wmOperator *op)
+static int edbm_mark_seam_exec(bContext *C, wmOperator *op)
 {
 	Scene *scene = CTX_data_scene(C);
 	Object *obedit = CTX_data_edit_object(C);
@@ -681,7 +681,7 @@
 	ot->description = "(Un)mark selected edges as a seam";
 	
 	/* api callbacks */
-	ot->exec = edbm_mark_seam;
+	ot->exec = edbm_mark_seam_exec;
 	ot->poll = ED_operator_editmesh;
 	
 	/* flags */
@@ -690,7 +690,7 @@
 	RNA_def_boolean(ot->srna, "clear", 0, "Clear", "");
 }
 
-static int edbm_mark_sharp(bContext *C, wmOperator *op)
+static int edbm_mark_sharp_exec(bContext *C, wmOperator *op)
 {
 	Object *obedit = CTX_data_edit_object(C);
 	Mesh *me = ((Mesh *)obedit->data);
@@ -735,7 +735,7 @@
 	ot->description = "(Un)mark selected edges as sharp";
 	
 	/* api callbacks */
-	ot->exec = edbm_mark_sharp;
+	ot->exec = edbm_mark_sharp_exec;
 	ot->poll = ED_operator_editmesh;
 	
 	/* flags */
@@ -745,7 +745,7 @@
 }
 
 
-static int edbm_vert_connect(bContext *C, wmOperator *op)
+static int edbm_vert_connect_exec(bContext *C, wmOperator *op)
 {
 	Object *obedit = CTX_data_edit_object(C);
 	BMEditMesh *em = BKE_editmesh_from_object(obedit);
@@ -795,7 +795,7 @@
 	ot->description = "Connect 2 vertices of a face by an edge, splitting the face in two";
 	
 	/* api callbacks */
-	ot->exec = edbm_vert_connect;
+	ot->exec = edbm_vert_connect_exec;
 	ot->poll = ED_operator_editmesh;
 	
 	/* flags */
@@ -4437,7 +4437,7 @@
 
 #ifdef WITH_FREESTYLE
 
-static int edbm_mark_freestyle_edge(bContext *C, wmOperator *op)
+static int edbm_mark_freestyle_edge_exec(bContext *C, wmOperator *op)
 {
 	Object *obedit = CTX_data_edit_object(C);
 	Mesh *me = (Mesh *)obedit->data;
@@ -4490,7 +4490,7 @@
 	ot->idname = "MESH_OT_mark_freestyle_edge";
 
 	/* api callbacks */
-	ot->exec = edbm_mark_freestyle_edge;
+	ot->exec = edbm_mark_freestyle_edge_exec;
 	ot->poll = ED_operator_editmesh;
 
 	/* flags */

Modified: trunk/blender/source/blender/editors/object/object_edit.c
===================================================================
--- trunk/blender/source/blender/editors/object/object_edit.c	2013-07-28 15:07:13 UTC (rev 58695)
+++ trunk/blender/source/blender/editors/object/object_edit.c	2013-07-28 17:06:31 UTC (rev 58696)
@@ -1610,7 +1610,7 @@
 
 /************************ Game Properties ***********************/
 
-static int game_property_new(bContext *C, wmOperator *op)
+static int game_property_new_exec(bContext *C, wmOperator *op)
 {
 	Object *ob = CTX_data_active_object(C);
 	bProperty *prop;
@@ -1640,7 +1640,7 @@
 	ot->idname = "OBJECT_OT_game_property_new";
 
 	/* api callbacks */
-	ot->exec = game_property_new;
+	ot->exec = game_property_new_exec;
 	ot->poll = ED_operator_object_active_editable;
 
 	/* flags */
@@ -1650,7 +1650,7 @@
 	RNA_def_string(ot->srna, "name", "", MAX_NAME, "Name", "Name of the game property to add");
 }
 
-static int game_property_remove(bContext *C, wmOperator *op)
+static int game_property_remove_exec(bContext *C, wmOperator *op)
 {
 	Object *ob = CTX_data_active_object(C);
 	bProperty *prop;
@@ -1681,7 +1681,7 @@
 	ot->idname = "OBJECT_OT_game_property_remove";
 
 	/* api callbacks */
-	ot->exec = game_property_remove;
+	ot->exec = game_property_remove_exec;
 	ot->poll = ED_operator_object_active_editable;
 
 	/* flags */

Modified: trunk/blender/source/blender/editors/render/render_shading.c
===================================================================
--- trunk/blender/source/blender/editors/render/render_shading.c	2013-07-28 15:07:13 UTC (rev 58695)
+++ trunk/blender/source/blender/editors/render/render_shading.c	2013-07-28 17:06:31 UTC (rev 58696)
@@ -1214,7 +1214,7 @@
 
 #endif /* WITH_FREESTYLE */
 
-static int texture_slot_move(bContext *C, wmOperator *op)
+static int texture_slot_move_exec(bContext *C, wmOperator *op)
 {
 	ID *id = CTX_data_pointer_get_type(C, "texture_slot", &RNA_TextureSlot).id.data;
 
@@ -1292,7 +1292,7 @@
 	ot->description = "Move texture slots up and down";
 
 	/* api callbacks */
-	ot->exec = texture_slot_move;
+	ot->exec = texture_slot_move_exec;
 
 	/* flags */
 	ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;

Modified: trunk/blender/source/blender/editors/screen/screen_ops.c
===================================================================
--- trunk/blender/source/blender/editors/screen/screen_ops.c	2013-07-28 15:07:13 UTC (rev 58695)
+++ trunk/blender/source/blender/editors/screen/screen_ops.c	2013-07-28 17:06:31 UTC (rev 58696)
@@ -2564,7 +2564,7 @@
 /* ******************************* */
 
 
-static int spacedata_cleanup(bContext *C, wmOperator *op)
+static int spacedata_cleanup_exec(bContext *C, wmOperator *op)
 {
 	Main *bmain = CTX_data_main(C);
 	bScreen *screen;
@@ -2596,7 +2596,7 @@
 	ot->idname = "SCREEN_OT_spacedata_cleanup";
 	
 	/* api callbacks */
-	ot->exec = spacedata_cleanup;
+	ot->exec = spacedata_cleanup_exec;
 	ot->poll = WM_operator_winactive;
 	
 }
@@ -3369,7 +3369,7 @@
  * poll()	has to be filled in by user for context
  */
 #if 0
-static int border_select_do(bContext *C, wmOperator *op)
+static int border_select_exec(bContext *C, wmOperator *op)
 {
 	int event_type = RNA_int_get(op->ptr, "event_type");
 	
@@ -3390,7 +3390,7 @@
 	ot->idname = "SCREEN_OT_border_select";
 	
 	/* api callbacks */
-	ot->exec = border_select_do;
+	ot->exec = border_select_exec;
 	ot->invoke = WM_border_select_invoke;
 	ot->modal = WM_border_select_modal;
 	ot->cancel = WM_border_select_cancel;

Modified: trunk/blender/source/blender/editors/sculpt_paint/paint_ops.c
===================================================================

@@ Diff output truncated at 10240 characters. @@



More information about the Bf-blender-cvs mailing list