v4games
/
assimp
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into SceneCombiner_Memory_Leaks

pull/3788/head
Scott Baldric 2021-04-23 07:42:32 -05:00 committed by GitHub
parent aae3788247 c8ad1cb078
commit 4b47b7a552
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
code/AssetLib/glTF/glTFAsset.h
View File

@ -954,7 +954,9 @@ namespace glTF
virtual void AttachToDocument(Document& doc) = 0; virtual void AttachToDocument(Document& doc) = 0;
virtual void DetachFromDocument() = 0; virtual void DetachFromDocument() = 0;
#if !defined(ASSIMP_BUILD_NO_EXPORT)
virtual void WriteObjects(AssetWriter& writer) = 0; virtual void WriteObjects(AssetWriter& writer) = 0;
#endif
}; };
@ -986,8 +988,10 @@ namespace glTF
void AttachToDocument(Document& doc); void AttachToDocument(Document& doc);
void DetachFromDocument(); void DetachFromDocument();
#if !defined(ASSIMP_BUILD_NO_EXPORT)
void WriteObjects(AssetWriter& writer) void WriteObjects(AssetWriter& writer)
{ WriteLazyDict<T>(*this, writer); } { WriteLazyDict<T>(*this, writer); }
#endif
Ref<T> Add(T* obj); Ref<T> Add(T* obj);

2
code/AssetLib/glTF/glTFImporter.cpp
View File

@ -43,7 +43,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include "AssetLib/glTF/glTFImporter.h" #include "AssetLib/glTF/glTFImporter.h"
#include "AssetLib/glTF/glTFAsset.h" #include "AssetLib/glTF/glTFAsset.h"
#if !defined(ASSIMP_BUILD_NO_EXPORT)
#include "AssetLib/glTF/glTFAssetWriter.h" #include "AssetLib/glTF/glTFAssetWriter.h"
#endif
#include "PostProcessing/MakeVerboseFormat.h" #include "PostProcessing/MakeVerboseFormat.h"
#include <assimp/StringComparison.h> #include <assimp/StringComparison.h>

4
code/AssetLib/glTF2/glTF2Asset.h
View File

@ -997,7 +997,9 @@ public:
virtual void AttachToDocument(Document &doc) = 0; virtual void AttachToDocument(Document &doc) = 0;
virtual void DetachFromDocument() = 0; virtual void DetachFromDocument() = 0;
#if !defined(ASSIMP_BUILD_NO_EXPORT)
virtual void WriteObjects(AssetWriter &writer) = 0; virtual void WriteObjects(AssetWriter &writer) = 0;
#endif
}; };
template <class T> template <class T>
@ -1030,7 +1032,9 @@ class LazyDict : public LazyDictBase {
void AttachToDocument(Document &doc); void AttachToDocument(Document &doc);
void DetachFromDocument(); void DetachFromDocument();
#if !defined(ASSIMP_BUILD_NO_EXPORT)
void WriteObjects(AssetWriter &writer) { WriteLazyDict<T>(*this, writer); } void WriteObjects(AssetWriter &writer) { WriteLazyDict<T>(*this, writer); }
#endif
Ref<T> Add(T *obj); Ref<T> Add(T *obj);

2
code/AssetLib/glTF2/glTF2Importer.cpp
View File

@ -44,7 +44,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include "AssetLib/glTF2/glTF2Importer.h" #include "AssetLib/glTF2/glTF2Importer.h"
#include "PostProcessing/MakeVerboseFormat.h" #include "PostProcessing/MakeVerboseFormat.h"
#include "AssetLib/glTF2/glTF2Asset.h" #include "AssetLib/glTF2/glTF2Asset.h"
#if !defined(ASSIMP_BUILD_NO_EXPORT)
#include "AssetLib/glTF2/glTF2AssetWriter.h" #include "AssetLib/glTF2/glTF2AssetWriter.h"
#endif
#include <assimp/CreateAnimMesh.h> #include <assimp/CreateAnimMesh.h>
#include <assimp/StringComparison.h> #include <assimp/StringComparison.h>