diff --git a/source/blender/src/buttons_editing.c b/source/blender/src/buttons_editing.c
index d14e3044784..f9f343f271e 100644
--- a/source/blender/src/buttons_editing.c
+++ b/source/blender/src/buttons_editing.c
@@ -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;
 	ID *id, *idfrom;
@@ -1714,7 +1714,7 @@ static void editing_panel_materials(Object *ob)
 	char str[64];
 	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;
 
 	buttons_active_id(&id, &idfrom);
@@ -1985,7 +1985,7 @@ void editing_panels()
 	
 	switch(ob->type) {
 	case OB_MESH:
-		editing_panel_materials(ob); // no editmode!
+		editing_panel_links(ob); // no editmode!
 		editing_panel_mesh_type(ob, ob->data);	// no editmode!
 		/* modes */
 		if(G.obedit) {
@@ -2004,7 +2004,7 @@ void editing_panels()
 	case OB_CURVE:
 	case OB_SURF:
 		cu= ob->data;
-		editing_panel_materials(ob); // no editmode!
+		editing_panel_links(ob); // no editmode!
 		editing_panel_curve_type(ob, cu);
 		if(G.obedit) {
 			editing_panel_curve_tools(ob, cu);
@@ -2014,7 +2014,7 @@ void editing_panels()
 
 	case OB_MBALL:
 		mb= ob->data;
-		editing_panel_materials(ob); // no editmode!
+		editing_panel_links(ob); // no editmode!
 		editing_panel_mball_type(ob, mb);
 		if(G.obedit) {
 			editing_panel_mball_tools(ob, mb);
@@ -2023,23 +2023,26 @@ void editing_panels()
 
 	case OB_FONT:
 		cu= ob->data;
-		editing_panel_materials(ob); // no editmode!
+		editing_panel_links(ob); // no editmode!
 		editing_panel_curve_type(ob, cu);
 		editing_panel_font_type(ob, cu);
 		break;
 
 	case OB_LATTICE:
 		lt= ob->data;
+		editing_panel_links(ob); // no editmode!
 		editing_panel_lattice_type(ob, lt);
 		break;
 		
 	case OB_CAMERA:
 		cam= ob->data;
+		editing_panel_links(ob); // no editmode!
 		editing_panel_camera_type(ob, cam);
 		break;
 		
 	case OB_ARMATURE:
 		arm= ob->data;
+		editing_panel_links(ob); // no editmode!
 		editing_panel_armature_type(ob, arm);
 		if(G.obedit) {
 			editing_panel_armature_bones(ob, arm);
diff --git a/source/blender/src/drawipo.c b/source/blender/src/drawipo.c
index 5519fa3ece8..1127f459842 100644
--- a/source/blender/src/drawipo.c
+++ b/source/blender/src/drawipo.c
@@ -433,7 +433,7 @@ void test_view2d(View2D *v2d, int winx, int winy)
 		dy= ((float)winy)/((float)winx);
 		
 		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 ) {