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-10-21 09:46:41 +0400
committerCampbell Barton <ideasman42@gmail.com>2012-10-21 09:46:41 +0400
commitf3ece5a108db0bdbefb4663ef4ebd9a7e039e263 (patch)
treecb6329453be169ef1ec49ef8b8d50a6b14364880 /source/blender/modifiers
parenta1a0c8da13a7b91b0264c7535752864379f3d852 (diff)
style cleanup: trailing tabs & expand some non prefix tabs into spaces.
Diffstat (limited to 'source/blender/modifiers')
-rw-r--r--source/blender/modifiers/intern/MOD_cloth.c2
-rw-r--r--source/blender/modifiers/intern/MOD_decimate.c8
-rw-r--r--source/blender/modifiers/intern/MOD_screw.c4
3 files changed, 7 insertions, 7 deletions
diff --git a/source/blender/modifiers/intern/MOD_cloth.c b/source/blender/modifiers/intern/MOD_cloth.c
index 8eb47f4066c..54f3efcc84c 100644
--- a/source/blender/modifiers/intern/MOD_cloth.c
+++ b/source/blender/modifiers/intern/MOD_cloth.c
@@ -180,7 +180,7 @@ static void freeData(ModifierData *md)
MEM_freeN(clmd->sim_parms);
}
if (clmd->coll_parms)
- MEM_freeN(clmd->coll_parms);
+ MEM_freeN(clmd->coll_parms);
BKE_ptcache_free_list(&clmd->ptcaches);
clmd->point_cache = NULL;
diff --git a/source/blender/modifiers/intern/MOD_decimate.c b/source/blender/modifiers/intern/MOD_decimate.c
index 765e264365b..e7ece60121e 100644
--- a/source/blender/modifiers/intern/MOD_decimate.c
+++ b/source/blender/modifiers/intern/MOD_decimate.c
@@ -50,8 +50,8 @@
#include "BKE_tessmesh.h"
/* testing only! - Campbell */
-// #define USE_DECIMATE_BMESH
-// #include "PIL_time.h"
+#define USE_DECIMATE_BMESH
+#include "PIL_time.h"
#ifdef WITH_MOD_DECIMATE
@@ -89,7 +89,7 @@ static DerivedMesh *applyModifier(ModifierData *md, Object *UNUSED(ob),
BMEditMesh *em;
BMesh *bm;
- // TIMEIT_START(decim);
+ TIMEIT_START(decim);
if (dmd->percent == 1.0f) {
return dm;
@@ -111,7 +111,7 @@ static DerivedMesh *applyModifier(ModifierData *md, Object *UNUSED(ob),
BMEdit_Free(em);
MEM_freeN(em);
- // TIMEIT_END(decim);
+ TIMEIT_END(decim);
return result;
}
diff --git a/source/blender/modifiers/intern/MOD_screw.c b/source/blender/modifiers/intern/MOD_screw.c
index a94b4834d18..3387eaf679b 100644
--- a/source/blender/modifiers/intern/MOD_screw.c
+++ b/source/blender/modifiers/intern/MOD_screw.c
@@ -215,7 +215,7 @@ static DerivedMesh *applyModifier(ModifierData *md, Object *ob,
if (totlen != 0.0f) {
float zero[3] = {0.0f, 0.0f, 0.0f};
- float cp[3];
+ float cp[3];
screw_ofs = closest_to_line_v3(cp, mtx_tx[3], zero, axis_vec);
}
else {
@@ -831,7 +831,7 @@ static DerivedMesh *applyModifier(ModifierData *md, Object *ob,
}
/* close the loop*/
- if (close) {
+ if (close) {
if (do_flip) {
ml_new[3].v = i1;
ml_new[2].v = i2;