0001-Fix-FBXConverter-use-proper-64-bit-constant.patch 1.4 KB

12345678910111213141516171819202122232425262728293031323334353637
  1. From 30a2ecc7939449f235282eb6de42e367fc5b1867 Mon Sep 17 00:00:00 2001
  2. From: Peter Seiderer <ps.report@gmx.net>
  3. Date: Thu, 14 Jan 2016 22:13:15 +0100
  4. Subject: [PATCH] Fix FBXConverter: use proper 64-bit constant
  5. Use proper 64-bit constant for CONVERT_FBX_TIME(time) conversion, fixes:
  6. code/FBXConverter.cpp:2025: error: integer constant is too large for 'long' type
  7. code/FBXConverter.cpp:2026: error: integer constant is too large for 'long' type
  8. code/FBXConverter.cpp:2794: error: integer constant is too large for 'long' type
  9. code/FBXConverter.cpp:2868: error: integer constant is too large for 'long' type
  10. code/FBXConverter.cpp:2878: error: integer constant is too large for 'long' type
  11. code/FBXConverter.cpp:2888: error: integer constant is too large for 'long' type
  12. Signed-off-by: Peter Seiderer <ps.report@gmx.net>
  13. [Rebased on 5.0.1]
  14. Signed-off-by: Peter Seiderer <ps.report@gmx.net>
  15. ---
  16. code/FBX/FBXConverter.cpp | 2 +-
  17. 1 file changed, 1 insertion(+), 1 deletion(-)
  18. diff --git a/code/FBX/FBXConverter.cpp b/code/FBXConverter.cpp
  19. index e0c6b9c..b1e9a71 100644
  20. --- a/code/FBX/FBXConverter.cpp
  21. +++ b/code/FBX/FBXConverter.cpp
  22. @@ -67,7 +67,7 @@ namespace FBX {
  23. #define MAGIC_NODE_TAG "_$AssimpFbx$"
  24. -#define CONVERT_FBX_TIME(time) static_cast<double>(time) / 46186158000L
  25. +#define CONVERT_FBX_TIME(time) static_cast<double>(time) / 46186158000LL
  26. // XXX vc9's debugger won't step into anonymous namespaces
  27. //namespace {
  28. --
  29. 2.1.4