diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2015-05-14 17:25:15 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2015-05-14 17:25:15 +0300 |
| commit | 51325025ec6d48fa878f2d6e312cfed72661fb3c (patch) | |
| tree | 59f2ac9fa404a4fd2cd7b00be5f174a33317ca79 /source/blender/makesrna/intern/rna_brush.c | |
| parent | 67dd6243f2c0a0780721f9fecd63f2526b18b87f (diff) | |
| parent | 0a60c7d8eebeda18a66229cf5f4de0f37d2522d2 (diff) | |
Merge branch 'master' into gooseberry
Conflicts:
build_files/scons/tools/Blender.py
source/blender/blenkernel/intern/mesh.c
source/blender/blenkernel/intern/object.c
source/blender/blenkernel/intern/particle_system.c
source/blender/editors/interface/interface_handlers.c
Diffstat (limited to 'source/blender/makesrna/intern/rna_brush.c')
| -rw-r--r-- | source/blender/makesrna/intern/rna_brush.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/makesrna/intern/rna_brush.c b/source/blender/makesrna/intern/rna_brush.c index 19f7886ac9b..f6e60471a58 100644 --- a/source/blender/makesrna/intern/rna_brush.c +++ b/source/blender/makesrna/intern/rna_brush.c @@ -353,8 +353,8 @@ static void rna_Brush_reset_icon(Brush *br, const char *UNUSED(type)) return; if (id->icon_id >= BIFICONID_LAST) { - BKE_icon_delete(id); - BKE_previewimg_free_id(id); + BKE_icon_id_delete(id); + BKE_previewimg_id_free(id); } id->icon_id = 0; @@ -433,8 +433,8 @@ 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_get(&br->id); - BKE_icon_changed(BKE_icon_getid(&br->id)); + BKE_previewimg_id_ensure(&br->id); + BKE_icon_changed(BKE_icon_id_ensure(&br->id)); } WM_main_add_notifier(NC_BRUSH | NA_EDITED, br); |