archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

- forgot to add links panel for:

Browse Source 
Armature, Camera, Lattice
- this enables browsing data again. All in F9 menu (editing)

- fixed 'home' in buttonswindow, mixed up 1 and 0 again! :)
  (it scaled in the wrong direction...)
This commit is contained in:
Ton Roosendaal
2003-10-28 19:03:28 +00:00
parent 5f3a96be10
commit dcfdb6f3bc
2 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
source/blender/src/buttons_editing.c
View File

@@ -1704,7 +1704,7 @@ static void editing_panel_mesh_tools1(Object *ob, Mesh *me)
} }
static void editing_panel_materials(Object *ob) static void editing_panel_links(Object *ob)
{ {
uiBlock *block; uiBlock *block;
ID *id, *idfrom; ID *id, *idfrom;
@@ -1714,7 +1714,7 @@ static void editing_panel_materials(Object *ob)
char str[64]; char str[64];
uiBut *but; uiBut *but;
block= uiNewBlock(&curarea->uiblocks, "editing_panel_materials", UI_EMBOSS, UI_HELV, curarea->win); block= uiNewBlock(&curarea->uiblocks, "editing_panel_links", UI_EMBOSS, UI_HELV, curarea->win);
if(uiNewPanel(curarea, block, "Link and Materials", "Editing", 0, 0, 318, 204)==0) return; if(uiNewPanel(curarea, block, "Link and Materials", "Editing", 0, 0, 318, 204)==0) return;
buttons_active_id(&id, &idfrom); buttons_active_id(&id, &idfrom);
@@ -1985,7 +1985,7 @@ void editing_panels()
switch(ob->type) { switch(ob->type) {
case OB_MESH: case OB_MESH:
editing_panel_materials(ob); // no editmode! editing_panel_links(ob); // no editmode!
editing_panel_mesh_type(ob, ob->data); // no editmode! editing_panel_mesh_type(ob, ob->data); // no editmode!
/* modes */ /* modes */
if(G.obedit) { if(G.obedit) {
@@ -2004,7 +2004,7 @@ void editing_panels()
case OB_CURVE: case OB_CURVE:
case OB_SURF: case OB_SURF:
cu= ob->data; cu= ob->data;
editing_panel_materials(ob); // no editmode! editing_panel_links(ob); // no editmode!
editing_panel_curve_type(ob, cu); editing_panel_curve_type(ob, cu);
if(G.obedit) { if(G.obedit) {
editing_panel_curve_tools(ob, cu); editing_panel_curve_tools(ob, cu);
@@ -2014,7 +2014,7 @@ void editing_panels()
case OB_MBALL: case OB_MBALL:
mb= ob->data; mb= ob->data;
editing_panel_materials(ob); // no editmode! editing_panel_links(ob); // no editmode!
editing_panel_mball_type(ob, mb); editing_panel_mball_type(ob, mb);
if(G.obedit) { if(G.obedit) {
editing_panel_mball_tools(ob, mb); editing_panel_mball_tools(ob, mb);
@@ -2023,23 +2023,26 @@ void editing_panels()
case OB_FONT: case OB_FONT:
cu= ob->data; cu= ob->data;
editing_panel_materials(ob); // no editmode! editing_panel_links(ob); // no editmode!
editing_panel_curve_type(ob, cu); editing_panel_curve_type(ob, cu);
editing_panel_font_type(ob, cu); editing_panel_font_type(ob, cu);
break; break;
case OB_LATTICE: case OB_LATTICE:
lt= ob->data; lt= ob->data;
editing_panel_links(ob); // no editmode!
editing_panel_lattice_type(ob, lt); editing_panel_lattice_type(ob, lt);
break; break;
case OB_CAMERA: case OB_CAMERA:
cam= ob->data; cam= ob->data;
editing_panel_links(ob); // no editmode!
editing_panel_camera_type(ob, cam); editing_panel_camera_type(ob, cam);
break; break;
case OB_ARMATURE: case OB_ARMATURE:
arm= ob->data; arm= ob->data;
editing_panel_links(ob); // no editmode!
editing_panel_armature_type(ob, arm); editing_panel_armature_type(ob, arm);
if(G.obedit) { if(G.obedit) {
editing_panel_armature_bones(ob, arm); editing_panel_armature_bones(ob, arm);

2
source/blender/src/drawipo.c
View File

@@ -433,7 +433,7 @@ void test_view2d(View2D *v2d, int winx, int winy)
dy= ((float)winy)/((float)winx); dy= ((float)winy)/((float)winx);
if(do_x==do_y) { if(do_x==do_y) {
if( dy > 1.0) do_x= 1; else do_x= 0; if( dy > 1.0) do_x= 0; else do_x= 1;
} }
if( do_x ) { if( do_x ) {