[Bf-blender-cvs] [9e91aea40a0] geometry-nodes-curve-support: Merge branch 'displist-to-cpp' into geometry-nodes-curve-support

[Hans Goudey]

Commit: 9e91aea40a031fe1e6297f2ded881a2caaad94ed
Author: Hans Goudey
Date:   Wed Mar 31 11:41:23 2021 -0500
Branches: geometry-nodes-curve-support
https://developer.blender.org/rB9e91aea40a031fe1e6297f2ded881a2caaad94ed

Merge branch 'displist-to-cpp' into geometry-nodes-curve-support

===================================================================



===================================================================

diff --cc source/blender/blenkernel/CMakeLists.txt
index 7396b1fe269,92327fc806d..0df3d394446
--- a/source/blender/blenkernel/CMakeLists.txt
+++ b/source/blender/blenkernel/CMakeLists.txt
@@@ -117,8 -117,7 +117,8 @@@ set(SR
    intern/customdata_file.c
    intern/data_transfer.c
    intern/deform.c
 +  intern/derived_curve.cc
-   intern/displist.c
+   intern/displist.cc
    intern/displist_tangent.c
    intern/dynamicpaint.c
    intern/editlattice.c