diff options
author | Campbell Barton <ideasman42@gmail.com> | 2018-09-11 10:45:38 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2018-09-11 10:45:38 +0300 |
commit | 01e6f09001148313bb1658bad0c2d1341a7821cf (patch) | |
tree | 75a81bb6791a545ca4dd9cb3aa2f0483e6fe7e2a /release/scripts/startup/bl_ui/properties_render.py | |
parent | a0581daf753a81ac1e410c6aa0c9cfd233b04793 (diff) | |
parent | bf8aac0d491ae7ea9c52c5911f61f041cfffdafc (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'release/scripts/startup/bl_ui/properties_render.py')
-rw-r--r-- | release/scripts/startup/bl_ui/properties_render.py | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/release/scripts/startup/bl_ui/properties_render.py b/release/scripts/startup/bl_ui/properties_render.py index b1ca853a1e8..ce58dcd7499 100644 --- a/release/scripts/startup/bl_ui/properties_render.py +++ b/release/scripts/startup/bl_ui/properties_render.py @@ -296,7 +296,6 @@ class RENDER_PT_output(RenderButtonsPanel, Panel): rd = context.scene.render image_settings = rd.image_settings - file_format = image_settings.file_format layout.prop(rd, "filepath", text="") |