[Bf-blender-cvs] [4029cdee7b0] master: Merge branch 'blender-v3.4-release'

Hans Goudey noreply at git.blender.org
Fri Nov 25 22:29:16 CET 2022


Commit: 4029cdee7b0fcae20ff4265af0310ce5483bcaae
Author: Hans Goudey
Date:   Fri Nov 25 15:28:48 2022 -0600
Branches: master
https://developer.blender.org/rB4029cdee7b0fcae20ff4265af0310ce5483bcaae

Merge branch 'blender-v3.4-release'

===================================================================



===================================================================

diff --cc source/blender/nodes/shader/nodes/node_shader_squeeze.cc
index 31965c5e13e,33f6d15abfd..c0fe5a21418
--- a/source/blender/nodes/shader/nodes/node_shader_squeeze.cc
+++ b/source/blender/nodes/shader/nodes/node_shader_squeeze.cc
@@@ -34,9 -34,10 +34,10 @@@ void register_node_type_sh_squeeze(
  
    static bNodeType ntype;
  
-   sh_node_type_base(&ntype, SH_NODE_SQUEEZE, "Squeeze Value", NODE_CLASS_CONVERTER);
+   sh_node_type_base(&ntype, SH_NODE_SQUEEZE, "Squeeze Value (Legacy)", NODE_CLASS_CONVERTER);
+   ntype.gather_link_search_ops = nullptr;
    ntype.declare = file_ns::node_declare;
 -  node_type_gpu(&ntype, file_ns::gpu_shader_squeeze);
 +  ntype.gpu_fn = file_ns::gpu_shader_squeeze;
  
    nodeRegisterType(&ntype);
  }



More information about the Bf-blender-cvs mailing list