diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2014-02-07 23:07:10 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2014-02-07 23:24:05 +0400 |
| commit | b3afbcab8ff2330c1473647be330a3ffe9b11885 (patch) | |
| tree | e86b9c7d9676e63b8da92da79889dee13b8be186 /source/blender/modifiers | |
| parent | 1c24d954f4ac63f22b703756b6664a4ad1b363d4 (diff) | |
ListBase API: add utility api funcs for clearing and checking empty
Diffstat (limited to 'source/blender/modifiers')
4 files changed, 7 insertions, 4 deletions
diff --git a/source/blender/modifiers/intern/MOD_mask.c b/source/blender/modifiers/intern/MOD_mask.c index 50788f4e4a6..f3672287d70 100644 --- a/source/blender/modifiers/intern/MOD_mask.c +++ b/source/blender/modifiers/intern/MOD_mask.c @@ -140,7 +140,7 @@ static DerivedMesh *applyModifier(ModifierData *md, Object *ob, * - must have verts and therefore verts assigned to vgroups to do anything useful */ if (!(ELEM(mmd->mode, MOD_MASK_MODE_ARM, MOD_MASK_MODE_VGROUP)) || - (maxVerts == 0) || (ob->defbase.first == NULL)) + (maxVerts == 0) || BLI_listbase_is_empty(&ob->defbase)) { return dm; } diff --git a/source/blender/modifiers/intern/MOD_weightvgedit.c b/source/blender/modifiers/intern/MOD_weightvgedit.c index 0dfb0403c68..a9062c31e66 100644 --- a/source/blender/modifiers/intern/MOD_weightvgedit.c +++ b/source/blender/modifiers/intern/MOD_weightvgedit.c @@ -32,6 +32,7 @@ #include "BLI_ghash.h" #include "BLI_math.h" #include "BLI_string.h" +#include "BLI_listbase.h" #include "BLI_rand.h" #include "DNA_color_types.h" /* CurveMapping. */ @@ -197,7 +198,7 @@ static DerivedMesh *applyModifier(ModifierData *md, Object *ob, DerivedMesh *der /* Check if we can just return the original mesh. * Must have verts and therefore verts assigned to vgroups to do anything useful! */ - if ((numVerts == 0) || (ob->defbase.first == NULL)) + if ((numVerts == 0) || BLI_listbase_is_empty(&ob->defbase)) return dm; /* Get vgroup idx from its name. */ diff --git a/source/blender/modifiers/intern/MOD_weightvgmix.c b/source/blender/modifiers/intern/MOD_weightvgmix.c index 304d4c8774a..b4be0f75f81 100644 --- a/source/blender/modifiers/intern/MOD_weightvgmix.c +++ b/source/blender/modifiers/intern/MOD_weightvgmix.c @@ -31,6 +31,7 @@ #include "BLI_utildefines.h" #include "BLI_math.h" #include "BLI_string.h" +#include "BLI_listbase.h" #include "DNA_mesh_types.h" #include "DNA_meshdata_types.h" @@ -244,7 +245,7 @@ static DerivedMesh *applyModifier(ModifierData *md, Object *ob, DerivedMesh *der /* Check if we can just return the original mesh. * Must have verts and therefore verts assigned to vgroups to do anything useful! */ - if ((numVerts == 0) || (ob->defbase.first == NULL)) + if ((numVerts == 0) || BLI_listbase_is_empty(&ob->defbase)) return dm; /* Get vgroup idx from its name. */ diff --git a/source/blender/modifiers/intern/MOD_weightvgproximity.c b/source/blender/modifiers/intern/MOD_weightvgproximity.c index 63019770942..8115cdaa640 100644 --- a/source/blender/modifiers/intern/MOD_weightvgproximity.c +++ b/source/blender/modifiers/intern/MOD_weightvgproximity.c @@ -30,6 +30,7 @@ #include "BLI_utildefines.h" #include "BLI_ghash.h" +#include "BLI_listbase.h" #include "BLI_math.h" #include "BLI_string.h" #include "BLI_rand.h" @@ -380,7 +381,7 @@ static DerivedMesh *applyModifier(ModifierData *md, Object *ob, DerivedMesh *der /* Check if we can just return the original mesh. * Must have verts and therefore verts assigned to vgroups to do anything useful! */ - if ((numVerts == 0) || (ob->defbase.first == NULL)) + if ((numVerts == 0) || BLI_listbase_is_empty(&ob->defbase)) return dm; /* Get our target object. */ |