[Bf-blender-cvs] [5522d28d547] gsoc-2018-many-light-sampling: Recently added IES conflicts w/ EEVEE

[Campbell Barton]

Commit: 5522d28d547eaa49e208975e4fa77f0596d700d4
Author: Campbell Barton
Date:   Sun May 27 11:01:46 2018 +0200
Branches: gsoc-2018-many-light-sampling
https://developer.blender.org/rB5522d28d547eaa49e208975e4fa77f0596d700d4

Recently added IES conflicts w/ EEVEE

===================================================================

M	source/blender/blenkernel/BKE_node.h

===================================================================

diff --git a/source/blender/blenkernel/BKE_node.h b/source/blender/blenkernel/BKE_node.h
index bd3b191c96c..150f0818cb8 100644
--- a/source/blender/blenkernel/BKE_node.h
+++ b/source/blender/blenkernel/BKE_node.h
@@ -789,7 +789,7 @@ struct ShadeResult;
 #define SH_NODE_UVALONGSTROKE			191
 #define SH_NODE_TEX_POINTDENSITY		192
 #define SH_NODE_BSDF_PRINCIPLED         193
-#define SH_NODE_TEX_IES                 195
+#define SH_NODE_TEX_IES                 194
 #define SH_NODE_BEVEL                   197
 #define SH_NODE_DISPLACEMENT            198
 #define SH_NODE_VECTOR_DISPLACEMENT     199