archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Cleanup: warnings, style

Browse Source
This commit is contained in:
Campbell Barton
2018-09-26 10:01:32 +10:00
parent c419cb7305
commit e40870c479
4 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
source/blender/blenkernel/intern/subdiv_ccg.c
View File

@@ -42,7 +42,6 @@
#include "BKE_ccg.h" #include "BKE_ccg.h"
#include "BKE_mesh.h" #include "BKE_mesh.h"
#include "BKE_subdiv.h" #include "BKE_subdiv.h"
#include "BKE_subdiv_ccg.h"
#include "BKE_subdiv_eval.h" #include "BKE_subdiv_eval.h"
#include "opensubdiv_topology_refiner_capi.h" #include "opensubdiv_topology_refiner_capi.h"

5
source/blender/draw/intern/draw_cache_impl_mesh.c
View File

@@ -1109,7 +1109,7 @@ static void vertex_weight_color(float vweight[3], float weight, bool show_alert_
if (show_alert_color) { if (show_alert_color) {
bTheme *theme = U.themes.first; 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) { else if (U.flag & USER_CUSTOM_RANGE) {
BKE_colorband_evaluate(&U.coba_weight, weight, vweight); 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) { if (vwsel->flags & VWEIGHT_MULTIPAINT) {
/* Multi-Paint feature */ /* Multi-Paint feature */
input = BKE_defvert_multipaint_collective_weight( 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 */ /* make it black if the selected groups have no weight on a vertex */
if (input == 0.0f) { if (input == 0.0f) {

1
source/blender/editors/include/ED_curve.h
View File

@@ -43,6 +43,7 @@ struct Text;
struct wmOperator; struct wmOperator;
struct wmKeyConfig; struct wmKeyConfig;
struct UndoType; struct UndoType;
struct View3D;
/* curve_ops.c */ /* curve_ops.c */
void ED_operatortypes_curve(void); void ED_operatortypes_curve(void);

2
source/blender/modifiers/intern/MOD_explode.c
View File

@@ -1035,7 +1035,7 @@ static ParticleSystemModifierData *findPrecedingParticlesystem(Object *ob, Modif
} }
static Mesh *applyModifier( static Mesh *applyModifier(
ModifierData *md, const ModifierEvalContext *ctx, ModifierData *md, const ModifierEvalContext *ctx,
Mesh *mesh) Mesh *mesh)
{ {
ExplodeModifierData *emd = (ExplodeModifierData *) md; ExplodeModifierData *emd = (ExplodeModifierData *) md;
ParticleSystemModifierData *psmd = findPrecedingParticlesystem(ctx->object, md); ParticleSystemModifierData *psmd = findPrecedingParticlesystem(ctx->object, md);