diff options
| author | Dalai Felinto <dfelinto@gmail.com> | 2017-03-02 17:03:02 +0300 |
|---|---|---|
| committer | Dalai Felinto <dfelinto@gmail.com> | 2017-03-02 19:09:24 +0300 |
| commit | aa845eed1e18fae45be8828bb08459c009dba6d5 (patch) | |
| tree | 19655cc2de5cf2e722e4e5e598c33d5bc3b2e041 /source/blender/nodes | |
| parent | 561d11c5e601cce73dc6ab108596147bdfd4507c (diff) | |
Remove tons of OBACT
There are now only referenced in:
* drawobject.c
* particle_edit.c
* space_image.c (a single case to be handled on workspace branch)
* rigidbody_constraint.c (to be handled in the following commit)
Diffstat (limited to 'source/blender/nodes')
| -rw-r--r-- | source/blender/nodes/shader/node_shader_tree.c | 3 | ||||
| -rw-r--r-- | source/blender/nodes/texture/node_texture_tree.c | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/source/blender/nodes/shader/node_shader_tree.c b/source/blender/nodes/shader/node_shader_tree.c index 40d1cfdfcb0..b5d77e99328 100644 --- a/source/blender/nodes/shader/node_shader_tree.c +++ b/source/blender/nodes/shader/node_shader_tree.c @@ -79,7 +79,8 @@ static void shader_get_from_context(const bContext *C, bNodeTreeType *UNUSED(tre { SpaceNode *snode = CTX_wm_space_node(C); Scene *scene = CTX_data_scene(C); - Object *ob = OBACT; + SceneLayer *sl = CTX_data_scene_layer(C); + Object *ob = OBACT_NEW; if ((snode->shaderfrom == SNODE_SHADER_OBJECT) || (BKE_scene_use_new_shading_nodes(scene) == false)) diff --git a/source/blender/nodes/texture/node_texture_tree.c b/source/blender/nodes/texture/node_texture_tree.c index 714665c303b..3b53d29d147 100644 --- a/source/blender/nodes/texture/node_texture_tree.c +++ b/source/blender/nodes/texture/node_texture_tree.c @@ -62,7 +62,8 @@ static void texture_get_from_context(const bContext *C, bNodeTreeType *UNUSED(tr { SpaceNode *snode = CTX_wm_space_node(C); Scene *scene = CTX_data_scene(C); - Object *ob = OBACT; + SceneLayer *sl = CTX_data_scene_layer(C); + Object *ob = OBACT_NEW; Tex *tx = NULL; if (snode->texfrom == SNODE_TEX_OBJECT) { |