diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2014-06-13 19:06:49 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2014-06-13 19:06:49 +0400 |
| commit | 2ca497d84db81fee2521dc5f3c6d2165f47c05d6 (patch) | |
| tree | 5aaa4f2188650ca3200b9c32f12dcf7eedec31b4 /source/blender/editors/space_buttons | |
| parent | 6c0926e802faffb242f36c6bccd1b7b36dec8bee (diff) | |
Revert part of rB477f35 (error resolving conflict)
Diffstat (limited to 'source/blender/editors/space_buttons')
| -rw-r--r-- | source/blender/editors/space_buttons/buttons_texture.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/space_buttons/buttons_texture.c b/source/blender/editors/space_buttons/buttons_texture.c index c558d811693..0aa3e47df4b 100644 --- a/source/blender/editors/space_buttons/buttons_texture.c +++ b/source/blender/editors/space_buttons/buttons_texture.c @@ -442,7 +442,7 @@ void buttons_texture_context_compute(const bContext *C, SpaceButs *sbuts) set_texture_context(C, sbuts); - if (!(BKE_scene_use_new_shading_nodes(scene) || (sbuts->texture_context == SB_TEXC_OTHER))) { + if (!((sbuts->texture_context == SB_TEXC_OTHER) || BKE_scene_use_new_shading_nodes(scene))) { if (ct) { BLI_freelistN(&ct->users); MEM_freeN(ct); |