Cycles microdisplacement: Move displacement options from mesh to material settings
[blender-staging.git] / intern / cycles / blender / blender_mesh.cpp
index b4c490c0d330c24dbf9733b0efa3674d005efdda..11aef55c277a76e7203645bb83a9752a7783d135 100644 (file)
@@ -1008,21 +1008,6 @@ Mesh *BlenderSync::sync_mesh(BL::Object& b_ob,
        }
        mesh->geometry_flags = requested_geometry_flags;
 
-       /* displacement method */
-       if(cmesh.data) {
-               const int method = get_enum(cmesh,
-                                           "displacement_method",
-                                           Mesh::DISPLACE_NUM_METHODS,
-                                           Mesh::DISPLACE_BUMP);
-
-               if(method == 0 || !experimental)
-                       mesh->displacement_method = Mesh::DISPLACE_BUMP;
-               else if(method == 1)
-                       mesh->displacement_method = Mesh::DISPLACE_TRUE;
-               else
-                       mesh->displacement_method = Mesh::DISPLACE_BOTH;
-       }
-
        /* fluid motion */
        sync_mesh_fluid_motion(b_ob, scene, mesh);