Wojtek Figat 09f2be907e Merge remote-tracking branch 'origin/master' into 1.7 ...

# Conflicts:
#	Flax.flaxproj

2023-10-09 12:40:47 +02:00

..

Prefab.Apply.cpp

Cleanup code in #1367 and fix api compatibility, revert joint changes

2023-09-28 13:10:58 +02:00

Prefab.cpp

Cleanup code in #1367 and fix api compatibility, revert joint changes

2023-09-28 13:10:58 +02:00

Prefab.h

Fix spawning nested prefab with different root actor

2023-06-11 20:43:31 +02:00

PrefabManager.cpp

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

2023-10-09 12:40:47 +02:00

PrefabManager.h

Cleanup code in #1367 and fix api compatibility, revert joint changes

2023-09-28 13:10:58 +02:00