[Bf-blender-cvs] [9b5183769b8] blender2.8: Cleanup: compiler warnings
Campbell Barton
noreply at git.blender.org
Fri Oct 19 05:52:14 CEST 2018
Commit: 9b5183769b869a4a69488d1fc073f175fa1f1b74
Author: Campbell Barton
Date: Fri Oct 19 14:51:55 2018 +1100
Branches: blender2.8
https://developer.blender.org/rB9b5183769b869a4a69488d1fc073f175fa1f1b74
Cleanup: compiler warnings
===================================================================
M source/blender/blenkernel/intern/shrinkwrap.c
M source/blender/draw/engines/eevee/eevee_depth_of_field.c
M source/blender/editors/mesh/editmesh_extrude_spin.c
M source/blender/editors/transform/transform_input.c
===================================================================
diff --git a/source/blender/blenkernel/intern/shrinkwrap.c b/source/blender/blenkernel/intern/shrinkwrap.c
index 1a1b852ef58..6942c8f1da3 100644
--- a/source/blender/blenkernel/intern/shrinkwrap.c
+++ b/source/blender/blenkernel/intern/shrinkwrap.c
@@ -757,7 +757,7 @@ void shrinkwrapModifier_deform(ShrinkwrapModifierData *smd, struct Scene *scene,
DerivedMesh *ss_mesh = NULL;
ShrinkwrapCalcData calc = NULL_ShrinkwrapCalcData;
- bool target_free;
+ bool target_free = false;
/* remove loop dependencies on derived meshes (TODO should this be done elsewhere?) */
if (smd->target == ob) smd->target = NULL;
diff --git a/source/blender/draw/engines/eevee/eevee_depth_of_field.c b/source/blender/draw/engines/eevee/eevee_depth_of_field.c
index c36e8601d25..602654068ff 100644
--- a/source/blender/draw/engines/eevee/eevee_depth_of_field.c
+++ b/source/blender/draw/engines/eevee/eevee_depth_of_field.c
@@ -59,7 +59,7 @@ static struct {
struct GPUShader *dof_downsample_sh[2];
struct GPUShader *dof_scatter_sh[2];
struct GPUShader *dof_resolve_sh[2];
-} e_data = {NULL}; /* Engine data */
+} e_data = {{NULL}}; /* Engine data */
extern char datatoc_effect_dof_vert_glsl[];
extern char datatoc_effect_dof_frag_glsl[];
diff --git a/source/blender/editors/mesh/editmesh_extrude_spin.c b/source/blender/editors/mesh/editmesh_extrude_spin.c
index d99caaf8380..848fe63cf8e 100644
--- a/source/blender/editors/mesh/editmesh_extrude_spin.c
+++ b/source/blender/editors/mesh/editmesh_extrude_spin.c
@@ -77,7 +77,7 @@ static int edbm_spin_exec(bContext *C, wmOperator *op)
RNA_boolean_get(op->ptr, "use_auto_merge") &&
(dupli == false) &&
(steps >= 3) &&
- fabsf((fabsf(angle) - (M_PI * 2))) <= 1e-6f);
+ fabsf((fabsf(angle) - (float)(M_PI * 2))) <= 1e-6f);
if (is_zero_v3(axis)) {
BKE_report(op->reports, RPT_ERROR, "Invalid/unset axis");
diff --git a/source/blender/editors/transform/transform_input.c b/source/blender/editors/transform/transform_input.c
index cdac18f7584..2721bccb7de 100644
--- a/source/blender/editors/transform/transform_input.c
+++ b/source/blender/editors/transform/transform_input.c
@@ -140,7 +140,7 @@ void setCustomPoints(TransInfo *UNUSED(t), MouseInput *mi, const int mval_start[
void setCustomPointsFromDirection(TransInfo *t, MouseInput *mi, const float dir[2])
{
BLI_ASSERT_UNIT_V2(dir);
- const int win_axis = t->ar ? ((abs(t->ar->winx * dir[0]) + abs(t->ar->winy * dir[1])) / 2) : 1;
+ const int win_axis = t->ar ? ((abs((int)(t->ar->winx * dir[0])) + abs((int)(t->ar->winy * dir[1]))) / 2) : 1;
const int mval_start[2] = {
mi->imval[0] + dir[0] * win_axis,
mi->imval[1] + dir[1] * win_axis,
More information about the Bf-blender-cvs
mailing list