Browse Source

Cleanup: redundant parenthesis, NULL checks

master
Campbell Barton 2 years ago
parent
commit
2a96e8be39
  1. 2
      intern/dualcon/dualcon.h
  2. 2
      intern/dualcon/intern/octree.cpp
  3. 4
      source/blender/editors/physics/physics_fluid.c
  4. 2
      source/blender/modifiers/intern/MOD_surfacedeform.c

2
intern/dualcon/dualcon.h

@ -29,7 +29,7 @@ typedef float (*DualConCo)[3];
typedef unsigned int (*DualConTri)[3];
typedef unsigned int(*DualConLoop);
typedef unsigned int *DualConLoop;
typedef struct DualConInput {
DualConLoop mloop;

2
intern/dualcon/intern/octree.cpp

@ -480,7 +480,7 @@ void Octree::trace()
if (chdpath != NULL) {
dc_printf("there are incomplete rings.\n");
printPaths(chdpath);
};
}
}
Node *Octree::trace(Node *newnode, int *st, int len, int depth, PathList *&paths)

4
source/blender/editors/physics/physics_fluid.c

@ -361,7 +361,7 @@ static void fluid_bake_endjob(void *customdata)
RPT_INFO, "Fluid: %s complete! (%.2f)", job->name, PIL_check_seconds_timer() - job->start);
}
else {
if (mds->error != NULL && mds->error[0] != '\0') {
if (mds->error[0] != '\0') {
WM_reportf(RPT_ERROR, "Fluid: %s failed: %s", job->name, mds->error);
}
else { /* User canceled the bake */
@ -473,7 +473,7 @@ static void fluid_free_endjob(void *customdata)
RPT_INFO, "Fluid: %s complete! (%.2f)", job->name, PIL_check_seconds_timer() - job->start);
}
else {
if (mds->error != NULL && mds->error[0] != '\0') {
if (mds->error[0] != '\0') {
WM_reportf(RPT_ERROR, "Fluid: %s failed: %s", job->name, mds->error);
}
else { /* User canceled the free job */

2
source/blender/modifiers/intern/MOD_surfacedeform.c

@ -112,7 +112,7 @@ typedef struct SDefDeformData {
const SDefVert *const bind_verts;
float (*const targetCos)[3];
float (*const vertexCos)[3];
float(*const weights);
float *const weights;
float const strength;
} SDefDeformData;

Loading…
Cancel
Save