diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-02-09 14:14:17 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-02-09 14:14:39 +0300 |
| commit | 5db950e860b2f64078cfc8cf00cb4f430b8a1baf (patch) | |
| tree | b9a734351e0cfa849c3c136e4fc6f26276c7c5c0 /source/blender/editors/interface/interface_icons.c | |
| parent | 25074be697cb5726328aa5d064a60788c1da6aeb (diff) | |
Cleanup: use workspace for object_mode when possible
Diffstat (limited to 'source/blender/editors/interface/interface_icons.c')
| -rw-r--r-- | source/blender/editors/interface/interface_icons.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/source/blender/editors/interface/interface_icons.c b/source/blender/editors/interface/interface_icons.c index 2941b08b7ad..f2798cedae1 100644 --- a/source/blender/editors/interface/interface_icons.c +++ b/source/blender/editors/interface/interface_icons.c @@ -46,6 +46,7 @@ #include "DNA_object_types.h" #include "DNA_screen_types.h" #include "DNA_space_types.h" +#include "DNA_workspace_types.h" #include "RNA_access.h" #include "RNA_enum_types.h" @@ -1195,8 +1196,7 @@ static int ui_id_brush_get_icon(const bContext *C, ID *id) ui_id_icon_render(C, id, true); } else { - EvaluationContext eval_ctx; - CTX_data_eval_ctx(C, &eval_ctx); + const WorkSpace *workspace = CTX_wm_workspace(C); Object *ob = CTX_data_active_object(C); SpaceImage *sima; const EnumPropertyItem *items = NULL; @@ -1207,11 +1207,11 @@ static int ui_id_brush_get_icon(const bContext *C, ID *id) * checking various context stuff here */ if (CTX_wm_view3d(C) && ob) { - if (eval_ctx.object_mode & OB_MODE_SCULPT) + if (workspace->object_mode & OB_MODE_SCULPT) mode = OB_MODE_SCULPT; - else if (eval_ctx.object_mode & (OB_MODE_VERTEX_PAINT | OB_MODE_WEIGHT_PAINT)) + else if (workspace->object_mode & (OB_MODE_VERTEX_PAINT | OB_MODE_WEIGHT_PAINT)) mode = OB_MODE_VERTEX_PAINT; - else if (eval_ctx.object_mode & OB_MODE_TEXTURE_PAINT) + else if (workspace->object_mode & OB_MODE_TEXTURE_PAINT) mode = OB_MODE_TEXTURE_PAINT; } else if ((sima = CTX_wm_space_image(C)) && |