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:
authorNicholas Bishop <nicholasbishop@gmail.com>2010-12-14 04:19:51 +0300
committerNicholas Bishop <nicholasbishop@gmail.com>2010-12-14 04:19:51 +0300
commit17bd906de3ba02c8d7bf848b1f61465f09fc631c (patch)
tree21dfc52529665420c48eb8ce05f36f753caa2ab4 /source/blender/makesdna/DNA_brush_types.h
parent991eac85ff682f66fdf5e73638fb5ebb66cf5bd2 (diff)
Fixed bug #23826, Other kind of brushes appear in sculpt mode
Was another problem caused by each brush being allowed in more than one paint mode. Added a new field to the brush struct to indicate what mode the icon was last set for; if it's changed then reset it. Not sure if it's really worth it to cache this, could remove it for simplicity.
Diffstat (limited to 'source/blender/makesdna/DNA_brush_types.h')
-rw-r--r--source/blender/makesdna/DNA_brush_types.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/source/blender/makesdna/DNA_brush_types.h b/source/blender/makesdna/DNA_brush_types.h
index 1492319fe22..8fca829101b 100644
--- a/source/blender/makesdna/DNA_brush_types.h
+++ b/source/blender/makesdna/DNA_brush_types.h
@@ -57,6 +57,9 @@ typedef struct Brush {
struct ImBuf *icon_imbuf;
PreviewImage *preview;
char icon_filepath[240];
+ int icon_mode; /* store paint mode for which brush's icon was last generated */
+ int pad;
+
float normal_weight;