From 0796807720882731cdb70be144aa182e9b0b9ee5 Mon Sep 17 00:00:00 2001 From: Jeroen Bakker Date: Wed, 7 Oct 2020 13:49:14 +0200 Subject: CleanUp: Introduce `eMeshBatchDirtyMode` enum It used to be an `int mode`. --- source/blender/blenkernel/BKE_curve.h | 6 +++-- source/blender/blenkernel/BKE_hair.h | 6 +++-- source/blender/blenkernel/BKE_lattice.h | 5 ++-- source/blender/blenkernel/BKE_mball.h | 6 +++-- source/blender/blenkernel/BKE_mesh.h | 13 +++------- source/blender/blenkernel/BKE_mesh_types.h | 32 +++++++++++++++++++++++++ source/blender/blenkernel/BKE_particle.h | 6 +++-- source/blender/blenkernel/BKE_pointcloud.h | 8 +++++-- source/blender/blenkernel/BKE_volume.h | 7 ++++-- source/blender/blenkernel/intern/curve.c | 4 ++-- source/blender/blenkernel/intern/hair.c | 4 ++-- source/blender/blenkernel/intern/lattice.c | 4 ++-- source/blender/blenkernel/intern/mball.c | 4 ++-- source/blender/blenkernel/intern/mesh_runtime.c | 4 ++-- source/blender/blenkernel/intern/particle.c | 4 ++-- source/blender/blenkernel/intern/pointcloud.c | 7 +++--- source/blender/blenkernel/intern/volume.cc | 4 ++-- 17 files changed, 83 insertions(+), 41 deletions(-) create mode 100644 source/blender/blenkernel/BKE_mesh_types.h (limited to 'source/blender/blenkernel') diff --git a/source/blender/blenkernel/BKE_curve.h b/source/blender/blenkernel/BKE_curve.h index 344338d4802..91a9bcbc602 100644 --- a/source/blender/blenkernel/BKE_curve.h +++ b/source/blender/blenkernel/BKE_curve.h @@ -22,6 +22,8 @@ * \ingroup bke */ +#include "BKE_mesh_types.h" + #include "DNA_scene_types.h" #ifdef __cplusplus @@ -276,10 +278,10 @@ enum { BKE_CURVE_BATCH_DIRTY_ALL = 0, BKE_CURVE_BATCH_DIRTY_SELECT, }; -void BKE_curve_batch_cache_dirty_tag(struct Curve *cu, int mode); +void BKE_curve_batch_cache_dirty_tag(struct Curve *cu, eMeshBatchDirtyMode mode); void BKE_curve_batch_cache_free(struct Curve *cu); -extern void (*BKE_curve_batch_cache_dirty_tag_cb)(struct Curve *cu, int mode); +extern void (*BKE_curve_batch_cache_dirty_tag_cb)(struct Curve *cu, eMeshBatchDirtyMode mode); extern void (*BKE_curve_batch_cache_free_cb)(struct Curve *cu); /* -------------------------------------------------------------------- */ diff --git a/source/blender/blenkernel/BKE_hair.h b/source/blender/blenkernel/BKE_hair.h index 0af0a1cc90c..3bbe0ffa180 100644 --- a/source/blender/blenkernel/BKE_hair.h +++ b/source/blender/blenkernel/BKE_hair.h @@ -16,6 +16,8 @@ #pragma once +#include "BKE_mesh_types.h" + /** \file * \ingroup bke * \brief General operations for hairs. @@ -53,10 +55,10 @@ enum { BKE_HAIR_BATCH_DIRTY_ALL = 0, }; -void BKE_hair_batch_cache_dirty_tag(struct Hair *hair, int mode); +void BKE_hair_batch_cache_dirty_tag(struct Hair *hair, eMeshBatchDirtyMode mode); void BKE_hair_batch_cache_free(struct Hair *hair); -extern void (*BKE_hair_batch_cache_dirty_tag_cb)(struct Hair *hair, int mode); +extern void (*BKE_hair_batch_cache_dirty_tag_cb)(struct Hair *hair, eMeshBatchDirtyMode mode); extern void (*BKE_hair_batch_cache_free_cb)(struct Hair *hair); #ifdef __cplusplus diff --git a/source/blender/blenkernel/BKE_lattice.h b/source/blender/blenkernel/BKE_lattice.h index e210c022d85..97f78a997e7 100644 --- a/source/blender/blenkernel/BKE_lattice.h +++ b/source/blender/blenkernel/BKE_lattice.h @@ -22,6 +22,7 @@ /** \file * \ingroup bke */ +#include "BKE_mesh_types.h" #include "BLI_compiler_attrs.h" @@ -92,10 +93,10 @@ enum { BKE_LATTICE_BATCH_DIRTY_ALL = 0, BKE_LATTICE_BATCH_DIRTY_SELECT, }; -void BKE_lattice_batch_cache_dirty_tag(struct Lattice *lt, int mode); +void BKE_lattice_batch_cache_dirty_tag(struct Lattice *lt, eMeshBatchDirtyMode mode); void BKE_lattice_batch_cache_free(struct Lattice *lt); -extern void (*BKE_lattice_batch_cache_dirty_tag_cb)(struct Lattice *lt, int mode); +extern void (*BKE_lattice_batch_cache_dirty_tag_cb)(struct Lattice *lt, eMeshBatchDirtyMode mode); extern void (*BKE_lattice_batch_cache_free_cb)(struct Lattice *lt); /* -------------------------------------------------------------------- */ diff --git a/source/blender/blenkernel/BKE_mball.h b/source/blender/blenkernel/BKE_mball.h index f2ad23a35f1..81a90be3fde 100644 --- a/source/blender/blenkernel/BKE_mball.h +++ b/source/blender/blenkernel/BKE_mball.h @@ -22,6 +22,8 @@ * \ingroup bke */ +#include "BKE_mesh_types.h" + #ifdef __cplusplus extern "C" { #endif @@ -82,10 +84,10 @@ struct Depsgraph; enum { BKE_MBALL_BATCH_DIRTY_ALL = 0, }; -void BKE_mball_batch_cache_dirty_tag(struct MetaBall *mb, int mode); +void BKE_mball_batch_cache_dirty_tag(struct MetaBall *mb, eMeshBatchDirtyMode mode); void BKE_mball_batch_cache_free(struct MetaBall *mb); -extern void (*BKE_mball_batch_cache_dirty_tag_cb)(struct MetaBall *mb, int mode); +extern void (*BKE_mball_batch_cache_dirty_tag_cb)(struct MetaBall *mb, eMeshBatchDirtyMode mode); extern void (*BKE_mball_batch_cache_free_cb)(struct MetaBall *mb); #ifdef __cplusplus diff --git a/source/blender/blenkernel/BKE_mesh.h b/source/blender/blenkernel/BKE_mesh.h index 68285c60a6c..d976204d0b5 100644 --- a/source/blender/blenkernel/BKE_mesh.h +++ b/source/blender/blenkernel/BKE_mesh.h @@ -23,6 +23,7 @@ */ /* defines BLI_INLINE */ +#include "BKE_mesh_types.h" #include "BLI_compiler_compat.h" struct BLI_Stack; @@ -685,18 +686,10 @@ void BKE_mesh_wrapper_deferred_finalize(struct Mesh *me_eval, void BKE_mesh_eval_geometry(struct Depsgraph *depsgraph, struct Mesh *mesh); /* Draw Cache */ -enum { - BKE_MESH_BATCH_DIRTY_ALL = 0, - BKE_MESH_BATCH_DIRTY_SELECT, - BKE_MESH_BATCH_DIRTY_SELECT_PAINT, - BKE_MESH_BATCH_DIRTY_SHADING, - BKE_MESH_BATCH_DIRTY_UVEDIT_ALL, - BKE_MESH_BATCH_DIRTY_UVEDIT_SELECT, -}; -void BKE_mesh_batch_cache_dirty_tag(struct Mesh *me, int mode); +void BKE_mesh_batch_cache_dirty_tag(struct Mesh *me, eMeshBatchDirtyMode mode); void BKE_mesh_batch_cache_free(struct Mesh *me); -extern void (*BKE_mesh_batch_cache_dirty_tag_cb)(struct Mesh *me, int mode); +extern void (*BKE_mesh_batch_cache_dirty_tag_cb)(struct Mesh *me, eMeshBatchDirtyMode mode); extern void (*BKE_mesh_batch_cache_free_cb)(struct Mesh *me); /* Inlines */ diff --git a/source/blender/blenkernel/BKE_mesh_types.h b/source/blender/blenkernel/BKE_mesh_types.h new file mode 100644 index 00000000000..aed8c44a031 --- /dev/null +++ b/source/blender/blenkernel/BKE_mesh_types.h @@ -0,0 +1,32 @@ +/* + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * + * The Original Code is Copyright (C) 2020 by Blender Foundation + * All rights reserved. + */ +#pragma once + +/** \file + * \ingroup bke + */ + +typedef enum eMeshBatchDirtyMode { + BKE_MESH_BATCH_DIRTY_ALL = 0, + BKE_MESH_BATCH_DIRTY_SELECT, + BKE_MESH_BATCH_DIRTY_SELECT_PAINT, + BKE_MESH_BATCH_DIRTY_SHADING, + BKE_MESH_BATCH_DIRTY_UVEDIT_ALL, + BKE_MESH_BATCH_DIRTY_UVEDIT_SELECT, +} eMeshBatchDirtyMode; diff --git a/source/blender/blenkernel/BKE_particle.h b/source/blender/blenkernel/BKE_particle.h index 7b60bd9ff7d..bc695013f8c 100644 --- a/source/blender/blenkernel/BKE_particle.h +++ b/source/blender/blenkernel/BKE_particle.h @@ -33,6 +33,7 @@ #include "DNA_particle_types.h" #include "BKE_customdata.h" +#include "BKE_mesh_types.h" #ifdef __cplusplus extern "C" { @@ -621,10 +622,11 @@ void BKE_particle_system_eval_init(struct Depsgraph *depsgraph, struct Object *o enum { BKE_PARTICLE_BATCH_DIRTY_ALL = 0, }; -void BKE_particle_batch_cache_dirty_tag(struct ParticleSystem *psys, int mode); +void BKE_particle_batch_cache_dirty_tag(struct ParticleSystem *psys, eMeshBatchDirtyMode mode); void BKE_particle_batch_cache_free(struct ParticleSystem *psys); -extern void (*BKE_particle_batch_cache_dirty_tag_cb)(struct ParticleSystem *psys, int mode); +extern void (*BKE_particle_batch_cache_dirty_tag_cb)(struct ParticleSystem *psys, + eMeshBatchDirtyMode mode); extern void (*BKE_particle_batch_cache_free_cb)(struct ParticleSystem *psys); #ifdef __cplusplus diff --git a/source/blender/blenkernel/BKE_pointcloud.h b/source/blender/blenkernel/BKE_pointcloud.h index f850e716ea6..eaaf22cf9ad 100644 --- a/source/blender/blenkernel/BKE_pointcloud.h +++ b/source/blender/blenkernel/BKE_pointcloud.h @@ -20,6 +20,9 @@ * \ingroup bke * \brief General operations for point-clouds. */ + +#include "BKE_mesh_types.h" + #ifdef __cplusplus extern "C" { #endif @@ -62,10 +65,11 @@ enum { BKE_POINTCLOUD_BATCH_DIRTY_ALL = 0, }; -void BKE_pointcloud_batch_cache_dirty_tag(struct PointCloud *pointcloud, int mode); +void BKE_pointcloud_batch_cache_dirty_tag(struct PointCloud *pointcloud, eMeshBatchDirtyMode mode); void BKE_pointcloud_batch_cache_free(struct PointCloud *pointcloud); -extern void (*BKE_pointcloud_batch_cache_dirty_tag_cb)(struct PointCloud *pointcloud, int mode); +extern void (*BKE_pointcloud_batch_cache_dirty_tag_cb)(struct PointCloud *pointcloud, + eMeshBatchDirtyMode mode); extern void (*BKE_pointcloud_batch_cache_free_cb)(struct PointCloud *pointcloud); #ifdef __cplusplus diff --git a/source/blender/blenkernel/BKE_volume.h b/source/blender/blenkernel/BKE_volume.h index 8e192aa7741..738042cc3c0 100644 --- a/source/blender/blenkernel/BKE_volume.h +++ b/source/blender/blenkernel/BKE_volume.h @@ -16,6 +16,8 @@ #pragma once +#include "BKE_mesh_types.h" + /** \file * \ingroup bke * \brief Volume datablock. @@ -64,10 +66,11 @@ enum { BKE_VOLUME_BATCH_DIRTY_ALL = 0, }; -void BKE_volume_batch_cache_dirty_tag(struct Volume *volume, int mode); +void BKE_volume_batch_cache_dirty_tag(struct Volume *volume, eMeshBatchDirtyMode mode); void BKE_volume_batch_cache_free(struct Volume *volume); -extern void (*BKE_volume_batch_cache_dirty_tag_cb)(struct Volume *volume, int mode); +extern void (*BKE_volume_batch_cache_dirty_tag_cb)(struct Volume *volume, + eMeshBatchDirtyMode mode); extern void (*BKE_volume_batch_cache_free_cb)(struct Volume *volume); /* Grids diff --git a/source/blender/blenkernel/intern/curve.c b/source/blender/blenkernel/intern/curve.c index 7a6488eb1f6..64785248daf 100644 --- a/source/blender/blenkernel/intern/curve.c +++ b/source/blender/blenkernel/intern/curve.c @@ -5589,10 +5589,10 @@ void BKE_curve_eval_geometry(Depsgraph *depsgraph, Curve *curve) } /* Draw Engine */ -void (*BKE_curve_batch_cache_dirty_tag_cb)(Curve *cu, int mode) = NULL; +void (*BKE_curve_batch_cache_dirty_tag_cb)(Curve *cu, eMeshBatchDirtyMode mode) = NULL; void (*BKE_curve_batch_cache_free_cb)(Curve *cu) = NULL; -void BKE_curve_batch_cache_dirty_tag(Curve *cu, int mode) +void BKE_curve_batch_cache_dirty_tag(Curve *cu, eMeshBatchDirtyMode mode) { if (cu->batch_cache) { BKE_curve_batch_cache_dirty_tag_cb(cu, mode); diff --git a/source/blender/blenkernel/intern/hair.c b/source/blender/blenkernel/intern/hair.c index 57997eaf3a1..b9b88dd062b 100644 --- a/source/blender/blenkernel/intern/hair.c +++ b/source/blender/blenkernel/intern/hair.c @@ -412,10 +412,10 @@ void BKE_hair_data_update(struct Depsgraph *depsgraph, struct Scene *scene, Obje } /* Draw Cache */ -void (*BKE_hair_batch_cache_dirty_tag_cb)(Hair *hair, int mode) = NULL; +void (*BKE_hair_batch_cache_dirty_tag_cb)(Hair *hair, eMeshBatchDirtyMode mode) = NULL; void (*BKE_hair_batch_cache_free_cb)(Hair *hair) = NULL; -void BKE_hair_batch_cache_dirty_tag(Hair *hair, int mode) +void BKE_hair_batch_cache_dirty_tag(Hair *hair, eMeshBatchDirtyMode mode) { if (hair->batch_cache) { BKE_hair_batch_cache_dirty_tag_cb(hair, mode); diff --git a/source/blender/blenkernel/intern/lattice.c b/source/blender/blenkernel/intern/lattice.c index 8725fcd86f9..b9745c67c66 100644 --- a/source/blender/blenkernel/intern/lattice.c +++ b/source/blender/blenkernel/intern/lattice.c @@ -808,10 +808,10 @@ void BKE_lattice_eval_geometry(struct Depsgraph *UNUSED(depsgraph), Lattice *UNU } /* Draw Engine */ -void (*BKE_lattice_batch_cache_dirty_tag_cb)(Lattice *lt, int mode) = NULL; +void (*BKE_lattice_batch_cache_dirty_tag_cb)(Lattice *lt, eMeshBatchDirtyMode mode) = NULL; void (*BKE_lattice_batch_cache_free_cb)(Lattice *lt) = NULL; -void BKE_lattice_batch_cache_dirty_tag(Lattice *lt, int mode) +void BKE_lattice_batch_cache_dirty_tag(Lattice *lt, eMeshBatchDirtyMode mode) { if (lt->batch_cache) { BKE_lattice_batch_cache_dirty_tag_cb(lt, mode); diff --git a/source/blender/blenkernel/intern/mball.c b/source/blender/blenkernel/intern/mball.c index d71c100ed87..f8409760ddd 100644 --- a/source/blender/blenkernel/intern/mball.c +++ b/source/blender/blenkernel/intern/mball.c @@ -746,10 +746,10 @@ bool BKE_mball_select_swap_multi_ex(Base **bases, int bases_len) /* Draw Engine */ -void (*BKE_mball_batch_cache_dirty_tag_cb)(MetaBall *mb, int mode) = NULL; +void (*BKE_mball_batch_cache_dirty_tag_cb)(MetaBall *mb, eMeshBatchDirtyMode mode) = NULL; void (*BKE_mball_batch_cache_free_cb)(MetaBall *mb) = NULL; -void BKE_mball_batch_cache_dirty_tag(MetaBall *mb, int mode) +void BKE_mball_batch_cache_dirty_tag(MetaBall *mb, eMeshBatchDirtyMode mode) { if (mb->batch_cache) { BKE_mball_batch_cache_dirty_tag_cb(mb, mode); diff --git a/source/blender/blenkernel/intern/mesh_runtime.c b/source/blender/blenkernel/intern/mesh_runtime.c index b9eb3876dde..150f7f19edc 100644 --- a/source/blender/blenkernel/intern/mesh_runtime.c +++ b/source/blender/blenkernel/intern/mesh_runtime.c @@ -249,10 +249,10 @@ void BKE_mesh_runtime_clear_geometry(Mesh *mesh) * \{ */ /* Draw Engine */ -void (*BKE_mesh_batch_cache_dirty_tag_cb)(Mesh *me, int mode) = NULL; +void (*BKE_mesh_batch_cache_dirty_tag_cb)(Mesh *me, eMeshBatchDirtyMode mode) = NULL; void (*BKE_mesh_batch_cache_free_cb)(Mesh *me) = NULL; -void BKE_mesh_batch_cache_dirty_tag(Mesh *me, int mode) +void BKE_mesh_batch_cache_dirty_tag(Mesh *me, eMeshBatchDirtyMode mode) { if (me->runtime.batch_cache) { BKE_mesh_batch_cache_dirty_tag_cb(me, mode); diff --git a/source/blender/blenkernel/intern/particle.c b/source/blender/blenkernel/intern/particle.c index f265eade749..c20a7842097 100644 --- a/source/blender/blenkernel/intern/particle.c +++ b/source/blender/blenkernel/intern/particle.c @@ -5016,10 +5016,10 @@ void psys_apply_hair_lattice(Depsgraph *depsgraph, Scene *scene, Object *ob, Par } /* Draw Engine */ -void (*BKE_particle_batch_cache_dirty_tag_cb)(ParticleSystem *psys, int mode) = NULL; +void (*BKE_particle_batch_cache_dirty_tag_cb)(ParticleSystem *psys, eMeshBatchDirtyMode mode) = NULL; void (*BKE_particle_batch_cache_free_cb)(ParticleSystem *psys) = NULL; -void BKE_particle_batch_cache_dirty_tag(ParticleSystem *psys, int mode) +void BKE_particle_batch_cache_dirty_tag(ParticleSystem *psys, eMeshBatchDirtyMode mode) { if (psys->batch_cache) { BKE_particle_batch_cache_dirty_tag_cb(psys, mode); diff --git a/source/blender/blenkernel/intern/pointcloud.c b/source/blender/blenkernel/intern/pointcloud.c index 02f318445ac..26f192d8625 100644 --- a/source/blender/blenkernel/intern/pointcloud.c +++ b/source/blender/blenkernel/intern/pointcloud.c @@ -39,10 +39,10 @@ #include "BKE_lib_query.h" #include "BKE_lib_remap.h" #include "BKE_main.h" +#include "BKE_mesh_types.h" #include "BKE_modifier.h" #include "BKE_object.h" #include "BKE_pointcloud.h" - #include "BLT_translation.h" #include "DEG_depsgraph_query.h" @@ -392,10 +392,11 @@ void BKE_pointcloud_data_update(struct Depsgraph *depsgraph, struct Scene *scene } /* Draw Cache */ -void (*BKE_pointcloud_batch_cache_dirty_tag_cb)(PointCloud *pointcloud, int mode) = NULL; +void (*BKE_pointcloud_batch_cache_dirty_tag_cb)(PointCloud *pointcloud, + eMeshBatchDirtyMode mode) = NULL; void (*BKE_pointcloud_batch_cache_free_cb)(PointCloud *pointcloud) = NULL; -void BKE_pointcloud_batch_cache_dirty_tag(PointCloud *pointcloud, int mode) +void BKE_pointcloud_batch_cache_dirty_tag(PointCloud *pointcloud, eMeshBatchDirtyMode mode) { if (pointcloud->batch_cache) { BKE_pointcloud_batch_cache_dirty_tag_cb(pointcloud, mode); diff --git a/source/blender/blenkernel/intern/volume.cc b/source/blender/blenkernel/intern/volume.cc index 6e7944f314e..7e895e0ba7a 100644 --- a/source/blender/blenkernel/intern/volume.cc +++ b/source/blender/blenkernel/intern/volume.cc @@ -999,10 +999,10 @@ void BKE_volume_grids_backup_restore(Volume *volume, VolumeGridVector *grids, co /* Draw Cache */ -void (*BKE_volume_batch_cache_dirty_tag_cb)(Volume *volume, int mode) = NULL; +void (*BKE_volume_batch_cache_dirty_tag_cb)(Volume *volume, eMeshBatchDirtyMode mode) = NULL; void (*BKE_volume_batch_cache_free_cb)(Volume *volume) = NULL; -void BKE_volume_batch_cache_dirty_tag(Volume *volume, int mode) +void BKE_volume_batch_cache_dirty_tag(Volume *volume, eMeshBatchDirtyMode mode) { if (volume->batch_cache) { BKE_volume_batch_cache_dirty_tag_cb(volume, mode); -- cgit v1.2.3