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-03-24 10:24:53 +0400
committerCampbell Barton <ideasman42@gmail.com>2012-03-24 10:24:53 +0400
commit5a90ea77bc1333efe4e1e54984a080550ed3f707 (patch)
tree8ba5f94ddcd2c57440197a910305daae5e913554 /source/blender/modifiers/intern/MOD_boolean.c
parent69e6894b15271884623ea6f56ead06db83acbe99 (diff)
style cleanup: follow style guide for formatting of if/for/while loops, and else if's
Diffstat (limited to 'source/blender/modifiers/intern/MOD_boolean.c')
-rw-r--r--source/blender/modifiers/intern/MOD_boolean.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/source/blender/modifiers/intern/MOD_boolean.c b/source/blender/modifiers/intern/MOD_boolean.c
index 2b3c1f00541..e4e89db403d 100644
--- a/source/blender/modifiers/intern/MOD_boolean.c
+++ b/source/blender/modifiers/intern/MOD_boolean.c
@@ -83,7 +83,7 @@ static void updateDepgraph(ModifierData *md, DagForest *forest,
{
BooleanModifierData *bmd = (BooleanModifierData*) md;
- if(bmd->object) {
+ if (bmd->object) {
DagNode *curNode = dag_get_node(forest, bmd->object);
dag_add_relation(forest, curNode, obNode,
@@ -96,14 +96,14 @@ static DerivedMesh *get_quick_derivedMesh(DerivedMesh *derivedData, DerivedMesh
{
DerivedMesh *result = NULL;
- if(derivedData->getNumPolys(derivedData) == 0 || dm->getNumPolys(dm) == 0) {
+ if (derivedData->getNumPolys(derivedData) == 0 || dm->getNumPolys(dm) == 0) {
switch(operation) {
case eBooleanModifierOp_Intersect:
result = CDDM_new(0, 0, 0, 0, 0);
break;
case eBooleanModifierOp_Union:
- if(derivedData->getNumPolys(derivedData)) result = derivedData;
+ if (derivedData->getNumPolys(derivedData)) result = derivedData;
else result = CDDM_copy(dm);
break;
@@ -125,12 +125,12 @@ static DerivedMesh *applyModifier(ModifierData *md, Object *ob,
BooleanModifierData *bmd = (BooleanModifierData*) md;
DerivedMesh *dm;
- if(!bmd->object)
+ if (!bmd->object)
return derivedData;
dm = bmd->object->derivedFinal;
- if(dm) {
+ if (dm) {
DerivedMesh *result;
/* when one of objects is empty (has got no faces) we could speed up
@@ -138,7 +138,7 @@ static DerivedMesh *applyModifier(ModifierData *md, Object *ob,
* Returning mesh is depended on modifiers operation (sergey) */
result = get_quick_derivedMesh(derivedData, dm, bmd->operation);
- if(result == NULL) {
+ if (result == NULL) {
DM_ensure_tessface(dm); /* BMESH - UNTIL MODIFIER IS UPDATED FOR MPoly */
DM_ensure_tessface(derivedData); /* BMESH - UNTIL MODIFIER IS UPDATED FOR MPoly */
@@ -153,7 +153,7 @@ static DerivedMesh *applyModifier(ModifierData *md, Object *ob,
/* if new mesh returned, return it; otherwise there was
* an error, so delete the modifier object */
- if(result)
+ if (result)
return result;
else
modifier_setError(md, "%s", TIP_("Can't execute boolean operation."));