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>2003-10-17 04:49:59 +0400
committerTon Roosendaal <ton@blender.org>2003-10-17 04:49:59 +0400
commit00cf36d6a5ce06f07960616bc06d06ceeea0f886 (patch)
tree8a3d9f3c8ce371c94b6cf44f5e8b597fe06a52a5 /source/blender/src/header_buttonswin.c
parent7a7956509d69ae3699d191af6cb625501c87dcb0 (diff)
- accidentally removed 2 lines in this file that made previewrender not
showing up...
Diffstat (limited to 'source/blender/src/header_buttonswin.c')
-rw-r--r--source/blender/src/header_buttonswin.c49
1 files changed, 7 insertions, 42 deletions
diff --git a/source/blender/src/header_buttonswin.c b/source/blender/src/header_buttonswin.c
index 9fd6b543350..ed88dd56516 100644
--- a/source/blender/src/header_buttonswin.c
+++ b/source/blender/src/header_buttonswin.c
@@ -384,11 +384,9 @@ static uiBlock *sbuts_context_menu(void *arg_unused)
void buts_buttons(void)
{
- ID *id, *idfrom;
- Object *ob;
uiBlock *block;
-// uiBut *but;
- short xco, t_base= -2;
+ ID *id, *idfrom;
+ short xco, t_base= 0;
char naam[20];
sprintf(naam, "header %d", curarea->headwin);
@@ -432,7 +430,7 @@ void buts_buttons(void)
uiDefIconButS(block, ROW, B_REDR, ICON_SCENE_DEHLT, xco+=XIC, 0, XIC, YIC, &(G.buts->mainb), 0.0, (float)CONTEXT_SCENE, 0, 0, "Scene (F10) ");
xco+=XIC;
- if(curarea->headertype==HEADERTOP) t_base= -3; else t_base= 4;
+ // if(curarea->headertype==HEADERTOP) t_base= -3; else t_base= 4;
/* select the context to be drawn, per contex/tab the actual context is tested */
uiBlockSetEmboss(block, UI_EMBOSSX); // normal
@@ -464,46 +462,13 @@ void buts_buttons(void)
break;
}
-
-
- xco+=XIC+XIC;
- ob= OBACT;
-
- buttons_active_id(&id, &idfrom);
- G.buts->lockpoin= id;
-
- if(G.buts->mainb==CONTEXT_SHADING) {
-
- }
- else if(G.buts->mainb==CONTEXT_EDITING) {
-
- }
-
-#if 0
- else if(G.buts->mainb==BUTS_CONSTRAINT){
- if(id) {
-
- short type;
- void *data=NULL;
- char str[256];
-
-
- xco= std_libbuttons(block, xco, 0, 0, NULL, 0, id, idfrom, &(G.buts->menunr), B_OBALONE, B_OBLOCAL, 0, 0, 0);
-
- get_constraint_client(NULL, &type, &data);
- if (data && type==TARGET_BONE){
- sprintf(str, "BO:%s", ((Bone*)data)->name);
- but= uiDefBut(block, LABEL, 1, str, xco, 0, 0, 135, YIC, ((Bone*)data)->name, 0.0, 19.0, 0, 0, "Displays Active Bone name. Click to change.");
- xco+= 135;
- }
- }
- }
- else if(G.buts->mainb==BUTS_SCRIPT) {
- }
+ xco+=XIC;
uiDefButS(block, NUM, B_NEWFRAME, "", (short)(xco+20),0,60,YIC, &(G.scene->r.cfra), 1.0, 18000.0, 0, 0, "Displays Current Frame of animation. Click to change.");
xco+= 80;
-#endif
+
+ buttons_active_id(&id, &idfrom);
+ G.buts->lockpoin= id;
/* always do as last */
uiDrawBlock(block);