[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [60567] trunk/blender/intern/cycles/ blender/blender_mesh.cpp: Fix #36962, "Render emitter" option for hair is ignored in Cycles.

[Lukas Toenne]

Revision: 60567
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=60567
Author:   lukastoenne
Date:     2013-10-05 12:46:32 +0000 (Sat, 05 Oct 2013)
Log Message:
-----------
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.

Modified Paths:
--------------
    trunk/blender/intern/cycles/blender/blender_mesh.cpp

Modified: trunk/blender/intern/cycles/blender/blender_mesh.cpp
===================================================================
--- trunk/blender/intern/cycles/blender/blender_mesh.cpp	2013-10-05 12:36:35 UTC (rev 60566)
+++ trunk/blender/intern/cycles/blender/blender_mesh.cpp	2013-10-05 12:46:32 UTC (rev 60567)
@@ -480,7 +480,7 @@
 		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