Commit: 78e0791a540ba7479f4e3905ce5ec4b6912a3c26
Author: Antony Riakiotakis
Date: Thu Nov 13 18:54:19 2014 +0100
Branches: master
https://developer.blender.org/rB78e0791a540ba7479f4e3905ce5ec4b6912a3c26
Fix T42590 baking bakes to duplicated objects too.
Only allow non instanced renderobjects to be baked.
===================================================================
M source/blender/render/intern/source/bake.c
===================================================================
diff --git a/source/blender/render/intern/source/bake.c
b/source/blender/render/intern/source/bake.c
index 15634c9..9b22c7d 100644
--- a/source/blender/render/intern/source/bake.c
+++ b/source/blender/render/intern/source/bake.c
@@ -613,6 +613,10 @@ static int get_next_bake_face(BakeShade *bs)
for (; obi; obi = obi->next, v = 0) {
obr = obi->obr;
+ /* only allow non instances here */
+ if (obr->flag & R_INSTANCEABLE)
+ continue;
+
for (; v < obr->totvlak; v++) {
vlr = RE_findOrAddVlak(obr, v);
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
