From 78cd971bace2b0ead5e2f879a5d60924b2a42ff1 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Sat, 20 Nov 2010 07:51:39 +0000 Subject: [PATCH] - 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) --- intern/smoke/intern/WAVELET_NOISE.h | 1 + source/blender/windowmanager/intern/wm_event_system.c | 1 + 2 files changed, 2 insertions(+) diff --git a/intern/smoke/intern/WAVELET_NOISE.h b/intern/smoke/intern/WAVELET_NOISE.h index 7056b1db5be..1c55acfb1ca 100644 --- a/intern/smoke/intern/WAVELET_NOISE.h +++ b/intern/smoke/intern/WAVELET_NOISE.h @@ -243,6 +243,7 @@ static bool loadTile(float* const noiseTileData, std::string filename) || (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; } diff --git a/source/blender/windowmanager/intern/wm_event_system.c b/source/blender/windowmanager/intern/wm_event_system.c index 943467d80ab..7f061517ed3 100644 --- a/source/blender/windowmanager/intern/wm_event_system.c +++ b/source/blender/windowmanager/intern/wm_event_system.c @@ -751,6 +751,7 @@ static int wm_operator_call_internal(bContext *C, wmOperatorType *ot, PointerRNA 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: