[Bf-blender-cvs] [854461002cb] modifier-panels-ui: Naming of modifier move to index operator

Hans Goudey noreply at git.blender.org
Tue Apr 28 21:53:08 CEST 2020


Commit: 854461002cbf9b60fb7700d08dd765a81c99c6a9
Author: Hans Goudey
Date:   Mon Apr 27 18:46:33 2020 -0500
Branches: modifier-panels-ui
https://developer.blender.org/rB854461002cbf9b60fb7700d08dd765a81c99c6a9

Naming of modifier move to index operator

===================================================================

M	source/blender/editors/object/object_modifier.c

===================================================================

diff --git a/source/blender/editors/object/object_modifier.c b/source/blender/editors/object/object_modifier.c
index b32ed390723..441df0d5f65 100644
--- a/source/blender/editors/object/object_modifier.c
+++ b/source/blender/editors/object/object_modifier.c
@@ -1225,12 +1225,12 @@ void OBJECT_OT_modifier_move_down(wmOperatorType *ot)
 /** \name Move to Index Modifier Operator
  * \{ */
 
-static bool OBJECT_OT_modifier_move_to_index_poll(bContext *C)
+static bool modifier_move_to_index_poll(bContext *C)
 {
   return edit_modifier_poll(C);
 }
 
-static int OBJECT_OT_modifier_move_to_index_exec(bContext *C, wmOperator *op)
+static int modifier_move_to_index_exec(bContext *C, wmOperator *op)
 {
   Object *ob = ED_object_active_context(C);
   ModifierData *md = edit_modifier_property_get(op, ob, 0);
@@ -1246,12 +1246,10 @@ static int OBJECT_OT_modifier_move_to_index_exec(bContext *C, wmOperator *op)
   return OPERATOR_FINISHED;
 }
 
-static int OBJECT_OT_modifier_move_to_index_invoke(bContext *C,
-                                                   wmOperator *op,
-                                                   const wmEvent *UNUSED(event))
+static int modifier_move_to_index_invoke(bContext *C, wmOperator *op, const wmEvent *UNUSED(event))
 {
   if (edit_modifier_invoke_properties(C, op)) {
-    return OBJECT_OT_modifier_move_to_index_exec(C, op);
+    return modifier_move_to_index_exec(C, op);
   }
   else {
     return OPERATOR_CANCELLED;
@@ -1264,9 +1262,9 @@ void OBJECT_OT_modifier_move_to_index(wmOperatorType *ot)
   ot->description = "Move the active modifier to an index in the stack";
   ot->idname = "OBJECT_OT_modifier_move_to_index";
 
-  ot->invoke = OBJECT_OT_modifier_move_to_index_invoke;
-  ot->exec = OBJECT_OT_modifier_move_to_index_exec;
-  ot->poll = OBJECT_OT_modifier_move_to_index_poll;
+  ot->invoke = modifier_move_to_index_invoke;
+  ot->exec = modifier_move_to_index_exec;
+  ot->poll = modifier_move_to_index_poll;
 
   /* flags */
   ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO | OPTYPE_INTERNAL;



More information about the Bf-blender-cvs mailing list