diff options
| author | Nicholas Bishop <nicholasbishop@gmail.com> | 2011-01-16 21:33:08 +0300 |
|---|---|---|
| committer | Nicholas Bishop <nicholasbishop@gmail.com> | 2011-01-16 21:33:08 +0300 |
| commit | c94eefd52b4174be3b98b3e921546a7a8486d691 (patch) | |
| tree | 87bc3c0b80c7cc6b25c66e5e43ce3abf2d521169 /source/blender/makesdna/DNA_brush_types.h | |
| parent | 6ef1f23a33dffa1765c358b158ef18798d1ec3c0 (diff) | |
Fixed bug [#25649] Image editor paint icon missing until enter weight
paint
A couple underlying issues:
* Paint icon was looking only at the object mode to determine what the
"current" mode is, but that gave problems when the object mode was
anything other than texpaint, but 2D image paint was turned on. Fix
was to also look at what space is being drawn, and only if it's in
the 3D view does it look at the ob mode.
* The brushes lists weren't getting filtered correctly in the same
case where 2D image paint was on but a different object mode is
enabled. Fixed by changing the brush rna poll to look at the paint
source, rather than the object mode.
Diffstat (limited to 'source/blender/makesdna/DNA_brush_types.h')
| -rw-r--r-- | source/blender/makesdna/DNA_brush_types.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/source/blender/makesdna/DNA_brush_types.h b/source/blender/makesdna/DNA_brush_types.h index 37c6200b91f..6ddad214af4 100644 --- a/source/blender/makesdna/DNA_brush_types.h +++ b/source/blender/makesdna/DNA_brush_types.h @@ -57,9 +57,6 @@ 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; |