[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [11898] trunk/blender: * updated MSVC projectfiles with SHD_sepcombRGB.c shader nodes.vcproj

[Andrea Weikert]

Revision: 11898
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=11898
Author:   elubie
Date:     2007-08-30 22:32:43 +0200 (Thu, 30 Aug 2007)

Log Message:
-----------
* updated MSVC projectfiles with SHD_sepcombRGB.c shader nodes.vcproj
* fix for possible double free.

Modified Paths:
--------------
    trunk/blender/projectfiles_vc7/blender/nodes/nodes.vcproj
    trunk/blender/source/blender/blenkernel/intern/image.c

Modified: trunk/blender/projectfiles_vc7/blender/nodes/nodes.vcproj
===================================================================
--- trunk/blender/projectfiles_vc7/blender/nodes/nodes.vcproj	2007-08-30 19:15:41 UTC (rev 11897)
+++ trunk/blender/projectfiles_vc7/blender/nodes/nodes.vcproj	2007-08-30 20:32:43 UTC (rev 11898)
@@ -385,6 +385,9 @@
 					RelativePath="..\..\..\source\blender\nodes\intern\SHD_nodes\SHD_rgb.c">
 				</File>
 				<File
+					RelativePath="..\..\..\source\blender\nodes\intern\SHD_nodes\SHD_sepcombRGB.c">
+				</File>
+				<File
 					RelativePath="..\..\..\source\blender\nodes\intern\SHD_nodes\SHD_squeeze.c">
 				</File>
 				<File

Modified: trunk/blender/source/blender/blenkernel/intern/image.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/image.c	2007-08-30 19:15:41 UTC (rev 11897)
+++ trunk/blender/source/blender/blenkernel/intern/image.c	2007-08-30 20:32:43 UTC (rev 11898)
@@ -207,7 +207,8 @@
 	ima->anim= NULL;
 	
 	if (ima->preview) {
-		MEM_freeN(ima->preview->rect);
+		if (ima->preview->rect)
+			MEM_freeN(ima->preview->rect);
 		MEM_freeN(ima->preview);
 		ima->preview = NULL;
 	}