diff options
Diffstat (limited to 'intern/string')
-rw-r--r-- | intern/string/SConscript | 2 | ||||
-rw-r--r-- | intern/string/STR_String.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/intern/string/SConscript b/intern/string/SConscript index 7f817f82759..292ddf5aa63 100644 --- a/intern/string/SConscript +++ b/intern/string/SConscript @@ -4,4 +4,4 @@ Import ('env') sources = env.Glob('intern/*.cpp') incs = '.' -env.BlenderLib ('bf_string', sources, Split(incs), [], libtype=['core', 'player'], priority = [30,10] ) +env.BlenderLib ('bf_string', sources, Split(incs), [], libtype=['core', 'common','player'], priority = [50,19,0] ) diff --git a/intern/string/STR_String.h b/intern/string/STR_String.h index ec945c80c7c..941430fd976 100644 --- a/intern/string/STR_String.h +++ b/intern/string/STR_String.h @@ -142,7 +142,7 @@ public: inline operator const char *() const { return pData; } inline char *Ptr() { return pData; } inline const char *ReadPtr() const { return pData; } - inline float ToFloat() const { float x=atof(pData); return x; } + inline float ToFloat() const { float x=(float)(atof(pData)); return x; } inline int ToInt() const { return atoi(pData); } // Operators |