Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/source
diff options
context:
space:
mode:
authorDalai Felinto <dfelinto@gmail.com>2014-06-17 19:39:14 +0400
committerDalai Felinto <dfelinto@gmail.com>2014-06-19 02:32:14 +0400
commit9cf66d9248f4d99857365b06de6b7a1fa4c3f563 (patch)
tree46514b1fef12ac88a75edde5e3c37a3b999e18dc /source
parenta3cf97e2aa28b7d916cdcb8b5c85f7926a5e3fce (diff)
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
Diffstat (limited to 'source')
-rw-r--r--source/blender/editors/object/object_bake_api.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/editors/object/object_bake_api.c b/source/blender/editors/object/object_bake_api.c
index 9e2d6d95f38..6e291e438cd 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;