Cleanup: naming
authorCampbell Barton <ideasman42@gmail.com>
Thu, 13 Dec 2018 23:30:06 +0000 (10:30 +1100)
committerCampbell Barton <ideasman42@gmail.com>
Thu, 13 Dec 2018 23:34:12 +0000 (10:34 +1100)
source/blender/editors/gpencil/gpencil_paint.c
source/blender/editors/gpencil/gpencil_utils.c
source/blender/editors/include/ED_gpencil.h
source/blender/editors/include/ED_object.h
source/blender/editors/object/object_edit.c
source/blender/editors/space_view3d/view3d_buttons.c

index 39bca4d096c304b1ca0a3114a3bd377b634d7d65..b97e335d0818bc21872c277cd09e2769eef2ddfb 100644 (file)
@@ -1832,7 +1832,7 @@ static bool gp_session_initdata(bContext *C, wmOperator *op, tGPsdata *p)
                                        local_view_bits = v3d->local_view_uuid;
                                }
                                /* create new default object */
-                               obact = ED_add_gpencil_object(C, p->scene, cur, local_view_bits);
+                               obact = ED_gpencil_add_object(C, p->scene, cur, local_view_bits);
                        }
                        /* assign object after all checks to be sure we have one active */
                        p->ob = obact;
index 7cc153e0f614c80b7d0200822386fd656fa386e5..40c2567f1c05d5aabfefe6fc9527b6e35674f7d1 100644 (file)
@@ -1171,7 +1171,7 @@ void ED_gpencil_reset_layers_parent(Depsgraph *depsgraph, Object *obact, bGPdata
 /* GP Object Stuff */
 
 /* Helper function to create new OB_GPENCIL Object */
-Object *ED_add_gpencil_object(bContext *C, Scene *UNUSED(scene), const float loc[3], ushort local_view_bits)
+Object *ED_gpencil_add_object(bContext *C, Scene *UNUSED(scene), const float loc[3], ushort local_view_bits)
 {
        float rot[3] = {0.0f};
 
index e4e047305c645dba0cd0df983bf57b81638fec57..06869cd226bed5d386d24a8bc9be6f8cf1582d63 100644 (file)
@@ -222,7 +222,7 @@ void ED_gpencil_create_monkey(struct bContext *C, float mat[4][4]);
 void ED_gpencil_create_stroke(struct bContext *C, float mat[4][4]);
 
 /* ------------ Object Utilities ------------ */
-struct Object *ED_add_gpencil_object(
+struct Object *ED_gpencil_add_object(
         struct bContext *C, struct Scene *scene, const float loc[3], unsigned short local_view_bits);
 void ED_gpencil_add_defaults(struct bContext *C);
 /* set object modes */
index 0a666b02c754840de4453a4b57dfcd5a743f7a5a..fd0635e31ef70b8019413ce5dd09c59d50723de6 100644 (file)
@@ -69,7 +69,7 @@ struct uiLayout;
 /* object_edit.c */
 struct Object *ED_object_context(struct bContext *C);               /* context.object */
 struct Object *ED_object_active_context(struct bContext *C); /* context.object or context.active_object */
-void ED_hide_collections_menu_draw(const struct bContext *C, struct uiLayout *layout);
+void ED_collection_hide_menu_draw(const struct bContext *C, struct uiLayout *layout);
 
 /* object_utils.c */
 bool ED_object_calc_active_center_for_editmode(
index c745a13087df61620ca8124417c266a6be252c15..676d44e3ea42353ac9a0b9ac16c7857d6905d7a2 100644 (file)
@@ -303,7 +303,7 @@ static int object_hide_collection_exec(bContext *C, wmOperator *op)
 
 #define COLLECTION_INVALID_INDEX -1
 
-void ED_hide_collections_menu_draw(const bContext *C, uiLayout *layout)
+void ED_collection_hide_menu_draw(const bContext *C, uiLayout *layout)
 {
        ViewLayer *view_layer = CTX_data_view_layer(C);
        LayerCollection *lc_scene = view_layer->layer_collections.first;
@@ -358,7 +358,7 @@ static int object_hide_collection_invoke(bContext *C, wmOperator *op, const wmEv
        uiPopupMenu *pup = UI_popup_menu_begin(C, title, ICON_GROUP);
        uiLayout *layout = UI_popup_menu_layout(pup);
 
-       ED_hide_collections_menu_draw(C, layout);
+       ED_collection_hide_menu_draw(C, layout);
 
        UI_popup_menu_end(C, pup);
 
index 357d04e0ce9059dc5b82de01f0e1862ae5ac0bcf..277d0f6a2a082b141b9071e34158b66257b14faa 100644 (file)
@@ -1172,7 +1172,7 @@ static void view3d_panel_transform(const bContext *C, Panel *pa)
 
 static void hide_collections_menu_draw(const bContext *C, Menu *menu)
 {
-       ED_hide_collections_menu_draw(C, menu->layout);
+       ED_collection_hide_menu_draw(C, menu->layout);
 }
 
 void view3d_buttons_register(ARegionType *art)