[Bf-blender-cvs] [55f97d1dd9a] blender2.8: Static override: cleanup: name consistency.

[Bastien Montagne]

Commit: 55f97d1dd9afd869bf73c39d4bbac1af893cddc4
Author: Bastien Montagne
Date:   Tue Jan 16 17:10:36 2018 +0100
Branches: blender2.8
https://developer.blender.org/rB55f97d1dd9afd869bf73c39d4bbac1af893cddc4

Static override: cleanup: name consistency.

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

M       source/blender/editors/object/object_intern.h
M       source/blender/editors/object/object_ops.c
M       source/blender/editors/object/object_relations.c

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

diff --git a/source/blender/editors/object/object_intern.h 
b/source/blender/editors/object/object_intern.h
index c38a7d58904..03aacc86ea7 100644
--- a/source/blender/editors/object/object_intern.h
+++ b/source/blender/editors/object/object_intern.h
@@ -68,7 +68,7 @@ void OBJECT_OT_track_clear(struct wmOperatorType *ot);
 void OBJECT_OT_slow_parent_set(struct wmOperatorType *ot);
 void OBJECT_OT_slow_parent_clear(struct wmOperatorType *ot);
 void OBJECT_OT_make_local(struct wmOperatorType *ot);
-void OBJECT_OT_make_override(struct wmOperatorType *ot);
+void OBJECT_OT_make_override_static(struct wmOperatorType *ot);
 void OBJECT_OT_make_single_user(struct wmOperatorType *ot);
 void OBJECT_OT_make_links_scene(struct wmOperatorType *ot);
 void OBJECT_OT_make_links_data(struct wmOperatorType *ot);
diff --git a/source/blender/editors/object/object_ops.c 
b/source/blender/editors/object/object_ops.c
index ceea3b9c0ac..9c321f5cb79 100644
--- a/source/blender/editors/object/object_ops.c
+++ b/source/blender/editors/object/object_ops.c
@@ -84,7 +84,7 @@ void ED_operatortypes_object(void)
        WM_operatortype_append(OBJECT_OT_slow_parent_set);
        WM_operatortype_append(OBJECT_OT_slow_parent_clear);
        WM_operatortype_append(OBJECT_OT_make_local);
-       WM_operatortype_append(OBJECT_OT_make_override);
+       WM_operatortype_append(OBJECT_OT_make_override_static);
        WM_operatortype_append(OBJECT_OT_make_single_user);
        WM_operatortype_append(OBJECT_OT_make_links_scene);
        WM_operatortype_append(OBJECT_OT_make_links_data);
diff --git a/source/blender/editors/object/object_relations.c 
b/source/blender/editors/object/object_relations.c
index a2d5f40cbd3..1bf605408f1 100644
--- a/source/blender/editors/object/object_relations.c
+++ b/source/blender/editors/object/object_relations.c
@@ -2336,7 +2336,7 @@ void OBJECT_OT_make_local(wmOperatorType *ot)
 }
 
 
-static void make_override_tag_object(Object *obact, Object *ob)
+static void make_override_static_tag_object(Object *obact, Object *ob)
 {
        if (ob == obact) {
                return;
@@ -2370,7 +2370,7 @@ static void make_override_tag_object(Object *obact, 
Object *ob)
 }
 
 /* Set the object to override. */
-static int make_override_invoke(bContext *C, wmOperator *op, const wmEvent 
*event)
+static int make_override_static_invoke(bContext *C, wmOperator *op, const 
wmEvent *event)
 {
        Scene *scene = CTX_data_scene(C);
        Object *obact = ED_object_active_context(C);
@@ -2409,7 +2409,7 @@ static int make_override_invoke(bContext *C, wmOperator 
*op, const wmEvent *even
 
 }
 
-static int make_override_exec(bContext *C, wmOperator *op)
+static int make_override_static_exec(bContext *C, wmOperator *op)
 {
        Main *bmain = CTX_data_main(C);
        Object *obact = CTX_data_active_object(C);
@@ -2470,7 +2470,7 @@ static int make_override_exec(bContext *C, wmOperator *op)
                obact->id.tag |= LIB_TAG_DOIT;
 
                for (Object *ob = bmain->object.first; ob != NULL; ob = 
ob->id.next) {
-                       make_override_tag_object(obact, ob);
+                       make_override_static_tag_object(obact, ob);
                }
 
                success = BKE_override_static_create_from_tag(bmain);
@@ -2491,7 +2491,7 @@ static int make_override_exec(bContext *C, wmOperator *op)
        return success ? OPERATOR_FINISHED : OPERATOR_CANCELLED;
 }
 
-static int make_override_poll(bContext *C)
+static int make_override_static_poll(bContext *C)
 {
        Object *obact = CTX_data_active_object(C);
 
@@ -2501,17 +2501,17 @@ static int make_override_poll(bContext *C)
                 (!ID_IS_LINKED(obact) && obact->dup_group != NULL && 
ID_IS_LINKED(obact->dup_group))));
 }
 
-void OBJECT_OT_make_override(wmOperatorType *ot)
+void OBJECT_OT_make_override_static(wmOperatorType *ot)
 {
        /* identifiers */
-       ot->name = "Make Override";
+       ot->name = "Make Static Override";
        ot->description = "Make local override of this library linked 
data-block";
-       ot->idname = "OBJECT_OT_make_override";
+       ot->idname = "OBJECT_OT_make_override_static";
 
        /* api callbacks */
-       ot->invoke = make_override_invoke;
-       ot->exec = make_override_exec;
-       ot->poll = make_override_poll;
+       ot->invoke = make_override_static_invoke;
+       ot->exec = make_override_static_exec;
+       ot->poll = make_override_static_poll;
 
        /* flags */
        ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs