Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHans Goudey <h.goudey@me.com>2021-08-23 22:41:44 +0300
committerHans Goudey <h.goudey@me.com>2021-08-23 22:41:44 +0300
commit24d1c352e8e59139efa8a1cdefed13952f8c99ee (patch)
tree021375ff7f4ba77f721065f711d9edbce67c2dbe /source/blender/nodes/shader
parentb3639670ee001cc77480cdc8db54ce517d992e3b (diff)
Make branch compile after recent multifunction network removaltemp-geometry-nodes-fields-prototype
Diffstat (limited to 'source/blender/nodes/shader')
-rw-r--r--source/blender/nodes/shader/nodes/node_shader_tex_noise.cc10
1 files changed, 4 insertions, 6 deletions
diff --git a/source/blender/nodes/shader/nodes/node_shader_tex_noise.cc b/source/blender/nodes/shader/nodes/node_shader_tex_noise.cc
index a9ff82f42ea..43515f0502f 100644
--- a/source/blender/nodes/shader/nodes/node_shader_tex_noise.cc
+++ b/source/blender/nodes/shader/nodes/node_shader_tex_noise.cc
@@ -191,19 +191,17 @@ class NoiseTextureFunction1D : public blender::fn::MultiFunction {
}
};
-static void sh_node_tex_noise_expand_in_mf_network(blender::nodes::NodeMFNetworkBuilder &builder)
+static void sh_node_tex_noise_build_multi_function(
+ blender::nodes::NodeMultiFunctionBuilder &builder)
{
/* TODO: Not only support 1D and 3D. */
- NodeTexNoise *tex = builder.dnode()->storage<NodeTexNoise>();
+ NodeTexNoise *tex = (NodeTexNoise *)builder.node().storage;
if (tex->dimensions == 1) {
builder.construct_and_set_matching_fn<NoiseTextureFunction1D>();
}
else if (tex->dimensions == 3) {
builder.construct_and_set_matching_fn<NoiseTextureFunction3D>();
}
- else {
- builder.set_not_implemented();
- }
}
/* node type definition */
@@ -218,7 +216,7 @@ void register_node_type_sh_tex_noise(void)
&ntype, "NodeTexNoise", node_free_standard_storage, node_copy_standard_storage);
node_type_gpu(&ntype, node_shader_gpu_tex_noise);
node_type_update(&ntype, node_shader_update_tex_noise);
- ntype.expand_in_mf_network = sh_node_tex_noise_expand_in_mf_network;
+ ntype.build_multi_function = sh_node_tex_noise_build_multi_function;
nodeRegisterType(&ntype);
}