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/blenkernel | |
| parent | 419911b1d19ceeb87cd1c0a7b78f0133bee4a6cd (diff) | |
DNA: rename SpaceButs -> SpaceProperties
Diffstat (limited to 'source/blender/blenkernel')
| -rw-r--r-- | source/blender/blenkernel/BKE_context.h | 2 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/anim_sys.c | 2 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/context.c | 4 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/screen.c | 2 |
4 files changed, 5 insertions, 5 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; } |