Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Tue, 11 Sep 2018 07:45:38 +0000 (17:45 +1000)
committerCampbell Barton <ideasman42@gmail.com>
Tue, 11 Sep 2018 07:45:38 +0000 (17:45 +1000)
release/scripts/startup/bl_operators/wm.py
release/scripts/startup/bl_ui/properties_freestyle.py
release/scripts/startup/bl_ui/properties_grease_pencil_common.py
release/scripts/startup/bl_ui/properties_render.py
release/scripts/startup/bl_ui/space_view3d_toolbar.py

index 168873ce5653ca4670bbf7c41d7609b226be5abf..5bcdc9e2f1aac4f305c04d024c761bb19fdfb708 100644 (file)
@@ -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
index 178392580622a2b42bbe874c2bfd83f02bc2acc5..2ec80784c2e5b810adbaf4e36d897ea3031e2095 100644 (file)
@@ -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)
index ded6106c5c35ea150a17eacd273e7993e3244e96..415f8a5fd8d1fa5c5a80d9fd6d630b141a14edab 100644 (file)
@@ -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)
 
index b1ca853a1e8d2e832d93547f136fb954b64b16f0..ce58dcd74992afef649d0f3c0f1bd012a8c5b9bb 100644 (file)
@@ -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="")
 
index 4fe4ce4375d830777f1829d722bc6587862f1a13..894b7e1eeadb592cc20928e7bc4b63ba75f8134a 100644 (file)
@@ -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()