merge with/from trunk at r35190
[blender.git] / source / blender / editors / space_view3d / view3d_edit.c
index 0a3ecd735f019a44a90f811bdca6f46fe31acce0..86957ecb86c4487d5ff5b7be05d36ccef2346475 100644 (file)
@@ -50,6 +50,7 @@
 #include "BKE_paint.h"
 #include "BKE_report.h"
 #include "BKE_scene.h"
+#include "BKE_tessmesh.h"
 
 
 #include "BIF_gl.h"
@@ -1932,18 +1933,18 @@ static void axis_set_view(bContext *C, float q1, float q2, float q3, float q4, s
 
        if(align_active==FALSE) {
                /* normal operation */
-               if(rv3d->viewlock) {
-                       /* only pass on if */
+       if(rv3d->viewlock) {
+               /* only pass on if */
                        if(rv3d->view==RV3D_VIEW_FRONT && view==RV3D_VIEW_BACK);
                        else if(rv3d->view==RV3D_VIEW_BACK && view==RV3D_VIEW_FRONT);
                        else if(rv3d->view==RV3D_VIEW_RIGHT && view==RV3D_VIEW_LEFT);
                        else if(rv3d->view==RV3D_VIEW_LEFT && view==RV3D_VIEW_RIGHT);
                        else if(rv3d->view==RV3D_VIEW_BOTTOM && view==RV3D_VIEW_TOP);
                        else if(rv3d->view==RV3D_VIEW_TOP && view==RV3D_VIEW_BOTTOM);
-                       else return;
-               }
+               else return;
+       }
 
-               rv3d->view= view;
+       rv3d->view= view;
        }
 
        if(rv3d->viewlock) {