Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAntonioya <blendergit@gmail.com>2018-08-25 00:59:56 +0300
committerAntonioya <blendergit@gmail.com>2018-08-25 01:04:40 +0300
commit1a7837596cb983fd3328eb680007147761f29f5b (patch)
tree9b5ca8f17bfaa1d7229f3687655ec490c18ed893 /release/scripts/startup
parent6901712734c306df6ff38ea8c64b442981545a2a (diff)
GP: Select color in Brush or in Properties
After some artist feedback the material selection was not clear. Now, the material can be selected in the top bar or in the properties panel. 1) If the material is selected in properties panel, all Brushes except pinned will be assigned to this material. 2) If the material is selected in the brush, the properties panel is updated to set the active material. Added a new Pin icon to keep locked the material to one brush
Diffstat (limited to 'release/scripts/startup')
-rw-r--r--release/scripts/startup/bl_ui/space_toolsystem_toolbar.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py b/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py
index af65ca35c52..4224ee02910 100644
--- a/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py
+++ b/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py
@@ -1127,6 +1127,8 @@ class _defs_gpencil_paint:
row.template_ID(gp_settings, "material", live_icon=True)
else:
row.template_greasepencil_color(gp_settings, "material", rows=3, cols=8, scale=0.8)
+ row.prop(gp_settings, "pin_material", text="")
+
@staticmethod
def draw_settings_common(context, layout, tool):