diff options
| author | Andrea Weikert <elubie@gmx.net> | 2007-08-31 00:32:43 +0400 |
|---|---|---|
| committer | Andrea Weikert <elubie@gmx.net> | 2007-08-31 00:32:43 +0400 |
| commit | ca5c21e1805a5c38e60c13916ba08ebb2b020706 (patch) | |
| tree | ca4d4a0f290e0642e55074ca736fb0b0306ee3bf | |
| parent | f596b2a15692deeec2d8a58bd35de9e85152c144 (diff) | |
* updated MSVC projectfiles with SHD_sepcombRGB.c shader nodes.vcproj
* fix for possible double free.
| -rw-r--r-- | projectfiles_vc7/blender/nodes/nodes.vcproj | 3 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/image.c | 3 |
2 files changed, 5 insertions, 1 deletions
diff --git a/projectfiles_vc7/blender/nodes/nodes.vcproj b/projectfiles_vc7/blender/nodes/nodes.vcproj index 0ada237b9ac..f05ed272e89 100644 --- a/projectfiles_vc7/blender/nodes/nodes.vcproj +++ b/projectfiles_vc7/blender/nodes/nodes.vcproj @@ -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 diff --git a/source/blender/blenkernel/intern/image.c b/source/blender/blenkernel/intern/image.c index dd666163c62..2c91c6cb0be 100644 --- a/source/blender/blenkernel/intern/image.c +++ b/source/blender/blenkernel/intern/image.c @@ -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; } |