blender
/
blender
128
396
Fork 569
Code Issues 6.2k Pull Requests 756 Projects 19 Wiki Activity

Cleanup: fix compiler warnings.

This commit is contained in:
Brecht Van Lommel 2018-10-18 12:19:06 +02:00
parent b3814d8645
commit 5869bf5002
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
source/blender/editors/gizmo_library/gizmo_types/dial3d_gizmo.c
View File

@ -334,7 +334,7 @@ static void dial_ghostarc_draw_with_helplines(
}
static void dial_draw_intern(
const bContext *C, wmGizmo *gz,
wmGizmo *gz,
const bool select, const bool highlight, float clip_plane[4])
{
float matrix_final[4][4];
@ -403,7 +403,7 @@ static void gizmo_dial_draw_select(const bContext *C, wmGizmo *gz, int select_id
}
GPU_select_load_id(select_id);
dial_draw_intern(C, gz, true, false, clip_plane);
dial_draw_intern(gz, true, false, clip_plane);
if (clip_plane) {
glDisable(GL_CLIP_DISTANCE0);
@ -428,7 +428,7 @@ static void gizmo_dial_draw(const bContext *C, wmGizmo *gz)
}
GPU_blend(true);
dial_draw_intern(C, gz, false, is_highlight, clip_plane);
dial_draw_intern(gz, false, is_highlight, clip_plane);
GPU_blend(false);
}

4
source/blender/editors/transform/transform_gizmo_3d.c
View File

@ -1262,11 +1262,11 @@ void drawDial3d(const TransInfo *t)
axis_idx = MAN_AXIS_ROT_Y;
negate_v3_v3(mat_basis[2], tc->mtx[1]);
}
else if (tc->mode & CON_AXIS2) {
else {
BLI_assert((tc->mode & CON_AXIS2) != 0);
axis_idx = MAN_AXIS_ROT_Z;
negate_v3_v3(mat_basis[2], tc->mtx[2]);
}
else BLI_assert(0);
}
else {
axis_idx = MAN_AXIS_ROT_C;

2
source/blender/gpu/intern/gpu_draw.c
View File

@ -1028,7 +1028,7 @@ static GPUTexture *create_density_texture(SmokeDomainSettings *sds, int highres)
GPUTexture *tex = GPU_texture_create_nD(
dim[0], dim[1], dim[2], 3,
(data) ? data : source,
(has_color) ? data : source,
format, GPU_DATA_FLOAT, 0, true, NULL);
if (data) {
MEM_freeN(data);