[Bf-blender-cvs] [6ee3714] bake-cycles: Cycles-Bake: remove assert and comment cleanup

[Dalai Felinto]

Commit: 6ee3714614700998096ef34117d12dd3c795b9d2
Author: Dalai Felinto
Date:   Fri Feb 21 18:37:45 2014 -0300
https://developer.blender.org/rB6ee3714614700998096ef34117d12dd3c795b9d2

Cycles-Bake: remove assert and comment cleanup

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

M	intern/cycles/kernel/kernel_displace.h
M	intern/cycles/render/film.cpp

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

diff --git a/intern/cycles/kernel/kernel_displace.h b/intern/cycles/kernel/kernel_displace.h
index e0f52d0..55e4580 100644
--- a/intern/cycles/kernel/kernel_displace.h
+++ b/intern/cycles/kernel/kernel_displace.h
@@ -135,7 +135,7 @@ ccl_device void kernel_bake_evaluate(KernelGlobals *kg, ccl_global uint4 *input,
 		/* data passes */
 		case SHADER_EVAL_NORMAL:
 		{
-			/* tangent space: normal = (2 * color) - 1 */
+			/* compression: normal = (2 * color) - 1 */
 			out = sd.N * 0.5f + make_float3(0.5f, 0.5f, 0.5f);
 			break;
 		}
diff --git a/intern/cycles/render/film.cpp b/intern/cycles/render/film.cpp
index edf7ccf..c1aefbc 100644
--- a/intern/cycles/render/film.cpp
+++ b/intern/cycles/render/film.cpp
@@ -156,8 +156,7 @@ void Pass::add(PassType type, vector<Pass>& passes)
 			pass.exposure = false;
 			break;
 		case PASS_LIGHT:
-			/* it should never happen */
-			assert(0);
+			/* ignores */
 			break;
 	}