diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2020-08-11 09:34:39 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2020-08-11 09:34:39 +0300 |
| commit | fb049a79761f50aefc4b4f86a23f0c9358928ccc (patch) | |
| tree | 06a62b4c4ebfa45c380154c68cd7f8e1281441b0 /source/blender/blenkernel/intern/object_dupli.c | |
| parent | 7f15120e9c30fd934dfff2a6771996e0724f988d (diff) | |
| parent | fc5ff997709bdc5ec458647eb8db0a6eced670a2 (diff) | |
Merge branch 'blender-v2.90-release' into master
Diffstat (limited to 'source/blender/blenkernel/intern/object_dupli.c')
| -rw-r--r-- | source/blender/blenkernel/intern/object_dupli.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/source/blender/blenkernel/intern/object_dupli.c b/source/blender/blenkernel/intern/object_dupli.c index 553cff33fbb..87c63e033e8 100644 --- a/source/blender/blenkernel/intern/object_dupli.c +++ b/source/blender/blenkernel/intern/object_dupli.c @@ -605,6 +605,7 @@ static const DupliGenerator gen_dupli_verts_font = { /** \} */ /* -------------------------------------------------------------------- */ +<<<<<<< HEAD /** \name Dupli-Vertices Implementation (#OB_DUPLIVERTS for #PointCloud) * \{ */ @@ -667,6 +668,8 @@ static const DupliGenerator gen_dupli_verts_pointcloud = { /** \} */ /* -------------------------------------------------------------------- */ +======= +>>>>>>> blender-v2.90-release~2 /** \name Dupli-Faces Implementation (#OB_DUPLIFACES) * \{ */ |