manual sync with trunk - pulling in changes where the issues are not bmesh spesific

- some merges added lines in multiple times
- removed some NULL checks that were only in bmesh
- enable cycles by default (was disabled because it used not to work)
- make formatting match

1 files changed, 3 insertions, 7 deletions

diff --git a/source/blender/editors/space_view3d/view3d_header.c b/source/blender/editors/space_view3d/view3d_header.c
index cc85770ac8b..739e7f186fe 100644
--- a/source/blender/editors/space_view3d/view3d_header.c
+++ b/source/blender/editors/space_view3d/view3d_header.c
@@ -481,16 +481,12 @@ void uiTemplateHeader3D(uiLayout *layout, struct bContext *C)
 	
 	/* mode */
 	if(ob) {
-		/*sanity point checkpoint, put here to avoid seeding
-		  this same code in 10 different other places.*/
-		if (!ob->mode)
-			ob->mode = OB_MODE_OBJECT;
-
 		v3d->modeselect = ob->mode;
-	} else {
+	}
+	else {
 		v3d->modeselect = OB_MODE_OBJECT;
 	}
-	
+
 	row= uiLayoutRow(layout, 1);
 	uiDefIconTextButS(block, MENU, B_MODESELECT, object_mode_icon(v3d->modeselect), view3d_modeselect_pup(scene) , 
 			  0,0,126 * dpi_fac, UI_UNIT_Y, &(v3d->modeselect), 0, 0, 0, 0, TIP_("Mode"));