Changeset View
Changeset View
Standalone View
Standalone View
intern/cycles/render/object.cpp
| Show First 20 Lines • Show All 506 Lines • ▼ Show 20 Lines | foreach(Object *object, scene->objects) { | ||||
| else | else | ||||
| it->second++; | it->second++; | ||||
| } | } | ||||
| if(progress.get_cancel()) return; | if(progress.get_cancel()) return; | ||||
| /* apply transforms for objects with single user meshes */ | /* apply transforms for objects with single user meshes */ | ||||
| foreach(Object *object, scene->objects) { | foreach(Object *object, scene->objects) { | ||||
| if(mesh_users[object->mesh] == 1 && | if((mesh_users[object->mesh] == 1 && !object->mesh->is_instanced()) && | ||||
| object->mesh->displacement_method == Mesh::DISPLACE_BUMP) | object->mesh->displacement_method == Mesh::DISPLACE_BUMP) | ||||
| { | { | ||||
| if(!(motion_blur && object->use_motion)) { | if(!(motion_blur && object->use_motion)) { | ||||
| if(!object->mesh->transform_applied) { | if(!object->mesh->transform_applied) { | ||||
| object->apply_transform(apply_to_motion); | object->apply_transform(apply_to_motion); | ||||
| object->mesh->transform_applied = true; | object->mesh->transform_applied = true; | ||||
| if(progress.get_cancel()) return; | if(progress.get_cancel()) return; | ||||
| Show All 28 Lines | |||||