diff options
| author | Fabian Schempp <fabianschempp@googlemail.com> | 2022-02-04 00:53:51 +0300 |
|---|---|---|
| committer | Fabian Schempp <fabianschempp@googlemail.com> | 2022-02-04 00:53:51 +0300 |
| commit | c1ae3b850c9c1b43ce6928add5362bcea63d7223 (patch) | |
| tree | 3820ed84811a44634a5ebdf9e03e089b56bc094a /source/blender/editors/mesh/editmesh_polybuild.c | |
| parent | bcb7f4c17278c3320ee34100eae37822ee780b10 (diff) | |
| parent | 3e0ffe5a396e5879f3e8d5cfbdfa438d87df0394 (diff) | |
Merge branch 'master' into soc-2021-porting-modifiers-to-nodes-solidify
# Conflicts:
# release/scripts/startup/nodeitems_builtins.py
# source/blender/blenkernel/BKE_node.h
# source/blender/blenkernel/intern/node.cc
# source/blender/geometry/CMakeLists.txt
# source/blender/geometry/intern/solidify_nonmanifold.c
# source/blender/makesdna/DNA_node_types.h
# source/blender/makesrna/RNA_enum_types.h
# source/blender/nodes/CMakeLists.txt
# source/blender/nodes/NOD_geometry.h
# source/blender/nodes/NOD_static_types.h
Diffstat (limited to 'source/blender/editors/mesh/editmesh_polybuild.c')
0 files changed, 0 insertions, 0 deletions