DagerD/blender
1
1
Fork 0
forked from blender/blender
Code Pull Requests Activity

MaterialX: make caching image in MaterialX independent from bf_usd project #31

Merged
Bogdan Nagirniak merged 4 commits from matx-cache-texture_2 into matx-export-material 2023-09-22 18:12:52 +02:00
Conversation 0 Commits 4 Files Changed 9 +89 -43
Georgiy Markelov commented 2023-09-22 16:03:38 +02:00
Owner
Copy Link

Purpose

Make caching image in MaterialX independent from bf_usd project

Technical steps

  • Added callback ExportImageFunction for image caching
  • Removed WITH_HYDRA from CMakeLists
### Purpose Make caching image in MaterialX independent from `bf_usd` project ### Technical steps * Added callback `ExportImageFunction` for image caching * Removed `WITH_HYDRA` from CMakeLists
Georgiy Markelov added 2 commits 2023-09-22 16:04:01 +02:00
Georgiy Markelov requested review from Brian Savery (AMD) 2023-09-22 16:05:20 +02:00
Georgiy Markelov requested review from Bogdan Nagirniak 2023-09-22 16:05:20 +02:00
Georgiy Markelov requested review from Vasyl Pidhirskyi 2023-09-22 16:05:20 +02:00
Bogdan Nagirniak requested changes 2023-09-22 16:26:06 +02:00
source/blender/nodes/shader/materialx/node_parser.h Outdated
@ -17,6 +17,10 @@ namespace blender::nodes::materialx {
extern struct CLG_LogRef *LOG_MATERIALX_SHADER;
class GroupNodeParser;
typedef std::string (*ExportImageFunction)(Main *bmain,
Bogdan Nagirniak commented 2023-09-22 16:25:50 +02:00
Collaborator
Copy Link

Use std::function and using

Use `std::function` and `using`
DagerD marked this conversation as resolved
Georgiy Markelov added 1 commit 2023-09-22 18:01:09 +02:00
Georgiy Markelov added 1 commit 2023-09-22 18:10:30 +02:00
Bogdan Nagirniak approved these changes 2023-09-22 18:11:03 +02:00
Bogdan Nagirniak left a comment
Collaborator
Copy Link

Looks good

Looks good
Bogdan Nagirniak merged commit d1492f8592 into matx-export-material 2023-09-22 18:12:52 +02:00
Sign in to join this conversation.
Reviewers
No reviewers
Brian Savery (AMD)
Vasyl Pidhirskyi
Bogdan Nagirniak
Labels
Clear labels
No items
No Label
Milestone
Clear milestone
No items
No Milestone
Assignees
Clear assignees
No Assignees
2 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: DagerD/blender#31
No description provided.
Delete Branch "matx-cache-texture_2"

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?