Merged revision(s) 57671-57767 from trunk/blender into soc-2013-dingto
[blender.git] / intern / cycles / render / graph.h
index 4d1d45ee924962b24aa52e28ae40082acc874e74..da8ed987346f93283e411e215ec5a77b33d9aa44 100644 (file)
@@ -75,7 +75,8 @@ enum ShaderBump {
 enum ShaderNodeSpecialType {
        SHADER_SPECIAL_TYPE_NONE,
        SHADER_SPECIAL_TYPE_PROXY,
-       SHADER_SPECIAL_TYPE_MIX_CLOSURE
+       SHADER_SPECIAL_TYPE_MIX_CLOSURE,
+       SHADER_SPECIAL_TYPE_AUTOCONVERT
 };
 
 /* Enum