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

[Antonio Vazquez]

Commit: a0673038ab51e58ee308cfed02c9e4adfb0d58f9
Author: Antonio Vazquez
Date:   Sat Oct 21 17:36:18 2017 +0200
Branches: greasepencil-object
https://developer.blender.org/rBa0673038ab51e58ee308cfed02c9e4adfb0d58f9

Merge branch 'blender2.8' into greasepencil-object

 Conflicts:
	release/scripts/startup/bl_ui/properties_scene.py
        release/scripts/startup/bl_ui/space_clip.py
	release/scripts/startup/bl_ui/space_image.py
	release/scripts/startup/bl_ui/space_node.py
	release/scripts/startup/bl_ui/space_view3d.py
	release/scripts/startup/bl_ui/space_view3d_toolbar.py

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



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

diff --cc release/scripts/startup/bl_ui/properties_scene.py
index 81dabf8a7e3,e8f25ea891b..c83fc9c4a10
--- a/release/scripts/startup/bl_ui/properties_scene.py
+++ b/release/scripts/startup/bl_ui/properties_scene.py
@@@ -26,13 -26,10 +26,13 @@@ from bpy.types import 
  
  from rna_prop_ui import PropertyPanel
  
- from bl_ui.properties_physics_common import (
+ from .properties_physics_common import (
 -    point_cache_ui,
 -    effector_weights_ui,
 -)
 +        point_cache_ui,
 +        effector_weights_ui,
 +        )
- from bl_ui.properties_grease_pencil_common import (
++from .properties_grease_pencil_common import (
 +        GreasePencilDataPanel
 +        )
  
  
  class SCENE_MT_units_length_presets(Menu):
diff --cc release/scripts/startup/bl_ui/space_clip.py
index ef2cd3122a1,11043ed1111..935246ef8e2
--- a/release/scripts/startup/bl_ui/space_clip.py
+++ b/release/scripts/startup/bl_ui/space_clip.py
@@@ -21,14 -21,15 +21,14 @@@
  import bpy
  from bpy.types import Panel, Header, Menu, UIList
  from bpy.app.translations import pgettext_iface as iface_
- from bl_ui.properties_grease_pencil_common import (
+ from .properties_grease_pencil_common import (
 -    GreasePencilDrawingToolsPanel,
 -    GreasePencilStrokeEditPanel,
 -    GreasePencilStrokeSculptPanel,
 -    GreasePencilBrushPanel,
 -    GreasePencilBrushCurvesPanel,
 -    GreasePencilDataPanel,
 -    GreasePencilPaletteColorPanel,
 -)
 +        GreasePencilDrawingToolsPanel,
 +        GreasePencilStrokeEditPanel,
 +        GreasePencilStrokeSculptPanel,
 +        GreasePencilBrushPanel,
 +        GreasePencilPaletteColorPanel,
 +        GreasePencilBrushCurvesPanel,
 +        GreasePencilDataPanel)
  
  
  class CLIP_UL_tracking_objects(UIList):
diff --cc release/scripts/startup/bl_ui/space_image.py
index 53d6f23b25e,24d3ed5a0bf..88b0be5cc05
--- a/release/scripts/startup/bl_ui/space_image.py
+++ b/release/scripts/startup/bl_ui/space_image.py
@@@ -20,21 -20,21 +20,21 @@@
  import bpy
  import math
  from bpy.types import Header, Menu, Panel
- from bl_ui.properties_paint_common import (
+ 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 bl_ui.properties_grease_pencil_common import (
+ 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 release/scripts/startup/bl_ui/space_node.py
index 6d32d36dbf4,200fc415f8a..8531c6af59b
--- a/release/scripts/startup/bl_ui/space_node.py
+++ b/release/scripts/startup/bl_ui/space_node.py
@@@ -21,16 -21,16 +21,16 @@@ import bp
  import nodeitems_utils
  from bpy.types import Header, Menu, Panel
  from bpy.app.translations import pgettext_iface as iface_
- from bl_ui.properties_grease_pencil_common import (
+ from .properties_grease_pencil_common import (
 -    GreasePencilDrawingToolsPanel,
 -    GreasePencilStrokeEditPanel,
 -    GreasePencilStrokeSculptPanel,
 -    GreasePencilBrushPanel,
 -    GreasePencilBrushCurvesPanel,
 -    GreasePencilDataPanel,
 -    GreasePencilPaletteColorPanel,
 -    GreasePencilToolsPanel
 -)
 +        GreasePencilDrawingToolsPanel,
 +        GreasePencilStrokeEditPanel,
 +        GreasePencilStrokeSculptPanel,
 +        GreasePencilBrushPanel,
 +        GreasePencilPaletteColorPanel,
 +        GreasePencilBrushCurvesPanel,
 +        GreasePencilDataPanel,
 +        GreasePencilToolsPanel
 +        )
  
  
  class NODE_HT_header(Header):
diff --cc release/scripts/startup/bl_ui/space_view3d.py
index 280c6eba1bd,da1db6836c6..151680ba09f
--- a/release/scripts/startup/bl_ui/space_view3d.py
+++ b/release/scripts/startup/bl_ui/space_view3d.py
@@@ -19,7 -19,11 +19,7 @@@
  # <pep8 compliant>
  import bpy
  from bpy.types import Header, Menu, Panel
- from bl_ui.properties_paint_common import UnifiedPaintPanel
 -from .properties_grease_pencil_common import (
 -    GreasePencilDataPanel,
 -    GreasePencilPaletteColorPanel,
 -)
+ from .properties_paint_common import UnifiedPaintPanel
  from bpy.app.translations import contexts as i18n_contexts
  
  
diff --cc release/scripts/startup/bl_ui/space_view3d_toolbar.py
index 431a0a3e134,134a91a8c1f..c9669a07325
--- a/release/scripts/startup/bl_ui/space_view3d_toolbar.py
+++ b/release/scripts/startup/bl_ui/space_view3d_toolbar.py
@@@ -20,24 -19,20 +20,24 @@@
  # <pep8 compliant>
  import bpy
  from bpy.types import Menu, Panel, UIList
- from bl_ui.properties_grease_pencil_common import (
+ from .properties_grease_pencil_common import (
 -    GreasePencilDrawingToolsPanel,
 -    GreasePencilStrokeEditPanel,
 -    GreasePencilInterpolatePanel,
 -    GreasePencilStrokeSculptPanel,
 -    GreasePencilBrushPanel,
 -    GreasePencilBrushCurvesPanel
 -)
 -from .properties_paint_common import (
 -    UnifiedPaintPanel,
 -    brush_texture_settings,
 -    brush_texpaint_common,
 -    brush_mask_texture_settings,
 -)
 +        GreasePencilDrawingToolsPanel,
 +        GreasePencilStrokeEditPanel,
 +        GreasePencilAnimationPanel,
 +        GreasePencilInterpolatePanel,
 +        GreasePencilStrokeSculptPanel,
 +        GreasePencilBrushPanel,
 +        GreasePencilBrushOptionsPanel,
 +        GreasePencilBrushCurvesPanel,
 +        GreasePencilAppearancePanel,
 +        GreasePencilEraserPanel
 +        )
 +from bl_ui.properties_paint_common import (
 +        UnifiedPaintPanel,
 +        brush_texture_settings,
 +        brush_texpaint_common,
 +        brush_mask_texture_settings,
 +        )
  
  
  class View3DPanel: