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>2006-12-20 20:57:56 +0300
committerTon Roosendaal <ton@blender.org>2006-12-20 20:57:56 +0300
commit253432bfc7c2a1dae224a03fb3055de19743ec67 (patch)
tree2cea30606f9f29be51d5366ddf0d3747b9649b90 /source/blender/src/headerbuttons.c
parent0a0753b409221b66f5003d8c257426043ada227e (diff)
The Big Image refactor!
Please read: http://www.blender3d.org/cms/Imaging.834.0.html Or in short: - adding MultiLayer Image support - recoded entire Image API - better integration of movie/sequence Images Was a whole load of work... went down for a week to do this. So, will need a lot of testing! Will be in irc all evening.
Diffstat (limited to 'source/blender/src/headerbuttons.c')
-rw-r--r--source/blender/src/headerbuttons.c11
1 files changed, 8 insertions, 3 deletions
diff --git a/source/blender/src/headerbuttons.c b/source/blender/src/headerbuttons.c
index 1837ae2e384..7b283427492 100644
--- a/source/blender/src/headerbuttons.c
+++ b/source/blender/src/headerbuttons.c
@@ -279,6 +279,8 @@ int std_libbuttons(uiBlock *block, short xco, short yco,
if (lb) {
if( id_code==ID_IP)
IPOnames_to_pupstring(&str, NULL, extrastr, lb, id, menupoin, G.sipo->blocktype);
+ else if(browse!=B_SIMABROWSE && id_code==ID_IM )
+ IMAnames_to_pupstring(&str, NULL, extrastr, lb, id, menupoin);
else
IDnames_to_pupstring(&str, NULL, extrastr, lb, id, menupoin);
}
@@ -411,9 +413,12 @@ static void do_update_for_newframe(int mute, int events)
/* this function applies the changes too */
scene_update_for_newframe(G.scene, screen_view3d_layers()); /* BKE_scene.h */
- if ( (CFRA>1) && (!mute) && (G.scene->audio.flag & AUDIO_SCRUB)) audiostream_scrub( CFRA );
+ if ( (CFRA>1) && (!mute) && (G.scene->audio.flag & AUDIO_SCRUB))
+ audiostream_scrub( CFRA );
+
BIF_view3d_previewrender_signal(curarea, PR_DBASE|PR_DISPRECT);
+ BIF_image_update_frame();
}
void update_for_newframe(void)
@@ -573,7 +578,7 @@ void do_global_buttons(unsigned short event)
ScrArea *sa;
Brush *br;
int nr= 1;
- char buf[FILE_MAXDIR+FILE_MAXFILE];
+ char buf[FILE_MAX];
ob= OBACT;
@@ -1518,8 +1523,8 @@ void do_global_buttons(unsigned short event)
allqueue(REDRAWNLA, 1);
/* name scene also in set PUPmenu */
allqueue(REDRAWBUTSALL, 0);
+ allqueue(REDRAWIMAGE, 0);
allqueue(REDRAWHEADERS, 0);
-
break;
case B_KEEPDATA: