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

Fix linux build #33

Merged
Bogdan Nagirniak merged 7 commits from BogdanNagirniak/blender:matx-linux-build-fix into matx-export-material 2023-09-24 07:42:31 +02:00
Conversation 0 Commits 7 Files Changed 5 +3 -5
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 0c0ba7ee3e - Show all commits

3
source/blender/nodes/shader/materialx/node_item.cc
View File

@ -430,8 +430,7 @@ NodeItem NodeItem::atan() const
NodeItem NodeItem::atan2(const NodeItem &other) const NodeItem NodeItem::atan2(const NodeItem &other) const
{ {
return to_vector().arithmetic( return to_vector().arithmetic(other, "atan2", [](float a, float b) { return std::atan2(a, b); });
other, "atan2", [](float a, float b) { return std::atan2(a, b); });
} }
NodeItem NodeItem::sinh() const NodeItem NodeItem::sinh() const

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

@ -18,7 +18,7 @@ extern struct CLG_LogRef *LOG_MATERIALX_SHADER;
class GroupNodeParser; class GroupNodeParser;
using ExportImageFunction = std::function<std::string(Main *,Scene *, Image *, ImageUser *)>; using ExportImageFunction = std::function<std::string(Main *, Scene *, Image *, ImageUser *)>;
/** /**
* This is base abstraction class for parsing Blender nodes into MaterialX nodes. * This is base abstraction class for parsing Blender nodes into MaterialX nodes.
@ -123,8 +123,7 @@ struct NodeParserData {
void node_shader_materialx(void *data, struct bNode *node, struct bNodeSocket *out) \ void node_shader_materialx(void *data, struct bNode *node, struct bNodeSocket *out) \
{ \ { \
materialx::NodeParserData *d = reinterpret_cast<materialx::NodeParserData *>(data); \ materialx::NodeParserData *d = reinterpret_cast<materialx::NodeParserData *>(data); \
d->result = MaterialXNodeParser( \ d->result = MaterialXNodeParser(d->graph, \
d->graph, \
d->depsgraph, \ d->depsgraph, \
d->material, \ d->material, \
node, \ node, \