* updated MSVC projectfiles with SHD_sepcombRGB.c shader nodes.vcproj
authorAndrea Weikert <elubie@gmx.net>
Thu, 30 Aug 2007 20:32:43 +0000 (20:32 +0000)
committerAndrea Weikert <elubie@gmx.net>
Thu, 30 Aug 2007 20:32:43 +0000 (20:32 +0000)
* fix for possible double free.

projectfiles_vc7/blender/nodes/nodes.vcproj
source/blender/blenkernel/intern/image.c

index 0ada237b9accfe4cd91f399f468ef0e09f916a35..f05ed272e897cde332c25e9436b5967f9f6c920b 100644 (file)
                                <File
                                        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>
index dd666163c62bf84de8a08c9d015e43dd565a7410..2c91c6cb0be9fe323906b5e8e56e3a2ed61d375f 100644 (file)
@@ -207,7 +207,8 @@ static void image_free_buffers(Image *ima)
        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;
        }