diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-03-28 21:08:33 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-03-28 21:08:33 +0400 |
| commit | 9b9c4184c88c49ff96f3f23cbfbd00f6811d7301 (patch) | |
| tree | 4c5aaf763f28710d07b3ec364088a98de8ae9794 /source/blender/editors/physics/particle_edit.c | |
| parent | faf07c3e2b6cb180d1580b4160ff6534b4754b76 (diff) | |
misc nodes & editors: floats were being implicitly promoted to doubles, adjust to use floats.
+ minor update to demo_mode
Diffstat (limited to 'source/blender/editors/physics/particle_edit.c')
| -rw-r--r-- | source/blender/editors/physics/particle_edit.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/editors/physics/particle_edit.c b/source/blender/editors/physics/particle_edit.c index 697f016f2d4..3f2fcaab94a 100644 --- a/source/blender/editors/physics/particle_edit.c +++ b/source/blender/editors/physics/particle_edit.c @@ -430,7 +430,7 @@ static int key_test_depth(PEData *data, float co[3]) } #endif - if((float)uz - 0.00001 > depth) + if((float)uz - 0.00001f > depth) return 0; else return 1; @@ -3246,7 +3246,7 @@ static int particle_intersect_dm(Scene *scene, Object *ob, DerivedMesh *dm, floa if(isect_line_tri_v3(co1, co2, v1, v2, v3, &cur_d, cur_uv)){ if(cur_d<*min_d){ *min_d=cur_d; - min_w[0]= 1.0 - cur_uv[0] - cur_uv[1]; + min_w[0]= 1.0f - cur_uv[0] - cur_uv[1]; min_w[1]= cur_uv[0]; min_w[2]= cur_uv[1]; min_w[3]= 0.0f; @@ -3260,7 +3260,7 @@ static int particle_intersect_dm(Scene *scene, Object *ob, DerivedMesh *dm, floa if(isect_line_tri_v3(co1, co2, v1, v3, v4, &cur_d, cur_uv)){ if(cur_d<*min_d){ *min_d=cur_d; - min_w[0]= 1.0 - cur_uv[0] - cur_uv[1]; + min_w[0]= 1.0f - cur_uv[0] - cur_uv[1]; min_w[1]= 0.0f; min_w[2]= cur_uv[0]; min_w[3]= cur_uv[1]; |