Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2012-05-19 17:28:19 +0400
committerCampbell Barton <ideasman42@gmail.com>2012-05-19 17:28:19 +0400
commitaf3e348430218e609c80d86c8dd418bed15e70e8 (patch)
treea93e0453c8fe47a954594060cc5bbda90214a7f3 /source/blender/blenkernel/intern/lattice.c
parent2f5173887e0c7f6ba19664f16b177e575d82a241 (diff)
code cleanup: use TRUE/FALSE rather then 1/0 for better readability, also replace do prefix with do_ for bool vars.
Diffstat (limited to 'source/blender/blenkernel/intern/lattice.c')
-rw-r--r--source/blender/blenkernel/intern/lattice.c24
1 files changed, 14 insertions, 10 deletions
diff --git a/source/blender/blenkernel/intern/lattice.c b/source/blender/blenkernel/intern/lattice.c
index 6a69ffb474a..025ea40e82b 100644
--- a/source/blender/blenkernel/intern/lattice.c
+++ b/source/blender/blenkernel/intern/lattice.c
@@ -658,13 +658,15 @@ void curve_deform_verts(Scene *scene, Object *cuOb, Object *target,
*/
if (target && target->type == OB_MESH) {
/* if there's derived data without deformverts, don't use vgroups */
- if (dm && !dm->getVertData(dm, 0, CD_MDEFORMVERT))
- use_vgroups = 0;
- else
- use_vgroups = 1;
+ if (dm) {
+ use_vgroups = (dm->getVertData(dm, 0, CD_MDEFORMVERT) != NULL);
+ }
+ else {
+ use_vgroups = FALSE;
+ }
}
else {
- use_vgroups = 0;
+ use_vgroups = FALSE;
}
if (vgroup && vgroup[0] && use_vgroups) {
@@ -801,13 +803,15 @@ void lattice_deform_verts(Object *laOb, Object *target, DerivedMesh *dm,
*/
if (target && target->type == OB_MESH) {
/* if there's derived data without deformverts, don't use vgroups */
- if (dm && !dm->getVertData(dm, 0, CD_MDEFORMVERT))
- use_vgroups = 0;
- else
- use_vgroups = 1;
+ if (dm) {
+ use_vgroups = (dm->getVertData(dm, 0, CD_MDEFORMVERT) != NULL);
+ }
+ else {
+ use_vgroups = FALSE;
+ }
}
else {
- use_vgroups = 0;
+ use_vgroups = FALSE;
}
if (vgroup && vgroup[0] && use_vgroups) {