[Bf-committers] [Bf-blender-cvs] [554024e08e] master: Cycles: move hair particle settings to scene context

[Sergey Sharybin]

Hi,

Just to clarify a bit. The commit message should have been updated to use
"Render context" instead of "Scene context". Those settings are now in the
Geometry panel of Render context.

On Thu, Jan 12, 2017 at 10:48 AM, Sergey Sharybin <noreply at git.blender.org>
wrote:

> Commit: 554024e08e7855685446b33d8bdbde5cacc196a5
> Author: Sergey Sharybin
> Date:   Tue Oct 11 16:33:07 2016 +0200
> Branches: master
> https://developer.blender.org/rB554024e08e7855685446b33d8bdbde5cacc196a5
>
> Cycles: move hair particle settings to scene context
>
> Since the beginning of times hair settings in cycles were global for
> the whole scene but were located in the particle context. This causes
> quite some trickery to get shots set up for the movies here in the
> studio by forcing artists to create dummy particle system to change
> settings of hair on the shot.
>
> While ideally this settings should be properly become per-particle
> system for the time being it will save sweat and blood to move the
> settings to scene context.
>
> Reviewers: brecht
>
> Subscribers: jtheninja, eyecandy, venomgfx, Blendify
>
> Differential Revision: https://developer.blender.org/D2287
>
> ===================================================================
>
> M       intern/cycles/blender/addon/ui.py
>
> ===================================================================
>
> diff --git a/intern/cycles/blender/addon/ui.py
> b/intern/cycles/blender/addon/ui.py
> index 3f7730efbb..925f923dd4 100644
> --- a/intern/cycles/blender/addon/ui.py
> +++ b/intern/cycles/blender/addon/ui.py
> @@ -226,6 +226,7 @@ class CyclesRender_PT_geometery(CyclesButtonsPanel,
> Panel):
>
>          scene = context.scene
>          cscene = scene.cycles
> +        ccscene = scene.cycles_curves
>
>          if cscene.feature_set == 'EXPERIMENTAL':
>              split = layout.split()
> @@ -252,6 +253,25 @@ class CyclesRender_PT_geometery(CyclesButtonsPanel,
> Panel):
>              row.prop(cscene, "volume_step_size")
>              row.prop(cscene, "volume_max_steps")
>
> +        layout.prop(ccscene, "use_curves", text="Use Hair")
> +        col = layout.column()
> +        col.active = ccscene.use_curves
> +
> +        col.prop(ccscene, "primitive", text="Primitive")
> +        col.prop(ccscene, "shape", text="Shape")
> +
> +        if not (ccscene.primitive in {'CURVE_SEGMENTS', 'LINE_SEGMENTS'}
> and ccscene.shape == 'RIBBONS'):
> +            col.prop(ccscene, "cull_backfacing", text="Cull back-faces")
> +
> +        if ccscene.primitive == 'TRIANGLES' and ccscene.shape == 'THICK':
> +            col.prop(ccscene, "resolution", text="Resolution")
> +        elif ccscene.primitive == 'CURVE_SEGMENTS':
> +            col.prop(ccscene, "subdivisions", text="Curve subdivisions")
> +
> +        row = col.row()
> +        row.prop(ccscene, "minimum_width", text="Min Pixels")
> +        row.prop(ccscene, "maximum_width", text="Max Ext.")
> +
>
>  class CyclesRender_PT_light_paths(CyclesButtonsPanel, Panel):
>      bl_label = "Light Paths"
> @@ -1391,43 +1411,6 @@ class CyclesParticle_PT_textures(CyclesButtonsPanel,
> Panel):
>              layout.template_ID(slot, "texture", new="texture.new")
>
>
> -class CyclesRender_PT_CurveRendering(CyclesButtonsPanel, Panel):
> -    bl_label = "Cycles Hair Rendering"
> -    bl_context = "particle"
> -
> -    @classmethod
> -    def poll(cls, context):
> -        psys = context.particle_system
> -        return CyclesButtonsPanel.poll(context) and psys and
> psys.settings.type == 'HAIR'
> -
> -    def draw_header(self, context):
> -        ccscene = context.scene.cycles_curves
> -        self.layout.prop(ccscene, "use_curves", text="")
> -
> -    def draw(self, context):
> -        layout = self.layout
> -
> -        scene = context.scene
> -        ccscene = scene.cycles_curves
> -
> -        layout.active = ccscene.use_curves
> -
> -        layout.prop(ccscene, "primitive", text="Primitive")
> -        layout.prop(ccscene, "shape", text="Shape")
> -
> -        if not (ccscene.primitive in {'CURVE_SEGMENTS', 'LINE_SEGMENTS'}
> and ccscene.shape == 'RIBBONS'):
> -            layout.prop(ccscene, "cull_backfacing", text="Cull
> back-faces")
> -
> -        if ccscene.primitive == 'TRIANGLES' and ccscene.shape == 'THICK':
> -            layout.prop(ccscene, "resolution", text="Resolution")
> -        elif ccscene.primitive == 'CURVE_SEGMENTS':
> -            layout.prop(ccscene, "subdivisions", text="Curve
> subdivisions")
> -
> -        row = layout.row()
> -        row.prop(ccscene, "minimum_width", text="Min Pixels")
> -        row.prop(ccscene, "maximum_width", text="Max Ext.")
> -
> -
>  class CyclesRender_PT_bake(CyclesButtonsPanel, Panel):
>      bl_label = "Bake"
>      bl_context = "render"
>
> _______________________________________________
> Bf-blender-cvs mailing list
> Bf-blender-cvs at blender.org
> https://lists.blender.org/mailman/listinfo/bf-blender-cvs
>



-- 
With best regards, Sergey Sharybin