diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-09-26 03:01:32 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-09-26 03:01:32 +0300 |
| commit | e40870c47967144aa75c9185a6d0ba1e149bb4e2 (patch) | |
| tree | b1a88c83cf6db3f827c584aeb80a16a296207077 /source | |
| parent | c419cb7305fec8a9c36085af3d3a03b6f2850a9d (diff) | |
Cleanup: warnings, style
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/blenkernel/intern/subdiv_ccg.c | 1 | ||||
| -rw-r--r-- | source/blender/draw/intern/draw_cache_impl_mesh.c | 5 | ||||
| -rw-r--r-- | source/blender/editors/include/ED_curve.h | 1 | ||||
| -rw-r--r-- | source/blender/modifiers/intern/MOD_explode.c | 2 |
4 files changed, 5 insertions, 4 deletions
diff --git a/source/blender/blenkernel/intern/subdiv_ccg.c b/source/blender/blenkernel/intern/subdiv_ccg.c index 60fae060fd6..edac9747f68 100644 --- a/source/blender/blenkernel/intern/subdiv_ccg.c +++ b/source/blender/blenkernel/intern/subdiv_ccg.c @@ -42,7 +42,6 @@ #include "BKE_ccg.h" #include "BKE_mesh.h" #include "BKE_subdiv.h" -#include "BKE_subdiv_ccg.h" #include "BKE_subdiv_eval.h" #include "opensubdiv_topology_refiner_capi.h" diff --git a/source/blender/draw/intern/draw_cache_impl_mesh.c b/source/blender/draw/intern/draw_cache_impl_mesh.c index 8fef7675587..f00eb084665 100644 --- a/source/blender/draw/intern/draw_cache_impl_mesh.c +++ b/source/blender/draw/intern/draw_cache_impl_mesh.c @@ -1109,7 +1109,7 @@ static void vertex_weight_color(float vweight[3], float weight, bool show_alert_ if (show_alert_color) { bTheme *theme = U.themes.first; - rgb_uchar_to_float(vweight, (unsigned char*)theme->tv3d.vertex_unreferenced); + rgb_uchar_to_float(vweight, (uchar *)theme->tv3d.vertex_unreferenced); } else if (U.flag & USER_CUSTOM_RANGE) { BKE_colorband_evaluate(&U.coba_weight, weight, vweight); @@ -1127,7 +1127,8 @@ static void evaluate_vertex_weight(float vweight[3], const MDeformVert *dvert, c if (vwsel->flags & VWEIGHT_MULTIPAINT) { /* Multi-Paint feature */ input = BKE_defvert_multipaint_collective_weight( - dvert, vwsel->defgroup_tot, vwsel->defgroup_sel, vwsel->defgroup_sel_tot, (vwsel->flags & VWEIGHT_AUTO_NORMALIZE) != 0); + dvert, vwsel->defgroup_tot, vwsel->defgroup_sel, vwsel->defgroup_sel_tot, + (vwsel->flags & VWEIGHT_AUTO_NORMALIZE) != 0); /* make it black if the selected groups have no weight on a vertex */ if (input == 0.0f) { diff --git a/source/blender/editors/include/ED_curve.h b/source/blender/editors/include/ED_curve.h index 734da4641ae..03b54487731 100644 --- a/source/blender/editors/include/ED_curve.h +++ b/source/blender/editors/include/ED_curve.h @@ -43,6 +43,7 @@ struct Text; struct wmOperator; struct wmKeyConfig; struct UndoType; +struct View3D; /* curve_ops.c */ void ED_operatortypes_curve(void); diff --git a/source/blender/modifiers/intern/MOD_explode.c b/source/blender/modifiers/intern/MOD_explode.c index 2a8f3f44ea8..99c60271cec 100644 --- a/source/blender/modifiers/intern/MOD_explode.c +++ b/source/blender/modifiers/intern/MOD_explode.c @@ -1035,7 +1035,7 @@ static ParticleSystemModifierData *findPrecedingParticlesystem(Object *ob, Modif } static Mesh *applyModifier( ModifierData *md, const ModifierEvalContext *ctx, - Mesh *mesh) + Mesh *mesh) { ExplodeModifierData *emd = (ExplodeModifierData *) md; ParticleSystemModifierData *psmd = findPrecedingParticlesystem(ctx->object, md); |