[Bf-blender-cvs] [d4b4e05] bake-cycles: Cycles-Bake: removing commented out code
Dalai Felinto
noreply at git.blender.org
Wed Apr 23 02:47:04 CEST 2014
Commit: d4b4e050dd8b1478b9b0938dc250fcb76ff63cc6
Author: Dalai Felinto
Date: Fri Feb 7 10:32:21 2014 -0200
https://developer.blender.org/rBd4b4e050dd8b1478b9b0938dc250fcb76ff63cc6
Cycles-Bake: removing commented out code
===================================================================
M intern/cycles/blender/blender_session.cpp
===================================================================
diff --git a/intern/cycles/blender/blender_session.cpp b/intern/cycles/blender/blender_session.cpp
index 8b41244..3a8379c 100644
--- a/intern/cycles/blender/blender_session.cpp
+++ b/intern/cycles/blender/blender_session.cpp
@@ -313,74 +313,6 @@ static ShaderEvalType get_shader_type(const string& pass_type)
else
return SHADER_EVAL_BAKE;
-
-#if 0
- if (strcmp(shader_type, "COMBINED")==0)
- return SHADER_EVAL_COMBINED;
- else if (strcmp(shader_type, "Z")==0)
- return SHADER_EVAL_DEPTH;
- else if (strcmp(shader_type, "MIST")==0)
- return SHADER_EVAL_MIST;
- else if (strcmp(shader_type, "NORMAL")==0)
- return SHADER_EVAL_NORMAL;
- else if (strcmp(shader_type, "OBJECT_INDEX")==0)
- return SHADER_EVAL_OBJECT_ID;
- else if (strcmp(shader_type, "UV")==0)
- return SHADER_EVAL_UV;
- else if (strcmp(shader_type, "VECTOR")==0)
- return SHADER_EVAL_MOTION;
- else if (strcmp(shader_type, "MATERIAL_INDEX")==0)
- return SHADER_EVAL_MATERIAL_ID;
-
- else if (strcmp(shader_type, "DIFFUSE_DIRECT")==0)
- return SHADER_EVAL_DIFFUSE_DIRECT;
- else if (strcmp(shader_type, "GLOSSY_DIRECT")==0)
- return SHADER_EVAL_GLOSSY_DIRECT;
- else if (strcmp(shader_type, "TRANSMISSION_DIRECT")==0)
- return SHADER_EVAL_TRANSMISSION_DIRECT;
- else if (strcmp(shader_type, "SUBSURFACE_DIRECT")==0)
- return SHADER_EVAL_SUBSURFACE_DIRECT;
-
- else if (strcmp(shader_type, "DIFFUSE_INDIRECT")==0)
- return SHADER_EVAL_DIFFUSE_INDIRECT;
- else if (strcmp(shader_type, "GLOSSY_INDIRECT")==0)
- return SHADER_EVAL_GLOSSY_INDIRECT;
- else if (strcmp(shader_type, "TRANSMISSION_INDIRECT")==0)
- return SHADER_EVAL_TRANSMISSION_INDIRECT;
- else if (strcmp(shader_type, "SUBSURFACE_INDIRECT")==0)
- return SHADER_EVAL_SUBSURFACE_INDIRECT;
-
- else if (strcmp(shader_type, "DIFFUSE_COLOR")==0)
- return SHADER_EVAL_DIFFUSE_COLOR;
- else if (strcmp(shader_type, "GLOSSY_COLOR")==0)
- return SHADER_EVAL_GLOSSY_COLOR;
- else if (strcmp(shader_type, "TRANSMISSION_COLOR")==0)
- return SHADER_EVAL_TRANSMISSION_COLOR;
- else if (strcmp(shader_type, "SUBSURFACE_COLOR")==0)
- return SHADER_EVAL_SUBSURFACE_COLOR;
-
- else if (strcmp(shader_type, "EMIT")==0)
- return SHADER_EVAL_EMISSION;
- else if (strcmp(shader_type, "ENVIRONMENT")==0)
- return SHADER_EVAL_ENVIRONMENT;
- else if (strcmp(shader_type, "AO")==0)
- return SHADER_EVAL_AO;
- else if (strcmp(shader_type, "SHADOW")==0)
- return SHADER_EVAL_SHADOW;
-
- else if (strcmp(shader_type, "DIFFUSE")==0)
- return SHADER_EVAL_DIFFUSE;
- else if (strcmp(shader_type, "COLOR")==0)
- return SHADER_EVAL_COLOR;
- else if (strcmp(shader_type, "REFRACTION")==0)
- return SHADER_EVAL_REFRACTION;
- else if (strcmp(shader_type, "SPECULAR")==0)
- return SHADER_EVAL_SPECULAR;
- else if (strcmp(shader_type, "REFLECTION")==0)
- return SHADER_EVAL_REFLECTION;
- else
- return SHADER_EVAL_BAKE;
-#endif
}
static BL::RenderResult begin_render_result(BL::RenderEngine b_engine, int x, int y, int w, int h, const char *layername)
More information about the Bf-blender-cvs
mailing list