[Bf-blender-cvs] [b7eff58] master: Bake-API prevent baking for engines that dont support the baking API

Dalai Felinto noreply at git.blender.org
Tue Jun 3 07:10:57 CEST 2014


Commit: b7eff584b0b6d692aabd88192b9e23b6a1a417b6
Author: Dalai Felinto
Date:   Tue Jun 3 00:34:20 2014 -0300
https://developer.blender.org/rBb7eff584b0b6d692aabd88192b9e23b6a1a417b6

Bake-API prevent baking for engines that dont support the baking API

In the future we can fallback to the Blender Internal baking.

Review/Suggestions by Campbell Barton

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

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

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

diff --git a/source/blender/editors/object/object_bake_api.c b/source/blender/editors/object/object_bake_api.c
index 8baea24..6c084e6 100644
--- a/source/blender/editors/object/object_bake_api.c
+++ b/source/blender/editors/object/object_bake_api.c
@@ -741,8 +741,8 @@ static int bake(
 				                    depth, pass_type, result);
 			}
 			else {
-				ok = RE_bake_internal(re, highpoly[i].ob, highpoly[i].pixel_array, num_pixels,
-				                      depth, pass_type, result);
+				BKE_report(reports, RPT_ERROR, "Current render engine does not support baking");
+				goto cleanup;
 			}
 
 			if (!ok)
@@ -773,8 +773,10 @@ static int bake(
 
 		if (RE_bake_has_engine(re))
 			ok = RE_bake_engine(re, ob_low, pixel_array_low, num_pixels, depth, pass_type, result);
-		else
-			ok = RE_bake_internal(re, ob_low, pixel_array_low, num_pixels, depth, pass_type, result);
+		else {
+				BKE_report(reports, RPT_ERROR, "Current render engine does not support baking");
+				goto cleanup;
+		}
 	}
 
 	/* normal space conversion




More information about the Bf-blender-cvs mailing list