diff options
29 files changed, 99 insertions, 98 deletions
diff --git a/source/blender/blenkernel/BKE_context.h b/source/blender/blenkernel/BKE_context.h index a126a9842ce..02ea5600b68 100644 --- a/source/blender/blenkernel/BKE_context.h +++ b/source/blender/blenkernel/BKE_context.h @@ -161,7 +161,7 @@ struct RegionView3D *CTX_wm_region_view3d(const bContext *C); struct SpaceText *CTX_wm_space_text(const bContext *C); struct SpaceImage *CTX_wm_space_image(const bContext *C); struct SpaceConsole *CTX_wm_space_console(const bContext *C); -struct SpaceButs *CTX_wm_space_buts(const bContext *C); +struct SpaceProperties *CTX_wm_space_properties(const bContext *C); struct SpaceFile *CTX_wm_space_file(const bContext *C); struct SpaceSeq *CTX_wm_space_seq(const bContext *C); struct SpaceOutliner *CTX_wm_space_outliner(const bContext *C); diff --git a/source/blender/blenkernel/intern/anim_sys.c b/source/blender/blenkernel/intern/anim_sys.c index 0f4e3c204a7..2bfbd547ee6 100644 --- a/source/blender/blenkernel/intern/anim_sys.c +++ b/source/blender/blenkernel/intern/anim_sys.c @@ -614,7 +614,7 @@ char *BKE_animdata_driver_path_hack(bContext *C, PointerRNA *ptr, PropertyRNA *p * restricts the subspace of options to the 'active' data (a manageable state) */ /* TODO: watch out for pinned context? */ - if ((sa) && (sa->spacetype == SPACE_BUTS)) { + if ((sa) && (sa->spacetype == SPACE_PROPERTIES)) { Object *ob = CTX_data_active_object(C); if (ob && id) { diff --git a/source/blender/blenkernel/intern/context.c b/source/blender/blenkernel/intern/context.c index 4765fee8c6c..e59926b03f0 100644 --- a/source/blender/blenkernel/intern/context.c +++ b/source/blender/blenkernel/intern/context.c @@ -726,10 +726,10 @@ struct SpaceImage *CTX_wm_space_image(const bContext *C) return NULL; } -struct SpaceButs *CTX_wm_space_buts(const bContext *C) +struct SpaceProperties *CTX_wm_space_properties(const bContext *C) { ScrArea *sa = CTX_wm_area(C); - if (sa && sa->spacetype == SPACE_BUTS) + if (sa && sa->spacetype == SPACE_PROPERTIES) return sa->spacedata.first; return NULL; } diff --git a/source/blender/blenkernel/intern/screen.c b/source/blender/blenkernel/intern/screen.c index cbbaa16fda3..0e5cb900521 100644 --- a/source/blender/blenkernel/intern/screen.c +++ b/source/blender/blenkernel/intern/screen.c @@ -853,7 +853,7 @@ void BKE_screen_header_alignment_reset(bScreen *screen) for (ScrArea *sa = screen->areabase.first; sa; sa = sa->next) { for (ARegion *ar = sa->regionbase.first; ar; ar = ar->next) { if (ar->regiontype == RGN_TYPE_HEADER) { - if (ELEM(sa->spacetype, SPACE_FILE, SPACE_USERPREF, SPACE_OUTLINER, SPACE_BUTS)) { + if (ELEM(sa->spacetype, SPACE_FILE, SPACE_USERPREF, SPACE_OUTLINER, SPACE_PROPERTIES)) { ar->alignment = RGN_ALIGN_TOP; continue; } diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c index c68dcfc18fc..f5c35d9228d 100644 --- a/source/blender/blenloader/intern/readfile.c +++ b/source/blender/blenloader/intern/readfile.c @@ -6893,8 +6893,8 @@ static void direct_link_area(FileData *fd, ScrArea *area) sseq->scopes.histogram_ibuf = NULL; sseq->compositor = NULL; } - else if (sl->spacetype == SPACE_BUTS) { - SpaceButs *sbuts = (SpaceButs *)sl; + else if (sl->spacetype == SPACE_PROPERTIES) { + SpaceProperties *sbuts = (SpaceProperties *)sl; sbuts->path = NULL; sbuts->texuser = NULL; @@ -6988,9 +6988,9 @@ static void lib_link_area(FileData *fd, ID *parent_id, ScrArea *area) } break; } - case SPACE_BUTS: + case SPACE_PROPERTIES: { - SpaceButs *sbuts = (SpaceButs *)sl; + SpaceProperties *sbuts = (SpaceProperties *)sl; sbuts->pinid = newlibadr(fd, parent_id->lib, sbuts->pinid); if (sbuts->pinid == NULL) { sbuts->flag &= ~SB_PIN_CONTEXT; @@ -7480,8 +7480,8 @@ static void lib_link_workspace_layout_restore(struct IDNameLib_Map *id_map, Main */ sipo->runtime.flag |= SIPO_RUNTIME_FLAG_NEED_CHAN_SYNC_COLOR; } - else if (sl->spacetype == SPACE_BUTS) { - SpaceButs *sbuts = (SpaceButs *)sl; + else if (sl->spacetype == SPACE_PROPERTIES) { + SpaceProperties *sbuts = (SpaceProperties *)sl; sbuts->pinid = restore_pointer_by_name(id_map, sbuts->pinid, USER_IGNORE); if (sbuts->pinid == NULL) { sbuts->flag &= ~SB_PIN_CONTEXT; diff --git a/source/blender/blenloader/intern/versioning_250.c b/source/blender/blenloader/intern/versioning_250.c index 4ae394fd4ee..15e3e7aa115 100644 --- a/source/blender/blenloader/intern/versioning_250.c +++ b/source/blender/blenloader/intern/versioning_250.c @@ -234,7 +234,7 @@ static void area_add_window_regions(ScrArea *sa, SpaceLink *sl, ListBase *lb) ar->alignment = RGN_ALIGN_RIGHT; ar->flag = RGN_FLAG_HIDDEN; #if 0 - case SPACE_BUTS: + case SPACE_PROPERTIES: /* context UI region */ ar = MEM_callocN(sizeof(ARegion), "area region from do_versions"); BLI_addtail(lb, ar); @@ -363,9 +363,9 @@ static void area_add_window_regions(ScrArea *sa, SpaceLink *sl, ListBase *lb) ar->v2d.keepzoom = V2D_LIMITZOOM | V2D_KEEPASPECT; break; } - case SPACE_BUTS: + case SPACE_PROPERTIES: { - SpaceButs *sbuts = (SpaceButs *)sl; + SpaceProperties *sbuts = (SpaceProperties *)sl; memcpy(&ar->v2d, &sbuts->v2d, sizeof(View2D)); ar->v2d.scroll |= (V2D_SCROLL_RIGHT | V2D_SCROLL_BOTTOM); diff --git a/source/blender/blenloader/intern/versioning_280.c b/source/blender/blenloader/intern/versioning_280.c index 3b0d08d1536..8a688a72ef8 100644 --- a/source/blender/blenloader/intern/versioning_280.c +++ b/source/blender/blenloader/intern/versioning_280.c @@ -2155,7 +2155,7 @@ void blo_do_versions_280(FileData *fd, Library *UNUSED(lib), Main *bmain) for (bScreen *screen = bmain->screen.first; screen; screen = screen->id.next) { for (ScrArea *sa = screen->areabase.first; sa; sa = sa->next) { for (SpaceLink *sl = sa->spacedata.first; sl; sl = sl->next) { - if (sl->spacetype == SPACE_BUTS) { + if (sl->spacetype == SPACE_PROPERTIES) { ListBase *regionbase = (sl == sa->spacedata.first) ? &sa->regionbase : &sl->regionbase; ARegion *ar = MEM_callocN(sizeof(ARegion), "navigation bar for properties"); ARegion *ar_header = NULL; @@ -2550,9 +2550,9 @@ void blo_do_versions_280(FileData *fd, Library *UNUSED(lib), Main *bmain) SNODE_FLAG_DEPRECATED_11); break; } - case SPACE_BUTS: + case SPACE_PROPERTIES: { - SpaceButs *sbuts = (SpaceButs *)sl; + SpaceProperties *sbuts = (SpaceProperties *)sl; sbuts->flag &= ~( SB_FLAG_DEPRECATED_2 | SB_FLAG_DEPRECATED_3); diff --git a/source/blender/blenloader/intern/versioning_legacy.c b/source/blender/blenloader/intern/versioning_legacy.c index 6038cde3ea4..d8245cf9df3 100644 --- a/source/blender/blenloader/intern/versioning_legacy.c +++ b/source/blender/blenloader/intern/versioning_legacy.c @@ -1013,8 +1013,8 @@ void blo_do_versions_pre250(FileData *fd, Library *lib, Main *bmain) SpaceLink *sl; for (sl = sa->spacedata.first; sl; sl = sl->next) { - if (sl->spacetype == SPACE_BUTS) { - SpaceButs *sbuts = (SpaceButs *)sl; + if (sl->spacetype == SPACE_PROPERTIES) { + SpaceProperties *sbuts = (SpaceProperties *)sl; sbuts->v2d.maxzoom = 1.2f; diff --git a/source/blender/blenloader/intern/writefile.c b/source/blender/blenloader/intern/writefile.c index a6172c30547..1a9e5aa4b85 100644 --- a/source/blender/blenloader/intern/writefile.c +++ b/source/blender/blenloader/intern/writefile.c @@ -2885,8 +2885,8 @@ static void write_area_regions(WriteData *wd, ScrArea *area) /* reenable ghost curves */ sipo->runtime.ghost_curves = tmpGhosts; } - else if (sl->spacetype == SPACE_BUTS) { - writestruct(wd, DATA, SpaceButs, 1, sl); + else if (sl->spacetype == SPACE_PROPERTIES) { + writestruct(wd, DATA, SpaceProperties, 1, sl); } else if (sl->spacetype == SPACE_FILE) { SpaceFile *sfile = (SpaceFile *)sl; diff --git a/source/blender/editors/armature/pose_edit.c b/source/blender/editors/armature/pose_edit.c index 8f78aadb067..bdf2b2d572a 100644 --- a/source/blender/editors/armature/pose_edit.c +++ b/source/blender/editors/armature/pose_edit.c @@ -79,7 +79,7 @@ Object *ED_pose_object_from_context(bContext *C) Object *ob; /* since this call may also be used from the buttons window, we need to check for where to get the object */ - if (sa && sa->spacetype == SPACE_BUTS) { + if (sa && sa->spacetype == SPACE_PROPERTIES) { ob = ED_object_context(C); } else { diff --git a/source/blender/editors/armature/pose_lib.c b/source/blender/editors/armature/pose_lib.c index 63f843433d1..711a9b3d64a 100644 --- a/source/blender/editors/armature/pose_lib.c +++ b/source/blender/editors/armature/pose_lib.c @@ -159,7 +159,7 @@ static Object *get_poselib_object(bContext *C) sa = CTX_wm_area(C); - if (sa && (sa->spacetype == SPACE_BUTS)) + if (sa && (sa->spacetype == SPACE_PROPERTIES)) return ED_object_context(C); else return BKE_object_pose_armature_get(CTX_data_active_object(C)); diff --git a/source/blender/editors/gpencil/gpencil_utils.c b/source/blender/editors/gpencil/gpencil_utils.c index 3154a89da5e..56f8d7cb517 100644 --- a/source/blender/editors/gpencil/gpencil_utils.c +++ b/source/blender/editors/gpencil/gpencil_utils.c @@ -95,7 +95,7 @@ bGPdata **ED_gpencil_data_get_pointers_direct(ID *screen_id, ScrArea *sa, Scene switch (sa->spacetype) { /* XXX: Should we reduce reliance on context.gpencil_data for these cases? */ - case SPACE_BUTS: /* properties */ + case SPACE_PROPERTIES: /* properties */ case SPACE_INFO: /* header info (needed after workspaces merge) */ { if (ob && (ob->type == OB_GPENCIL)) { @@ -460,7 +460,7 @@ bool ED_gpencil_stroke_can_use_direct(const ScrArea *sa, const bGPDstroke *gps) /* filter stroke types by flags + spacetype */ if (gps->flag & GP_STROKE_3DSPACE) { /* 3D strokes - only in 3D view */ - return ((sa->spacetype == SPACE_VIEW3D) || (sa->spacetype == SPACE_BUTS)); + return ((sa->spacetype == SPACE_VIEW3D) || (sa->spacetype == SPACE_PROPERTIES)); } else if (gps->flag & GP_STROKE_2DIMAGE) { /* Special "image" strokes - only in Image Editor */ diff --git a/source/blender/editors/interface/interface_panel.c b/source/blender/editors/interface/interface_panel.c index 69b43fefdb3..410478fc628 100644 --- a/source/blender/editors/interface/interface_panel.c +++ b/source/blender/editors/interface/interface_panel.c @@ -124,7 +124,7 @@ static void panel_title_color_get(bool show_background, uchar color[4]) /*********************** space specific code ************************/ /* temporary code to remove all sbuts stuff from panel code */ -/* SpaceButs.align */ +/* SpaceProperties.align */ typedef enum eSpaceButtons_Align { BUT_HORIZONTAL = 0, BUT_VERTICAL = 1, @@ -133,7 +133,7 @@ typedef enum eSpaceButtons_Align { static int panel_aligned(ScrArea *sa, ARegion *ar) { - if (sa->spacetype == SPACE_BUTS && ar->regiontype == RGN_TYPE_WINDOW) + if (sa->spacetype == SPACE_PROPERTIES && ar->regiontype == RGN_TYPE_WINDOW) return BUT_VERTICAL; else if (sa->spacetype == SPACE_USERPREF && ar->regiontype == RGN_TYPE_WINDOW) return BUT_VERTICAL; @@ -189,8 +189,8 @@ static bool panels_need_realign(ScrArea *sa, ARegion *ar, Panel **pa_animate) { *pa_animate = NULL; - if (sa->spacetype == SPACE_BUTS && ar->regiontype == RGN_TYPE_WINDOW) { - SpaceButs *sbuts = sa->spacedata.first; + if (sa->spacetype == SPACE_PROPERTIES && ar->regiontype == RGN_TYPE_WINDOW) { + SpaceProperties *sbuts = sa->spacedata.first; if (sbuts->mainbo != sbuts->mainb) { return true; @@ -2313,7 +2313,7 @@ int ui_handler_panel_region(bContext *C, const wmEvent *event, ARegion *ar, cons ScrArea *sa = CTX_wm_area(C); SpaceLink *sl = sa->spacedata.first; - if (sa->spacetype != SPACE_BUTS) { + if (sa->spacetype != SPACE_PROPERTIES) { if (!(pa->control & UI_PNL_SCALE)) { if (event->type == PADPLUSKEY) sl->blockscale += 0.1; else sl->blockscale -= 0.1; diff --git a/source/blender/editors/interface/interface_templates.c b/source/blender/editors/interface/interface_templates.c index 0262237a051..df233cd6e41 100644 --- a/source/blender/editors/interface/interface_templates.c +++ b/source/blender/editors/interface/interface_templates.c @@ -5049,7 +5049,7 @@ void uiTemplateCacheFile(uiLayout *layout, bContext *C, PointerRNA *ptr, const c return; } - SpaceButs *sbuts = CTX_wm_space_buts(C); + SpaceProperties *sbuts = CTX_wm_space_properties(C); uiLayout *row = uiLayoutRow(layout, false); uiBlock *block = uiLayoutGetBlock(row); diff --git a/source/blender/editors/interface/resources.c b/source/blender/editors/interface/resources.c index 1751e43b973..bea8f8aed2b 100644 --- a/source/blender/editors/interface/resources.c +++ b/source/blender/editors/interface/resources.c @@ -108,7 +108,7 @@ const uchar *UI_ThemeGetColorPtr(bTheme *btheme, int spacetype, int colorid) else { switch (spacetype) { - case SPACE_BUTS: + case SPACE_PROPERTIES: ts = &btheme->tbuts; break; case SPACE_VIEW3D: @@ -779,7 +779,7 @@ void UI_SetTheme(int spacetype, int regionid) else if (regionid) { /* popups */ theme_active = U.themes.first; - theme_spacetype = SPACE_BUTS; + theme_spacetype = SPACE_PROPERTIES; theme_regionid = regionid; } else { diff --git a/source/blender/editors/render/render_preview.c b/source/blender/editors/render/render_preview.c index e6fd3e5116e..262c4e11ca9 100644 --- a/source/blender/editors/render/render_preview.c +++ b/source/blender/editors/render/render_preview.c @@ -622,7 +622,7 @@ void ED_preview_draw(const bContext *C, void *idp, void *parentp, void *slotp, r ID *id = (ID *)idp; ID *parent = (ID *)parentp; MTex *slot = (MTex *)slotp; - SpaceButs *sbuts = CTX_wm_space_buts(C); + SpaceProperties *sbuts = CTX_wm_space_properties(C); ShaderPreview *sp = WM_jobs_customdata(wm, sa); rcti newrect; int ok; diff --git a/source/blender/editors/render/render_shading.c b/source/blender/editors/render/render_shading.c index 6f78b9338f5..1600ff9b44d 100644 --- a/source/blender/editors/render/render_shading.c +++ b/source/blender/editors/render/render_shading.c @@ -99,9 +99,9 @@ static Object **object_array_for_shading(bContext *C, uint *r_objects_len) { ScrArea *sa = CTX_wm_area(C); - SpaceButs *sbuts = NULL; + SpaceProperties *sbuts = NULL; View3D *v3d = NULL; - if (sa->spacetype == SPACE_BUTS) { + if (sa->spacetype == SPACE_PROPERTIES) { sbuts = sa->spacedata.first; } else if (sa->spacetype == SPACE_VIEW3D) { diff --git a/source/blender/editors/render/render_view.c b/source/blender/editors/render/render_view.c index d002c1da312..3a1959a3585 100644 --- a/source/blender/editors/render/render_view.c +++ b/source/blender/editors/render/render_view.c @@ -60,7 +60,7 @@ static ScrArea *biggest_non_image_area(bContext *C) for (sa = sc->areabase.first; sa; sa = sa->next) { if (sa->winx > 30 && sa->winy > 30) { size = sa->winx * sa->winy; - if (!sa->full && sa->spacetype == SPACE_BUTS) { + if (!sa->full && sa->spacetype == SPACE_PROPERTIES) { if (foundwin == 0 && size > bwmaxsize) { bwmaxsize = size; big = sa; 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; diff --git a/source/blender/editors/space_buttons/buttons_context.c b/source/blender/editors/space_buttons/buttons_context.c index 68bc548e31e..f1ee4dd2d48 100644 --- a/source/blender/editors/space_buttons/buttons_context.c +++ b/source/blender/editors/space_buttons/buttons_context.c @@ -465,7 +465,7 @@ static bool buttons_context_linestyle_pinnable(const bContext *C, ViewLayer *vie wmWindow *window = CTX_wm_window(C); Scene *scene = WM_window_get_active_scene(window); FreestyleConfig *config; - SpaceButs *sbuts; + SpaceProperties *sbuts; /* if Freestyle is disabled in the scene */ if ((scene->r.mode & R_EDGE_FRS) == 0) { @@ -477,7 +477,7 @@ static bool buttons_context_linestyle_pinnable(const bContext *C, ViewLayer *vie return false; } /* if the scene has already been pinned */ - sbuts = CTX_wm_space_buts(C); + sbuts = CTX_wm_space_properties(C); if (sbuts->pinid && sbuts->pinid == &scene->id) { return false; } @@ -489,7 +489,7 @@ static int buttons_context_path(const bContext *C, ButsContextPath *path, int ma { /* Note we don't use CTX_data here, instead we get it from the window. * Otherwise there is a loop reading the context that we are setting. */ - SpaceButs *sbuts = CTX_wm_space_buts(C); + SpaceProperties *sbuts = CTX_wm_space_properties(C); wmWindow *window = CTX_wm_window(C); Scene *scene = WM_window_get_active_scene(window); ViewLayer *view_layer = WM_window_get_active_view_layer(window); @@ -619,7 +619,7 @@ static int buttons_shading_new_context(const bContext *C, int flag) return BCONTEXT_RENDER; } -void buttons_context_compute(const bContext *C, SpaceButs *sbuts) +void buttons_context_compute(const bContext *C, SpaceProperties *sbuts) { ButsContextPath *path; PointerRNA *ptr; @@ -712,7 +712,7 @@ const char *buttons_context_dir[] = { int buttons_context(const bContext *C, const char *member, bContextDataResult *result) { - SpaceButs *sbuts = CTX_wm_space_buts(C); + SpaceProperties *sbuts = CTX_wm_space_properties(C); ButsContextPath *path = sbuts ? sbuts->path : NULL; if (!path) @@ -991,7 +991,7 @@ int buttons_context(const bContext *C, const char *member, bContextDataResult *r static void pin_cb(bContext *C, void *UNUSED(arg1), void *UNUSED(arg2)) { - SpaceButs *sbuts = CTX_wm_space_buts(C); + SpaceProperties *sbuts = CTX_wm_space_properties(C); if (sbuts->flag & SB_PIN_CONTEXT) { sbuts->pinid = buttons_context_id_path(C); @@ -1004,7 +1004,7 @@ static void pin_cb(bContext *C, void *UNUSED(arg1), void *UNUSED(arg2)) void buttons_context_draw(const bContext *C, uiLayout *layout) { - SpaceButs *sbuts = CTX_wm_space_buts(C); + SpaceProperties *sbuts = CTX_wm_space_properties(C); ButsContextPath *path = sbuts->path; uiLayout *row; uiBlock *block; @@ -1072,7 +1072,7 @@ static bool buttons_header_context_poll(const bContext *C, HeaderType *UNUSED(ht static bool buttons_panel_context_poll(const bContext *C, PanelType *UNUSED(pt)) #endif { - SpaceButs *sbuts = CTX_wm_space_buts(C); + SpaceProperties *sbuts = CTX_wm_space_properties(C); return (sbuts->mainb != BCONTEXT_TOOL); } @@ -1092,7 +1092,7 @@ void buttons_context_register(ARegionType *art) ht = MEM_callocN(sizeof(HeaderType), "spacetype buttons context header"); strcpy(ht->idname, "BUTTONS_HT_context"); - ht->space_type = SPACE_BUTS; + ht->space_type = SPACE_PROPERTIES; ht->region_type = art->regionid; ht->poll = buttons_header_context_poll; ht->draw = buttons_header_context_draw; @@ -1113,7 +1113,7 @@ void buttons_context_register(ARegionType *art) ID *buttons_context_id_path(const bContext *C) { - SpaceButs *sbuts = CTX_wm_space_buts(C); + SpaceProperties *sbuts = CTX_wm_space_properties(C); ButsContextPath *path = sbuts->path; PointerRNA *ptr; int a; diff --git a/source/blender/editors/space_buttons/buttons_intern.h b/source/blender/editors/space_buttons/buttons_intern.h index 55f33797cca..3c81b1e4b51 100644 --- a/source/blender/editors/space_buttons/buttons_intern.h +++ b/source/blender/editors/space_buttons/buttons_intern.h @@ -28,7 +28,7 @@ struct ARegionType; struct ID; -struct SpaceButs; +struct SpaceProperties; struct Tex; struct bContext; struct bContextDataResult; @@ -79,7 +79,7 @@ typedef struct ButsContextTexture { /* internal exports only */ /* buttons_context.c */ -void buttons_context_compute(const struct bContext *C, struct SpaceButs *sbuts); +void buttons_context_compute(const struct bContext *C, struct SpaceProperties *sbuts); int buttons_context(const struct bContext *C, const char *member, struct bContextDataResult *result); void buttons_context_draw(const struct bContext *C, struct uiLayout *layout); void buttons_context_register(struct ARegionType *art); @@ -88,7 +88,7 @@ struct ID *buttons_context_id_path(const struct bContext *C); extern const char *buttons_context_dir[]; /* doc access */ /* buttons_texture.c */ -void buttons_texture_context_compute(const struct bContext *C, struct SpaceButs *sbuts); +void buttons_texture_context_compute(const struct bContext *C, struct SpaceProperties *sbuts); /* buttons_ops.c */ void BUTTONS_OT_file_browse(struct wmOperatorType *ot); diff --git a/source/blender/editors/space_buttons/buttons_texture.c b/source/blender/editors/space_buttons/buttons_texture.c index b0ddb35d124..a6e0fe6d174 100644 --- a/source/blender/editors/space_buttons/buttons_texture.c +++ b/source/blender/editors/space_buttons/buttons_texture.c @@ -159,7 +159,7 @@ static void buttons_texture_modifier_gpencil_foreach(void *userData, Object *ob, N_("Grease Pencil Modifiers"), RNA_struct_ui_icon(ptr.type), md->name); } -static void buttons_texture_users_from_context(ListBase *users, const bContext *C, SpaceButs *sbuts) +static void buttons_texture_users_from_context(ListBase *users, const bContext *C, SpaceProperties *sbuts) { Scene *scene = NULL; Object *ob = NULL; @@ -265,7 +265,7 @@ static void buttons_texture_users_from_context(ListBase *users, const bContext * } } -void buttons_texture_context_compute(const bContext *C, SpaceButs *sbuts) +void buttons_texture_context_compute(const bContext *C, SpaceProperties *sbuts) { /* gather available texture users in context. runs on every draw of * properties editor, before the buttons are created. */ @@ -327,7 +327,7 @@ void buttons_texture_context_compute(const bContext *C, SpaceButs *sbuts) static void template_texture_select(bContext *C, void *user_p, void *UNUSED(arg)) { /* callback when selecting a texture user in the menu */ - SpaceButs *sbuts = CTX_wm_space_buts(C); + SpaceProperties *sbuts = CTX_wm_space_properties(C); ButsContextTexture *ct = (sbuts) ? sbuts->texuser : NULL; ButsTextureUser *user = (ButsTextureUser *)user_p; PointerRNA texptr; @@ -369,7 +369,7 @@ static void template_texture_select(bContext *C, void *user_p, void *UNUSED(arg) static void template_texture_user_menu(bContext *C, uiLayout *layout, void *UNUSED(arg)) { /* callback when opening texture user selection menu, to create buttons. */ - SpaceButs *sbuts = CTX_wm_space_buts(C); + SpaceProperties *sbuts = CTX_wm_space_properties(C); ButsContextTexture *ct = sbuts->texuser; ButsTextureUser *user; uiBlock *block = uiLayoutGetBlock(layout); @@ -414,7 +414,7 @@ void uiTemplateTextureUser(uiLayout *layout, bContext *C) /* texture user selection dropdown menu. the available users have been * gathered before drawing in ButsContextTexture, we merely need to * display the current item. */ - SpaceButs *sbuts = CTX_wm_space_buts(C); + SpaceProperties *sbuts = CTX_wm_space_properties(C); ButsContextTexture *ct = (sbuts) ? sbuts->texuser : NULL; uiBlock *block = uiLayoutGetBlock(layout); uiBut *but; @@ -454,7 +454,7 @@ void uiTemplateTextureUser(uiLayout *layout, bContext *C) static void template_texture_show(bContext *C, void *data_p, void *prop_p) { - SpaceButs *sbuts = CTX_wm_space_buts(C); + SpaceProperties *sbuts = CTX_wm_space_properties(C); ButsContextTexture *ct = (sbuts) ? sbuts->texuser : NULL; ButsTextureUser *user; @@ -482,7 +482,7 @@ static void template_texture_show(bContext *C, void *data_p, void *prop_p) void uiTemplateTextureShow(uiLayout *layout, bContext *C, PointerRNA *ptr, PropertyRNA *prop) { /* button to quickly show texture in texture tab */ - SpaceButs *sbuts = CTX_wm_space_buts(C); + SpaceProperties *sbuts = CTX_wm_space_properties(C); ButsContextTexture *ct = (sbuts) ? sbuts->texuser : NULL; ButsTextureUser *user; diff --git a/source/blender/editors/space_buttons/space_buttons.c b/source/blender/editors/space_buttons/space_buttons.c index 6f59a373b6c..a4277666837 100644 --- a/source/blender/editors/space_buttons/space_buttons.c +++ b/source/blender/editors/space_buttons/space_buttons.c @@ -53,10 +53,10 @@ static SpaceLink *buttons_new(const ScrArea *UNUSED(area), const Scene *UNUSED(scene)) { ARegion *ar; - SpaceButs *sbuts; + SpaceProperties *sbuts; - sbuts = MEM_callocN(sizeof(SpaceButs), "initbuts"); - sbuts->spacetype = SPACE_BUTS; + sbuts = MEM_callocN(sizeof(SpaceProperties), "initbuts"); + sbuts->spacetype = SPACE_PROPERTIES; sbuts->mainb = sbuts->mainbuser = BCONTEXT_OBJECT; @@ -94,7 +94,7 @@ static SpaceLink *buttons_new(const ScrArea *UNUSED(area), const Scene *UNUSED(s /* not spacelink itself */ static void buttons_free(SpaceLink *sl) { - SpaceButs *sbuts = (SpaceButs *) sl; + SpaceProperties *sbuts = (SpaceProperties *) sl; if (sbuts->path) MEM_freeN(sbuts->path); @@ -113,7 +113,7 @@ static void buttons_init(struct wmWindowManager *UNUSED(wm), ScrArea *UNUSED(sa) static SpaceLink *buttons_duplicate(SpaceLink *sl) { - SpaceButs *sbutsn = MEM_dupallocN(sl); + SpaceProperties *sbutsn = MEM_dupallocN(sl); /* clear or remove stuff from old */ sbutsn->path = NULL; @@ -129,11 +129,11 @@ static void buttons_main_region_init(wmWindowManager *wm, ARegion *ar) ED_region_panels_init(wm, ar); - keymap = WM_keymap_ensure(wm->defaultconf, "Property Editor", SPACE_BUTS, 0); + keymap = WM_keymap_ensure(wm->defaultconf, "Property Editor", SPACE_PROPERTIES, 0); WM_event_add_keymap_handler(&ar->handlers, keymap); } -static void buttons_main_region_layout_properties(const bContext *C, SpaceButs *sbuts, ARegion *ar) +static void buttons_main_region_layout_properties(const bContext *C, SpaceProperties *sbuts, ARegion *ar) { buttons_context_compute(C, sbuts); @@ -310,7 +310,7 @@ static void buttons_main_region_layout_tool(const bContext *C, ARegion *ar) static void buttons_main_region_layout(const bContext *C, ARegion *ar) { /* draw entirely, view changes should be handled here */ - SpaceButs *sbuts = CTX_wm_space_buts(C); + SpaceProperties *sbuts = CTX_wm_space_properties(C); if (sbuts->mainb == BCONTEXT_TOOL) { buttons_main_region_layout_tool(C, ar); @@ -345,7 +345,7 @@ static void buttons_operatortypes(void) static void buttons_keymap(struct wmKeyConfig *keyconf) { - WM_keymap_ensure(keyconf, "Property Editor", SPACE_BUTS, 0); + WM_keymap_ensure(keyconf, "Property Editor", SPACE_PROPERTIES, 0); } /* add handlers, stuff you only do once or on area/region changes */ @@ -363,7 +363,7 @@ static void buttons_header_region_init(wmWindowManager *UNUSED(wm), ARegion *ar) static void buttons_header_region_draw(const bContext *C, ARegion *ar) { - SpaceButs *sbuts = CTX_wm_space_buts(C); + SpaceProperties *sbuts = CTX_wm_space_properties(C); /* Needed for RNA to get the good values! */ buttons_context_compute(C, sbuts); @@ -377,14 +377,14 @@ static void buttons_header_region_message_subscribe( bScreen *UNUSED(screen), ScrArea *sa, ARegion *ar, struct wmMsgBus *mbus) { - SpaceButs *sbuts = sa->spacedata.first; + SpaceProperties *sbuts = sa->spacedata.first; wmMsgSubscribeValue msg_sub_value_region_tag_redraw = { .owner = ar, .user_data = ar, .notify = ED_region_do_msg_notify_tag_redraw, }; - /* Don't check for SpaceButs.mainb here, we may toggle between view-layers + /* Don't check for SpaceProperties.mainb here, we may toggle between view-layers * where one has no active object, so that available contexts changes. */ WM_msg_subscribe_rna_anon_prop(mbus, Window, view_layer, &msg_sub_value_region_tag_redraw); @@ -403,7 +403,7 @@ static void buttons_header_region_message_subscribe( static void buttons_navigation_bar_region_init(wmWindowManager *wm, ARegion *ar) { - wmKeyMap *keymap = WM_keymap_ensure(wm->defaultconf, "Property Editor", SPACE_BUTS, 0); + wmKeyMap *keymap = WM_keymap_ensure(wm->defaultconf, "Property Editor", SPACE_PROPERTIES, 0); WM_event_add_keymap_handler(&ar->handlers, keymap); ar->flag |= RGN_FLAG_PREFSIZE_OR_HIDDEN; @@ -443,7 +443,7 @@ static void buttons_navigation_bar_region_message_subscribe( * showing that button set, to reduce unnecessary drawing. */ static void buttons_area_redraw(ScrArea *sa, short buttons) { - SpaceButs *sbuts = sa->spacedata.first; + SpaceProperties *sbuts = sa->spacedata.first; /* if the area's current button set is equal to the one to redraw */ if (sbuts->mainb == buttons) @@ -454,7 +454,7 @@ static void buttons_area_redraw(ScrArea *sa, short buttons) static void buttons_area_listener( wmWindow *UNUSED(win), ScrArea *sa, wmNotifier *wmn, Scene *UNUSED(scene)) { - SpaceButs *sbuts = sa->spacedata.first; + SpaceProperties *sbuts = sa->spacedata.first; /* context changes */ switch (wmn->category) { @@ -636,7 +636,7 @@ static void buttons_area_listener( static void buttons_id_remap(ScrArea *UNUSED(sa), SpaceLink *slink, ID *old_id, ID *new_id) { - SpaceButs *sbuts = (SpaceButs *)slink; + SpaceProperties *sbuts = (SpaceProperties *)slink; if (sbuts->pinid == old_id) { sbuts->pinid = new_id; @@ -693,7 +693,7 @@ void ED_spacetype_buttons(void) SpaceType *st = MEM_callocN(sizeof(SpaceType), "spacetype buttons"); ARegionType *art; - st->spaceid = SPACE_BUTS; + st->spaceid = SPACE_PROPERTIES; strncpy(st->name, "Buttons", BKE_ST_MAXNAME); st->new = buttons_new; diff --git a/source/blender/makesdna/DNA_space_types.h b/source/blender/makesdna/DNA_space_types.h index 5aaf2184cb0..a08edf936d2 100644 --- a/source/blender/makesdna/DNA_space_types.h +++ b/source/blender/makesdna/DNA_space_types.h @@ -115,7 +115,7 @@ typedef enum eSpaceInfo_RptMask { * \{ */ /* Properties Editor */ -typedef struct SpaceButs { +typedef struct SpaceProperties { SpaceLink *next, *prev; /** Storage of regions for inactive spaces. */ ListBase regionbase; @@ -144,12 +144,12 @@ typedef struct SpaceButs { ID *pinid; void *texuser; -} SpaceButs; +} SpaceProperties; /* button defines (deprecated) */ #ifdef DNA_DEPRECATED_ALLOW -/* warning: the values of these defines are used in SpaceButs.tabs[8] */ -/* SpaceButs.mainb new */ +/* warning: the values of these defines are used in SpaceProperties.tabs[8] */ +/* SpaceProperties.mainb new */ #define CONTEXT_SCENE 0 #define CONTEXT_OBJECT 1 // #define CONTEXT_TYPES 2 @@ -158,7 +158,7 @@ typedef struct SpaceButs { // #define CONTEXT_SCRIPT 5 // #define CONTEXT_LOGIC 6 -/* SpaceButs.mainb old (deprecated) */ +/* SpaceProperties.mainb old (deprecated) */ // #define BUTS_VIEW 0 #define BUTS_LAMP 1 #define BUTS_MAT 2 @@ -176,7 +176,7 @@ typedef struct SpaceButs { // #define BUTS_EFFECTS 14 #endif /* DNA_DEPRECATED_ALLOW */ -/* SpaceButs.mainb new */ +/* SpaceProperties.mainb new */ typedef enum eSpaceButtons_Context { BCONTEXT_RENDER = 0, BCONTEXT_SCENE = 1, @@ -200,7 +200,7 @@ typedef enum eSpaceButtons_Context { BCONTEXT_TOT } eSpaceButtons_Context; -/* SpaceButs.flag */ +/* SpaceProperties.flag */ typedef enum eSpaceButtons_Flag { SB_PRV_OSA = (1 << 0), SB_PIN_CONTEXT = (1 << 1), @@ -1597,7 +1597,7 @@ typedef enum eSpace_Type { SPACE_VIEW3D = 1, SPACE_IPO = 2, SPACE_OUTLINER = 3, - SPACE_BUTS = 4, + SPACE_PROPERTIES = 4, SPACE_FILE = 5, SPACE_IMAGE = 6, SPACE_INFO = 7, diff --git a/source/blender/makesdna/intern/dna_rename_defs.h b/source/blender/makesdna/intern/dna_rename_defs.h index 9e11cc92e4f..6ae1d17a64f 100644 --- a/source/blender/makesdna/intern/dna_rename_defs.h +++ b/source/blender/makesdna/intern/dna_rename_defs.h @@ -40,6 +40,7 @@ /* Match RNA names where possible, keep sorted. */ +DNA_STRUCT_RENAME(SpaceButs, SpaceProperties) DNA_STRUCT_RENAME(SpaceIpo, SpaceGraph) DNA_STRUCT_RENAME(SpaceOops, SpaceOutliner) DNA_STRUCT_RENAME_ELEM(Camera, YF_dofdist, dof_distance) diff --git a/source/blender/makesrna/intern/rna_space.c b/source/blender/makesrna/intern/rna_space.c index d1b99f59835..3b012581f23 100644 --- a/source/blender/makesrna/intern/rna_space.c +++ b/source/blender/makesrna/intern/rna_space.c @@ -93,7 +93,7 @@ const EnumPropertyItem rna_enum_space_type_items[] = { /* Data */ {0, "", ICON_NONE, "Data", ""}, {SPACE_OUTLINER, "OUTLINER", ICON_OUTLINER, "Outliner", "Overview of scene graph and all available data-blocks"}, - {SPACE_BUTS, "PROPERTIES", ICON_PROPERTIES, "Properties", "Edit properties of active object and related data-blocks"}, + {SPACE_PROPERTIES, "PROPERTIES", ICON_PROPERTIES, "Properties", "Edit properties of active object and related data-blocks"}, {SPACE_FILE, "FILE_BROWSER", ICON_FILEBROWSER, "File Browser", "Browse for files and assets"}, {SPACE_USERPREF, "PREFERENCES", ICON_PREFERENCES, "Preferences", "Edit persistent configuration settings"}, @@ -389,7 +389,7 @@ static StructRNA *rna_Space_refine(struct PointerRNA *ptr) return &RNA_SpaceGraphEditor; case SPACE_OUTLINER: return &RNA_SpaceOutliner; - case SPACE_BUTS: + case SPACE_PROPERTIES: return &RNA_SpaceProperties; case SPACE_FILE: return &RNA_SpaceFileBrowser; @@ -1217,13 +1217,13 @@ static void rna_SpaceTextEditor_updateEdited(Main *UNUSED(bmain), Scene *UNUSED( /* note: this function exists only to avoid id refcounting */ static void rna_SpaceProperties_pin_id_set(PointerRNA *ptr, PointerRNA value) { - SpaceButs *sbuts = (SpaceButs *)(ptr->data); + SpaceProperties *sbuts = (SpaceProperties *)(ptr->data); sbuts->pinid = value.data; } static StructRNA *rna_SpaceProperties_pin_id_typef(PointerRNA *ptr) { - SpaceButs *sbuts = (SpaceButs *)(ptr->data); + SpaceProperties *sbuts = (SpaceProperties *)(ptr->data); if (sbuts->pinid) return ID_code_to_RNA_type(GS(sbuts->pinid->name)); @@ -1233,7 +1233,7 @@ static StructRNA *rna_SpaceProperties_pin_id_typef(PointerRNA *ptr) static void rna_SpaceProperties_pin_id_update(Main *UNUSED(bmain), Scene *UNUSED(scene), PointerRNA *ptr) { - SpaceButs *sbuts = (SpaceButs *)(ptr->data); + SpaceProperties *sbuts = (SpaceProperties *)(ptr->data); ID *id = sbuts->pinid; if (id == NULL) { @@ -1262,7 +1262,7 @@ static void rna_SpaceProperties_pin_id_update(Main *UNUSED(bmain), Scene *UNUSED static void rna_SpaceProperties_context_set(PointerRNA *ptr, int value) { - SpaceButs *sbuts = (SpaceButs *)(ptr->data); + SpaceProperties *sbuts = (SpaceProperties *)(ptr->data); sbuts->mainb = value; sbuts->mainbuser = value; @@ -1272,7 +1272,7 @@ static const EnumPropertyItem *rna_SpaceProperties_context_itemf( bContext *UNUSED(C), PointerRNA *ptr, PropertyRNA *UNUSED(prop), bool *r_free) { - SpaceButs *sbuts = (SpaceButs *)(ptr->data); + SpaceProperties *sbuts = (SpaceProperties *)(ptr->data); EnumPropertyItem *item = NULL; int totitem = 0; @@ -1361,7 +1361,7 @@ static const EnumPropertyItem *rna_SpaceProperties_context_itemf( static void rna_SpaceProperties_context_update(Main *UNUSED(bmain), Scene *UNUSED(scene), PointerRNA *ptr) { - SpaceButs *sbuts = (SpaceButs *)(ptr->data); + SpaceProperties *sbuts = (SpaceProperties *)(ptr->data); /* XXX BCONTEXT_DATA is ugly, but required for lights... See T51318. */ if (ELEM(sbuts->mainb, BCONTEXT_WORLD, BCONTEXT_MATERIAL, BCONTEXT_TEXTURE, BCONTEXT_DATA)) { sbuts->preview = 1; @@ -3450,7 +3450,7 @@ static void rna_def_space_buttons(BlenderRNA *brna) PropertyRNA *prop; srna = RNA_def_struct(brna, "SpaceProperties", "Space"); - RNA_def_struct_sdna(srna, "SpaceButs"); + RNA_def_struct_sdna(srna, "SpaceProperties"); RNA_def_struct_ui_text(srna, "Properties Space", "Properties space data"); prop = RNA_def_property(srna, "context", PROP_ENUM, PROP_NONE); diff --git a/source/blender/makesrna/intern/rna_userdef.c b/source/blender/makesrna/intern/rna_userdef.c index 714f11a5ee0..913d29510d8 100644 --- a/source/blender/makesrna/intern/rna_userdef.c +++ b/source/blender/makesrna/intern/rna_userdef.c @@ -1352,7 +1352,7 @@ static void rna_def_userdef_theme_space_common(StructRNA *srna) RNA_def_property_update(prop, 0, "rna_userdef_update"); /* buttons */ -/* if (! ELEM(spacetype, SPACE_BUTS, SPACE_OUTLINER)) { */ +/* if (! ELEM(spacetype, SPACE_PROPERTIES, SPACE_OUTLINER)) { */ prop = RNA_def_property(srna, "button", PROP_FLOAT, PROP_COLOR_GAMMA); RNA_def_property_array(prop, 4); RNA_def_property_ui_text(prop, "Region Background", ""); diff --git a/source/blender/python/intern/bpy_rna_callback.c b/source/blender/python/intern/bpy_rna_callback.c index 1206ec498d1..554ef59d47e 100644 --- a/source/blender/python/intern/bpy_rna_callback.c +++ b/source/blender/python/intern/bpy_rna_callback.c @@ -207,7 +207,7 @@ static eSpace_Type rna_Space_refine_reverse(StructRNA *srna) if (srna == &RNA_SpaceView3D) return SPACE_VIEW3D; if (srna == &RNA_SpaceGraphEditor) return SPACE_IPO; if (srna == &RNA_SpaceOutliner) return SPACE_OUTLINER; - if (srna == &RNA_SpaceProperties) return SPACE_BUTS; + if (srna == &RNA_SpaceProperties) return SPACE_PROPERTIES; if (srna == &RNA_SpaceFileBrowser) return SPACE_FILE; if (srna == &RNA_SpaceImageEditor) return SPACE_IMAGE; if (srna == &RNA_SpaceInfo) return SPACE_INFO; |