Skip to content

Commit 1b1ca6f

Browse files
committed
Add Houdini py7 support
1 parent 4b18c04 commit 1b1ca6f

4 files changed

Lines changed: 10 additions & 4 deletions

File tree

CMakeLists.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,9 @@ if("$ENV{AR_DCC_NAME}" STREQUAL "HOUDINI")
114114
elseif(EXISTS "${AR_HOUDINI_ROOT}/python/bin/python3.9")
115115
set(AR_PYTHON_LIB python3.9)
116116
set(AR_PYTHON_LIB_NUMBER python39)
117+
elseif(EXISTS "${AR_HOUDINI_ROOT}/python/bin/python3.7m")
118+
set(AR_PYTHON_LIB python3.7m)
119+
set(AR_PYTHON_LIB_NUMBER python37)
117120
else()
118121
set(AR_PYTHON_LIB python3.7)
119122
set(AR_PYTHON_LIB_NUMBER python37)

docs/src/resolvers/CachedResolver/example.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ class ResolverContext:
185185
re-applies the correct mapping. If the identifier is encountered again it will use the C++ cache, which means everything is kept fast.
186186
"""
187187
#######
188-
base_identifier = assetPath.removeprefix(RELATIVE_PATH_IDENTIFIER_PREFIX)
188+
base_identifier = assetPath[len(RELATIVE_PATH_IDENTIFIER_PREFIX):]
189189
anchor_path, entity_element = base_identifier.split("?")
190190
entity_type, entity_identifier = anchor_path.split("/")
191191
entity_element, entity_version = entity_element.split("-")

files/implementations/CachedResolver/code/PythonExpose.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ def ResolveAndCache(context, assetPath):
119119
)
120120
resolved_asset_path = ""
121121
if assetPath.startswith(RELATIVE_PATH_IDENTIFIER_PREFIX):
122-
base_identifier = assetPath.removeprefix(RELATIVE_PATH_IDENTIFIER_PREFIX)
122+
base_identifier = assetPath[len(RELATIVE_PATH_IDENTIFIER_PREFIX):]
123123
anchor_path, entity_element = base_identifier.split("?")
124124
entity_type, entity_identifier = anchor_path.split("/")
125125
entity_element, entity_version = entity_element.split("-")

src/CachedResolver/PythonExpose.py

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -126,8 +126,11 @@ def ResolveAndCache(context, assetPath):
126126
asset_b_file_path = os.path.join(current_dir_path, "assetB.usd")
127127
context.AddCachingPair("assetA.usd", asset_a_file_path)
128128
context.AddCachingPair("assetB.usd", asset_b_file_path)
129-
if assetPath.startswith("relativePath|"):
130-
relative_path, anchor_path = assetPath.removeprefix("relativePath|").split("?")
129+
relative_path_prefix = "relativePath|"
130+
if assetPath.startswith(relative_path_prefix):
131+
relative_path, anchor_path = assetPath[len(relative_path_prefix) :].split(
132+
"?"
133+
)
131134
anchor_path = anchor_path[:-1] if anchor_path[-1] == "/" else anchor_path[:anchor_path.rfind("/")]
132135
resolved_asset_path = os.path.normpath(os.path.join(anchor_path, relative_path))
133136
context.AddCachingPair(assetPath, resolved_asset_path)

0 commit comments

Comments
 (0)