diff options
| author | Antony Riakiotakis <kalast@gmail.com> | 2014-11-13 20:54:19 +0300 |
|---|---|---|
| committer | Antony Riakiotakis <kalast@gmail.com> | 2014-11-13 20:54:32 +0300 |
| commit | 78e0791a540ba7479f4e3905ce5ec4b6912a3c26 (patch) | |
| tree | 546cdb6bd80f8ddd277a50147fb54e84d6eabfda | |
| parent | 15a7a5a08cd0d6c08feeb158a9f81af4114e3f57 (diff) | |
Fix T42590 baking bakes to duplicated objects too.
Only allow non instanced renderobjects to be baked.
| -rw-r--r-- | source/blender/render/intern/source/bake.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/source/blender/render/intern/source/bake.c b/source/blender/render/intern/source/bake.c index 15634c93491..9b22c7d8bad 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); |