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/nodes/texture/node_texture_tree.c | |
| parent | 25074be697cb5726328aa5d064a60788c1da6aeb (diff) | |
Cleanup: use workspace for object_mode when possible
Diffstat (limited to 'source/blender/nodes/texture/node_texture_tree.c')
| -rw-r--r-- | source/blender/nodes/texture/node_texture_tree.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/nodes/texture/node_texture_tree.c b/source/blender/nodes/texture/node_texture_tree.c index 5eb6fcdba22..24e79b71c0a 100644 --- a/source/blender/nodes/texture/node_texture_tree.c +++ b/source/blender/nodes/texture/node_texture_tree.c @@ -35,6 +35,7 @@ #include "DNA_texture_types.h" #include "DNA_node_types.h" #include "DNA_space_types.h" +#include "DNA_workspace_types.h" #include "BLI_listbase.h" #include "BLI_threads.h" @@ -62,8 +63,7 @@ static void texture_get_from_context( const bContext *C, bNodeTreeType *UNUSED(treetype), bNodeTree **r_ntree, ID **r_id, ID **r_from) { - EvaluationContext eval_ctx; - CTX_data_eval_ctx(C, &eval_ctx); + const WorkSpace *workspace = CTX_wm_workspace(C); SpaceNode *snode = CTX_wm_space_node(C); Scene *scene = CTX_data_scene(C); ViewLayer *view_layer = CTX_data_view_layer(C); @@ -98,7 +98,7 @@ static void texture_get_from_context( else if (snode->texfrom == SNODE_TEX_BRUSH) { struct Brush *brush = NULL; - if (ob && (eval_ctx.object_mode & OB_MODE_SCULPT)) + if (ob && (workspace->object_mode & OB_MODE_SCULPT)) brush = BKE_paint_brush(&scene->toolsettings->sculpt->paint); else brush = BKE_paint_brush(&scene->toolsettings->imapaint.paint); |