[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [53543] trunk/blender/source: code cleanup : warnings

[Campbell Barton]

Revision: 53543
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=53543
Author:   campbellbarton
Date:     2013-01-04 02:13:29 +0000 (Fri, 04 Jan 2013)
Log Message:
-----------
code cleanup: warnings

Modified Paths:
--------------
    trunk/blender/source/blender/editors/interface/interface_icons.c
    trunk/blender/source/blender/editors/sculpt_paint/paint_vertex.c
    trunk/blender/source/blender/modifiers/intern/MOD_edgesplit.c
    trunk/blender/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_ListRasterizer.h

Modified: trunk/blender/source/blender/editors/interface/interface_icons.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_icons.c	2013-01-04 02:01:50 UTC (rev 53542)
+++ trunk/blender/source/blender/editors/interface/interface_icons.c	2013-01-04 02:13:29 UTC (rev 53543)
@@ -76,8 +76,8 @@
 #include "interface_intern.h"
 
 
-#define ICON_IMAGE_W        600
-#define ICON_IMAGE_H        640
+// #define ICON_IMAGE_W        600
+// #define ICON_IMAGE_H        640
 
 #define ICON_GRID_COLS      26
 #define ICON_GRID_ROWS      30

Modified: trunk/blender/source/blender/editors/sculpt_paint/paint_vertex.c
===================================================================
--- trunk/blender/source/blender/editors/sculpt_paint/paint_vertex.c	2013-01-04 02:01:50 UTC (rev 53542)
+++ trunk/blender/source/blender/editors/sculpt_paint/paint_vertex.c	2013-01-04 02:13:29 UTC (rev 53543)
@@ -3091,12 +3091,10 @@
 			if (grad_data->type == WPAINT_GRADIENT_TYPE_LINEAR) {
 				alpha = line_point_factor_v2(vs->sco, grad_data->sco_start, grad_data->sco_end);
 			}
-			else if (grad_data->type == WPAINT_GRADIENT_TYPE_RADIAL) {
+			else {
+				BLI_assert(grad_data->type == WPAINT_GRADIENT_TYPE_RADIAL);
 				alpha = len_v2v2(grad_data->sco_start, vs->sco) * grad_data->sco_line_div;
 			}
-			else {
-				BLI_assert(0);
-			}
 			/* no need to clamp 'alpha' yet */
 
 			/* adjust weight */

Modified: trunk/blender/source/blender/modifiers/intern/MOD_edgesplit.c
===================================================================
--- trunk/blender/source/blender/modifiers/intern/MOD_edgesplit.c	2013-01-04 02:01:50 UTC (rev 53542)
+++ trunk/blender/source/blender/modifiers/intern/MOD_edgesplit.c	2013-01-04 02:13:29 UTC (rev 53543)
@@ -48,7 +48,6 @@
 
 #include "DNA_object_types.h"
 
-#define EDGE_MARK  1
 
 static DerivedMesh *doEdgeSplit(DerivedMesh *dm, EdgeSplitModifierData *emd, Object *UNUSED(ob))
 {

Modified: trunk/blender/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_ListRasterizer.h
===================================================================
--- trunk/blender/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_ListRasterizer.h	2013-01-04 02:01:50 UTC (rev 53542)
+++ trunk/blender/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_ListRasterizer.h	2013-01-04 02:13:29 UTC (rev 53543)
@@ -51,7 +51,6 @@
 
 class RAS_ListRasterizer : public RAS_OpenGLRasterizer
 {
-	bool mUseVertexArrays;
 	bool mATI;
 	RAS_ArrayLists mArrayLists;
 	RAS_DerivedMeshLists mDerivedMeshLists;