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 +2 -4
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 37bb54fc61 - Show all commits

6
source/blender/nodes/shader/materialx/node_parser.h
View File

@ -17,10 +17,8 @@ namespace blender::nodes::materialx {
extern struct CLG_LogRef *LOG_MATERIALX_SHADER; extern struct CLG_LogRef *LOG_MATERIALX_SHADER;
class GroupNodeParser; class GroupNodeParser;
typedef std::string (*ExportImageFunction)(Main *bmain,
DagerD marked this conversation as resolved Outdated
Bogdan Nagirniak commented 2023-09-22 16:25:50 +02:00
Outdated
Review
Copy Link

Use std::function and using

Use `std::function` and `using`
Scene *Scene, using ExportImageFunction = std::function<std::string(Main *,Scene *, Image *, ImageUser *)>;
Image *image,
ImageUser *iuser);
class NodeParser { class NodeParser {
protected: protected: