diff options
author | Antony Riakiotakis <kalast@gmail.com> | 2015-03-23 20:54:56 +0300 |
---|---|---|
committer | Antony Riakiotakis <kalast@gmail.com> | 2015-03-23 20:54:56 +0300 |
commit | f65e3c7f1b5aaa9b5376c20a36267aad27ce40ec (patch) | |
tree | 9ba06b8ae8e4f43af2a101851138ec345e2c6f36 /release | |
parent | 1b71279adccb9f8cc1f4d7cbb3cbb06871da982e (diff) |
Fix T44076, SSAO in solid mode will disable antialiasing in wireframe
mode.
Yes it will, because those modes stay active. So on user side, expose
depth of field option always (I don't see why not), but disable SSAO in
wireframe/bounding box mode. It is a known limitation that compositing
does not support antialiasing yet, but better give users some more
control.
This could be included in final release but it's not that serious
either.
Diffstat (limited to 'release')
-rw-r--r-- | release/scripts/startup/bl_ui/space_view3d.py | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/release/scripts/startup/bl_ui/space_view3d.py b/release/scripts/startup/bl_ui/space_view3d.py index 128e24a6d68..a5d399ee55e 100644 --- a/release/scripts/startup/bl_ui/space_view3d.py +++ b/release/scripts/startup/bl_ui/space_view3d.py @@ -2975,12 +2975,14 @@ class VIEW3D_PT_view3d_shading(Panel): if obj and obj.mode == 'EDIT': col.prop(view, "show_occlude_wire") - fx_settings = view.fx_settings - sub = col.column() - sub.active = view.region_3d.view_perspective == 'CAMERA' - sub.prop(fx_settings, "use_dof") + fx_settings = view.fx_settings + sub = col.column() + sub.active = view.region_3d.view_perspective == 'CAMERA' + sub.prop(fx_settings, "use_dof") + + if view.viewport_shade not in {'BOUNDBOX', 'WIREFRAME'}: col.prop(fx_settings, "use_ssao", text="Ambient Occlusion") if fx_settings.use_ssao: ssao_settings = fx_settings.ssao |