diff options
| author | Julian Eisel <eiseljulian@gmail.com> | 2015-10-21 18:30:35 +0300 |
|---|---|---|
| committer | Julian Eisel <eiseljulian@gmail.com> | 2015-10-21 18:30:35 +0300 |
| commit | 0775680e4d05eda3c495a56dc0b6eafbe96dc586 (patch) | |
| tree | 4f3286eef96dec6ababe43467ed2a4f50388b988 /intern/cycles/blender/addon/ui.py | |
| parent | 4ade467fc6adfc13ce9e21d7e50b366fce70ea5f (diff) | |
| parent | 6bc007610263c879f6bb30b844ba9d9a0fb9433c (diff) | |
Merge branch 'master' into UI-graphical-redesignUI-graphical-redesign
Conflicts:
source/blender/blenkernel/BKE_blender.h
source/blender/blenloader/intern/versioning_270.c
source/blender/editors/interface/interface.c
source/blender/editors/interface/interface_handlers.c
source/blender/editors/interface/interface_intern.h
source/blender/editors/interface/resources.c
Diffstat (limited to 'intern/cycles/blender/addon/ui.py')
| -rw-r--r-- | intern/cycles/blender/addon/ui.py | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/intern/cycles/blender/addon/ui.py b/intern/cycles/blender/addon/ui.py index fdb2afdb5e9..3700da3263e 100644 --- a/intern/cycles/blender/addon/ui.py +++ b/intern/cycles/blender/addon/ui.py @@ -259,11 +259,14 @@ class CyclesRender_PT_motion_blur(CyclesButtonsPanel, Panel): def draw(self, context): layout = self.layout - rd = context.scene.render + scene = context.scene + cscene = scene.cycles + rd = scene.render layout.active = rd.use_motion_blur - row = layout.row() - row.prop(rd, "motion_blur_shutter") + col = layout.column() + col.prop(cscene, "motion_blur_position", text="Position") + col.prop(rd, "motion_blur_shutter") class CyclesRender_PT_film(CyclesButtonsPanel, Panel): @@ -332,7 +335,6 @@ class CyclesRender_PT_performance(CyclesButtonsPanel, Panel): col.separator() col.label(text="Final Render:") - col.prop(cscene, "use_cache") col.prop(rd, "use_persistent_data", text="Persistent Images") col.separator() @@ -438,6 +440,7 @@ class CyclesRender_PT_layer_passes(CyclesButtonsPanel, Panel): class CyclesRender_PT_views(CyclesButtonsPanel, Panel): bl_label = "Views" bl_context = "render_layer" + bl_options = {'DEFAULT_CLOSED'} def draw_header(self, context): rd = context.scene.render @@ -1163,13 +1166,17 @@ class CyclesMaterial_PT_settings(CyclesButtonsPanel, Panel): col.prop(mat, "alpha") col.separator() - col.prop(mat, "pass_index") + col.label("Viewport Alpha:") + col.prop(mat.game_settings, "alpha_blend", text="") col = split.column(align=True) col.label("Viewport Specular:") col.prop(mat, "specular_color", text="") col.prop(mat, "specular_hardness", text="Hardness") + col.separator() + col.prop(mat, "pass_index") + class CyclesTexture_PT_context(CyclesButtonsPanel, Panel): bl_label = "" |