diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2015-07-12 00:00:56 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2015-07-12 00:00:56 +0300 |
| commit | 37a6a92f7694015bb7e16adffa1a58e913e5d391 (patch) | |
| tree | 77557fe1a1959b326eed49148d3733264d3c234e /source/blender/makesrna/intern/makesrna.c | |
| parent | 80acaa3009665f21e51494f121b3b43c13f4458e (diff) | |
| parent | 5a16f297006b728f4e777f89fa73ee83d062ee1f (diff) | |
Merge branch 'asset-experiments' into asset-engine
Conflicts:
source/blender/editors/space_file/file_ops.c
Diffstat (limited to 'source/blender/makesrna/intern/makesrna.c')
| -rw-r--r-- | source/blender/makesrna/intern/makesrna.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/makesrna/intern/makesrna.c b/source/blender/makesrna/intern/makesrna.c index 71430265d0e..b57841c38e3 100644 --- a/source/blender/makesrna/intern/makesrna.c +++ b/source/blender/makesrna/intern/makesrna.c @@ -503,7 +503,7 @@ static void rna_float_print(FILE *f, float num) { if (num == -FLT_MAX) fprintf(f, "-FLT_MAX"); else if (num == FLT_MAX) fprintf(f, "FLT_MAX"); - else if ((int)num == num) fprintf(f, "%.1ff", num); + else if ((int64_t)num == num) fprintf(f, "%.1ff", num); else fprintf(f, "%.10ff", num); } |