[Bf-blender-cvs] [dffde4a49cd] blender2.8: Merge branch 'master' into blender2.8
Brecht Van Lommel
noreply at git.blender.org
Tue Oct 30 14:14:46 CET 2018
Commit: dffde4a49cd73d0d6003258d6ac36526652cd5d5
Author: Brecht Van Lommel
Date: Tue Oct 30 14:13:47 2018 +0100
Branches: blender2.8
https://developer.blender.org/rBdffde4a49cd73d0d6003258d6ac36526652cd5d5
Merge branch 'master' into blender2.8
===================================================================
===================================================================
diff --cc intern/cycles/blender/addon/ui.py
index 7aa66fac31f,0fdefe5d442..d172fd0b4c8
--- a/intern/cycles/blender/addon/ui.py
+++ b/intern/cycles/blender/addon/ui.py
@@@ -757,76 -503,115 +757,72 @@@ class CYCLES_RENDER_PT_layer_passes(Cyc
split = layout.split()
col = split.column()
- col.prop(rl, "use_pass_combined")
- col.prop(rl, "use_pass_z")
- col.prop(rl, "use_pass_mist")
- col.prop(rl, "use_pass_normal")
+ col.prop(view_layer, "use_pass_combined")
+ col.prop(view_layer, "use_pass_z")
+ col.prop(view_layer, "use_pass_mist")
+ col.prop(view_layer, "use_pass_normal")
row = col.row()
- row.prop(rl, "use_pass_vector")
+ row.prop(view_layer, "use_pass_vector")
row.active = not rd.use_motion_blur
- col.prop(rl, "use_pass_uv")
- col.prop(rl, "use_pass_object_index")
- col.prop(rl, "use_pass_material_index")
+ col.prop(view_layer, "use_pass_uv")
+ col.prop(view_layer, "use_pass_object_index")
+ col.prop(view_layer, "use_pass_material_index")
col.separator()
- col.prop(rl, "use_pass_shadow")
- col.prop(rl, "use_pass_ambient_occlusion")
+ col.prop(view_layer, "use_pass_shadow")
+ col.prop(view_layer, "use_pass_ambient_occlusion", text="Ambient Occlusion")
col.separator()
- col.prop(crl, "denoising_store_passes", text="Denoising Data")
++ col.prop(cycles_view_layer, "denoising_store_passes", text="Denoising Data")
+ col.separator()
- col.prop(rl, "pass_alpha_threshold")
+ col.prop(view_layer, "pass_alpha_threshold")
col = split.column()
col.label(text="Diffuse:")
row = col.row(align=True)
- row.prop(rl, "use_pass_diffuse_direct", text="Direct", toggle=True)
- row.prop(rl, "use_pass_diffuse_indirect", text="Indirect", toggle=True)
- row.prop(rl, "use_pass_diffuse_color", text="Color", toggle=True)
+ row.prop(view_layer, "use_pass_diffuse_direct", text="Direct", toggle=True)
+ row.prop(view_layer, "use_pass_diffuse_indirect", text="Indirect", toggle=True)
+ row.prop(view_layer, "use_pass_diffuse_color", text="Color", toggle=True)
col.label(text="Glossy:")
row = col.row(align=True)
- row.prop(rl, "use_pass_glossy_direct", text="Direct", toggle=True)
- row.prop(rl, "use_pass_glossy_indirect", text="Indirect", toggle=True)
- row.prop(rl, "use_pass_glossy_color", text="Color", toggle=True)
+ row.prop(view_layer, "use_pass_glossy_direct", text="Direct", toggle=True)
+ row.prop(view_layer, "use_pass_glossy_indirect", text="Indirect", toggle=True)
+ row.prop(view_layer, "use_pass_glossy_color", text="Color", toggle=True)
col.label(text="Transmission:")
row = col.row(align=True)
- row.prop(rl, "use_pass_transmission_direct", text="Direct", toggle=True)
- row.prop(rl, "use_pass_transmission_indirect", text="Indirect", toggle=True)
- row.prop(rl, "use_pass_transmission_color", text="Color", toggle=True)
+ row.prop(view_layer, "use_pass_transmission_direct", text="Direct", toggle=True)
+ row.prop(view_layer, "use_pass_transmission_indirect", text="Indirect", toggle=True)
+ row.prop(view_layer, "use_pass_transmission_color", text="Color", toggle=True)
col.label(text="Subsurface:")
row = col.row(align=True)
- row.prop(rl, "use_pass_subsurface_direct", text="Direct", toggle=True)
- row.prop(rl, "use_pass_subsurface_indirect", text="Indirect", toggle=True)
- row.prop(rl, "use_pass_subsurface_color", text="Color", toggle=True)
+ row.prop(view_layer, "use_pass_subsurface_direct", text="Direct", toggle=True)
+ row.prop(view_layer, "use_pass_subsurface_indirect", text="Indirect", toggle=True)
+ row.prop(view_layer, "use_pass_subsurface_color", text="Color", toggle=True)
col.label(text="Volume:")
row = col.row(align=True)
- row.prop(crl, "use_pass_volume_direct", text="Direct", toggle=True)
- row.prop(crl, "use_pass_volume_indirect", text="Indirect", toggle=True)
+ row.prop(cycles_view_layer, "use_pass_volume_direct", text="Direct", toggle=True)
+ row.prop(cycles_view_layer, "use_pass_volume_indirect", text="Indirect", toggle=True)
col.separator()
- col.prop(rl, "use_pass_emit", text="Emission")
- col.prop(rl, "use_pass_environment")
+ col.prop(view_layer, "use_pass_emit", text="Emission")
+ col.prop(view_layer, "use_pass_environment")
- if context.scene.cycles.feature_set == 'EXPERIMENTAL':
- col.separator()
- sub = col.column()
- sub.active = cycles_view_layer.use_denoising
- sub.prop(cycles_view_layer, "denoising_store_passes", text="Denoising")
-
col = layout.column()
- col.prop(crl, "pass_debug_render_time")
+ col.prop(cycles_view_layer, "pass_debug_render_time")
if _cycles.with_cycles_debug:
- col.prop(crl, "pass_debug_bvh_traversed_nodes")
- col.prop(crl, "pass_debug_bvh_traversed_instances")
- col.prop(crl, "pass_debug_bvh_intersections")
- col.prop(crl, "pass_debug_ray_bounces")
+ col.prop(cycles_view_layer, "pass_debug_bvh_traversed_nodes")
+ col.prop(cycles_view_layer, "pass_debug_bvh_traversed_instances")
+ col.prop(cycles_view_layer, "pass_debug_bvh_intersections")
+ col.prop(cycles_view_layer, "pass_debug_ray_bounces")
- crl = rl.cycles
- layout.label("Cryptomatte:")
+ layout.label(text="Cryptomatte:")
row = layout.row(align=True)
- row.prop(crl, "use_pass_crypto_object", text="Object", toggle=True)
- row.prop(crl, "use_pass_crypto_material", text="Material", toggle=True)
- row.prop(crl, "use_pass_crypto_asset", text="Asset", toggle=True)
+ row.prop(cycles_view_layer, "use_pass_crypto_object", text="Object", toggle=True)
+ row.prop(cycles_view_layer, "use_pass_crypto_material", text="Material", toggle=True)
+ row.prop(cycles_view_layer, "use_pass_crypto_asset", text="Asset", toggle=True)
row = layout.row(align=True)
- row.prop(crl, "pass_crypto_depth")
+ row.prop(cycles_view_layer, "pass_crypto_depth")
row = layout.row(align=True)
row.active = use_cpu(context)
- row.prop(crl, "pass_crypto_accurate", text="Accurate Mode")
-
-class CYCLES_RENDER_PT_views(CyclesButtonsPanel, Panel):
- bl_label = "Views"
- bl_context = "render_layer"
- bl_options = {'DEFAULT_CLOSED'}
-
- def draw_header(self, context):
- rd = context.scene.render
- self.layout.prop(rd, "use_multiview", text="")
-
- def draw(self, context):
- layout = self.layout
-
- scene = context.scene
- rd = scene.render
- rv = rd.views.active
-
- layout.active = rd.use_multiview
- basic_stereo = (rd.views_format == 'STEREO_3D')
-
- row = layout.row()
- row.prop(rd, "views_format", expand=True)
-
- if basic_stereo:
- row = layout.row()
- row.template_list("RENDERLAYER_UL_renderviews", "name", rd, "stereo_views", rd.views, "active_index", rows=2)
-
- row = layout.row()
- row.label(text="File Suffix:")
- row.prop(rv, "file_suffix", text="")
-
- else:
- row = layout.row()
- row.template_list("RENDERLAYER_UL_renderviews", "name", rd, "views", rd.views, "active_index", rows=2)
-
- col = row.column(align=True)
- col.operator("scene.render_view_add", icon='ZOOMIN', text="")
- col.operator("scene.render_view_remove", icon='ZOOMOUT', text="")
-
- row = layout.row()
- row.label(text="Camera Suffix:")
- row.prop(rv, "camera_suffix", text="")
+ row.prop(cycles_view_layer, "pass_crypto_accurate", text="Accurate Mode")
class CYCLES_RENDER_PT_denoising(CyclesButtonsPanel, Panel):
@@@ -850,71 -633,52 +846,45 @@@
scene = context.scene
cscene = scene.cycles
- rd = scene.render
- rl = rd.layers.active
- crl = rl.cycles
+ view_layer = context.view_layer
+ cycles_view_layer = view_layer.cycles
- layout.active = cycles_view_layer.use_denoising
-
- col = layout.column()
- sub = col.column()
- sub.prop(cycles_view_layer, "denoising_radius", text="Radius")
- sub.prop(cycles_view_layer, "denoising_strength", slider=True, text="Strength")
-
- sub = col.column(align=True)
- sub.prop(cycles_view_layer, "denoising_feature_strength", slider=True, text="Feature Strength")
- sub.prop(cycles_view_layer, "denoising_relative_pca")
+ split = layout.split()
- split.active = crl.use_denoising
++ split.active = cycles_view_layer.use_denoising
- # layout.use_property_split = False
- col = split.column()
- sub = col.column(align=True)
- sub.prop(crl, "denoising_radius", text="Radius")
- sub.prop(crl, "denoising_strength", slider=True, text="Strength")
-
- col = split.column()
- sub = col.column(align=True)
- sub.prop(crl, "denoising_feature_strength", slider=True, text="Feature Strength")
- sub.prop(crl, "denoising_relative_pca")
++ layout = layout.column(align=True)
++ layout.prop(cycles_view_layer, "denoising_feature_strength", slider=True, text="Feature Strength")
++ layout.prop(cycles_view_layer, "denoising_relative_pca")
- """
layout.separator()
- col = layout.column(align=True)
- col.prop(cycles_view_layer, "denoising_diffuse_direct", text="Diffuse Direct")
- col.prop(cycles_view_layer, "denoising_diffuse_indirect", text="Indirect")
-
- col = layout.column(align=True)
- col.prop(cycl
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list