Jelajahi Sumber

Merge branch 'master' of github.com:bkaradzic/bgfx

bkaradzic 13 tahun lalu
induk
melakukan
28158d8c05
2 mengubah file dengan 3 tambahan dan 3 penghapusan
  1. 2 2
      3rdparty/openctm/lib/openctmpp.h
  2. 1 1
      3rdparty/openctm/tools/dae.cpp

+ 2 - 2
3rdparty/openctm/lib/openctmpp.h

@@ -95,7 +95,7 @@ class CTMimporter {
     {
       CTMenum err = ctmGetError(mContext);
       if(err != CTM_NONE)
-        throw ctm_error(err);
+        abort(); //throw ctm_error(err);
     }
 
   public:
@@ -251,7 +251,7 @@ class CTMexporter {
     {
       CTMenum err = ctmGetError(mContext);
       if(err != CTM_NONE)
-        throw ctm_error(err);
+        abort(); //throw ctm_error(err);
     }
 
   public:

+ 1 - 1
3rdparty/openctm/tools/dae.cpp

@@ -168,7 +168,7 @@ Source& GetSource(map<string, Source >& sources, map<string, vector<Input> >& ve
       
     }
   } else {
-    throw string("Error");
+    abort(); //throw string("Error");
   }
   
   return srcIterator->second;