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>2011-03-27 21:22:04 +0400
committerCampbell Barton <ideasman42@gmail.com>2011-03-27 21:22:04 +0400
commita73c3fe5c992777718431d5e5bb5f8a2c3b7a1bc (patch)
tree51ca1d7a06715f0dde24196157c915b12da334c0 /source/blender/blenkernel/intern/lattice.c
parent9c8f1e2ef487483bc374feaed9ff709e07638623 (diff)
subsurf, derived mesh and other misc files: floats were being implicitly promoted to doubles, adjust to use floats.
Diffstat (limited to 'source/blender/blenkernel/intern/lattice.c')
-rw-r--r--source/blender/blenkernel/intern/lattice.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/source/blender/blenkernel/intern/lattice.c b/source/blender/blenkernel/intern/lattice.c
index 091c4a2fe50..f66afff0741 100644
--- a/source/blender/blenkernel/intern/lattice.c
+++ b/source/blender/blenkernel/intern/lattice.c
@@ -412,7 +412,7 @@ void calc_latt_deform(Object *ob, float *co, float weight)
for(ww= wi-1; ww<=wi+2; ww++) {
w= tw[ww-wi+1];
- if(w!=0.0) {
+ if(w != 0.0f) {
if(ww>0) {
if(ww<lt->pntsw) idx_w= ww*lt->pntsu*lt->pntsv;
else idx_w= (lt->pntsw-1)*lt->pntsu*lt->pntsv;
@@ -422,7 +422,7 @@ void calc_latt_deform(Object *ob, float *co, float weight)
for(vv= vi-1; vv<=vi+2; vv++) {
v= w*tv[vv-vi+1];
- if(v!=0.0) {
+ if(v != 0.0f) {
if(vv>0) {
if(vv<lt->pntsv) idx_v= idx_w + vv*lt->pntsu;
else idx_v= idx_w + (lt->pntsv-1)*lt->pntsu;
@@ -432,7 +432,7 @@ void calc_latt_deform(Object *ob, float *co, float weight)
for(uu= ui-1; uu<=ui+2; uu++) {
u= weight*v*tu[uu-ui+1];
- if(u!=0.0) {
+ if(u != 0.0f) {
if(uu>0) {
if(uu<lt->pntsu) idx_u= idx_v + uu;
else idx_u= idx_v + (lt->pntsu-1);
@@ -508,7 +508,7 @@ static int where_on_path_deform(Object *ob, float ctime, float *vec, float *dir,
if(bl && bl->poly> -1) cycl= 1;
if(cycl==0) {
- ctime1= CLAMPIS(ctime, 0.0, 1.0);
+ ctime1= CLAMPIS(ctime, 0.0f, 1.0f);
}
else ctime1= ctime;
@@ -519,16 +519,16 @@ static int where_on_path_deform(Object *ob, float ctime, float *vec, float *dir,
Path *path= cu->path;
float dvec[3];
- if(ctime < 0.0) {
+ if(ctime < 0.0f) {
sub_v3_v3v3(dvec, path->data[1].vec, path->data[0].vec);
mul_v3_fl(dvec, ctime*(float)path->len);
add_v3_v3(vec, dvec);
if(quat) copy_qt_qt(quat, path->data[0].quat);
if(radius) *radius= path->data[0].radius;
}
- else if(ctime > 1.0) {
+ else if(ctime > 1.0f) {
sub_v3_v3v3(dvec, path->data[path->len-1].vec, path->data[path->len-2].vec);
- mul_v3_fl(dvec, (ctime-1.0)*(float)path->len);
+ mul_v3_fl(dvec, (ctime-1.0f)*(float)path->len);
add_v3_v3(vec, dvec);
if(quat) copy_qt_qt(quat, path->data[path->len-1].quat);
if(radius) *radius= path->data[path->len-1].radius;