[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [51288] trunk/blender/source/blender/ editors/render/render_preview.c: Bugfix [#32865] Usercounts for World Textures not decremented after preview

[Joshua Leung]

Revision: 51288
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=51288
Author:   aligorith
Date:     2012-10-13 01:19:23 +0000 (Sat, 13 Oct 2012)
Log Message:
-----------
Bugfix [#32865] Usercounts for World Textures not decremented after preview
render

When adjusting settings for world textures (with Both/World preview modes),
every tweak would result in the usercount of the texture increasing. As a
result, before long the texture would claim to have over 100 users. Fortunately,
this only appeared to be just a cosmetic issue (i.e. no real memory leak here),
though it was a bit unsettling.

NOTE: this is still a bit glitchy, as now we have flickering when updating
texture settings - the texture still temporarily has a second user during
preview rendering.

Modified Paths:
--------------
    trunk/blender/source/blender/editors/render/render_preview.c

Modified: trunk/blender/source/blender/editors/render/render_preview.c
===================================================================
--- trunk/blender/source/blender/editors/render/render_preview.c	2012-10-12 18:19:39 UTC (rev 51287)
+++ trunk/blender/source/blender/editors/render/render_preview.c	2012-10-13 01:19:23 UTC (rev 51288)
@@ -809,7 +809,7 @@
 		
 		/* get rid of copied world */
 		BLI_remlink(&pr_main->world, sp->worldcopy);
-		BKE_world_free_ex(sp->worldcopy, FALSE);
+		BKE_world_free_ex(sp->worldcopy, TRUE); /* [#32865] - we need to unlink the texture copies, unlike for materials */
 		
 		properties = IDP_GetProperties((ID *)sp->worldcopy, FALSE);
 		if (properties) {