diff options
| author | Fabian Schempp <fabianschempp@googlemail.com> | 2021-08-06 00:48:58 +0300 |
|---|---|---|
| committer | Fabian Schempp <fabianschempp@googlemail.com> | 2021-08-06 00:48:58 +0300 |
| commit | aef45a4ef2593365eeb40f11f4b8ea3d399c9717 (patch) | |
| tree | de2e8e00995bd44c3fe73bc1746b4a0f99816ce8 /source/blender/compositor/operations/COM_WrapOperation.cc | |
| parent | 504e3c563f851fc0296fb2d6b96704233c477814 (diff) | |
| parent | c659af0c13ea83ada39d514e014b1596ed19f5d1 (diff) | |
Merge remote-tracking branch 'origin/soc-2021-porting-modifiers-to-nodes-extrude' into soc-2021-porting-modifiers-to-nodes-extrude
# Conflicts:
# source/blender/bmesh/intern/bmesh_mesh.c
# source/blender/bmesh/intern/bmesh_mesh.h
# source/blender/nodes/NOD_static_types.h
# source/blender/nodes/geometry/nodes/node_geo_extrude.cc
Diffstat (limited to 'source/blender/compositor/operations/COM_WrapOperation.cc')
0 files changed, 0 insertions, 0 deletions