diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2016-06-23 00:52:58 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2016-06-23 00:52:58 +0300 |
| commit | 3b0a5dd15884aed00d988d73a72f4946673f8be9 (patch) | |
| tree | 07f488e24eb2b9f9b3dfce9d15ac66dabd74b7e4 /source/blender/render | |
| parent | 97ee7f8609bed555ff4bd371b7e25d13b2d6a0d6 (diff) | |
| parent | 7547c6a250cd6f36c9894605b822380a1261febf (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/render')
| -rw-r--r-- | source/blender/render/intern/source/pipeline.c | 4 | ||||
| -rw-r--r-- | source/blender/render/intern/source/render_texture.c | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/source/blender/render/intern/source/pipeline.c b/source/blender/render/intern/source/pipeline.c index 2af2449c4ba..d81d77dc161 100644 --- a/source/blender/render/intern/source/pipeline.c +++ b/source/blender/render/intern/source/pipeline.c @@ -66,6 +66,7 @@ #include "BKE_global.h" #include "BKE_image.h" #include "BKE_library.h" +#include "BKE_library_remap.h" #include "BKE_main.h" #include "BKE_modifier.h" #include "BKE_node.h" @@ -2266,7 +2267,8 @@ static void free_all_freestyle_renders(void) if (freestyle_render) { freestyle_scene = freestyle_render->scene; RE_FreeRender(freestyle_render); - BKE_scene_unlink(re1->freestyle_bmain, freestyle_scene, NULL); + BKE_libblock_unlink(re1->freestyle_bmain, freestyle_scene, false); + BKE_libblock_free(re1->freestyle_bmain, freestyle_scene); } } BLI_freelistN(&re1->freestyle_renders); diff --git a/source/blender/render/intern/source/render_texture.c b/source/blender/render/intern/source/render_texture.c index 8f61f4159e6..530ebc084be 100644 --- a/source/blender/render/intern/source/render_texture.c +++ b/source/blender/render/intern/source/render_texture.c @@ -3806,6 +3806,7 @@ void RE_sample_material_free(Material *mat) MTex *mtex= mat->mtex[tex_nr]; if (mtex->tex) { + /* don't update user counts as we are freeing a duplicate */ BKE_texture_free(mtex->tex); MEM_freeN(mtex->tex); mtex->tex = NULL; @@ -3814,7 +3815,7 @@ void RE_sample_material_free(Material *mat) } /* don't update user counts as we are freeing a duplicate */ - BKE_material_free_ex(mat, false); + BKE_material_free(mat); MEM_freeN(mat); } |