[Bf-blender-cvs] [9cf66d9] master: Bake-API: fix for non-NORMAL maps baking black when using cage

[Dalai Felinto]

Commit: 9cf66d9248f4d99857365b06de6b7a1fa4c3f563
Author: Dalai Felinto
Date:   Tue Jun 17 12:39:14 2014 -0300
https://developer.blender.org/rB9cf66d9248f4d99857365b06de6b7a1fa4c3f563

Bake-API: fix for non-NORMAL maps baking black when using cage

Reported by Andy Davies (metalliandy) outside the tracker
Fix to include in 2.71

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

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 9e2d6d9..6e291e4 100644
--- a/source/blender/editors/object/object_bake_api.c
+++ b/source/blender/editors/object/object_bake_api.c
@@ -635,6 +635,7 @@ static int bake(
 			}
 			else {
 				restrict_flag_cage = ob_cage->restrictflag;
+				ob_cage->restrictflag |= OB_RESTRICT_RENDER;
 			}
 		}
 	}
@@ -772,7 +773,7 @@ static int bake(
 
 		/* reverting data back */
 		if (ob_cage) {
-			ob_cage->restrictflag |= OB_RESTRICT_RENDER;
+			ob_cage->restrictflag = restrict_flag_cage;
 		}
 		else if (is_cage) {
 			ob_low->modifiers = modifiers_original;