diff options
author | Campbell Barton <ideasman42@gmail.com> | 2015-11-02 13:37:15 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2015-11-02 13:42:47 +0300 |
commit | 7b7aba31f24d51c904c76a17ee50608b770e1bc9 (patch) | |
tree | 326c218109d49fe285579ace7e4097643a9a8cdc /source/blender/makesrna/intern/rna_main_api.c | |
parent | 7a9693fa8ba2132e09a892dfa0e60736b741002a (diff) |
Fix T46626: Crash generating previews
Brush.toggle_brush was allowed to be an invalid pointer,
it worked for the one operator that used it - but in general bad practice,
requiring a lookup on every access.
Ensure the pointer is kept valid now.
Diffstat (limited to 'source/blender/makesrna/intern/rna_main_api.c')
-rw-r--r-- | source/blender/makesrna/intern/rna_main_api.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/source/blender/makesrna/intern/rna_main_api.c b/source/blender/makesrna/intern/rna_main_api.c index 8e28b35b0ed..057fed50c32 100644 --- a/source/blender/makesrna/intern/rna_main_api.c +++ b/source/blender/makesrna/intern/rna_main_api.c @@ -504,6 +504,7 @@ static void rna_Main_brushes_remove(Main *bmain, ReportList *reports, PointerRNA { Brush *brush = brush_ptr->data; if (ID_REAL_USERS(brush) <= 0) { + BKE_brush_unlink(bmain, brush); BKE_libblock_free(bmain, brush); RNA_POINTER_INVALIDATE(brush_ptr); } |