Page MenuHome
Files F7028

patch.txt
Public
Actions

patch.txt
View Options

Index: source/blender/src/edittime.c
===================================================================
--- source/blender/src/edittime.c (revision 15446)
+++ source/blender/src/edittime.c (working copy)
@@ -777,59 +777,6 @@
scrarea_queue_winredraw(curarea);
}
-/* copy of this is actually in editscreen.c, but event based */
-static void timeline_force_draw(short val)
-{
- ScrArea *sa, *tempsa, *samin= NULL;
- int dodraw;
-
- if(val & TIME_LEFTMOST_3D_WIN) {
- ScrArea *sa= G.curscreen->areabase.first;
- int min= 10000;
- for(; sa; sa= sa->next) {
- if(sa->spacetype==SPACE_VIEW3D) {
- if(sa->winrct.xmin - sa->winrct.ymin < min) {
- samin= sa;
- min= sa->winrct.xmin - sa->winrct.ymin;
- }
- }
- }
- }
-
- tempsa= curarea;
- sa= G.curscreen->areabase.first;
- while(sa) {
- dodraw= 0;
- if(sa->spacetype==SPACE_VIEW3D) {
- if(sa==samin || (val & TIME_ALL_3D_WIN)) dodraw= 1;
- }
- else if(ELEM6(sa->spacetype, SPACE_NLA, SPACE_IPO, SPACE_SEQ, SPACE_BUTS, SPACE_ACTION, SPACE_SOUND)) {
- if(val & TIME_ALL_ANIM_WIN) dodraw= 1;
- }
- else if(sa->spacetype==SPACE_BUTS) {
- if(val & TIME_ALL_BUTS_WIN) dodraw= 1;
- }
- else if(sa->spacetype==SPACE_IMAGE) {
- if (val & TIME_ALL_IMAGE_WIN) dodraw = 1;
- }
- else if(sa->spacetype==SPACE_SEQ) {
- if (val & TIME_SEQ) dodraw = 1;
- }
- else if(sa->spacetype==SPACE_TIME) dodraw= 2;
-
- if(dodraw) {
- areawinset(sa->win);
- scrarea_do_windraw(sa);
- if(dodraw==2) scrarea_do_headdraw(sa);
- }
- sa= sa->next;
- }
- areawinset(tempsa->win);
-
- screen_swapbuffers();
-
-}
-
/* ***************************** */
/* Right. Now for some implementation: */
@@ -875,7 +822,7 @@
first= 0;
CFRA= cfra;
update_for_newframe_nodraw(0); // 1= nosound
- timeline_force_draw(stime->redraws);
+ force_draw_all(0);
}
else PIL_sleep_ms(30);
Index: source/blender/src/space.c
===================================================================
--- source/blender/src/space.c (revision 15446)
+++ source/blender/src/space.c (working copy)
@@ -4835,8 +4835,8 @@
first= 0;
CFRA= cfra;
- force_draw(0);
- update_for_newframe(); /* for audio scrubbing */
+ force_draw_all(0);
+ update_for_newframe(); /* for audio scrubbing */
}
else PIL_sleep_ms(30);
Index: source/blender/src/editsound.c
===================================================================
--- source/blender/src/editsound.c (revision 15446)
+++ source/blender/src/editsound.c (working copy)
@@ -148,7 +148,7 @@
first= 0;
CFRA= cfra;
update_for_newframe();
- force_draw_plus(SPACE_VIEW3D, 1);
+ force_draw_all(0);
}
else PIL_sleep_ms(30);

File Metadata

Mime Type
text/x-diff
Storage Engine
local-disk
Storage Format
Raw Data
Storage Handle
c4/c9/fd6dd52e1d72d9acb026b366eb97

Event Timeline