diff --git a/source/blender/src/drawobject.c b/source/blender/src/drawobject.c
index 9a6ffd7ca74..7cf51d08acb 100644
--- a/source/blender/src/drawobject.c
+++ b/source/blender/src/drawobject.c
@@ -801,6 +801,7 @@ void calc_lattverts_ext(void)
 {
 
 	areawinset(curarea->win);
+	persp(PERSP_VIEW);
 	mymultmatrix(G.obedit->obmat);
 	calc_lattverts();
 	myloadmatrix(G.vd->viewmat);
@@ -1025,6 +1026,7 @@ void calc_nurbverts_ext(void)
 {
 
 	areawinset(curarea->win);
+	persp(PERSP_VIEW);
 	mymultmatrix(G.obedit->obmat);
 	calc_Nurbverts(editNurb.first);
 	myloadmatrix(G.vd->viewmat);
diff --git a/source/blender/src/drawview.c b/source/blender/src/drawview.c
index 07c6050bfb9..5e04dab2691 100644
--- a/source/blender/src/drawview.c
+++ b/source/blender/src/drawview.c
@@ -766,6 +766,9 @@ void backdrawview3d(int test)
 			return;
 		}
 	}
+	
+	persp(PERSP_VIEW);
+	
 #ifdef __APPLE__
 	glDrawBuffer(GL_AUX0);
 #endif	
diff --git a/source/blender/src/previewrender.c b/source/blender/src/previewrender.c
index 318b61d0785..7c013c6cd78 100644
--- a/source/blender/src/previewrender.c
+++ b/source/blender/src/previewrender.c
@@ -1094,7 +1094,8 @@ void BIF_previewrender(SpaceButs *sbuts)
 	}
 
 	if(sbuts->cury>=PR_RECTY && tex) 
-		draw_tex_crop(sbuts->lockpoin);
+		if (sbuts->tab[CONTEXT_SHADING]==TAB_SHADING_TEX) 
+			draw_tex_crop(sbuts->lockpoin);
 	
 	glDrawBuffer(GL_BACK);
 	/* draw again for clean swapbufers */