Cleanup: Rename DerivedMesh.cc and header
After recent commits, the .cc file is only used for actual object data evaluation in the depsgraph, and the header is only used for the old DerivedMesh data structure that's still being phased out.
This commit is contained in:
@@ -8,7 +8,7 @@
|
||||
*/
|
||||
|
||||
/* struct DerivedMesh is used directly */
|
||||
#include "BKE_DerivedMesh.hh"
|
||||
#include "BKE_mesh_legacy_derived_mesh.hh"
|
||||
|
||||
/* Thread sync primitives used directly. */
|
||||
#include "BLI_ordered_edge.hh"
|
||||
|
||||
@@ -47,7 +47,6 @@ set(SRC
|
||||
intern/CCGSubSurf.cc
|
||||
intern/CCGSubSurf_legacy.cc
|
||||
intern/CCGSubSurf_util.cc
|
||||
intern/DerivedMesh.cc
|
||||
intern/action.cc
|
||||
intern/action_bones.cc
|
||||
intern/action_mirror.cc
|
||||
@@ -200,6 +199,7 @@ set(SRC
|
||||
intern/mesh_calc_edges.cc
|
||||
intern/mesh_compare.cc
|
||||
intern/mesh_convert.cc
|
||||
intern/mesh_data_update.cc
|
||||
intern/mesh_debug.cc
|
||||
intern/mesh_evaluate.cc
|
||||
intern/mesh_fair.cc
|
||||
@@ -321,7 +321,6 @@ set(SRC
|
||||
intern/world.cc
|
||||
intern/writemovie.cc
|
||||
|
||||
BKE_DerivedMesh.hh
|
||||
BKE_action.h
|
||||
BKE_action.hh
|
||||
BKE_addon.h
|
||||
@@ -446,6 +445,7 @@ set(SRC
|
||||
BKE_mesh_fair.hh
|
||||
BKE_mesh_iterators.hh
|
||||
BKE_mesh_legacy_convert.hh
|
||||
BKE_mesh_legacy_derived_mesh.hh
|
||||
BKE_mesh_mapping.hh
|
||||
BKE_mesh_mirror.hh
|
||||
BKE_mesh_remap.hh
|
||||
|
||||
@@ -7,8 +7,8 @@
|
||||
#include "DNA_mesh_types.h"
|
||||
#include "DNA_meshdata_types.h"
|
||||
|
||||
#include "BKE_DerivedMesh.hh"
|
||||
#include "BKE_customdata.hh"
|
||||
#include "BKE_mesh_legacy_derived_mesh.hh"
|
||||
|
||||
struct MeshElemMap;
|
||||
struct PBVH;
|
||||
|
||||
@@ -21,10 +21,10 @@
|
||||
#include "BLI_task.h"
|
||||
#include "BLI_utildefines.h"
|
||||
|
||||
#include "BKE_DerivedMesh.hh"
|
||||
#include "BKE_ccg.h"
|
||||
#include "BKE_editmesh.hh"
|
||||
#include "BKE_mesh.hh"
|
||||
#include "BKE_mesh_legacy_derived_mesh.hh"
|
||||
#include "BKE_mesh_runtime.hh"
|
||||
#include "BKE_modifier.hh"
|
||||
#include "BKE_multires.hh"
|
||||
|
||||
@@ -65,7 +65,6 @@
|
||||
|
||||
#include "BLT_translation.hh"
|
||||
|
||||
#include "BKE_DerivedMesh.hh"
|
||||
#include "BKE_action.h"
|
||||
#include "BKE_anim_data.hh"
|
||||
#include "BKE_anim_path.h"
|
||||
@@ -111,6 +110,7 @@
|
||||
#include "BKE_material.h"
|
||||
#include "BKE_mball.hh"
|
||||
#include "BKE_mesh.hh"
|
||||
#include "BKE_mesh_legacy_derived_mesh.hh"
|
||||
#include "BKE_mesh_wrapper.hh"
|
||||
#include "BKE_modifier.hh"
|
||||
#include "BKE_multires.hh"
|
||||
|
||||
@@ -25,8 +25,8 @@
|
||||
#include "BLI_task.h"
|
||||
#include "BLI_utildefines.h"
|
||||
|
||||
#include "BKE_DerivedMesh.hh"
|
||||
#include "BKE_attribute.hh"
|
||||
#include "BKE_mesh_legacy_derived_mesh.hh"
|
||||
#include "BKE_modifier.hh"
|
||||
#include "BKE_shrinkwrap.hh"
|
||||
|
||||
|
||||
@@ -31,9 +31,9 @@
|
||||
#include "BLI_utildefines.h"
|
||||
#include "BLI_vector.hh"
|
||||
|
||||
#include "BKE_DerivedMesh.hh"
|
||||
#include "BKE_ccg.h"
|
||||
#include "BKE_customdata.hh"
|
||||
#include "BKE_mesh_legacy_derived_mesh.hh"
|
||||
#include "BKE_mesh_mapping.hh"
|
||||
#include "BKE_multires.hh"
|
||||
#include "BKE_scene.hh"
|
||||
|
||||
@@ -18,12 +18,12 @@
|
||||
|
||||
#include "BLI_utildefines.h"
|
||||
|
||||
#include "BKE_DerivedMesh.hh"
|
||||
#include "BKE_attribute.hh"
|
||||
#include "BKE_context.hh"
|
||||
#include "BKE_customdata.hh"
|
||||
#include "BKE_global.hh"
|
||||
#include "BKE_image.h"
|
||||
#include "BKE_mesh_legacy_derived_mesh.hh"
|
||||
#include "BKE_modifier.hh"
|
||||
#include "BKE_multires.hh"
|
||||
#include "BKE_report.hh"
|
||||
|
||||
@@ -87,7 +87,7 @@ static void deform_verts(ModifierData *md,
|
||||
}
|
||||
}
|
||||
|
||||
/* TODO(sergey): For now it actually duplicates logic from DerivedMesh.cc
|
||||
/* TODO(sergey): For now it actually duplicates logic from mesh_data_update.cc
|
||||
* and needs some more generic solution. But starting experimenting with
|
||||
* this so close to the release is not that nice..
|
||||
*
|
||||
|
||||
@@ -18,7 +18,6 @@
|
||||
#include "BLI_math_matrix.h"
|
||||
#include "BLI_threads.h"
|
||||
|
||||
#include "BKE_DerivedMesh.hh"
|
||||
#include "BKE_attribute.hh"
|
||||
#include "BKE_ccg.h"
|
||||
#include "BKE_customdata.hh"
|
||||
@@ -26,6 +25,7 @@
|
||||
#include "BKE_image.h"
|
||||
#include "BKE_lib_id.hh"
|
||||
#include "BKE_mesh.hh"
|
||||
#include "BKE_mesh_legacy_derived_mesh.hh"
|
||||
#include "BKE_mesh_tangent.hh"
|
||||
#include "BKE_modifier.hh"
|
||||
#include "BKE_multires.hh"
|
||||
|
||||
@@ -12,10 +12,10 @@
|
||||
#include "BLI_math_vector_types.hh"
|
||||
#include "BLI_vector.hh"
|
||||
|
||||
#include "BKE_DerivedMesh.hh"
|
||||
#include "BKE_attribute.hh"
|
||||
#include "BKE_customdata.hh"
|
||||
#include "BKE_mesh.hh"
|
||||
#include "BKE_mesh_legacy_derived_mesh.hh"
|
||||
#include "BKE_mesh_mapping.hh"
|
||||
|
||||
#include "IMB_imbuf.hh"
|
||||
|
||||
Reference in New Issue
Block a user