[Bf-blender-cvs] [172812b40ca] greasepencil-object: GPencil: Tweaks to Display panel

[Antonio Vazquez]

Commit: 172812b40ca3e9035aa11511d46a54b19ab63738
Author: Antonio Vazquez
Date:   Fri Nov 22 20:27:38 2019 +0100
Branches: greasepencil-object
https://developer.blender.org/rB172812b40ca3e9035aa11511d46a54b19ab63738

GPencil: Tweaks to Display panel

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

M	release/scripts/startup/bl_ui/properties_grease_pencil_common.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 4c9318235d2..802f1cdbe45 100644
--- a/release/scripts/startup/bl_ui/properties_grease_pencil_common.py
+++ b/release/scripts/startup/bl_ui/properties_grease_pencil_common.py
@@ -284,22 +284,6 @@ class GreasePencilAppearancePanel:
         if brush:
             gp_settings = brush.gpencil_settings
 
-            sub = layout.column(align=True)
-            sub.enabled = not brush.use_custom_icon
-            if ob.mode == 'PAINT_GPENCIL':
-                sub.prop(gp_settings, "gpencil_paint_icon", text="Icon")
-            elif ob.mode == 'SCULPT_GPENCIL':
-                sub.prop(gp_settings, "gpencil_sculpt_icon", text="Icon")
-            elif ob.mode == 'WEIGHT_GPENCIL':
-                sub.prop(gp_settings, "gpencil_weight_icon", text="Icon")
-            elif ob.mode == 'VERTEX_GPENCIL':
-                sub.prop(gp_settings, "gpencil_vertex_icon", text="Icon")
-
-            layout.prop(brush, "use_custom_icon")
-            sub = layout.column()
-            sub.active = brush.use_custom_icon
-            sub.prop(brush, "icon_filepath", text="")
-
             layout.prop(gp_settings, "use_cursor", text="Show Brush")
 
             if ob.mode == 'PAINT_GPENCIL':
@@ -327,6 +311,24 @@ class GreasePencilAppearancePanel:
             if ob.mode == 'VERTEX_GPENCIL':
                 col.prop(brush, "cursor_color_add", text="Add")
 
+            sub = layout.column(align=True)
+            sub.enabled = not brush.use_custom_icon
+            if ob.mode == 'PAINT_GPENCIL':
+                sub.prop(gp_settings, "gpencil_paint_icon", text="Icon")
+            elif ob.mode == 'SCULPT_GPENCIL':
+                sub.prop(gp_settings, "gpencil_sculpt_icon", text="Icon")
+            elif ob.mode == 'WEIGHT_GPENCIL':
+                sub.prop(gp_settings, "gpencil_weight_icon", text="Icon")
+            elif ob.mode == 'VERTEX_GPENCIL':
+                sub.prop(gp_settings, "gpencil_vertex_icon", text="Icon")
+
+            col = layout.column()
+            col.prop(brush, "use_custom_icon")
+
+            sub =col.column()
+            sub.active = brush.use_custom_icon
+            sub.prop(brush, "icon_filepath", text="")
+
 
 class GreasePencilBrushFalloff:
     bl_label = "Falloff"