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
diff options
context:
space:
mode:
authorSergey Sharybin <sergey.vfx@gmail.com>2016-06-08 13:24:57 +0300
committerJeroen Bakker <j.bakker@atmind.nl>2016-06-08 22:45:40 +0300
commitb3f2a5c19c1046356c9faaa21ce18bf0e1e88648 (patch)
tree9da130f5f9150dcc7db7a791aea79d8594599b49
parent9051036e8e51dfaa74467b07d19fda89fd3e055b (diff)
Cycles: Fix crash after recent zero scale instance optimization
-rw-r--r--intern/cycles/bvh/bvh_build.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/intern/cycles/bvh/bvh_build.cpp b/intern/cycles/bvh/bvh_build.cpp
index d00de007b2d..3f687224eee 100644
--- a/intern/cycles/bvh/bvh_build.cpp
+++ b/intern/cycles/bvh/bvh_build.cpp
@@ -230,6 +230,7 @@ void BVHBuild::add_references(BVHRange& root)
foreach(Object *ob, objects) {
if(params.top_level) {
if(!ob->is_traceable()) {
+ ++i;
continue;
}
if(!ob->mesh->is_instanced())