[Bf-blender-cvs] [d4eac6f9986] greasepencil-object: Fix parameter values after merge

Antonio Vazquez noreply at git.blender.org
Fri Jun 1 09:19:57 CEST 2018


Commit: d4eac6f99867dcf1dfeb39e7f3c39eb17cb5bd43
Author: Antonio Vazquez
Date:   Fri Jun 1 09:19:39 2018 +0200
Branches: greasepencil-object
https://developer.blender.org/rBd4eac6f99867dcf1dfeb39e7f3c39eb17cb5bd43

Fix parameter values after merge

This python function needs different settings after merge.

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

M	release/scripts/startup/bl_ui/space_topbar.py

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

diff --git a/release/scripts/startup/bl_ui/space_topbar.py b/release/scripts/startup/bl_ui/space_topbar.py
index cc99a583cbf..c40eb4c4c35 100644
--- a/release/scripts/startup/bl_ui/space_topbar.py
+++ b/release/scripts/startup/bl_ui/space_topbar.py
@@ -160,13 +160,13 @@ class TOPBAR_HT_lower_bar(Header):
         elif mode == 'PARTICLE':
             pass
         elif mode == 'GPENCIL_PAINT':
-            layout.popover_group(space_type='VIEW_3D', region_type='TOOLS', context=".greasepencil_paint", category="")
+            layout.popover_group(space_type='PROPERTIES', region_type='WINDOW', context=".greasepencil_paint", category="")
         elif mode == 'GPENCIL_EDIT':
-            layout.popover_group(space_type='VIEW_3D', region_type='TOOLS', context=".greasepencil_edit", category="")
+            layout.popover_group(space_type='PROPERTIES', region_type='WINDOW', context=".greasepencil_edit", category="")
         elif mode == 'GPENCIL_SCULPT':
-            layout.popover_group(space_type='VIEW_3D', region_type='TOOLS', context=".greasepencil_sculpt", category="")
+            layout.popover_group(space_type='PROPERTIES', region_type='WINDOW', context=".greasepencil_sculpt", category="")
         elif mode == 'GPENCIL_WEIGHT':
-            layout.popover_group(space_type='VIEW_3D', region_type='TOOLS', context=".greasepencil_weight", category="")
+            layout.popover_group(space_type='PROPERTIES', region_type='WINDOW', context=".greasepencil_weight", category="")
 
     def draw_right(self, context):
         layout = self.layout



More information about the Bf-blender-cvs mailing list