[Bf-blender-cvs] [07968077208] master: CleanUp: Introduce `eMeshBatchDirtyMode` enum
Jeroen Bakker
noreply at git.blender.org
Wed Oct 7 16:18:23 CEST 2020
Commit: 0796807720882731cdb70be144aa182e9b0b9ee5
Author: Jeroen Bakker
Date: Wed Oct 7 13:49:14 2020 +0200
Branches: master
https://developer.blender.org/rB0796807720882731cdb70be144aa182e9b0b9ee5
CleanUp: Introduce `eMeshBatchDirtyMode` enum
It used to be an `int mode`.
===================================================================
M source/blender/blenkernel/BKE_curve.h
M source/blender/blenkernel/BKE_hair.h
M source/blender/blenkernel/BKE_lattice.h
M source/blender/blenkernel/BKE_mball.h
M source/blender/blenkernel/BKE_mesh.h
A source/blender/blenkernel/BKE_mesh_types.h
M source/blender/blenkernel/BKE_particle.h
M source/blender/blenkernel/BKE_pointcloud.h
M source/blender/blenkernel/BKE_volume.h
M source/blender/blenkernel/intern/curve.c
M source/blender/blenkernel/intern/hair.c
M source/blender/blenkernel/intern/lattice.c
M source/blender/blenkernel/intern/mball.c
M source/blender/blenkernel/intern/mesh_runtime.c
M source/blender/blenkernel/intern/particle.c
M source/blender/blenkernel/intern/pointcloud.c
M source/blender/blenkernel/intern/volume.cc
M source/blender/draw/intern/draw_cache_impl.h
M source/blender/draw/intern/draw_cache_impl_curve.c
M source/blender/draw/intern/draw_cache_impl_hair.c
M source/blender/draw/intern/draw_cache_impl_lattice.c
M source/blender/draw/intern/draw_cache_impl_mesh.c
M source/blender/draw/intern/draw_cache_impl_metaball.c
M source/blender/draw/intern/draw_cache_impl_particles.c
M source/blender/draw/intern/draw_cache_impl_pointcloud.c
M source/blender/draw/intern/draw_cache_impl_volume.c
===================================================================
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->ba
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list