diff options
author | Campbell Barton <ideasman42@gmail.com> | 2013-08-07 07:36:05 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2013-08-07 07:36:05 +0400 |
commit | f97a4bd25458fdc8da1a97f7b68a305c8ab35ff4 (patch) | |
tree | 833fde5e6a46028fb9cebf1234cca6956bb6099b /source/blender/blenkernel/intern | |
parent | c2ad963e2877851a02f2aa7355751733867bd87c (diff) |
code cleanup: more zero as NULL pointers.
Diffstat (limited to 'source/blender/blenkernel/intern')
-rw-r--r-- | source/blender/blenkernel/intern/dynamicpaint.c | 4 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/image_gen.c | 2 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/smoke.c | 6 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/tracking.c | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/source/blender/blenkernel/intern/dynamicpaint.c b/source/blender/blenkernel/intern/dynamicpaint.c index dcbbd776228..a62ca530bf9 100644 --- a/source/blender/blenkernel/intern/dynamicpaint.c +++ b/source/blender/blenkernel/intern/dynamicpaint.c @@ -3290,7 +3290,7 @@ static int dynamicPaint_paintMesh(DynamicPaintSurface *surface, if (!brush->dm) return 0; { - BVHTreeFromMesh treeData = {0}; + BVHTreeFromMesh treeData = {NULL}; float avg_brushNor[3] = {0.0f}; float brush_radius = brush->paint_distance * surface->radius_scale; int numOfVerts; @@ -4977,7 +4977,7 @@ static int dynamicPaint_doStep(Scene *scene, Object *ob, DynamicPaintSurface *su /* make sure we're dealing with a brush */ if (pmd2->brush) { DynamicPaintBrushSettings *brush = pmd2->brush; - BrushMaterials bMats = {0}; + BrushMaterials bMats = {NULL}; /* calculate brush speed vectors if required */ if (surface->type == MOD_DPAINT_SURFACE_T_PAINT && brush->flags & MOD_DPAINT_DO_SMUDGE) { diff --git a/source/blender/blenkernel/intern/image_gen.c b/source/blender/blenkernel/intern/image_gen.c index eda22a095ef..71b4f9947a4 100644 --- a/source/blender/blenkernel/intern/image_gen.c +++ b/source/blender/blenkernel/intern/image_gen.c @@ -336,7 +336,7 @@ static void checker_board_text(unsigned char *rect, float *rect_float, int width } /* cleanup the buffer. */ - BLF_buffer(mono, NULL, NULL, 0, 0, 0, FALSE); + BLF_buffer(mono, NULL, NULL, 0, 0, 0, NULL); } void BKE_image_buf_fill_checker_color(unsigned char *rect, float *rect_float, int width, int height) diff --git a/source/blender/blenkernel/intern/smoke.c b/source/blender/blenkernel/intern/smoke.c index 789b0ec5823..bb65955e3b5 100644 --- a/source/blender/blenkernel/intern/smoke.c +++ b/source/blender/blenkernel/intern/smoke.c @@ -722,7 +722,7 @@ static void obstacles_from_derivedmesh(Object *coll_ob, SmokeDomainSettings *sds DerivedMesh *dm = NULL; MVert *mvert = NULL; MFace *mface = NULL; - BVHTreeFromMesh treeData = {0}; + BVHTreeFromMesh treeData = {NULL}; int numverts, i, z; float surface_distance = 0.6; @@ -1573,7 +1573,7 @@ static void emit_from_derivedmesh(Object *flow_ob, SmokeDomainSettings *sds, Smo MVert *mvert_orig = NULL; MFace *mface = NULL; MTFace *tface = NULL; - BVHTreeFromMesh treeData = {0}; + BVHTreeFromMesh treeData = {NULL}; int numOfVerts, i, z; float flow_center[3] = {0}; @@ -2108,7 +2108,7 @@ static void update_flowsfluids(Scene *scene, Object *ob, SmokeDomainSettings *sd // float scene_subframe = scene->r.subframe; // UNUSED int subframe; for (subframe = 0; subframe <= subframes; subframe++) { - EmissionMap em_temp = {0}; + EmissionMap em_temp = {NULL}; float sample_size = 1.0f / (float)(subframes+1); float prev_frame_pos = sample_size * (float)(subframe+1); float sdt = dt * sample_size; diff --git a/source/blender/blenkernel/intern/tracking.c b/source/blender/blenkernel/intern/tracking.c index 12c2967afcf..4c363292898 100644 --- a/source/blender/blenkernel/intern/tracking.c +++ b/source/blender/blenkernel/intern/tracking.c @@ -654,7 +654,7 @@ void BKE_tracking_track_flag_clear(MovieTrackingTrack *track, int area, int flag */ int BKE_tracking_track_has_marker_at_frame(MovieTrackingTrack *track, int framenr) { - return BKE_tracking_marker_get_exact(track, framenr) != 0; + return BKE_tracking_marker_get_exact(track, framenr) != NULL; } /* Check whether track has got enabled marker at specified frame. |