Blender Git Loki

Display:

Blender Git "soc-2021-porting-modifiers-to-nodes_all" branch commits.

Page: 22 / 26

Revision d2b9cc4 by Fabian Schempp (soc-2021-porting-modifiers-to-nodes-decimate, soc-2021-porting-modifiers-to-nodes_all)

July 8, 2021, 10:11 (GMT)

Added attribute delimiter for dissolve node

Revision 1512c5c by Fabian Schempp (soc-2021-porting-modifiers-to-nodes-decimate, soc-2021-porting-modifiers-to-nodes_all)

July 7, 2021, 07:17 (GMT)

changes based on review by Hans Goudey (HooglyBoogly)

Revision 402422e by Fabian Schempp (soc-2021-porting-modifiers-to-nodes-decimate, soc-2021-porting-modifiers-to-nodes_all)

July 6, 2021, 20:26 (GMT)

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

Revision 126026c by Fabian Schempp (soc-2021-porting-modifiers-to-nodes-decimate, soc-2021-porting-modifiers-to-nodes_all)

July 6, 2021, 20:24 (GMT)

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

Revision 79f8e71 by Fabian Schempp (soc-2021-porting-modifiers-to-nodes-remesh-voxel, soc-2021-porting-modifiers-to-nodes_all)

July 6, 2021, 20:22 (GMT)

cleanup

Revision 54a45d1 by Fabian Schempp (soc-2021-porting-modifiers-to-nodes-remesh-blocks, soc-2021-porting-modifiers-to-nodes-remesh-voxel, soc-2021-porting-modifiers-to-nodes_all)

July 5, 2021, 20:23 (GMT)

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

# Conflicts:
# source/blender/blenkernel/BKE_node.h
# source/blender/nodes/NOD_geometry.h

Revision bcc1b61 by Fabian Schempp (soc-2021-porting-modifiers-to-nodes-decimate, soc-2021-porting-modifiers-to-nodes_all)

July 2, 2021, 22:56 (GMT)

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

Revision 7cacec8 by Fabian Schempp (soc-2021-porting-modifiers-to-nodes-decimate, soc-2021-porting-modifiers-to-nodes_all)

July 2, 2021, 22:07 (GMT)

merged with master and cleanup

Revision d85d59a by Fabian Schempp (soc-2021-porting-modifiers-to-nodes-decimate, soc-2021-porting-modifiers-to-nodes_all)

July 2, 2021, 19:57 (GMT)

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

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

Revision 703bdbe by Fabian Schempp (soc-2021-porting-modifiers-to-nodes-decimate, soc-2021-porting-modifiers-to-nodes_all)

July 2, 2021, 19:49 (GMT)

removed decimate node and reformatting

Revision 328084a by Fabian Schempp (soc-2021-porting-modifiers-to-nodes-decimate, soc-2021-porting-modifiers-to-nodes_all)

July 2, 2021, 19:36 (GMT)

Set default values for dissolve node

Revision 78322cb by Fabian Schempp (soc-2021-porting-modifiers-to-nodes-decimate, soc-2021-porting-modifiers-to-nodes_all)

July 2, 2021, 18:49 (GMT)

Split decimate into three different nodes.

Revision 9722c83 by Fabian Schempp (soc-2021-porting-modifiers-to-nodes-decimate, soc-2021-porting-modifiers-to-nodes_all)

June 27, 2021, 08:28 (GMT)

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

Revision f0f26b3 by Fabian Schempp (gsoc-2021-porting-modifiers-to-nodes-solidify, soc-2021-porting-modifiers-to-nodes_all)

June 25, 2021, 07:15 (GMT)

- cleanup

Revision 28ee6ef by Fabian Schempp (gsoc-2021-porting-modifiers-to-nodes-solidify, soc-2021-porting-modifiers-to-nodes_all)

June 25, 2021, 07:06 (GMT)

- changes previously lost due to merge conflict.
- some more cleanup.

Revision 6afd66c by Fabian Schempp (gsoc-2021-porting-modifiers-to-nodes-solidify, soc-2021-porting-modifiers-to-nodes_all)

June 25, 2021, 06:04 (GMT)

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

Revision 5379633 by Fabian Schempp (gsoc-2021-porting-modifiers-to-nodes-solidify, soc-2021-porting-modifiers-to-nodes_all)

June 24, 2021, 21:11 (GMT)

- corrected two comments in corresponding test