[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [18660] branches/blender2.5/blender/source /blender: Fixed a drawing error in radial control and a warning in sculpt.c .

[Nicholas Bishop]

Revision: 18660
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=18660
Author:   nicholasbishop
Date:     2009-01-25 00:20:25 +0100 (Sun, 25 Jan 2009)

Log Message:
-----------
Fixed a drawing error in radial control and a warning in sculpt.c.

Modified Paths:
--------------
    branches/blender2.5/blender/source/blender/editors/sculpt/sculpt.c
    branches/blender2.5/blender/source/blender/editors/sculpt/sculpt_intern.h
    branches/blender2.5/blender/source/blender/windowmanager/intern/wm_operators.c

Modified: branches/blender2.5/blender/source/blender/editors/sculpt/sculpt.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/sculpt/sculpt.c	2009-01-24 22:58:22 UTC (rev 18659)
+++ branches/blender2.5/blender/source/blender/editors/sculpt/sculpt.c	2009-01-24 23:20:25 UTC (rev 18660)
@@ -271,7 +271,7 @@
 /* For clipping against a mirror modifier */
 static void sculpt_clip(StrokeCache *cache, float *co, const float val[3])
 {
-	char i;
+	int i;
 	for(i=0; i<3; ++i) {
 		if((cache->flag & (CLIP_X << i)) && (fabs(co[i]) <= cache->clip_tolerance[i]))
 			co[i]= 0.0f;

Modified: branches/blender2.5/blender/source/blender/editors/sculpt/sculpt_intern.h
===================================================================
--- branches/blender2.5/blender/source/blender/editors/sculpt/sculpt_intern.h	2009-01-24 22:58:22 UTC (rev 18659)
+++ branches/blender2.5/blender/source/blender/editors/sculpt/sculpt_intern.h	2009-01-24 23:20:25 UTC (rev 18660)
@@ -34,15 +34,10 @@
 #include "DNA_vec_types.h"
 #include "BKE_sculpt.h"
 
-struct BrushAction;
 struct Brush;
-struct IndexNode;
-struct KeyBlock;
 struct Mesh;
 struct Object;
-struct PartialVisibility;
 struct Scene;
-struct ScrArea;
 struct Sculpt;
 struct SculptStroke;
 

Modified: branches/blender2.5/blender/source/blender/windowmanager/intern/wm_operators.c
===================================================================
--- branches/blender2.5/blender/source/blender/windowmanager/intern/wm_operators.c	2009-01-24 22:58:22 UTC (rev 18659)
+++ branches/blender2.5/blender/source/blender/windowmanager/intern/wm_operators.c	2009-01-24 23:20:25 UTC (rev 18660)
@@ -924,7 +924,10 @@
 	if(rc->tex) {
 		const float str = rc->mode == WM_RADIALCONTROL_STRENGTH ? (rc->value + 0.5) : 1;
 
-		glRotatef(angle, 0, 0, 1);
+		if(rc->mode == WM_RADIALCONTROL_ANGLE) {
+			glRotatef(angle, 0, 0, 1);
+			fdrawline(0, 0, WM_RADIAL_CONTROL_DISPLAY_SIZE, 0);
+		}
 
 		glBindTexture(GL_TEXTURE_2D, rc->tex);
 
@@ -947,8 +950,6 @@
 	}
 
 	glColor4ub(255, 255, 255, 128);	
-	if(rc->mode == WM_RADIALCONTROL_ANGLE)
-		fdrawline(0, 0, WM_RADIAL_CONTROL_DISPLAY_SIZE, 0);
 	glutil_draw_lined_arc(0.0, M_PI*2.0, r1, 40);
 	glutil_draw_lined_arc(0.0, M_PI*2.0, r2, 40);
 	glDisable(GL_BLEND);