Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDalai Felinto <dfelinto@gmail.com>2017-10-16 21:36:44 +0300
committerDalai Felinto <dfelinto@gmail.com>2017-10-16 21:36:45 +0300
commite8962f90de4222d6f750d3d3478eff65490365d8 (patch)
tree45d534da762cab5b697d371fef0b42dffaad1f47 /source/blender/blenkernel/BKE_node.h
parenta2758152e2dccb3b016e13a3de2d9e58587866ab (diff)
Fix compatibility flag for nodetree
NODE_NEWER_SHADING was introduced in e868b459bb8e however it should have been added as a bitflag. BKE_scene_uses_blender_eevee() was used in gpu_shader_output() as a workaround for compatibility being poorly used. Anyways this fixes this situation. This is necessary for an upcoming patch, even though this is considered temporary - since the other NODE_*_SHADING values are legacy from Blender Internal drawing.
Diffstat (limited to 'source/blender/blenkernel/BKE_node.h')
-rw-r--r--source/blender/blenkernel/BKE_node.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/blenkernel/BKE_node.h b/source/blender/blenkernel/BKE_node.h
index ea0b350b8af..3bb8f6c9ed3 100644
--- a/source/blender/blenkernel/BKE_node.h
+++ b/source/blender/blenkernel/BKE_node.h
@@ -251,9 +251,9 @@ typedef struct bNodeType {
#define NODE_CLASS_LAYOUT 100
/* nodetype->compatibility */
-#define NODE_OLD_SHADING 1
-#define NODE_NEW_SHADING 2
-#define NODE_NEWER_SHADING 3
+#define NODE_OLD_SHADING (1 << 0)
+#define NODE_NEW_SHADING (1 << 1)
+#define NODE_NEWER_SHADING (1 << 2)
/* node resize directions */
#define NODE_RESIZE_TOP 1