[Bf-blender-cvs] [0e2e8381b8e] greasepencil-object: Merge branch 'blender2.8' into greasepencil-object

[Antonio Vazquez]

Commit: 0e2e8381b8e298897118e46055f17085e6be827f
Author: Antonio Vazquez
Date:   Fri Jun 15 09:23:38 2018 +0200
Branches: greasepencil-object
https://developer.blender.org/rB0e2e8381b8e298897118e46055f17085e6be827f

Merge branch 'blender2.8' into greasepencil-object

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



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

diff --cc release/scripts/startup/bl_ui/space_image.py
index 1c842f90aa0,1acc8cf601d..f9eb5863ef4
--- a/release/scripts/startup/bl_ui/space_image.py
+++ b/release/scripts/startup/bl_ui/space_image.py
@@@ -19,22 -19,22 +19,22 @@@
  # <pep8 compliant>
  import bpy
  import math
- from bpy.types import Header, Menu, Panel
+ from bpy.types import Header, Menu, Panel, UIList
  from .properties_paint_common import (
 -    UnifiedPaintPanel,
 -    brush_texture_settings,
 -    brush_texpaint_common,
 -    brush_mask_texture_settings,
 -)
 +        UnifiedPaintPanel,
 +        brush_texture_settings,
 +        brush_texpaint_common,
 +        brush_mask_texture_settings,
 +        )
  from .properties_grease_pencil_common import (
 -    GreasePencilDrawingToolsPanel,
 -    GreasePencilStrokeEditPanel,
 -    GreasePencilStrokeSculptPanel,
 -    GreasePencilBrushPanel,
 -    GreasePencilBrushCurvesPanel,
 -    GreasePencilDataPanel,
 -    GreasePencilPaletteColorPanel,
 -)
 +        GreasePencilDrawingToolsPanel,
 +        GreasePencilStrokeEditPanel,
 +        GreasePencilStrokeSculptPanel,
 +        GreasePencilBrushPanel,
 +        GreasePencilPaletteColorPanel,
 +        GreasePencilBrushCurvesPanel,
 +        GreasePencilDataPanel
 +        )
  from bpy.app.translations import pgettext_iface as iface_
  
  
diff --cc source/blender/blenloader/intern/versioning_280.c
index 270ee66303a,a5d2ced6858..d3d95d7ece6
--- a/source/blender/blenloader/intern/versioning_280.c
+++ b/source/blender/blenloader/intern/versioning_280.c
@@@ -59,12 -58,11 +59,13 @@@
  #include "BKE_collection.h"
  #include "BKE_constraint.h"
  #include "BKE_customdata.h"
 +#include "BKE_colortools.h"
  #include "BKE_freestyle.h"
  #include "BKE_idprop.h"
+ #include "BKE_image.h"
  #include "BKE_layer.h"
  #include "BKE_main.h"
 +#include "BKE_material.h"
  #include "BKE_mesh.h"
  #include "BKE_node.h"
  #include "BKE_report.h"