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>2009-05-19 19:40:03 +0400
committerTon Roosendaal <ton@blender.org>2009-05-19 19:40:03 +0400
commitecacef36829897c1b5d03dffb08f3a4ab7863e9a (patch)
tree13d9d9aff775daa80c94c30cda88fbe7f14ec43d
parent1a16fb1953a566cd57f49683d4711b7052d6b586 (diff)
Last minute mini feature:
Expanded the "10-timer" (ALT+CTRL+T) with two new test options: - Draw entire window - Anim step The latter will only call animation system, no drawing. Added this to match the testing menu in 2.5 too, so we can get good reference performance tests.
-rw-r--r--source/blender/src/toets.c23
1 files changed, 17 insertions, 6 deletions
diff --git a/source/blender/src/toets.c b/source/blender/src/toets.c
index 804660c3433..3a1b21e91f1 100644
--- a/source/blender/src/toets.c
+++ b/source/blender/src/toets.c
@@ -901,7 +901,7 @@ int blenderqread(unsigned short event, short val)
}
else if(G.qual==(LR_ALTKEY|LR_CTRLKEY)) {
int a;
- int event= pupmenu("10 Timer%t|draw|draw+swap|undo");
+ int event= pupmenu("10 Timer%t|Draw Area|Draw Area and Swap|Draw Window and Swap|Anim Steps|Undo/Redo");
if(event>0) {
double stime= PIL_check_seconds_timer();
char tmpstr[128];
@@ -912,11 +912,20 @@ int blenderqread(unsigned short event, short val)
for(a=0; a<10; a++) {
if (event==1) {
scrarea_do_windraw(curarea);
- } else if (event==2) {
+ }
+ else if (event==2) {
scrarea_do_windraw(curarea);
screen_swapbuffers();
}
- else if(event==3) {
+ else if (event==3) {
+ force_draw_all(1);
+ }
+ else if(event==4) {
+ if(a & 1) G.scene->r.cfra--;
+ else G.scene->r.cfra++;
+ scene_update_for_newframe(G.scene, G.scene->lay);
+ }
+ else if(event==5) {
BIF_undo();
BIF_redo();
}
@@ -924,9 +933,11 @@ int blenderqread(unsigned short event, short val)
time= (int) ((PIL_check_seconds_timer()-stime)*1000);
- if(event==1) sprintf(tmpstr, "draw %%t|%d ms", time);
- if(event==2) sprintf(tmpstr, "d+sw %%t|%d ms", time);
- if(event==3) sprintf(tmpstr, "undo %%t|%d ms", time);
+ if(event==1) sprintf(tmpstr, "Draw %%t|%d ms", time);
+ if(event==2) sprintf(tmpstr, "Draw+swap %%t|%d ms", time);
+ if(event==3) sprintf(tmpstr, "Window+sw %%t|%d ms", time);
+ if(event==4) sprintf(tmpstr, "Anim %%t|%d ms", time);
+ if(event==5) sprintf(tmpstr, "Undo %%t|%d ms", time);
waitcursor(0);
pupmenu(tmpstr);