[Bf-blender-cvs] [aef45a4ef25] soc-2021-porting-modifiers-to-nodes-extrude: Merge remote-tracking branch 'origin/soc-2021-porting-modifiers-to-nodes-extrude' into soc-2021-porting-modifiers-to-nodes-extrude
Fabian Schempp
noreply at git.blender.org
Thu Aug 5 23:50:35 CEST 2021
Commit: aef45a4ef2593365eeb40f11f4b8ea3d399c9717
Author: Fabian Schempp
Date: Thu Aug 5 23:48:58 2021 +0200
Branches: soc-2021-porting-modifiers-to-nodes-extrude
https://developer.blender.org/rBaef45a4ef2593365eeb40f11f4b8ea3d399c9717
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
===================================================================
===================================================================
More information about the Bf-blender-cvs
mailing list