[Bf-blender-cvs] [c21199a0ba7] geometry-nodes-curve-support: Geometry Nodes Curves: Rename files
Hans Goudey
noreply at git.blender.org
Thu Apr 22 16:38:03 CEST 2021
Commit: c21199a0ba7fd0cf32b2f3371b8967c4191e5d5a
Author: Hans Goudey
Date: Thu Apr 22 09:37:53 2021 -0500
Branches: geometry-nodes-curve-support
https://developer.blender.org/rBc21199a0ba7fd0cf32b2f3371b8967c4191e5d5a
Geometry Nodes Curves: Rename files
===================================================================
R100 source/blender/blenkernel/BKE_derived_curve.hh source/blender/blenkernel/BKE_spline.hh
M source/blender/blenkernel/CMakeLists.txt
M source/blender/blenkernel/intern/derived_curve.cc
M source/blender/blenkernel/intern/displist.cc
M source/blender/blenkernel/intern/geometry_component_curve.cc
M source/blender/blenkernel/intern/geometry_set.cc
R099 source/blender/blenkernel/intern/derived_curve_spline_base.cc source/blender/blenkernel/intern/spline_base.cc
R099 source/blender/blenkernel/intern/derived_curve_spline_bezier.cc source/blender/blenkernel/intern/spline_bezier.cc
R099 source/blender/blenkernel/intern/derived_curve_spline_nurbs.cc source/blender/blenkernel/intern/spline_nurbs.cc
R099 source/blender/blenkernel/intern/derived_curve_spline_poly.cc source/blender/blenkernel/intern/spline_poly.cc
M source/blender/nodes/geometry/nodes/node_geo_curve_sample_points.cc
M source/blender/nodes/geometry/nodes/node_geo_curve_to_mesh.cc
M source/blender/nodes/geometry/nodes/node_geo_curve_trim.cc
M source/blender/nodes/geometry/nodes/node_geo_join_geometry.cc
M source/blender/nodes/geometry/nodes/node_geo_object_info.cc
M source/blender/nodes/geometry/nodes/node_geo_transform.cc
===================================================================
diff --git a/source/blender/blenkernel/BKE_derived_curve.hh b/source/blender/blenkernel/BKE_spline.hh
similarity index 100%
rename from source/blender/blenkernel/BKE_derived_curve.hh
rename to source/blender/blenkernel/BKE_spline.hh
diff --git a/source/blender/blenkernel/CMakeLists.txt b/source/blender/blenkernel/CMakeLists.txt
index 72c90c44a13..17639eaba85 100644
--- a/source/blender/blenkernel/CMakeLists.txt
+++ b/source/blender/blenkernel/CMakeLists.txt
@@ -118,10 +118,6 @@ set(SRC
intern/data_transfer.c
intern/deform.c
intern/derived_curve.cc
- intern/derived_curve_spline_base.cc
- intern/derived_curve_spline_bezier.cc
- intern/derived_curve_spline_nurbs.cc
- intern/derived_curve_spline_poly.cc
intern/displist.cc
intern/displist_tangent.c
intern/dynamicpaint.c
@@ -247,6 +243,10 @@ set(SRC
intern/softbody.c
intern/sound.c
intern/speaker.c
+ intern/spline_base.cc
+ intern/spline_bezier.cc
+ intern/spline_nurbs.cc
+ intern/spline_poly.cc
intern/studiolight.c
intern/subdiv.c
intern/subdiv_ccg.c
@@ -328,7 +328,7 @@ set(SRC
BKE_customdata_file.h
BKE_data_transfer.h
BKE_deform.h
- BKE_derived_curve.hh
+ BKE_spline.hh
BKE_displist.h
BKE_displist_tangent.h
BKE_duplilist.h
diff --git a/source/blender/blenkernel/intern/derived_curve.cc b/source/blender/blenkernel/intern/derived_curve.cc
index 36b3dd2aff6..9f5f9143641 100644
--- a/source/blender/blenkernel/intern/derived_curve.cc
+++ b/source/blender/blenkernel/intern/derived_curve.cc
@@ -21,7 +21,7 @@
#include "DNA_curve_types.h"
#include "BKE_curve.h"
-#include "BKE_derived_curve.hh"
+#include "BKE_spline.hh"
using blender::Array;
using blender::float3;
diff --git a/source/blender/blenkernel/intern/displist.cc b/source/blender/blenkernel/intern/displist.cc
index 3f3ffee19be..0b960add98d 100644
--- a/source/blender/blenkernel/intern/displist.cc
+++ b/source/blender/blenkernel/intern/displist.cc
@@ -44,7 +44,6 @@
#include "BKE_anim_path.h"
#include "BKE_curve.h"
-#include "BKE_derived_curve.hh"
#include "BKE_displist.h"
#include "BKE_font.h"
#include "BKE_geometry_set.hh"
@@ -56,6 +55,7 @@
#include "BKE_mesh.h"
#include "BKE_modifier.h"
#include "BKE_object.h"
+#include "BKE_spline.hh"
#include "BLI_sys_types.h" // for intptr_t support
diff --git a/source/blender/blenkernel/intern/geometry_component_curve.cc b/source/blender/blenkernel/intern/geometry_component_curve.cc
index a1f77c36cc0..a37b1da3847 100644
--- a/source/blender/blenkernel/intern/geometry_component_curve.cc
+++ b/source/blender/blenkernel/intern/geometry_component_curve.cc
@@ -14,7 +14,7 @@
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#include "BKE_derived_curve.hh"
+#include "BKE_spline.hh"
#include "BKE_attribute_access.hh"
#include "BKE_attribute_math.hh"
@@ -192,7 +192,8 @@ class BuiltinSplineAttributeProvider final : public BuiltinAttributeProvider {
return false;
}
- bool try_create(GeometryComponent &UNUSED(component)) const final
+ bool try_create(GeometryComponent &UNUSED(component),
+ const AttributeInit &UNUSED(initializer)) const final
{
return false;
}
@@ -327,7 +328,8 @@ class BuiltinPointAttributeProvider final : public BuiltinAttributeProvider {
return false;
}
- bool try_create(GeometryComponent &UNUSED(component)) const final
+ bool try_create(GeometryComponent &UNUSED(component),
+ const AttributeInit &UNUSED(initializer)) const final
{
return false;
}
diff --git a/source/blender/blenkernel/intern/geometry_set.cc b/source/blender/blenkernel/intern/geometry_set.cc
index d52f41c6bbd..1493eedf01c 100644
--- a/source/blender/blenkernel/intern/geometry_set.cc
+++ b/source/blender/blenkernel/intern/geometry_set.cc
@@ -18,13 +18,13 @@
#include "BKE_attribute.h"
#include "BKE_attribute_access.hh"
-#include "BKE_derived_curve.hh"
#include "BKE_geometry_set.hh"
#include "BKE_lib_id.h"
#include "BKE_mesh.h"
#include "BKE_mesh_wrapper.h"
#include "BKE_modifier.h"
#include "BKE_pointcloud.h"
+#include "BKE_spline.hh"
#include "BKE_volume.h"
#include "DNA_collection_types.h"
diff --git a/source/blender/blenkernel/intern/derived_curve_spline_base.cc b/source/blender/blenkernel/intern/spline_base.cc
similarity index 99%
rename from source/blender/blenkernel/intern/derived_curve_spline_base.cc
rename to source/blender/blenkernel/intern/spline_base.cc
index 3140a5d55ca..88ac8aa1a30 100644
--- a/source/blender/blenkernel/intern/derived_curve_spline_base.cc
+++ b/source/blender/blenkernel/intern/spline_base.cc
@@ -20,7 +20,7 @@
#include "DNA_curve_types.h"
-#include "BKE_derived_curve.hh"
+#include "BKE_spline.hh"
using blender::Array;
using blender::float3;
diff --git a/source/blender/blenkernel/intern/derived_curve_spline_bezier.cc b/source/blender/blenkernel/intern/spline_bezier.cc
similarity index 99%
rename from source/blender/blenkernel/intern/derived_curve_spline_bezier.cc
rename to source/blender/blenkernel/intern/spline_bezier.cc
index b0ff18116d1..b8f3717c464 100644
--- a/source/blender/blenkernel/intern/derived_curve_spline_bezier.cc
+++ b/source/blender/blenkernel/intern/spline_bezier.cc
@@ -18,7 +18,7 @@
#include "BLI_listbase.h"
#include "BLI_span.hh"
-#include "BKE_derived_curve.hh"
+#include "BKE_spline.hh"
using blender::Array;
using blender::float3;
diff --git a/source/blender/blenkernel/intern/derived_curve_spline_nurbs.cc b/source/blender/blenkernel/intern/spline_nurbs.cc
similarity index 99%
rename from source/blender/blenkernel/intern/derived_curve_spline_nurbs.cc
rename to source/blender/blenkernel/intern/spline_nurbs.cc
index 0691dfdd84c..a03a0a23ca2 100644
--- a/source/blender/blenkernel/intern/derived_curve_spline_nurbs.cc
+++ b/source/blender/blenkernel/intern/spline_nurbs.cc
@@ -20,7 +20,7 @@
#include "BLI_virtual_array.hh"
#include "BKE_attribute_math.hh"
-#include "BKE_derived_curve.hh"
+#include "BKE_spline.hh"
using blender::Array;
using blender::float3;
diff --git a/source/blender/blenkernel/intern/derived_curve_spline_poly.cc b/source/blender/blenkernel/intern/spline_poly.cc
similarity index 99%
rename from source/blender/blenkernel/intern/derived_curve_spline_poly.cc
rename to source/blender/blenkernel/intern/spline_poly.cc
index 23e88192da2..aa9935cb055 100644
--- a/source/blender/blenkernel/intern/derived_curve_spline_poly.cc
+++ b/source/blender/blenkernel/intern/spline_poly.cc
@@ -19,7 +19,7 @@
#include "BLI_span.hh"
#include "BKE_curve.h"
-#include "BKE_derived_curve.hh"
+#include "BKE_spline.hh"
using blender::Array;
using blender::float3;
diff --git a/source/blender/nodes/geometry/nodes/node_geo_curve_sample_points.cc b/source/blender/nodes/geometry/nodes/node_geo_curve_sample_points.cc
index dd3b94cfcff..080cfdaf5c5 100644
--- a/source/blender/nodes/geometry/nodes/node_geo_curve_sample_points.cc
+++ b/source/blender/nodes/geometry/nodes/node_geo_curve_sample_points.cc
@@ -14,8 +14,8 @@
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#include "BKE_derived_curve.hh"
#include "BKE_pointcloud.h"
+#include "BKE_spline.hh"
#include "UI_interface.h"
#include "UI_resources.h"
diff --git a/source/blender/nodes/geometry/nodes/node_geo_curve_to_mesh.cc b/source/blender/nodes/geometry/nodes/node_geo_curve_to_mesh.cc
index 19a5f0660ca..619ee71e387 100644
--- a/source/blender/nodes/geometry/nodes/node_geo_curve_to_mesh.cc
+++ b/source/blender/nodes/geometry/nodes/node_geo_curve_to_mesh.cc
@@ -21,8 +21,8 @@
#include "DNA_mesh_types.h"
#include "DNA_meshdata_types.h"
-#include "BKE_derived_curve.hh"
#include "BKE_mesh.h"
+#include "BKE_spline.hh"
#include "UI_interface.h"
#include "UI_resources.h"
diff --git a/source/blender/nodes/geometry/nodes/node_geo_curve_trim.cc b/source/blender/nodes/geometry/nodes/node_geo_curve_trim.cc
index 01c9eac2036..60b0e648e01 100644
--- a/source/blender/nodes/geometry/nodes/node_geo_curve_trim.cc
+++ b/source/blender/nodes/geometry/nodes/node_geo_curve_trim.cc
@@ -14,7 +14,7 @@
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#include "BKE_derived_curve.hh"
+#include "BKE_spline.hh"
#include "UI_interface.h"
#include "UI_resources.h"
diff --git a/source/blender/nodes/geometry/nodes/node_geo_join_geometry.cc b/source/blender/nodes/geometry/nodes/node_geo_join_geometry.cc
index 536cb446140..4f994a75a0e 100644
--- a/source/blender/nodes/geometry/nodes/node_geo_join_geometry.cc
+++ b/source/blender/nodes/geometry/nodes/node_geo_join_geometry.cc
@@ -14,10 +14,10 @@
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#include "BKE_derived_curve.hh"
#include "BKE_mesh.h"
#include "BKE_mesh_runtime.h"
#include "BKE_pointcloud.h"
+#include "BKE_spline.hh"
#include "DNA_mesh_types.h"
#include "DNA_meshdata_types.h"
diff --git a/source/blender/nodes/geometry/nodes/node_geo_object_info.cc b/source/blender/nodes/geometry/nodes/node_geo_object_info.cc
index 9764940115e..2f339aa761c 100644
--- a/source/blender/nodes/geometry/nodes/node_geo_object_info.cc
+++ b/source/blender/nodes/geometry/nodes/node_geo_object_info.cc
@@ -17,7 +17,7 @@
#include "DNA_curve_types.h"
#include "DNA_object_types.h"
-#include "BKE_derived_curve.hh"
+#include "BKE_spline.hh"
#include "BLI_math_matrix.h"
diff --git a/source/blender/nodes/geometry/nodes/node_geo_transform.cc b/source/blender/nodes/geometry/nodes/node_geo_transform.cc
index 9fc8e6daccc..68e1a08a774 100644
--- a/source/blender/nodes/geometry/nodes/node_geo_transform.cc
+++ b/source/blender/nodes/geometry/nodes/node_geo_transform.cc
@@ -23,8 +23,8 @@
#include "DNA_pointcloud_types.h"
#include "DNA_volume_types.h"
-#include "BKE_derived_curve.hh"
#include "BKE_mesh.h"
+#include "BKE_spline.hh"
#include "BKE_volume.h"
#include "DEG_depsgraph_query.h"
More information about the Bf-blender-cvs
mailing list