Changeset View
Changeset View
Standalone View
Standalone View
intern/cycles/blender/blender_mesh.cpp
| Show First 20 Lines • Show All 821 Lines • ▼ Show 20 Lines | if(b_mesh) { | ||||
| /* free derived mesh */ | /* free derived mesh */ | ||||
| b_data.meshes.remove(b_mesh); | b_data.meshes.remove(b_mesh); | ||||
| } | } | ||||
| } | } | ||||
| mesh->geometry_flags = requested_geometry_flags; | mesh->geometry_flags = requested_geometry_flags; | ||||
| /* displacement method */ | /* displacement method */ | ||||
| if(cmesh.data) { | if(cmesh.data) { | ||||
| const int method = get_enum(cmesh, "displacement_method"); | const int method = get_enum(cmesh, | ||||
| "displacement_method", | |||||
| Mesh::DISPLACE_NUM_METHODS, | |||||
| Mesh::DISPLACE_BUMP); | |||||
| if(method == 0 || !experimental) | if(method == 0 || !experimental) | ||||
| mesh->displacement_method = Mesh::DISPLACE_BUMP; | mesh->displacement_method = Mesh::DISPLACE_BUMP; | ||||
| else if(method == 1) | else if(method == 1) | ||||
| mesh->displacement_method = Mesh::DISPLACE_TRUE; | mesh->displacement_method = Mesh::DISPLACE_TRUE; | ||||
| else | else | ||||
| mesh->displacement_method = Mesh::DISPLACE_BOTH; | mesh->displacement_method = Mesh::DISPLACE_BOTH; | ||||
| } | } | ||||
| ▲ Show 20 Lines • Show All 186 Lines • Show Last 20 Lines | |||||