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/modifiers | |
parent | c2ad963e2877851a02f2aa7355751733867bd87c (diff) |
code cleanup: more zero as NULL pointers.
Diffstat (limited to 'source/blender/modifiers')
-rw-r--r-- | source/blender/modifiers/intern/MOD_boolean_util.c | 4 | ||||
-rw-r--r-- | source/blender/modifiers/intern/MOD_warp.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/modifiers/intern/MOD_boolean_util.c b/source/blender/modifiers/intern/MOD_boolean_util.c index 02ec6108733..98fab9c06ff 100644 --- a/source/blender/modifiers/intern/MOD_boolean_util.c +++ b/source/blender/modifiers/intern/MOD_boolean_util.c @@ -519,8 +519,8 @@ static DerivedMesh *NewBooleanDerivedMesh_intern( DerivedMesh *result = NULL; - if (dm == NULL || dm_select == NULL) return 0; - if (!dm->getNumTessFaces(dm) || !dm_select->getNumTessFaces(dm_select)) return 0; + if (dm == NULL || dm_select == NULL) return NULL; + if (!dm->getNumTessFaces(dm) || !dm_select->getNumTessFaces(dm_select)) return NULL; /* we map the final object back into ob's local coordinate space. For this * we need to compute the inverse transform from global to ob (inv_mat), diff --git a/source/blender/modifiers/intern/MOD_warp.c b/source/blender/modifiers/intern/MOD_warp.c index 3429acdcea4..4fac201377a 100644 --- a/source/blender/modifiers/intern/MOD_warp.c +++ b/source/blender/modifiers/intern/MOD_warp.c @@ -368,8 +368,8 @@ ModifierTypeInfo modifierType_Warp = { /* deformMatrices */ NULL, /* deformVertsEM */ deformVertsEM, /* deformMatricesEM */ NULL, - /* applyModifier */ 0, - /* applyModifierEM */ 0, + /* applyModifier */ NULL, + /* applyModifierEM */ NULL, /* initData */ initData, /* requiredDataMask */ requiredDataMask, /* freeData */ freeData, |