BogdanNagirniak
/
blender
forked from blender/blender
0
0
Fork 3
Code Pull Requests Activity

Fix wrong path for PXR_MTLX_STDLIB_SEARCH_PATHS #30

Merged
Bogdan Nagirniak merged 3 commits from BLEN-398 into hydra-render 2023-04-28 11:44:03 +02:00
Conversation 0 Commits 3 Files Changed 1 +5 -2
Georgiy Markelov commented 2023-04-25 10:36:20 +02:00
Collaborator
Copy Link

Fix setting PXR_MTLX_STDLIB_SEARCH_PATHS depending on the platform.

Fix setting `PXR_MTLX_STDLIB_SEARCH_PATHS` depending on the platform.
Georgiy Markelov added 1 commit 2023-04-25 10:36:38 +02:00
Georgiy Markelov requested review from Brian Savery (AMD) 2023-04-25 10:36:45 +02:00
Brian Savery (AMD) was assigned by Georgiy Markelov 2023-04-25 10:36:49 +02:00
Georgiy Markelov self-assigned this 2023-04-25 10:36:49 +02:00
Bogdan Nagirniak was assigned by Georgiy Markelov 2023-04-25 10:36:49 +02:00
Bogdan Nagirniak approved these changes 2023-04-25 11:17:04 +02:00
Brian Savery (AMD) requested changes 2023-04-27 00:45:28 +02:00
scripts/modules/bpy_hydra.py Outdated
@ -66,2 +67,3 @@
_bpy_hydra.init()
os.environ['PXR_MTLX_STDLIB_SEARCH_PATHS'] = str(Path(bpy.app.binary_path).parent / "materialx/libraries") + \
root_folder = "blender.shared" if platform.system() == 'Windows' else "lib"
os.environ['PXR_MTLX_STDLIB_SEARCH_PATHS'] = str(Path(bpy.app.binary_path).parent / f"{root_folder}/materialx/libraries") + \
Brian Savery (AMD) commented 2023-04-27 00:45:22 +02:00
Collaborator
Copy Link

Isn't there a more compact way to do this in python? Seems you're going back and forth from string to path and using path separators? If it's a path you shouldn't have to use os.pathseparator.

Isn't there a more compact way to do this in python? Seems you're going back and forth from string to path and using path separators? If it's a path you shouldn't have to use os.pathseparator.
Bogdan Nagirniak commented 2023-04-27 09:12:18 +02:00
Owner
Copy Link

os.pathsep equals to ';' in windows or ':' in unix to separate different paths in env variable

`os.pathsep` equals to ';' in windows or ':' in unix to separate different paths in env variable
Brian Savery (AMD) commented 2023-04-27 23:05:35 +02:00
Collaborator
Copy Link

I understand that but doing some_path / some_other_path takes care of worrying about the pathsep

I understand that but doing `some_path / some_other_path` takes care of worrying about the pathsep
BrianSavery marked this conversation as resolved
Brian Savery (AMD) approved these changes 2023-04-27 23:09:50 +02:00
Brian Savery (AMD) left a comment
Collaborator
Copy Link

Still think this could be cleaner, I would do
`os.pathsep.join([Path(bpy.app.binary_path).parent / f"{root_folder}/materialx/libraries"), os.environ.get('PXR_MTLX_STDLIB_SEARCH_PATHS', "")])

Still think this could be cleaner, I would do `os.pathsep.join([Path(bpy.app.binary_path).parent / f"{root_folder}/materialx/libraries"), os.environ.get('PXR_MTLX_STDLIB_SEARCH_PATHS', "")])
Georgiy Markelov added 1 commit 2023-04-28 11:08:54 +02:00
Georgiy Markelov added 1 commit 2023-04-28 11:14:01 +02:00
Bogdan Nagirniak merged commit 486b6ea406 into hydra-render 2023-04-28 11:44:03 +02:00
Sign in to join this conversation.
Reviewers
No reviewers
Bogdan Nagirniak
Brian Savery (AMD)
Labels
Clear labels
No items
No Label
Milestone
Clear milestone
No items
No Milestone
Assignees
Clear assignees
No Assignees
Brian Savery (AMD)
Bogdan Nagirniak
3 Participants
Notifications
Due Date
The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: BogdanNagirniak/blender#30
No description provided.
Delete Branch "BLEN-398"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?