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, 3 deletions

diff --git a/source/blender/editors/screen/screen_ops.c b/source/blender/editors/screen/screen_ops.c
index ddf766330d4..b15278bd583 100644
--- a/source/blender/editors/screen/screen_ops.c
+++ b/source/blender/editors/screen/screen_ops.c
@@ -361,7 +361,6 @@ int ED_operator_uvedit(bContext *C)
 {
 	SpaceImage *sima= CTX_wm_space_image(C);
 	Object *obedit= CTX_data_edit_object(C);
-
 	return ED_space_image_show_uvedit(sima, obedit);
 }
 
@@ -373,8 +372,9 @@ int ED_operator_uvmap(bContext *C)
 	if(obedit && obedit->type==OB_MESH)
 		em= ((Mesh *)obedit->data)->edit_btmesh;
 	
-	if(em && (em->bm->totface))
+	if(em && (em->bm->totface)) {
 		return 1;
+	}
 	
 	return 0;
 }
@@ -2976,7 +2976,7 @@ int ED_screen_animation_play(bContext *C, int sync, int mode)
 			ScreenAnimData *sad= wt->customdata;
 			
 			sad->ar= CTX_wm_region(C);
-			}
+		}
 	}
 
 	return OPERATOR_FINISHED;