Merge pull request #2385 from pypeclub/feature/flame-move-utility-to-api

ynput · Dec 13, 2021 · dcd5ecf · dcd5ecf
2 parents 2ba8018 + 99939fb
commit dcd5ecf
Show file tree

Hide file tree

Showing 12 changed files with 2 additions and 1 deletion.
diff --git a/openpype/hosts/flame/scripts/wiretap_com.py → ...pe/hosts/flame/api/scripts/wiretap_com.py b/openpype/hosts/flame/scripts/wiretap_com.py → ...pe/hosts/flame/api/scripts/wiretap_com.py
diff --git a/...rt_preset/openpype_seg_thumbnails_jpg.xml → ...rt_preset/openpype_seg_thumbnails_jpg.xml b/...rt_preset/openpype_seg_thumbnails_jpg.xml → ...rt_preset/openpype_seg_thumbnails_jpg.xml
diff --git a/...export_preset/openpype_seg_video_h264.xml → ...export_preset/openpype_seg_video_h264.xml b/...export_preset/openpype_seg_video_h264.xml → ...export_preset/openpype_seg_video_h264.xml
diff --git a/...npype_flame_to_ftrack/modules/__init__.py → ...npype_flame_to_ftrack/modules/__init__.py b/...npype_flame_to_ftrack/modules/__init__.py → ...npype_flame_to_ftrack/modules/__init__.py
diff --git a/...pype_flame_to_ftrack/modules/app_utils.py → ...pype_flame_to_ftrack/modules/app_utils.py b/...pype_flame_to_ftrack/modules/app_utils.py → ...pype_flame_to_ftrack/modules/app_utils.py
diff --git a/...ype_flame_to_ftrack/modules/ftrack_lib.py → ...ype_flame_to_ftrack/modules/ftrack_lib.py b/...ype_flame_to_ftrack/modules/ftrack_lib.py → ...ype_flame_to_ftrack/modules/ftrack_lib.py
diff --git a/...pype_flame_to_ftrack/modules/panel_app.py → ...pype_flame_to_ftrack/modules/panel_app.py b/...pype_flame_to_ftrack/modules/panel_app.py → ...pype_flame_to_ftrack/modules/panel_app.py
diff --git a/...pype_flame_to_ftrack/modules/uiwidgets.py → ...pype_flame_to_ftrack/modules/uiwidgets.py b/...pype_flame_to_ftrack/modules/uiwidgets.py → ...pype_flame_to_ftrack/modules/uiwidgets.py
diff --git a/...ame_to_ftrack/openpype_flame_to_ftrack.py → ...ame_to_ftrack/openpype_flame_to_ftrack.py b/...ame_to_ftrack/openpype_flame_to_ftrack.py → ...ame_to_ftrack/openpype_flame_to_ftrack.py
diff --git a/...lame/utility_scripts/openpype_in_flame.py → .../api/utility_scripts/openpype_in_flame.py b/...lame/utility_scripts/openpype_in_flame.py → .../api/utility_scripts/openpype_in_flame.py
diff --git a/openpype/hosts/flame/api/utils.py b/openpype/hosts/flame/api/utils.py
@@ -27,6 +27,7 @@ def _sync_utility_scripts(env=None):
 
  fsd_paths = [os.path.join(
  HOST_DIR,
+ "api",
  "utility_scripts"
  )]
 

diff --git a/openpype/hosts/flame/hooks/pre_flame_setup.py b/openpype/hosts/flame/hooks/pre_flame_setup.py
@@ -22,7 +22,7 @@ class FlamePrelaunch(PreLaunchHook):
  flame_python_exe = "/opt/Autodesk/python/2021/bin/python2.7"
 
  wtc_script_path = os.path.join(
- opflame.HOST_DIR, "scripts", "wiretap_com.py")
+ opflame.HOST_DIR, "api", "scripts", "wiretap_com.py")
 
  def __init__(self, *args, **kwargs):
  super().__init__(*args, **kwargs)