diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2016-05-11 14:36:42 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2016-05-11 14:36:42 +0300 |
| commit | d57f416e47f54241dea0892f3b064afbe1b8a899 (patch) | |
| tree | 46b9c812301668cd27eae92f1f5638e12c6d6492 /source | |
| parent | 67d2de882841f56c9cd35f0f0e7329b0c9190c97 (diff) | |
Fix incorrect FLT_MIN use
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/blenkernel/intern/DerivedMesh.c | 2 | ||||
| -rw-r--r-- | source/blender/makesrna/intern/rna_tracking.c | 4 | ||||
| -rw-r--r-- | source/blender/python/intern/bpy_rna_anim.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/blenkernel/intern/DerivedMesh.c b/source/blender/blenkernel/intern/DerivedMesh.c index 1ec714ea0bb..1bfc3d90730 100644 --- a/source/blender/blenkernel/intern/DerivedMesh.c +++ b/source/blender/blenkernel/intern/DerivedMesh.c @@ -4000,7 +4000,7 @@ void DM_init_origspace(DerivedMesh *dm) float p_nor[3], co[3]; float mat[3][3]; - float min[2] = {FLT_MAX, FLT_MAX}, max[2] = {FLT_MIN, FLT_MIN}; + float min[2] = {FLT_MAX, FLT_MAX}, max[2] = {-FLT_MAX, -FLT_MAX}; float translate[2], scale[2]; BKE_mesh_calc_poly_normal(mp, l, mv, p_nor); diff --git a/source/blender/makesrna/intern/rna_tracking.c b/source/blender/makesrna/intern/rna_tracking.c index a9901fd3a50..2564bdb800f 100644 --- a/source/blender/makesrna/intern/rna_tracking.c +++ b/source/blender/makesrna/intern/rna_tracking.c @@ -1777,8 +1777,8 @@ static void rna_def_trackingReconstructedCameras(BlenderRNA *brna) RNA_def_function_flag(func, FUNC_USE_SELF_ID); RNA_def_function_ui_description(func, "Return interpolated camera matrix for a given frame"); RNA_def_int(func, "frame", 1, MINFRAME, MAXFRAME, "Frame", "Frame number to find camera for", MINFRAME, MAXFRAME); - parm = RNA_def_float_matrix(func, "matrix", 4, 4, NULL, FLT_MIN, FLT_MAX, "Matrix", - "Interpolated camera matrix for a given frame", FLT_MIN, FLT_MAX); + parm = RNA_def_float_matrix(func, "matrix", 4, 4, NULL, -FLT_MAX, FLT_MAX, "Matrix", + "Interpolated camera matrix for a given frame", -FLT_MAX, FLT_MAX); RNA_def_property_flag(parm, PROP_THICK_WRAP); /* needed for string return value */ RNA_def_function_output(func, parm); } diff --git a/source/blender/python/intern/bpy_rna_anim.c b/source/blender/python/intern/bpy_rna_anim.c index 2ec73c3c9b7..92931eb8090 100644 --- a/source/blender/python/intern/bpy_rna_anim.c +++ b/source/blender/python/intern/bpy_rna_anim.c @@ -27,7 +27,7 @@ */ #include <Python.h> -#include <float.h> /* FLT_MIN/MAX */ +#include <float.h> /* FLT_MAX */ #include "MEM_guardedalloc.h" |