Merge branch 'features/ig.multiscene' of github.com:Unity-Technologies/film-tv-toolbox into features/ig.multiscene

# Conflicts:
#	com.unity.film-tv.toolbox/Editor/MultiScene/MultiSceneLoaderEditor.cs

This commit is contained in:

Mike Wuetherick

2020-01-01 18:08:04 -08:00

Родитель 4544cc1464 9e62c1736f

Коммит 3fe721e00b