[Bf-blender-cvs] [99111065349] greasepencil-object: More fixes after merge

[Antonio Vazquez]

Commit: 99111065349bda18a66a1998f535a44daa403739
Author: Antonio Vazquez
Date:   Fri Jun 1 10:02:31 2018 +0200
Branches: greasepencil-object
https://developer.blender.org/rB99111065349bda18a66a1998f535a44daa403739

More fixes after merge

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

M	release/scripts/startup/bl_ui/properties_grease_pencil_common.py
M	release/scripts/startup/bl_ui/space_clip.py
M	release/scripts/startup/bl_ui/space_image.py

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

diff --git a/release/scripts/startup/bl_ui/properties_grease_pencil_common.py b/release/scripts/startup/bl_ui/properties_grease_pencil_common.py
index 09e181b316c..5de8c6a45f5 100644
--- a/release/scripts/startup/bl_ui/properties_grease_pencil_common.py
+++ b/release/scripts/startup/bl_ui/properties_grease_pencil_common.py
@@ -245,7 +245,6 @@ class GreasePencilStrokeSculptPanel:
     # bl_space_type = 'IMAGE_EDITOR'
     bl_label = "Sculpt Strokes"
     bl_category = "Tools"
-    bl_region_type = 'TOOLS'
 
     @staticmethod
     def draw(self, context):
diff --git a/release/scripts/startup/bl_ui/space_clip.py b/release/scripts/startup/bl_ui/space_clip.py
index 8ce2272f5f4..d65f9f5d37a 100644
--- a/release/scripts/startup/bl_ui/space_clip.py
+++ b/release/scripts/startup/bl_ui/space_clip.py
@@ -1157,30 +1157,36 @@ class CLIP_PT_grease_pencil(GreasePencilDataPanel, CLIP_PT_clip_view_panel, Pane
 # Grease Pencil palette colors
 class CLIP_PT_grease_pencil_palettecolor(GreasePencilPaletteColorPanel, Panel):
     bl_space_type = 'CLIP_EDITOR'
+    bl_region_type = 'TOOLS'
 
 # Grease Pencil drawing tools
 class CLIP_PT_tools_grease_pencil_draw(GreasePencilDrawingToolsPanel, Panel):
     bl_space_type = 'CLIP_EDITOR'
+    bl_region_type = 'TOOLS'
 
 
 # Grease Pencil stroke editing tools
 class CLIP_PT_tools_grease_pencil_edit(GreasePencilStrokeEditPanel, Panel):
     bl_space_type = 'CLIP_EDITOR'
+    bl_region_type = 'TOOLS'
 
 
 # Grease Pencil stroke sculpting tools
 class CLIP_PT_tools_grease_pencil_sculpt(GreasePencilStrokeSculptPanel, Panel):
     bl_space_type = 'CLIP_EDITOR'
+    bl_region_type = 'TOOLS'
 
 
 # Grease Pencil drawing brushes
 class CLIP_PT_tools_grease_pencil_brush(GreasePencilBrushPanel, Panel):
     bl_space_type = 'CLIP_EDITOR'
+    bl_region_type = 'TOOLS'
 
 
 # Grease Pencil drawing curves
 class CLIP_PT_tools_grease_pencil_brushcurves(GreasePencilBrushCurvesPanel, Panel):
     bl_space_type = 'CLIP_EDITOR'
+    bl_region_type = 'TOOLS'
 
 class CLIP_MT_view(Menu):
     bl_label = "View"
diff --git a/release/scripts/startup/bl_ui/space_image.py b/release/scripts/startup/bl_ui/space_image.py
index 1b3632ba6a0..54d104a3319 100644
--- a/release/scripts/startup/bl_ui/space_image.py
+++ b/release/scripts/startup/bl_ui/space_image.py
@@ -1264,6 +1264,7 @@ class IMAGE_PT_grease_pencil(GreasePencilDataPanel, Panel):
 # Grease Pencil palette colors
 class IMAGE_PT_grease_pencil_palettecolor(GreasePencilPaletteColorPanel, Panel):
     bl_space_type = 'IMAGE_EDITOR'
+    bl_region_type = 'TOOLS'
 
     # NOTE: this is just a wrapper around the generic GP Panel
 
@@ -1271,26 +1272,31 @@ class IMAGE_PT_grease_pencil_palettecolor(GreasePencilPaletteColorPanel, Panel):
 # Grease Pencil drawing tools
 class IMAGE_PT_tools_grease_pencil_draw(GreasePencilDrawingToolsPanel, Panel):
     bl_space_type = 'IMAGE_EDITOR'
+    bl_region_type = 'TOOLS'
 
 
 # Grease Pencil stroke editing tools
 class IMAGE_PT_tools_grease_pencil_edit(GreasePencilStrokeEditPanel, Panel):
     bl_space_type = 'IMAGE_EDITOR'
+    bl_region_type = 'TOOLS'
 
 
 # Grease Pencil stroke sculpting tools
 class IMAGE_PT_tools_grease_pencil_sculpt(GreasePencilStrokeSculptPanel, Panel):
     bl_space_type = 'IMAGE_EDITOR'
+    bl_region_type = 'TOOLS'
 
 
 # Grease Pencil drawing brushes
 class IMAGE_PT_tools_grease_pencil_brush(GreasePencilBrushPanel, Panel):
     bl_space_type = 'IMAGE_EDITOR'
+    bl_region_type = 'TOOLS'
 
 
 # Grease Pencil drawing curves
 class IMAGE_PT_tools_grease_pencil_brushcurves(GreasePencilBrushCurvesPanel, Panel):
     bl_space_type = 'IMAGE_EDITOR'
+    bl_region_type = 'TOOLS'
 
 
 classes = (