diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2016-07-11 17:50:59 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2016-07-11 22:30:02 +0300 |
| commit | 62ea383622d8cb9ae284217bd040d93a6d123859 (patch) | |
| tree | f70e908b2519c2e5f73d68ae66641ff73432fe19 /source/blender/blenkernel/intern/material.c | |
| parent | 4569e19b83894218257e04976df34662fed7a381 (diff) | |
Fix (unreported) memory leak when making local linked databock which has a preview image.
Also cleaned-up/synchronized code across al ID types that support preview.
Diffstat (limited to 'source/blender/blenkernel/intern/material.c')
| -rw-r--r-- | source/blender/blenkernel/intern/material.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/material.c b/source/blender/blenkernel/intern/material.c index bd476ccc9c7..3e29a9e91de 100644 --- a/source/blender/blenkernel/intern/material.c +++ b/source/blender/blenkernel/intern/material.c @@ -239,12 +239,12 @@ Material *BKE_material_copy(Main *bmain, Material *ma) if (ma->ramp_col) man->ramp_col = MEM_dupallocN(ma->ramp_col); if (ma->ramp_spec) man->ramp_spec = MEM_dupallocN(ma->ramp_spec); - if (ma->preview) man->preview = BKE_previewimg_copy(ma->preview); - if (ma->nodetree) { man->nodetree = ntreeCopyTree(bmain, ma->nodetree); } + man->preview = BKE_previewimg_copy(ma->preview); + BLI_listbase_clear(&man->gpumaterial); if (ID_IS_LINKED_DATABLOCK(ma)) { |