diff options
| author | Antony Riakiotakis <kalast@gmail.com> | 2012-08-10 04:42:11 +0400 |
|---|---|---|
| committer | Antony Riakiotakis <kalast@gmail.com> | 2012-08-10 04:42:11 +0400 |
| commit | 539c3d296de87b0b31705fe19b7dc1a761f09399 (patch) | |
| tree | cb8db6fef5265eeb739e0759378bb487f9a6d499 /source/blender/modifiers/intern | |
| parent | 30fda0216b77061bcd1e22bf0099fee0565ced15 (diff) | |
| parent | 32a8d7cbdf9a705a5b97554651ab500ed5962fb4 (diff) | |
merge with trunk 49750
Diffstat (limited to 'source/blender/modifiers/intern')
| -rw-r--r-- | source/blender/modifiers/intern/MOD_cloth.c | 2 | ||||
| -rw-r--r-- | source/blender/modifiers/intern/MOD_collision.c | 2 | ||||
| -rw-r--r-- | source/blender/modifiers/intern/MOD_meshdeform.c | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/modifiers/intern/MOD_cloth.c b/source/blender/modifiers/intern/MOD_cloth.c index 2c38bc42a8f..dc6fef9b617 100644 --- a/source/blender/modifiers/intern/MOD_cloth.c +++ b/source/blender/modifiers/intern/MOD_cloth.c @@ -169,7 +169,7 @@ static void freeData(ModifierData *md) ClothModifierData *clmd = (ClothModifierData *) md; if (clmd) { - if (G.rt > 0) + if (G.debug_value > 0) printf("clothModifier_freeData\n"); cloth_free_modifier_extern(clmd); diff --git a/source/blender/modifiers/intern/MOD_collision.c b/source/blender/modifiers/intern/MOD_collision.c index 45296e322b5..b9384e6208e 100644 --- a/source/blender/modifiers/intern/MOD_collision.c +++ b/source/blender/modifiers/intern/MOD_collision.c @@ -132,7 +132,7 @@ static void deformVerts(ModifierData *md, Object *ob, current_time = BKE_scene_frame_get(md->scene); - if (G.rt > 0) + if (G.debug_value > 0) printf("current_time %f, collmd->time_xnew %f\n", current_time, collmd->time_xnew); numverts = dm->getNumVerts(dm); diff --git a/source/blender/modifiers/intern/MOD_meshdeform.c b/source/blender/modifiers/intern/MOD_meshdeform.c index 12209fd69fb..aafb21b3c34 100644 --- a/source/blender/modifiers/intern/MOD_meshdeform.c +++ b/source/blender/modifiers/intern/MOD_meshdeform.c @@ -274,7 +274,7 @@ static void meshdeformModifier_do( /* get cage vertex in world space with binding transform */ copy_v3_v3(co, cagecos[a]); - if (G.rt != 527) { + if (G.debug_value != 527) { mul_m4_v3(mmd->bindmat, co); /* compute difference with world space bind coord */ sub_v3_v3v3(dco[a], co, bindcagecos[a]); @@ -324,7 +324,7 @@ static void meshdeformModifier_do( if (totweight > 0.0f) { mul_v3_fl(co, fac / totweight); mul_m3_v3(icagemat, co); - if (G.rt != 527) + if (G.debug_value != 527) add_v3_v3(vertexCos[b], co); else copy_v3_v3(vertexCos[b], co); |