[Bf-blender-cvs] [fa8195ba559] sculpt-dev: Fix color palette panel

[Joseph Eagar]

Commit: fa8195ba559ccce28f164d7f227518179a23ff5c
Author: Joseph Eagar
Date:   Sat Sep 25 14:20:57 2021 -0700
Branches: sculpt-dev
https://developer.blender.org/rBfa8195ba559ccce28f164d7f227518179a23ff5c

Fix color palette panel

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

M	release/scripts/startup/bl_ui/space_view3d_toolbar.py
M	source/blender/blenkernel/intern/brush_channel_define.h

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

diff --git a/release/scripts/startup/bl_ui/space_view3d_toolbar.py b/release/scripts/startup/bl_ui/space_view3d_toolbar.py
index 071e3d269c8..95a94a9db95 100644
--- a/release/scripts/startup/bl_ui/space_view3d_toolbar.py
+++ b/release/scripts/startup/bl_ui/space_view3d_toolbar.py
@@ -507,6 +507,12 @@ class VIEW3D_PT_tools_brush_swatches(Panel, View3DPaintPanel, ColorPalettePanel)
     bl_label = "Color Palette"
     bl_options = {'DEFAULT_CLOSED'}
 
+class VIEW3D_PT_tools_brush_swatches_channels(Panel, View3DPaintPanel, ColorPalettePanel):
+    bl_context = ".paint_common"
+    bl_parent_id = "VIEW3D_PT_tools_brush_settings_channels"
+    bl_label = "Color Palette"
+    bl_options = {'DEFAULT_CLOSED'}
+
 
 class VIEW3D_PT_tools_brush_clone(Panel, View3DPaintPanel, ClonePanel):
     bl_context = ".paint_common"
@@ -2601,6 +2607,7 @@ classes = (
     VIEW3D_PT_tools_grease_pencil_brush_vertex_color,
     VIEW3D_PT_tools_grease_pencil_brush_vertex_palette,
     VIEW3D_PT_tools_grease_pencil_brush_vertex_falloff,
+    VIEW3D_PT_tools_brush_swatches_channels,
     VIEW3D_PT_sculpt_dyntopo_advanced,
     SCULPT_OT_set_dyntopo_mode
 )
diff --git a/source/blender/blenkernel/intern/brush_channel_define.h b/source/blender/blenkernel/intern/brush_channel_define.h
index eee51e5a9c3..57a1d4e598a 100644
--- a/source/blender/blenkernel/intern/brush_channel_define.h
+++ b/source/blender/blenkernel/intern/brush_channel_define.h
@@ -235,7 +235,7 @@ MAKE_BOOL(invert_to_scrape_fill,"Invert to Scrape or Fill",
 MAKE_FLOAT(area_radius_factor, "Area Radius", "Ratio between the brush radius and the radius that is going to be "
                         "used to sample the area center", 0.5f, 0.0f, 2.0f)
 MAKE_BOOL(use_multiplane_scrape_dynamic, "Dynamic Mode",  "The angle between the planes changes during the stroke to fit the "
-                        "surface under the cursor", true)
+                        "surface under the cursor", true) 
 MAKE_BOOL(show_multiplane_scrape_planes_preview, "Show Cursor Preview", "Preview the scrape planes in the cursor during the stroke", true)
 MAKE_FLOAT(multiplane_scrape_angle, "Plane Angle", "Angle between the planes of the crease", 60.0f, 0.0f, 160.0f)