Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix wrong user counter in world node trees

Browse Source 
World is being localized without increasing ID users, so no need
to decrease ID users on localized world free.
This commit is contained in:
Sergey Sharybin
2012-08-29 12:47:42 +00:00
parent 635db3b306
commit 7a13bc2196
3 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
source/blender/blenkernel/BKE_world.h
View File

@@ -35,7 +35,8 @@
struct World;
void BKE_world_free(struct World *sc);
void BKE_world_free(struct World *sc);
void BKE_world_free_ex(struct World *sc, int do_id_user);
struct World *add_world(const char *name);
struct World *BKE_world_copy(struct World *wrld);
struct World *localize_world(struct World *wrld);

10
source/blender/blenkernel/intern/world.c
View File

@@ -51,14 +51,14 @@
#include "BKE_node.h"
#include "BKE_world.h"
void BKE_world_free(World *wrld)
void BKE_world_free_ex(World *wrld, int do_id_user)
{
MTex *mtex;
int a;
for (a = 0; a < MAX_MTEX; a++) {
mtex = wrld->mtex[a];
if (mtex && mtex->tex) mtex->tex->id.us--;
if (do_id_user && mtex && mtex->tex) mtex->tex->id.us--;
if (mtex) MEM_freeN(mtex);
}
BKE_previewimg_free(&wrld->preview);
@@ -67,7 +67,7 @@ void BKE_world_free(World *wrld)
/* is no lib link block, but world extension */
if (wrld->nodetree) {
ntreeFreeTree(wrld->nodetree);
ntreeFreeTree_ex(wrld->nodetree, do_id_user);
MEM_freeN(wrld->nodetree);
}
@@ -75,6 +75,10 @@ void BKE_world_free(World *wrld)
wrld->id.icon_id = 0;
}
void BKE_world_free(World *wrld)
{
BKE_world_free_ex(wrld, TRUE);
}
World *add_world(const char *name)
{

2
source/blender/editors/render/render_preview.c
View File

@@ -788,7 +788,7 @@ static void shader_preview_free(void *customdata)
/* get rid of copied world */
BLI_remlink(&pr_main->world, sp->worldcopy);
BKE_world_free(sp->worldcopy);
BKE_world_free_ex(sp->worldcopy, FALSE);
properties = IDP_GetProperties((ID *)sp->worldcopy, FALSE);
if (properties) {