[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [50264] trunk/blender/source/blender: Fix wrong user counter in world node trees

[Sergey Sharybin]

Revision: 50264
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=50264
Author:   nazgul
Date:     2012-08-29 12:47:42 +0000 (Wed, 29 Aug 2012)
Log Message:
-----------
Fix wrong user counter in world node trees

World is being localized without increasing ID users, so no need
to decrease ID users on localized world free.

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/BKE_world.h
    trunk/blender/source/blender/blenkernel/intern/world.c
    trunk/blender/source/blender/editors/render/render_preview.c

Modified: trunk/blender/source/blender/blenkernel/BKE_world.h
===================================================================
--- trunk/blender/source/blender/blenkernel/BKE_world.h	2012-08-29 10:32:38 UTC (rev 50263)
+++ trunk/blender/source/blender/blenkernel/BKE_world.h	2012-08-29 12:47:42 UTC (rev 50264)
@@ -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);

Modified: trunk/blender/source/blender/blenkernel/intern/world.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/world.c	2012-08-29 10:32:38 UTC (rev 50263)
+++ trunk/blender/source/blender/blenkernel/intern/world.c	2012-08-29 12:47:42 UTC (rev 50264)
@@ -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 @@
 
 	/* 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 @@
 	wrld->id.icon_id = 0;
 }
 
+void BKE_world_free(World *wrld)
+{
+	BKE_world_free_ex(wrld, TRUE);
+}
 
 World *add_world(const char *name)
 {

Modified: trunk/blender/source/blender/editors/render/render_preview.c
===================================================================
--- trunk/blender/source/blender/editors/render/render_preview.c	2012-08-29 10:32:38 UTC (rev 50263)
+++ trunk/blender/source/blender/editors/render/render_preview.c	2012-08-29 12:47:42 UTC (rev 50264)
@@ -788,7 +788,7 @@
 		
 		/* 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) {