[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [33191] trunk/blender: - smoke wasn' t closing the file of loading a tile had the wrong length.

Campbell Barton ideasman42 at gmail.com
Sat Nov 20 08:51:40 CET 2010


Revision: 33191
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=33191
Author:   campbellbarton
Date:     2010-11-20 08:51:39 +0100 (Sat, 20 Nov 2010)

Log Message:
-----------
- smoke wasn't closing the file of loading a tile had the wrong length.
- missing break in operator context switch meant RGN_TYPE_CHANNELS was always being overwritten with RGN_TYPE_PREVIEW when calling operators (from r26692)

Modified Paths:
--------------
    trunk/blender/intern/smoke/intern/WAVELET_NOISE.h
    trunk/blender/source/blender/windowmanager/intern/wm_event_system.c

Modified: trunk/blender/intern/smoke/intern/WAVELET_NOISE.h
===================================================================
--- trunk/blender/intern/smoke/intern/WAVELET_NOISE.h	2010-11-20 07:40:50 UTC (rev 33190)
+++ trunk/blender/intern/smoke/intern/WAVELET_NOISE.h	2010-11-20 07:51:39 UTC (rev 33191)
@@ -243,6 +243,7 @@
 		|| (headerbuffer[headerlen-1] != (char)((char)sizeof(long)+'0')))
 	{
 		printf("loadTile : Noise tile '%s' was generated on an incompatible platform.\n",filename.c_str());
+		fclose(file);
 		return false;
 	}
 	

Modified: trunk/blender/source/blender/windowmanager/intern/wm_event_system.c
===================================================================
--- trunk/blender/source/blender/windowmanager/intern/wm_event_system.c	2010-11-20 07:40:50 UTC (rev 33190)
+++ trunk/blender/source/blender/windowmanager/intern/wm_event_system.c	2010-11-20 07:51:39 UTC (rev 33191)
@@ -751,6 +751,7 @@
 					case WM_OP_EXEC_REGION_CHANNELS:
 					case WM_OP_INVOKE_REGION_CHANNELS:
 						type = RGN_TYPE_CHANNELS;
+						break;
 					
 					case WM_OP_EXEC_REGION_PREVIEW:
 					case WM_OP_INVOKE_REGION_PREVIEW:





More information about the Bf-blender-cvs mailing list