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

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

Browse Source 
# Conflicts:
#	Content/Editor/MaterialTemplates/Deformable.shader
#	Flax.flaxproj
#	Source/Engine/Content/Content.h
#	Source/Engine/Serialization/JsonTools.cpp
This commit is contained in:
Wojtek Figat
2026-04-01 17:14:21 +02:00
parent 9f54bca831 9a7abd751f
commit 2fc95bdf57
115 changed files with 2933 additions and 1074 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Engine/Networking/NetworkReplicator.cpp
View File

@@ -1863,7 +1863,7 @@ void NetworkInternal::NetworkReplicatorClientConnected(NetworkClient* client)
{
auto& item = it->Item;
ScriptingObject* obj = item.Object.Get();
if (!obj || !item.Spawned || item.Role != NetworkObjectRole::OwnedAuthoritative)
if (!obj || item.Role != NetworkObjectRole::OwnedAuthoritative)
continue;
// Mark this client as missing cached data