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

MaterialX: fix review comments #19

Merged
Bogdan Nagirniak merged 10 commits from matx-fix-review-comments into matx-export-material 2023-09-14 02:01:04 +02:00
Conversation 0 Commits 10 Files Changed 34 +5 -4
4 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 2938eec7a0 - Show all commits

4
source/blender/blenkernel/BKE_node.h
View File

@ -225,7 +225,7 @@ typedef int (*NodeGPUExecFunction)(struct GPUMaterial *mat,
struct bNodeExecData *execdata, struct bNodeExecData *execdata,
struct GPUNodeStack *in, struct GPUNodeStack *in,
struct GPUNodeStack *out); struct GPUNodeStack *out);
typedef void (*NodeMaterialXExecFunction)(void *data, typedef void (*NodeMaterialXFunction)(void *data,
struct bNode *node, struct bNode *node,
struct bNodeSocket *out); struct bNodeSocket *out);
@ -343,7 +343,7 @@ typedef struct bNodeType {
/* gpu */ /* gpu */
NodeGPUExecFunction gpu_fn; NodeGPUExecFunction gpu_fn;
/* MaterialX */ /* MaterialX */
NodeMaterialXExecFunction materialx_fn; NodeMaterialXFunction materialx_fn;
/* Get an instance of this node's compositor operation. Freeing the instance is the /* Get an instance of this node's compositor operation. Freeing the instance is the
* responsibility of the caller. */ * responsibility of the caller. */

2
source/blender/io/usd/hydra/material.cc
View File

@ -88,7 +88,7 @@ void MaterialData::init()
} }
} }
} }
else { else
#endif #endif
{ {
usd_material = usd::create_usd_material(export_context, material_path, (Material *)id, "st"); usd_material = usd::create_usd_material(export_context, material_path, (Material *)id, "st");

1
source/blender/nodes/shader/CMakeLists.txt
View File

@ -145,6 +145,7 @@ set(LIB
) )
if(WITH_MATERIALX) if(WITH_MATERIALX)
add_definitions(-DWITH_MATERIALX)
list(APPEND SRC list(APPEND SRC
materialx/material.cc materialx/material.cc
materialx/node_item.cc materialx/node_item.cc

2
source/blender/nodes/shader/node_shader_util.hh
View File

@ -25,7 +25,7 @@
#ifdef WITH_MATERIALX #ifdef WITH_MATERIALX
# include "materialx/node_parser.h" # include "materialx/node_parser.h"
#else #else
# define NODE_SHADER_MATERIALX_BEGIN NodeMaterialXExecFunction node_shader_materialx = nullptr; # define NODE_SHADER_MATERIALX_BEGIN NodeMaterialXFunction node_shader_materialx = nullptr;
# define NODE_SHADER_MATERIALX_END # define NODE_SHADER_MATERIALX_END
#endif #endif
BogdanNagirniak marked this conversation as resolved
Bogdan Nagirniak commented 2023-09-13 15:37:46 +02:00
Review
Copy Link

Seems could be simpliifed to:

#  define NODE_SHADER_MATERIALX_BEGIN \
    void *node_shader_materialx = nullptr;
#  define NODE_SHADER_MATERIALX_END

Export code would be:

NODE_SHADER_MATERIALX_BEGIN
#ifdef WITH_MATERIALX
{
....
}
#endif
NODE_SHADER_MATERIALX_END
Seems could be simpliifed to: ``` # define NODE_SHADER_MATERIALX_BEGIN \ void *node_shader_materialx = nullptr; # define NODE_SHADER_MATERIALX_END ``` Export code would be: ``` NODE_SHADER_MATERIALX_BEGIN #ifdef WITH_MATERIALX { .... } #endif NODE_SHADER_MATERIALX_END ```