[Bf-blender-cvs] [01e6f090011] blender2.8: Merge branch 'master' into blender2.8

[Campbell Barton]

Commit: 01e6f09001148313bb1658bad0c2d1341a7821cf
Author: Campbell Barton
Date:   Tue Sep 11 17:45:38 2018 +1000
Branches: blender2.8
https://developer.blender.org/rB01e6f09001148313bb1658bad0c2d1341a7821cf

Merge branch 'master' into blender2.8

===================================================================



===================================================================

diff --cc release/scripts/startup/bl_ui/properties_freestyle.py
index 17839258062,5260b7f371e..2ec80784c2e
--- a/release/scripts/startup/bl_ui/properties_freestyle.py
+++ b/release/scripts/startup/bl_ui/properties_freestyle.py
@@@ -151,9 -151,9 +151,9 @@@ class VIEWLAYER_PT_freestyle(ViewLayerF
  
          if freestyle.mode == 'SCRIPT':
              row = layout.row()
 -            row.label("Style modules:")
 +            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 --cc release/scripts/startup/bl_ui/properties_grease_pencil_common.py
index ded6106c5c3,373e3797f71..415f8a5fd8d
--- a/release/scripts/startup/bl_ui/properties_grease_pencil_common.py
+++ b/release/scripts/startup/bl_ui/properties_grease_pencil_common.py
@@@ -404,8 -544,8 +404,13 @@@ class GPENCIL_MT_pie_settings_palette(M
          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)