[Bf-blender-cvs] [d57f416] master: Fix incorrect FLT_MIN use
Campbell Barton
noreply at git.blender.org
Wed May 11 14:15:45 CEST 2016
Commit: d57f416e47f54241dea0892f3b064afbe1b8a899
Author: Campbell Barton
Date: Wed May 11 21:36:42 2016 +1000
Branches: master
https://developer.blender.org/rBd57f416e47f54241dea0892f3b064afbe1b8a899
Fix incorrect FLT_MIN use
===================================================================
M source/blender/blenkernel/intern/DerivedMesh.c
M source/blender/makesrna/intern/rna_tracking.c
M source/blender/python/intern/bpy_rna_anim.c
===================================================================
diff --git a/source/blender/blenkernel/intern/DerivedMesh.c b/source/blender/blenkernel/intern/DerivedMesh.c
index 1ec714e..1bfc3d9 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 a9901fd..2564bdb 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 2ec73c3..92931eb 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"
More information about the Bf-blender-cvs
mailing list