[Bf-blender-cvs] [686e8e4] master: Fix T45390: Cycles experimental displacement method ignores scaling when render

[Sergey Sharybin]

Commit: 686e8e452c2c40839283e66022e84c7be4cef230
Author: Sergey Sharybin
Date:   Mon Jul 13 15:22:36 2015 +0200
Branches: master
https://developer.blender.org/rB686e8e452c2c40839283e66022e84c7be4cef230

Fix T45390: Cycles experimental displacement method ignores scaling when render

>From artists perspective it makes sense to always apply displacement in a local
space.

TODO: Double-check that BVH is being packed properly. From quick tests seems it's
all fine, but might be missing some obvious failure still.

===================================================================

M	intern/cycles/render/object.cpp

===================================================================

diff --git a/intern/cycles/render/object.cpp b/intern/cycles/render/object.cpp
index 4a57ac4..ec85aa8 100644
--- a/intern/cycles/render/object.cpp
+++ b/intern/cycles/render/object.cpp
@@ -512,7 +512,9 @@ void ObjectManager::apply_static_transforms(DeviceScene *dscene, Scene *scene, u
 
 	/* apply transforms for objects with single user meshes */
 	foreach(Object *object, scene->objects) {
-		if(mesh_users[object->mesh] == 1) {
+		if(mesh_users[object->mesh] == 1 &&
+		   object->mesh->displacement_method == Mesh::DISPLACE_BUMP)
+		{
 			if(!(motion_blur && object->use_motion)) {
 				if(!object->mesh->transform_applied) {
 					object->apply_transform(apply_to_motion);