[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [12038] trunk/blender/source/blender/src/ drawimage.c: mistake in last commit.

Campbell Barton cbarton at metavr.com
Fri Sep 14 18:20:02 CEST 2007


Revision: 12038
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=12038
Author:   campbellbarton
Date:     2007-09-14 18:20:02 +0200 (Fri, 14 Sep 2007)

Log Message:
-----------
mistake in last commit. 2d cursor was displayed in the UV out of editmode but could not be moved.

Modified Paths:
--------------
    trunk/blender/source/blender/src/drawimage.c

Modified: trunk/blender/source/blender/src/drawimage.c
===================================================================
--- trunk/blender/source/blender/src/drawimage.c	2007-09-14 16:12:17 UTC (rev 12037)
+++ trunk/blender/source/blender/src/drawimage.c	2007-09-14 16:20:02 UTC (rev 12038)
@@ -620,11 +620,7 @@
 
 	
 	/* Draw the cursor here, this should be in its own function really but it relys on the previous calls to set the view matrix */
-	{
-		
-
-		
-	}
+	drawcursor_sima();
 	
 	glPointSize(1.0);
 }
@@ -1592,10 +1588,8 @@
 	
 	if(ibuf==NULL || (ibuf->rect==NULL && ibuf->rect_float==NULL)) {
 		imagespace_grid(sima);
-		if(show_viewer==0) {
+		if(show_viewer==0)
 			draw_tfaces();
-			drawcursor_sima(); /* warning, mist be called after draw_tfaces */
-		}
 	}
 	else {
 		float xim, yim, xoffs=0.0f, yoffs= 0.0f;
@@ -1769,7 +1763,6 @@
 			
 			if(show_viewer==0) { 
 				draw_tfaces();
-				drawcursor_sima(); /* make sure this is after draw_tfaces() */
 			}
 		}
 





More information about the Bf-blender-cvs mailing list