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:
authorWeizhen Huang <itsnotrj@gmail.com>2022-11-11 18:17:58 +0300
committerWeizhen Huang <itsnotrj@gmail.com>2022-11-11 18:17:58 +0300
commitdad3574a8c0b673efa9d7f7c890d9562e3f6a267 (patch)
tree84dff4a90c34a44744c329de21a999289f9d209a /source/blender/nodes/shader/nodes/node_shader_tex_image.cc
parente9260afa93068d0181de6e3223f65e7bb016aecc (diff)
parentdc8a1d38b73420428f9fb878386b99ebb69dd841 (diff)
Merge branch 'master' into soc-2022-many-lights-sampling
Diffstat (limited to 'source/blender/nodes/shader/nodes/node_shader_tex_image.cc')
-rw-r--r--source/blender/nodes/shader/nodes/node_shader_tex_image.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/nodes/shader/nodes/node_shader_tex_image.cc b/source/blender/nodes/shader/nodes/node_shader_tex_image.cc
index 80398871625..9f4f885fee1 100644
--- a/source/blender/nodes/shader/nodes/node_shader_tex_image.cc
+++ b/source/blender/nodes/shader/nodes/node_shader_tex_image.cc
@@ -163,10 +163,10 @@ void register_node_type_sh_tex_image()
sh_node_type_base(&ntype, SH_NODE_TEX_IMAGE, "Image Texture", NODE_CLASS_TEXTURE);
ntype.declare = file_ns::sh_node_tex_image_declare;
- node_type_init(&ntype, file_ns::node_shader_init_tex_image);
+ ntype.initfunc = file_ns::node_shader_init_tex_image;
node_type_storage(
&ntype, "NodeTexImage", node_free_standard_storage, node_copy_standard_storage);
- node_type_gpu(&ntype, file_ns::node_shader_gpu_tex_image);
+ ntype.gpu_fn = file_ns::node_shader_gpu_tex_image;
ntype.labelfunc = node_image_label;
node_type_size_preset(&ntype, NODE_SIZE_LARGE);