[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [35009] trunk/blender/source/blender/ editors/render/render_preview.c: bugfix [#26118] Getting 'Error Totblock' when using sub-properties from a PointerProperty

[Campbell Barton]

Revision: 35009
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=35009
Author:   campbellbarton
Date:     2011-02-21 02:07:26 +0000 (Mon, 21 Feb 2011)
Log Message:
-----------
bugfix [#26118] Getting 'Error Totblock' when using sub-properties from a PointerProperty
blender wasnt freeing ID-Properties when freeing the material copy.
Checked that this isnt a problem for other preview types - texture/world/lamp.

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	2011-02-21 01:29:35 UTC (rev 35008)
+++ trunk/blender/source/blender/editors/render/render_preview.c	2011-02-21 02:07:26 UTC (rev 35009)
@@ -68,6 +68,7 @@
 #include "BKE_main.h"
 #include "BKE_material.h"
 #include "BKE_node.h"
+#include "BKE_idprop.h"
 
 #include "IMB_imbuf.h"
 #include "IMB_imbuf_types.h"
@@ -1078,12 +1079,19 @@
 	ShaderPreview *sp= customdata;
 	
 	if(sp->matcopy) {
+		struct IDProperty *properties;
 		/* node previews */
 		shader_preview_updatejob(sp);
 		
 		/* get rid of copied material */
 		BLI_remlink(&pr_main->mat, sp->matcopy);
 		free_material(sp->matcopy);
+
+		properties= IDP_GetProperties((ID *)sp->matcopy, FALSE);
+		if (properties) {
+			IDP_FreeProperty(properties);
+			MEM_freeN(properties);
+		}
 		MEM_freeN(sp->matcopy);
 	}