[Bf-blender-cvs] [6021321] bake-cycles: Cycles-Bake: better to always use the external engine to bake, the only map that we could map using the internal mechanism is the UV map

Dalai Felinto noreply at git.blender.org
Wed Apr 23 02:46:25 CEST 2014


Commit: 6021321a862a70a7fb2281d508d8c8bdaef73912
Author: Dalai Felinto
Date:   Tue Jan 14 10:14:05 2014 -0200
https://developer.blender.org/rB6021321a862a70a7fb2281d508d8c8bdaef73912

Cycles-Bake: better to always use the external engine to bake, the only map that
we could map using the internal mechanism is the UV map

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

M	source/blender/editors/object/object_bake_new.c

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

diff --git a/source/blender/editors/object/object_bake_new.c b/source/blender/editors/object/object_bake_new.c
index 525c0ff..a595725 100644
--- a/source/blender/editors/object/object_bake_new.c
+++ b/source/blender/editors/object/object_bake_new.c
@@ -121,13 +121,6 @@ static int bake_break(void *UNUSED(rjv))
 	return 0;
 }
 
-static bool bake_type_needs_external(Render *UNUSED(re), ScenePassType pass_type)
-{
-	if (ELEM3(pass_type, SCE_PASS_UV, SCE_PASS_INDEXOB, SCE_PASS_INDEXMA))
-		return false;
-	return true;
-}
-
 static bool write_external_bakepixels(const char *filepath, float *buffer, const int width, const int height, const int depth)
 {
 	ImBuf *ibuf = NULL;
@@ -263,7 +256,7 @@ static int bake_exec(bContext *C, wmOperator *op)
 	    e.g., do the image part? the cycle part? the blender internal changes? ...
 	 */
 
-	if (RE_engine_has_bake(re) && bake_type_needs_external(re, pass_type))
+	if (RE_engine_has_bake(re))
 		ok = RE_engine_bake(re, object, pixel_array, num_pixels, depth, pass_type, result);
 	else
 		ok = RE_internal_bake(re, object, pixel_array, num_pixels, depth, pass_type, result);




More information about the Bf-blender-cvs mailing list