birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Integrating up through commit 90f050496

Browse Source
This commit is contained in:
alexpete
2021-04-07 14:03:29 -07:00
parent 8f2ed080a9
commit c2cbd430fe
2694 changed files with 285622 additions and 176874 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scripts/project_manager/projects.py
+18 -6
View File
@@ -384,11 +384,18 @@ class ProjectDialog(QObject):
:return: None
"""
remove_gems = self.get_selected_project_gems()
for this_gem in remove_gems:
gem_path = self.path_for_gem(this_gem)
add_remove_gem.add_remove_gem(False, engine_path, gem_path or os.path.join(engine_path, 'Gems', this_gem),
self.path_for_selection(), gem_name=this_gem)
add_remove_gem.add_remove_gem(add=False,
dev_root=engine_path,
gem_path=gem_path or os.path.join(engine_path, 'Gems', this_gem),
gem_target=this_gem,
project_path=self.path_for_selection(),
dependencies_file=None,
runtime_dependency=True,
tool_dependency=True,
server_dependency=True)
self.update_gems()
def manage_gems_handler(self):
@@ -455,10 +462,15 @@ class ProjectDialog(QObject):
if not gem_info:
logger.error(f'Unknown gem {this_gem}!')
continue
add_remove_gem.add_remove_gem(True, engine_path, this_gem[1], self.path_for_selection(),
gem_name=gem_info.get('Name'),
add_remove_gem.add_remove_gem(add=True,
dev_root=engine_path,
gem_path=this_gem[1],
gem_target=gem_info.get('Name'),
project_path=self.path_for_selection(),
dependencies_file=None,
runtime_dependency=gem_info.get('Runtime', False),
tool_dependency=gem_info.get('Tools', False))
tool_dependency=gem_info.get('Tools', False),
server_dependency=gem_info.get('Tools', False))
self.update_gems()
def create_project_handler(self):
scripts/project_manager/pyside.py
+1
View File
@@ -29,6 +29,7 @@ def add_pyside_environment(bin_path):
old_env = os.environ.copy()
binaries_path = Path(os.path.normpath(bin_path))
platforms_path = binaries_path.joinpath("platforms")
logger.info(f'Adding binaries path {binaries_path}')
os.environ["QT_QPA_PLATFORM_PLUGIN_PATH"] = str(platforms_path)
path = os.environ['PATH']