diff options
author | Campbell Barton <ideasman42@gmail.com> | 2013-01-04 06:13:29 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2013-01-04 06:13:29 +0400 |
commit | c7b7cba2380e6885bc23b2d5fc485cd6938e55da (patch) | |
tree | 8c87f81e18eb5b97f560f559684aeeaa9d644c4b /source | |
parent | 922aeb33c840f6bce1cc62e551a2729eaf8f7a29 (diff) |
code cleanup: warnings
Diffstat (limited to 'source')
4 files changed, 4 insertions, 8 deletions
diff --git a/source/blender/editors/interface/interface_icons.c b/source/blender/editors/interface/interface_icons.c index ec9374400a7..ebc80d61af3 100644 --- a/source/blender/editors/interface/interface_icons.c +++ b/source/blender/editors/interface/interface_icons.c @@ -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 diff --git a/source/blender/editors/sculpt_paint/paint_vertex.c b/source/blender/editors/sculpt_paint/paint_vertex.c index ead6320c7d2..08c26aaa755 100644 --- a/source/blender/editors/sculpt_paint/paint_vertex.c +++ b/source/blender/editors/sculpt_paint/paint_vertex.c @@ -3091,11 +3091,9 @@ static void gradientVert__mapFunc(void *userData, int index, const float co[3], 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) { - alpha = len_v2v2(grad_data->sco_start, vs->sco) * grad_data->sco_line_div; - } else { - BLI_assert(0); + BLI_assert(grad_data->type == WPAINT_GRADIENT_TYPE_RADIAL); + alpha = len_v2v2(grad_data->sco_start, vs->sco) * grad_data->sco_line_div; } /* no need to clamp 'alpha' yet */ diff --git a/source/blender/modifiers/intern/MOD_edgesplit.c b/source/blender/modifiers/intern/MOD_edgesplit.c index 5c786626c94..33601c197b9 100644 --- a/source/blender/modifiers/intern/MOD_edgesplit.c +++ b/source/blender/modifiers/intern/MOD_edgesplit.c @@ -48,7 +48,6 @@ #include "DNA_object_types.h" -#define EDGE_MARK 1 static DerivedMesh *doEdgeSplit(DerivedMesh *dm, EdgeSplitModifierData *emd, Object *UNUSED(ob)) { diff --git a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_ListRasterizer.h b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_ListRasterizer.h index 0eddde7c203..558850a9173 100644 --- a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_ListRasterizer.h +++ b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_ListRasterizer.h @@ -51,7 +51,6 @@ typedef std::map<DerivedMesh*, RAS_ListSlots*> RAS_DerivedMeshLists; class RAS_ListRasterizer : public RAS_OpenGLRasterizer { - bool mUseVertexArrays; bool mATI; RAS_ArrayLists mArrayLists; RAS_DerivedMeshLists mDerivedMeshLists; |