diff options
author | Pablo Vazquez <pablo@blender.org> | 2021-10-04 17:21:26 +0300 |
---|---|---|
committer | Pablo Vazquez <pablo@blender.org> | 2021-10-04 17:21:26 +0300 |
commit | f0731bd5ac78856e69f1ee09e4762e7d42dc17c9 (patch) | |
tree | af1576c25c72517e970fbe07a4a7ad2d1248004f /intern/cycles/blender/addon/ui.py | |
parent | 2c5661682b61ac4a8a8f45f77a4eff7b85f6f141 (diff) | |
parent | 4a3464050c4e83d446d47c946e17b9540f5a3862 (diff) |
Merge branch 'master' into temp-ui-tweakstemp-ui-tweaks
Diffstat (limited to 'intern/cycles/blender/addon/ui.py')
-rw-r--r-- | intern/cycles/blender/addon/ui.py | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/intern/cycles/blender/addon/ui.py b/intern/cycles/blender/addon/ui.py index c4a1844480c..55782088444 100644 --- a/intern/cycles/blender/addon/ui.py +++ b/intern/cycles/blender/addon/ui.py @@ -792,7 +792,6 @@ class CYCLES_RENDER_PT_passes_data(CyclesButtonsPanel, Panel): col.prop(view_layer, "use_pass_material_index") col = layout.column(heading="Debug", align=True) - col.prop(cycles_view_layer, "pass_debug_render_time", text="Render Time") col.prop(cycles_view_layer, "pass_debug_sample_count", text="Sample Count") layout.prop(view_layer, "pass_alpha_threshold") |