Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTon Roosendaal <ton@blender.org>2004-10-31 01:18:53 +0400
committerTon Roosendaal <ton@blender.org>2004-10-31 01:18:53 +0400
commit357325250862a50407fe19f9bd6a7feda708a6db (patch)
treea101135e967ba9f4677aa2135c3e6b6457c859a9 /source/blender/src/interface.c
parentd292541cac01daf267fc693b3873ad254dfe4007 (diff)
Found critical error in using pulldowns and toolbox menus; after returning
from menu code, it left the main window active (for global draw), this sometimes could screw up drawing calls after... as happens when a command is executed that draws immediate. Now the previous window is restored before a menu command is executed
Diffstat (limited to 'source/blender/src/interface.c')
-rw-r--r--source/blender/src/interface.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/source/blender/src/interface.c b/source/blender/src/interface.c
index ce2c6f8d512..738fea7db6e 100644
--- a/source/blender/src/interface.c
+++ b/source/blender/src/interface.c
@@ -3570,7 +3570,10 @@ int uiDoBlocks(ListBase *lb, int event)
/* afterfunc is used for fileloading too, so after this call, the blocks pointers are invalid */
if(retval & UI_RETURN_OK) {
- if(UIafterfunc) UIafterfunc(UIafterfunc_arg, UIafterval);
+ if(UIafterfunc) {
+ mywinset(curarea->win);
+ UIafterfunc(UIafterfunc_arg, UIafterval);
+ }
UIafterfunc= NULL;
}