kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

code cleanup: warnings

Browse Source
This commit is contained in:
Campbell Barton 2013-01-04 02:13:29 +00:00
parent 922aeb33c8
commit c7b7cba238
4 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/editors/interface/interface_icons.c
View File

@ -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

6
source/blender/editors/sculpt_paint/paint_vertex.c
View File

@ -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 */

1
source/blender/modifiers/intern/MOD_edgesplit.c
View File

@ -48,7 +48,6 @@
#include "DNA_object_types.h"
#define EDGE_MARK 1
static DerivedMesh *doEdgeSplit(DerivedMesh *dm, EdgeSplitModifierData *emd, Object *UNUSED(ob))
{

1
source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_ListRasterizer.h
View File

@ -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;