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 | |
parent | a0581daf753a81ac1e410c6aa0c9cfd233b04793 (diff) | |
parent | bf8aac0d491ae7ea9c52c5911f61f041cfffdafc (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'release/scripts/startup')
5 files changed, 6 insertions, 4 deletions
diff --git a/release/scripts/startup/bl_operators/wm.py b/release/scripts/startup/bl_operators/wm.py index 168873ce565..5bcdc9e2f1a 100644 --- a/release/scripts/startup/bl_operators/wm.py +++ b/release/scripts/startup/bl_operators/wm.py @@ -2276,7 +2276,6 @@ class WM_OT_app_template_install(Operator): def execute(self, context): import traceback import zipfile - import shutil import os filepath = self.filepath diff --git a/release/scripts/startup/bl_ui/properties_freestyle.py b/release/scripts/startup/bl_ui/properties_freestyle.py index 17839258062..2ec80784c2e 100644 --- a/release/scripts/startup/bl_ui/properties_freestyle.py +++ b/release/scripts/startup/bl_ui/properties_freestyle.py @@ -153,7 +153,7 @@ class VIEWLAYER_PT_freestyle(ViewLayerFreestyleButtonsPanel, Panel): row = layout.row() row.label(text="Style modules:") row.operator("scene.freestyle_module_add", text="Add") - for i, module in enumerate(freestyle.modules): + for module in freestyle.modules: box = layout.box() box.context_pointer_set("freestyle_module", module) row = box.row(align=True) diff --git a/release/scripts/startup/bl_ui/properties_grease_pencil_common.py b/release/scripts/startup/bl_ui/properties_grease_pencil_common.py index ded6106c5c3..415f8a5fd8d 100644 --- a/release/scripts/startup/bl_ui/properties_grease_pencil_common.py +++ b/release/scripts/startup/bl_ui/properties_grease_pencil_common.py @@ -404,8 +404,13 @@ class GPENCIL_MT_pie_settings_palette(Menu): pie = layout.menu_pie() gpd = context.gpencil_data gpl = context.active_gpencil_layer +<<<<<<< HEAD palcolor = None # context.active_gpencil_palettecolor brush = context.active_gpencil_brush +======= + palcolor = context.active_gpencil_palettecolor + # brush = context.active_gpencil_brush +>>>>>>> master is_editmode = bool(gpd and gpd.use_stroke_edit_mode and context.editable_gpencil_strokes) 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="") diff --git a/release/scripts/startup/bl_ui/space_view3d_toolbar.py b/release/scripts/startup/bl_ui/space_view3d_toolbar.py index 4fe4ce4375d..894b7e1eead 100644 --- a/release/scripts/startup/bl_ui/space_view3d_toolbar.py +++ b/release/scripts/startup/bl_ui/space_view3d_toolbar.py @@ -1152,7 +1152,6 @@ class VIEW3D_PT_tools_vertexpaint(Panel, View3DPaintPanel): layout = self.layout toolsettings = context.tool_settings - vpaint = toolsettings.vertex_paint col = layout.column() |