diff options
author | Campbell Barton <ideasman42@gmail.com> | 2019-02-16 02:44:15 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2019-02-16 02:44:15 +0300 |
commit | ec471a9b1c14ea5dcb855de7e570e27ad70661c5 (patch) | |
tree | ab84e5d466b440a0202ff6271f43484763902f79 /source/blender/editors/screen | |
parent | 419911b1d19ceeb87cd1c0a7b78f0133bee4a6cd (diff) |
DNA: rename SpaceButs -> SpaceProperties
Diffstat (limited to 'source/blender/editors/screen')
-rw-r--r-- | source/blender/editors/screen/screen_ops.c | 8 | ||||
-rw-r--r-- | source/blender/editors/screen/screen_user_menu.c | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/source/blender/editors/screen/screen_ops.c b/source/blender/editors/screen/screen_ops.c index 1129bd7b1b9..d2e4366b34e 100644 --- a/source/blender/editors/screen/screen_ops.c +++ b/source/blender/editors/screen/screen_ops.c @@ -243,7 +243,7 @@ bool ED_operator_action_active(bContext *C) bool ED_operator_buttons_active(bContext *C) { - return ed_spacetype_test(C, SPACE_BUTS); + return ed_spacetype_test(C, SPACE_PROPERTIES); } bool ED_operator_node_active(bContext *C) @@ -3873,7 +3873,7 @@ static int match_region_with_redraws(int spacetype, int regiontype, int redraws, if ((redraws & (TIME_ALL_ANIM_WIN | TIME_REGION | TIME_ALL_3D_WIN)) || from_anim_edit) return 1; break; - case SPACE_BUTS: + case SPACE_PROPERTIES: if (redraws & TIME_ALL_BUTS_WIN) return 1; break; @@ -4777,7 +4777,7 @@ static bool space_context_cycle_poll(bContext *C) { ScrArea *sa = CTX_wm_area(C); /* sa might be NULL if called out of window bounds */ - return (sa && ELEM(sa->spacetype, SPACE_BUTS, SPACE_USERPREF)); + return (sa && ELEM(sa->spacetype, SPACE_PROPERTIES, SPACE_USERPREF)); } /** @@ -4791,7 +4791,7 @@ static void context_cycle_prop_get( const char *propname; switch (sa->spacetype) { - case SPACE_BUTS: + case SPACE_PROPERTIES: RNA_pointer_create(&screen->id, &RNA_SpaceProperties, sa->spacedata.first, r_ptr); propname = "context"; break; diff --git a/source/blender/editors/screen/screen_user_menu.c b/source/blender/editors/screen/screen_user_menu.c index 1f49eb2d5fc..dfcfd339889 100644 --- a/source/blender/editors/screen/screen_user_menu.c +++ b/source/blender/editors/screen/screen_user_menu.c @@ -68,7 +68,7 @@ bUserMenu **ED_screen_user_menus_find(const bContext *C, uint *r_len) bUserMenu **um_array = MEM_calloc_arrayN(array_len, sizeof(*um_array), __func__); um_array[0] = BKE_blender_user_menu_find(&U.user_menus, sl->spacetype, context); um_array[1] = (sl->spacetype != SPACE_TOPBAR) ? BKE_blender_user_menu_find(&U.user_menus, SPACE_TOPBAR, context) : NULL; - um_array[2] = (sl->spacetype == SPACE_VIEW3D) ? BKE_blender_user_menu_find(&U.user_menus, SPACE_BUTS, context) : NULL; + um_array[2] = (sl->spacetype == SPACE_VIEW3D) ? BKE_blender_user_menu_find(&U.user_menus, SPACE_PROPERTIES, context) : NULL; *r_len = array_len; return um_array; |