diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-12-02 05:01:07 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-12-02 05:01:07 +0400 |
| commit | 15ad39e6848ea54da8a3f36b867f8b09a7b8b163 (patch) | |
| tree | 53e4f1c2f37d0e2f3679e284a8f7c0f3f66f6d5c /intern/cycles/blender/blender_mesh.cpp | |
| parent | ce6487291349b00a85f265d2b8cfb682e2bb8086 (diff) | |
| parent | 1936b31cd0f7741ec39f638cc57286e5b379134c (diff) | |
svn merge ^/trunk/blender -r42303:42329
Diffstat (limited to 'intern/cycles/blender/blender_mesh.cpp')
| -rw-r--r-- | intern/cycles/blender/blender_mesh.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/intern/cycles/blender/blender_mesh.cpp b/intern/cycles/blender/blender_mesh.cpp index bed6af87cc9..7b701be49d7 100644 --- a/intern/cycles/blender/blender_mesh.cpp +++ b/intern/cycles/blender/blender_mesh.cpp @@ -281,7 +281,7 @@ Mesh *BlenderSync::sync_mesh(BL::Object b_ob, bool object_updated) mesh->name = ustring(b_ob_data.name().c_str()); if(b_mesh) { - if(cmesh.data && RNA_boolean_get(&cmesh, "use_subdivision")) + if(cmesh.data && experimental && RNA_boolean_get(&cmesh, "use_subdivision")) create_subd_mesh(mesh, b_mesh, &cmesh, used_shaders); else create_mesh(scene, mesh, b_mesh, used_shaders); @@ -294,7 +294,7 @@ Mesh *BlenderSync::sync_mesh(BL::Object b_ob, bool object_updated) if(cmesh.data) { int method = RNA_enum_get(&cmesh, "displacement_method"); - if(method == 0) + if(method == 0 || !experimental) mesh->displacement_method = Mesh::DISPLACE_BUMP; else if(method == 1) mesh->displacement_method = Mesh::DISPLACE_TRUE; |