Merge branch 'master' into ContentExporting

2025-12-14 23:56:23 +00:00 · 2017-01-29 07:33:14 -07:00
parent 9706ae4a94 57c2830b04
commit 678ca01fb1
29 changed files with 895 additions and 187 deletions
--- a/src/Core/Resource/Script/CScriptTemplate.cpp
+++ b/src/Core/Resource/Script/CScriptTemplate.cpp
@@ -160,6 +160,7 @@ CResource* CScriptTemplate::FindDisplayAsset(CPropertyStruct *pProperties, u32&

    for (auto it = mAssets.begin(); it != mAssets.end(); it++)
    {
+        if (it->AssetType == SEditorAsset::eCollision) continue;
        CResource *pRes = nullptr;

        // File