archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Cleanup: naming

Browse Source
This commit is contained in:
Campbell Barton
2018-12-14 10:30:06 +11:00
parent 948256442b
commit aca13040da
6 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/editors/gpencil/gpencil_paint.c
View 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;

2
source/blender/editors/gpencil/gpencil_utils.c
View 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};

2
source/blender/editors/include/ED_gpencil.h
View 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 */

2
source/blender/editors/include/ED_object.h
View 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(

4
source/blender/editors/object/object_edit.c
View 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);

2
source/blender/editors/space_view3d/view3d_buttons.c
View 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)