GoaLitiuM/FlaxEngine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into 1.9

Browse Source
This commit is contained in:
Wojtek Figat
2024-08-05 11:08:51 +02:00
parent f21b259376 d6e99071aa
commit e44e44d317
62 changed files with 9529 additions and 2700 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Source/Engine/Level/Scene/Scene.cpp
View File

@@ -180,7 +180,7 @@ void Scene::CreateCsgCollider()
// Create collider
auto result = New<MeshCollider>();
result->SetStaticFlags(StaticFlags::FullyStatic);
result->SetName(CSG_COLLIDER_NAME);
result->SetName(String(CSG_COLLIDER_NAME));
result->CollisionData = CSGData.CollisionData;
result->HideFlags |= HideFlags::DontSelect;
@@ -203,7 +203,7 @@ void Scene::CreateCsgModel()
// Create model
auto result = New<StaticModel>();
result->SetStaticFlags(StaticFlags::FullyStatic);
result->SetName(CSG_MODEL_NAME);
result->SetName(String(CSG_MODEL_NAME));
result->Model = CSGData.Model;
result->HideFlags |= HideFlags::DontSelect;