diff options
author | Campbell Barton <ideasman42@gmail.com> | 2013-12-03 02:22:29 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2013-12-03 02:22:29 +0400 |
commit | 4fcd8b64da9309b668fe5d31fa6f0c1727dc3a42 (patch) | |
tree | ee8ec1803e0822717321a5be4e1d17ec157ceea7 /source/blender/blenkernel/intern | |
parent | 1cee3e53fc9e5d056c3b5f37d3ec19105a0cfeed (diff) |
Code Cleanup: remove redundant/misleading NULL checks
Diffstat (limited to 'source/blender/blenkernel/intern')
-rw-r--r-- | source/blender/blenkernel/intern/displist.c | 3 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/gpencil.c | 6 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/mask.c | 6 |
3 files changed, 3 insertions, 12 deletions
diff --git a/source/blender/blenkernel/intern/displist.c b/source/blender/blenkernel/intern/displist.c index 3f35ced3550..9670a1892b0 100644 --- a/source/blender/blenkernel/intern/displist.c +++ b/source/blender/blenkernel/intern/displist.c @@ -1179,8 +1179,7 @@ static void curve_calc_orcodm(Scene *scene, Object *ob, DerivedMesh *derivedFina /* add an orco layer if needed */ add_orco_dm(ob, derivedFinal, orcodm); - if (orcodm) - orcodm->release(orcodm); + orcodm->release(orcodm); } void BKE_displist_make_surf(Scene *scene, Object *ob, ListBase *dispbase, diff --git a/source/blender/blenkernel/intern/gpencil.c b/source/blender/blenkernel/intern/gpencil.c index 3ce44dcb1f1..232ee335fbb 100644 --- a/source/blender/blenkernel/intern/gpencil.c +++ b/source/blender/blenkernel/intern/gpencil.c @@ -62,11 +62,7 @@ bool free_gpencil_strokes(bGPDframe *gpf) { bGPDstroke *gps, *gpsn; bool changed = (gpf->strokes.first != NULL); - - /* error checking */ - if (gpf == NULL) - return false; - + /* free strokes */ for (gps = gpf->strokes.first; gps; gps = gpsn) { gpsn = gps->next; diff --git a/source/blender/blenkernel/intern/mask.c b/source/blender/blenkernel/intern/mask.c index 6097e05d91d..b20b4294f84 100644 --- a/source/blender/blenkernel/intern/mask.c +++ b/source/blender/blenkernel/intern/mask.c @@ -1813,15 +1813,11 @@ MaskLayerShape *BKE_mask_layer_shape_duplicate(MaskLayerShape *masklay_shape) return masklay_shape_copy; } -bool BKE_mask_layer_shape_unlink(MaskLayer *masklay, MaskLayerShape *masklay_shape) +void BKE_mask_layer_shape_unlink(MaskLayer *masklay, MaskLayerShape *masklay_shape) { - bool changed = (masklay_shape != NULL); - BLI_remlink(&masklay->splines_shapes, masklay_shape); BKE_mask_layer_shape_free(masklay_shape); - - return changed; } static int mask_layer_shape_sort_cb(void *masklay_shape_a_ptr, void *masklay_shape_b_ptr) |