[Bf-blender-cvs] [dfb68726eb4] greasepencil-object: Merge branch 'greasepencil-object' of git.blender.org:blender into greasepencil-object

[Antonio Vazquez]

Commit: dfb68726eb4d9e8dade76ba6e93283db1f7651ca
Author: Antonio Vazquez
Date:   Thu Jan 4 09:41:09 2018 +0100
Branches: greasepencil-object
https://developer.blender.org/rBdfb68726eb4d9e8dade76ba6e93283db1f7651ca

Merge branch 'greasepencil-object' of git.blender.org:blender into greasepencil-object

 Conflicts:
	release/scripts/startup/bl_ui/properties_grease_pencil_common.py

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



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

diff --cc release/scripts/startup/bl_ui/properties_grease_pencil_common.py
index 2733cb4e2aa,bca315ed926..857d4448975
--- a/release/scripts/startup/bl_ui/properties_grease_pencil_common.py
+++ b/release/scripts/startup/bl_ui/properties_grease_pencil_common.py
@@@ -1020,9 -1015,8 +1020,8 @@@ class GPENCIL_MT_gpencil_draw_specials(
          layout.separator()
          palette = context.active_gpencil_palette
          brush = context.active_gpencil_brush
-         i = 0
-         for palcolor in palette.colors:
+         for i, palcolor in enumerate(palette.colors):
 -            if brush is None or brush.is_fill_only is False:
 +            if brush is None or brush.fill_only is False:
                  layout.operator("palette.palettecolor_choose", text=palcolor.name).index=i
              else:
                  if palcolor.fill_alpha > 0.0: