[Bf-blender-cvs] [42090ad] temp-cycles-microdisplacement: Disable curves on subdivision meshes for now

[Mai Lavelle]

Commit: 42090adabf055e136b40083b2db1645dcedf0118
Author: Mai Lavelle
Date:   Thu Jun 23 05:50:51 2016 -0400
Branches: temp-cycles-microdisplacement
https://developer.blender.org/rB42090adabf055e136b40083b2db1645dcedf0118

Disable curves on subdivision meshes for now

Attributes on curves seems broken even without subdivision, but is even
worse with. Will investigate re-enabling later.

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

M	intern/cycles/blender/blender_mesh.cpp

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

diff --git a/intern/cycles/blender/blender_mesh.cpp b/intern/cycles/blender/blender_mesh.cpp
index cc55b62..a6b79c5 100644
--- a/intern/cycles/blender/blender_mesh.cpp
+++ b/intern/cycles/blender/blender_mesh.cpp
@@ -901,7 +901,7 @@ Mesh *BlenderSync::sync_mesh(BL::Object& b_ob,
 				create_mesh_volume_attributes(scene, b_ob, mesh, b_scene.frame_current());
 			}
 
-			if(render_layer.use_hair)
+			if(render_layer.use_hair && !subdivision)
 				sync_curves(mesh, b_mesh, b_ob, false);
 
 			if(can_free_caches) {