bartvdbraak/blender
1
0
Fork 4
Code Issues 4 Pull Requests 1 Actions 1 Packages Projects Releases Wiki Activity

Cycles / Hair:

Browse Source 
* Hair rendering is now a supported feature, no further need to change the feature set to "Experimental".
This commit is contained in:
Thomas Dinges 2013-09-16 15:34:31 +00:00
parent 786b26438e
commit da5ce8cb1c
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
intern/cycles/blender/addon/ui.py
View File

@ -1178,8 +1178,7 @@ class CyclesRender_PT_CurveRendering(CyclesButtonsPanel, Panel):
scene = context.scene
cscene = scene.cycles
psys = context.particle_system
experimental = (cscene.feature_set == 'EXPERIMENTAL')
return CyclesButtonsPanel.poll(context) and experimental and psys
return CyclesButtonsPanel.poll(context) and psys
def draw_header(self, context):
ccscene = context.scene.cycles_curves
@ -1220,8 +1219,7 @@ class CyclesParticle_PT_CurveSettings(CyclesButtonsPanel, Panel):
cscene = scene.cycles
ccscene = scene.cycles_curves
use_curves = ccscene.use_curves and context.particle_system
experimental = cscene.feature_set == 'EXPERIMENTAL'
return CyclesButtonsPanel.poll(context) and experimental and use_curves
return CyclesButtonsPanel.poll(context) and use_curves
def draw(self, context):
layout = self.layout

2
intern/cycles/blender/blender_mesh.cpp
View File

@ -487,7 +487,7 @@ Mesh *BlenderSync::sync_mesh(BL::Object b_ob, bool object_updated, bool hide_tri
create_mesh(scene, mesh, b_mesh, used_shaders);
}
if(render_layer.use_hair && experimental)
if(render_layer.use_hair)
sync_curves(mesh, b_mesh, b_ob, object_updated);
/* free derived mesh */