Blender Git Commits

Added attribute delimiter for dissolve node

changes based on review by Hans Goudey (HooglyBoogly)

Merge branch 'master' into soc-2021-porting-modifiers-to-nodes-decimate

# Conflicts:
# source/blender/blenkernel/BKE_node.h
# source/blender/blenkernel/intern/node.cc
# source/blender/nodes/CMakeLists.txt
# source/blender/nodes/NOD_geometry.h
# source/blender/nodes/NOD_static_types.h

Merge remote-tracking branch 'origin/soc-2021-porting-modifiers-to-nodes-decimate' into soc-2021-porting-modifiers-to-nodes-decimate

Geometry Nodes: Collapse Node, Dissolve Node, Unsubdivide Node

initially working node

added factor as slot

Merge branch 'master' into gsoc-2021-porting-modifiers-to-nodes-decimate

# Conflicts:
# source/blender/blenkernel/BKE_node.h
# source/blender/blenkernel/intern/node.cc
# source/blender/nodes/CMakeLists.txt
# source/blender/nodes/NOD_geometry.h
# source/blender/nodes/NOD_static_types.h

Split decimate into three different nodes.

Set default values for dissolve node

removed decimate node and reformatting

Merge branch 'master' into soc-2021-porting-modifiers-to-nodes-decimate

# Conflicts:
# source/blender/blenkernel/BKE_node.h
# source/blender/nodes/CMakeLists.txt

merged with master and cleanup

Differential Revision: https://developer.blender.org/D11791

merged with master and cleanup

Merge branch 'master' into soc-2021-porting-modifiers-to-nodes-decimate

# Conflicts:
# source/blender/blenkernel/BKE_node.h
# source/blender/nodes/CMakeLists.txt

removed decimate node and reformatting

Set default values for dissolve node

Split decimate into three different nodes.

Merge branch 'master' into gsoc-2021-porting-modifiers-to-nodes-decimate

# Conflicts:
# source/blender/blenkernel/BKE_node.h
# source/blender/blenkernel/intern/node.cc
# source/blender/nodes/CMakeLists.txt
# source/blender/nodes/NOD_geometry.h
# source/blender/nodes/NOD_static_types.h

added factor as slot

initially working node

Initial setup for decimate node