Page MenuHome
Differential D5689 Diff 18078 intern/cycles/blender/addon/ui.py

Changeset View

Standalone View

View Options

intern/cycles/blender/addon/ui.py

Show First 20 Lines • Show All 2,044 Lines • ▼ Show 20 Lines def draw(self, context):
col = layout.column() col = layout.column()
col.prop(cscene, "use_distance_cull") col.prop(cscene, "use_distance_cull")
sub = col.column() sub = col.column()
sub.active = cscene.use_distance_cull sub.active = cscene.use_distance_cull
sub.prop(cscene, "distance_cull_margin", text="Distance") sub.prop(cscene, "distance_cull_margin", text="Distance")
class CYCLES_VIEW3D_PT_shading_render_pass(Panel):
bl_space_type = 'VIEW_3D'
bl_region_type = 'HEADER'
bl_label = "Render Pass"
bl_parent_id = 'VIEW3D_PT_shading'
COMPAT_ENGINES = {'CYCLES'}
@classmethod
def poll(cls, context):
return (context.engine in cls.COMPAT_ENGINES
and context.space_data.shading.type == 'RENDERED')
def draw(self, context):
shading = context.space_data.shading
layout = self.layout
layout.prop(shading.cycles, "render_pass", text="")
class CYCLES_VIEW3D_PT_shading_lighting(Panel): class CYCLES_VIEW3D_PT_shading_lighting(Panel):
bl_space_type = 'VIEW_3D' bl_space_type = 'VIEW_3D'
bl_region_type = 'HEADER' bl_region_type = 'HEADER'
bl_label = "Lighting" bl_label = "Lighting"
bl_parent_id = 'VIEW3D_PT_shading' bl_parent_id = 'VIEW3D_PT_shading'
COMPAT_ENGINES = {'CYCLES'} COMPAT_ENGINES = {'CYCLES'}
@classmethod @classmethod
def poll(cls, context): def poll(cls, context):
return (context.engine in cls.COMPAT_ENGINES return (context.engine in cls.COMPAT_ENGINES
and context.space_data.shading.type == 'RENDERED') and context.space_data.shading.type == 'RENDERED')
def draw(self, context): def draw(self, context):
layout = self.layout layout = self.layout
col = layout.column() col = layout.column()
split = col.split(factor=0.9) split = col.split(factor=0.9)
shading = context.space_data.shading shading = context.space_data.shading
col.prop(shading, "use_scene_lights_render") col.prop(shading, "use_scene_lights_render")
col.prop(shading, "use_scene_world_render") col.prop(shading, "use_scene_world_render")
brechtUnsubmitted
Done
Inline Actions

It's a bit strange in the middle of these lighting settings.

It can be moved into a separate subpanel instead:

diff --git a/intern/cycles/blender/addon/ui.py b/intern/cycles/blender/addon/ui.py
index 73bb499..8676f48 100644
--- a/intern/cycles/blender/addon/ui.py
+++ b/intern/cycles/blender/addon/ui.py
@@ -2050,6 +2050,25 @@ class CYCLES_RENDER_PT_simplify_culling(CyclesButtonsPanel, Panel):
         sub.prop(cscene, "distance_cull_margin", text="Distance")
 
 
+class CYCLES_VIEW3D_PT_shading_render_pass(Panel):
+    bl_space_type = 'VIEW_3D'
+    bl_region_type = 'HEADER'
+    bl_label = "Render Pass"
+    bl_parent_id = 'VIEW3D_PT_shading'
+    COMPAT_ENGINES = {'CYCLES'}
+
+    @classmethod
+    def poll(cls, context):
+        return (context.engine in cls.COMPAT_ENGINES
+            and context.space_data.shading.type == 'RENDERED')
+
+    def draw(self, context):
+        shading = context.space_data.shading
+
+        layout = self.layout
+        layout.prop(shading.cycles, "render_pass", text="")
+
+
 class CYCLES_VIEW3D_PT_shading_lighting(Panel):
     bl_space_type = 'VIEW_3D'
     bl_region_type = 'HEADER'
@@ -2173,6 +2192,7 @@ classes = (
     CYCLES_RENDER_PT_simplify_render,
     CYCLES_RENDER_PT_simplify_culling,
     CYCLES_VIEW3D_PT_shading_lighting,
+    CYCLES_VIEW3D_PT_shading_render_pass,
     CYCLES_RENDER_PT_motion_blur,
     CYCLES_RENDER_PT_motion_blur_curve,
     CYCLES_RENDER_PT_film,
brecht: It's a bit strange in the middle of these lighting settings. It can be moved into a separate…
if not shading.use_scene_world_render: if not shading.use_scene_world_render:
col = layout.column() col = layout.column()
split = col.split(factor=0.9) split = col.split(factor=0.9)
col = split.column() col = split.column()
sub = col.row() sub = col.row()
sub.scale_y = 0.6 sub.scale_y = 0.6
sub.template_icon_view(shading, "studio_light", scale_popup=3) sub.template_icon_view(shading, "studio_light", scale_popup=3)
▲ Show 20 Lines • Show All 85 Lines • ▼ Show 20 Linesclasses = (
CYCLES_RENDER_PT_volumes, CYCLES_RENDER_PT_volumes,
CYCLES_RENDER_PT_subdivision, CYCLES_RENDER_PT_subdivision,
CYCLES_RENDER_PT_hair, CYCLES_RENDER_PT_hair,
CYCLES_RENDER_PT_simplify, CYCLES_RENDER_PT_simplify,
CYCLES_RENDER_PT_simplify_viewport, CYCLES_RENDER_PT_simplify_viewport,
CYCLES_RENDER_PT_simplify_render, CYCLES_RENDER_PT_simplify_render,
CYCLES_RENDER_PT_simplify_culling, CYCLES_RENDER_PT_simplify_culling,
CYCLES_VIEW3D_PT_shading_lighting, CYCLES_VIEW3D_PT_shading_lighting,
CYCLES_VIEW3D_PT_shading_render_pass,
CYCLES_RENDER_PT_motion_blur, CYCLES_RENDER_PT_motion_blur,
CYCLES_RENDER_PT_motion_blur_curve, CYCLES_RENDER_PT_motion_blur_curve,
CYCLES_RENDER_PT_film, CYCLES_RENDER_PT_film,
CYCLES_RENDER_PT_film_pixel_filter, CYCLES_RENDER_PT_film_pixel_filter,
CYCLES_RENDER_PT_film_transparency, CYCLES_RENDER_PT_film_transparency,
CYCLES_RENDER_PT_performance, CYCLES_RENDER_PT_performance,
CYCLES_RENDER_PT_performance_threads, CYCLES_RENDER_PT_performance_threads,
CYCLES_RENDER_PT_performance_tiles, CYCLES_RENDER_PT_performance_tiles,
▲ Show 20 Lines • Show All 81 Lines • Show Last 20 Lines