diff options
| author | Lukas Toenne <lukas.toenne@googlemail.com> | 2013-10-05 16:46:32 +0400 |
|---|---|---|
| committer | Lukas Toenne <lukas.toenne@googlemail.com> | 2013-10-05 16:46:32 +0400 |
| commit | 4aacb0eda9d3b0bec60726d16fa7c35322612ff5 (patch) | |
| tree | a24c78a60510ea776244896cfa39c495b0c5ec4d /intern | |
| parent | 8ccf118058fceb99bdbef12d82a6cd6627a0fc3f (diff) | |
Fix #36962, "Render emitter" option for hair is ignored in Cycles. Hair particles use the hide_tris boolean to disable rendering of the emitter, but this was still ANDed with the "experimental" flag.
Hair is not experimental any longer, so this has to be removed.
Diffstat (limited to 'intern')
| -rw-r--r-- | intern/cycles/blender/blender_mesh.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/intern/cycles/blender/blender_mesh.cpp b/intern/cycles/blender/blender_mesh.cpp index caa61e0c5d7..940a923e5af 100644 --- a/intern/cycles/blender/blender_mesh.cpp +++ b/intern/cycles/blender/blender_mesh.cpp @@ -480,7 +480,7 @@ Mesh *BlenderSync::sync_mesh(BL::Object b_ob, bool object_updated, bool hide_tri BL::Mesh b_mesh = object_to_mesh(b_data, b_ob, b_scene, true, !preview, need_undeformed); if(b_mesh) { - if(render_layer.use_surfaces && !(hide_tris && experimental)) { + if(render_layer.use_surfaces && !hide_tris) { if(cmesh.data && experimental && RNA_boolean_get(&cmesh, "use_subdivision")) create_subd_mesh(mesh, b_mesh, &cmesh, used_shaders); else |