diff options
| author | Thomas Dinges <blender@dingto.org> | 2013-05-08 21:33:25 +0400 |
|---|---|---|
| committer | Thomas Dinges <blender@dingto.org> | 2013-05-08 21:33:25 +0400 |
| commit | 872a8ed1bf635a62a65d3b2a92b7d2fbb368eea1 (patch) | |
| tree | d09aaf49f569515eb3eacb7921ac90f13357657d /intern/cycles/blender/blender_mesh.cpp | |
| parent | 9037a2d3ab7630b877039244cc71b56d413df893 (diff) | |
Cycles / Hair rendering:
* Enable hair rendering on the GPU.
Patch by Stuart Broadfoot, with small tweaks by me, to only enable it on sm_20 and above.
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 c545ad240c4..b144933bb22 100644 --- a/intern/cycles/blender/blender_mesh.cpp +++ b/intern/cycles/blender/blender_mesh.cpp @@ -449,14 +449,14 @@ Mesh *BlenderSync::sync_mesh(BL::Object b_ob, bool object_updated, bool hide_tri mesh->name = ustring(b_ob_data.name().c_str()); if(b_mesh) { - if(!(hide_tris && experimental && is_cpu)) { + if(!(hide_tris && experimental)) { 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); } - if(experimental && is_cpu) + if(experimental) sync_curves(mesh, b_mesh, b_ob, object_updated); /* free derived mesh */ |