From 621146238c19c0a82f2ad329741356fceafedde3 Mon Sep 17 00:00:00 2001 From: Ton Roosendaal Date: Fri, 18 Nov 2005 10:31:39 +0000 Subject: [PATCH] Bugfix: in Sequencer, an active image/movie strip also allowed to add Ipos, causing Blender to crash. (reported by Levon, thanks!) Bugfix: InfoWindow, pulldown menu said "Dump 3D window", whilst this can be any window type... renamed it to "Dump Subwindow" next to "Dump Screen". --- source/blender/src/editipo.c | 6 ++++-- source/blender/src/header_info.c | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/source/blender/src/editipo.c b/source/blender/src/editipo.c index 67f2b4eca0d..1ae90cccfd6 100644 --- a/source/blender/src/editipo.c +++ b/source/blender/src/editipo.c @@ -976,8 +976,10 @@ static void get_ipo_context(short blocktype, ID **from, Ipo **ipo, char *actname else if(blocktype==ID_SEQ) { extern Sequence *last_seq; - *from= (ID *)last_seq; - if(last_seq) *ipo= last_seq->ipo; + if(last_seq && (last_seq->type & SEQ_EFFECT)) { + *from= (ID *)last_seq; + *ipo= last_seq->ipo; + } } else if(blocktype==ID_WO) { World *wo= G.scene->world; diff --git a/source/blender/src/header_info.c b/source/blender/src/header_info.c index eed01d7ac6e..01c1ddc194d 100644 --- a/source/blender/src/header_info.c +++ b/source/blender/src/header_info.c @@ -852,7 +852,7 @@ static uiBlock *info_filemenu(void *arg_unused) uiDefBut(block, SEPR, 0, "", 0, yco-=6, menuwidth, 6, NULL, 0.0, 0.0, 0, 0, ""); uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Save Image...|F3", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 6, ""); - uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Dump 3DView|Ctrl F3", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 24, ""); + uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Dump Subwindow|Ctrl F3", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 24, ""); uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Dump Screen|Ctrl Shift F3", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 25, ""); #if GAMEBLENDER == 1 uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Save Runtime...", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 22, "");