diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2018-03-16 19:06:43 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2018-03-16 19:06:43 +0300 |
| commit | 1a71d5ae85c8080705fc88188b6ef78aad29efdd (patch) | |
| tree | d4804960a4e45f2ac7f0182efdc6eab855982e6b /source/blender/makesrna/intern | |
| parent | 67e2806dcbd3adfc1b691554ff22281a49db680a (diff) | |
Fix T54310: Assert when enable Brush custom icon.
We had a mix of two issues here actually:
* First, Brush are currently using their own sauce for custom previews,
this is not great, but moving them to use common ImagePreview system of
IDs is a low-priority TODO. For now, they should totally ignore their
own ImagePreview.
* Second, BKE_icon_changed() would systematically create a PreviewImage
for ID types supporting it, which does not really makes sense, this
function is merely here to 'tag' previews as outdated. Actual creation
of previews is deferred to later, when we actually need them.
Diffstat (limited to 'source/blender/makesrna/intern')
| -rw-r--r-- | source/blender/makesrna/intern/rna_brush.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/source/blender/makesrna/intern/rna_brush.c b/source/blender/makesrna/intern/rna_brush.c index 6a67e036c5d..1fd17afdc60 100644 --- a/source/blender/makesrna/intern/rna_brush.c +++ b/source/blender/makesrna/intern/rna_brush.c @@ -430,7 +430,6 @@ static void rna_Brush_icon_update(Main *UNUSED(bmain), Scene *UNUSED(scene), Poi br->id.icon_id = 0; if (br->flag & BRUSH_CUSTOM_ICON) { - BKE_previewimg_id_ensure(&br->id); BKE_icon_changed(BKE_icon_id_ensure(&br->id)); } |