diff options
author | Jeroen Bakker <jeroen@blender.org> | 2020-10-09 08:25:43 +0300 |
---|---|---|
committer | Jeroen Bakker <jeroen@blender.org> | 2020-10-09 08:25:43 +0300 |
commit | 048c5580c2136165f401b1d6b88624fbc1484d46 (patch) | |
tree | 1b7729d35ce1c240f54e5e0b96a01ccb04c650cd /source/blender | |
parent | b96f1f80916ac6e2707adfc6cd5503bcf795e006 (diff) |
Revert "CleanUp: Introduce `eMeshBatchDirtyMode` enum"
This reverts commit 0796807720882731cdb70be144aa182e9b0b9ee5.
Diffstat (limited to 'source/blender')
26 files changed, 57 insertions, 102 deletions
diff --git a/source/blender/blenkernel/BKE_curve.h b/source/blender/blenkernel/BKE_curve.h index 2b238ef18f5..d9138db2769 100644 --- a/source/blender/blenkernel/BKE_curve.h +++ b/source/blender/blenkernel/BKE_curve.h @@ -22,8 +22,6 @@ * \ingroup bke */ -#include "BKE_mesh_types.h" - #include "DNA_scene_types.h" #ifdef __cplusplus @@ -277,10 +275,10 @@ enum { BKE_CURVE_BATCH_DIRTY_ALL = 0, BKE_CURVE_BATCH_DIRTY_SELECT, }; -void BKE_curve_batch_cache_dirty_tag(struct Curve *cu, eMeshBatchDirtyMode mode); +void BKE_curve_batch_cache_dirty_tag(struct Curve *cu, int mode); void BKE_curve_batch_cache_free(struct Curve *cu); -extern void (*BKE_curve_batch_cache_dirty_tag_cb)(struct Curve *cu, eMeshBatchDirtyMode mode); +extern void (*BKE_curve_batch_cache_dirty_tag_cb)(struct Curve *cu, int 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 1d7985e5c98..403e461a9dc 100644 --- a/source/blender/blenkernel/BKE_hair.h +++ b/source/blender/blenkernel/BKE_hair.h @@ -16,8 +16,6 @@ #pragma once -#include "BKE_mesh_types.h" - /** \file * \ingroup bke * \brief General operations for hairs. @@ -54,10 +52,10 @@ enum { BKE_HAIR_BATCH_DIRTY_ALL = 0, }; -void BKE_hair_batch_cache_dirty_tag(struct Hair *hair, eMeshBatchDirtyMode mode); +void BKE_hair_batch_cache_dirty_tag(struct Hair *hair, int mode); void BKE_hair_batch_cache_free(struct Hair *hair); -extern void (*BKE_hair_batch_cache_dirty_tag_cb)(struct Hair *hair, eMeshBatchDirtyMode mode); +extern void (*BKE_hair_batch_cache_dirty_tag_cb)(struct Hair *hair, int 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 0396d050b35..f4c1a6fdcb4 100644 --- a/source/blender/blenkernel/BKE_lattice.h +++ b/source/blender/blenkernel/BKE_lattice.h @@ -22,7 +22,6 @@ /** \file * \ingroup bke */ -#include "BKE_mesh_types.h" #include "BLI_compiler_attrs.h" @@ -92,10 +91,10 @@ enum { BKE_LATTICE_BATCH_DIRTY_ALL = 0, BKE_LATTICE_BATCH_DIRTY_SELECT, }; -void BKE_lattice_batch_cache_dirty_tag(struct Lattice *lt, eMeshBatchDirtyMode mode); +void BKE_lattice_batch_cache_dirty_tag(struct Lattice *lt, int mode); void BKE_lattice_batch_cache_free(struct Lattice *lt); -extern void (*BKE_lattice_batch_cache_dirty_tag_cb)(struct Lattice *lt, eMeshBatchDirtyMode mode); +extern void (*BKE_lattice_batch_cache_dirty_tag_cb)(struct Lattice *lt, int 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 8a294c96e26..db4dca14535 100644 --- a/source/blender/blenkernel/BKE_mball.h +++ b/source/blender/blenkernel/BKE_mball.h @@ -22,8 +22,6 @@ * \ingroup bke */ -#include "BKE_mesh_types.h" - #ifdef __cplusplus extern "C" { #endif @@ -83,10 +81,10 @@ struct Depsgraph; enum { BKE_MBALL_BATCH_DIRTY_ALL = 0, }; -void BKE_mball_batch_cache_dirty_tag(struct MetaBall *mb, eMeshBatchDirtyMode mode); +void BKE_mball_batch_cache_dirty_tag(struct MetaBall *mb, int mode); void BKE_mball_batch_cache_free(struct MetaBall *mb); -extern void (*BKE_mball_batch_cache_dirty_tag_cb)(struct MetaBall *mb, eMeshBatchDirtyMode mode); +extern void (*BKE_mball_batch_cache_dirty_tag_cb)(struct MetaBall *mb, int 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 a61e453ec52..42d22cb9f16 100644 --- a/source/blender/blenkernel/BKE_mesh.h +++ b/source/blender/blenkernel/BKE_mesh.h @@ -23,7 +23,6 @@ */ /* defines BLI_INLINE */ -#include "BKE_mesh_types.h" #include "BLI_compiler_compat.h" struct BLI_Stack; @@ -685,10 +684,18 @@ void BKE_mesh_wrapper_deferred_finalize(struct Mesh *me_eval, void BKE_mesh_eval_geometry(struct Depsgraph *depsgraph, struct Mesh *mesh); /* Draw Cache */ -void BKE_mesh_batch_cache_dirty_tag(struct Mesh *me, eMeshBatchDirtyMode mode); +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_free(struct Mesh *me); -extern void (*BKE_mesh_batch_cache_dirty_tag_cb)(struct Mesh *me, eMeshBatchDirtyMode mode); +extern void (*BKE_mesh_batch_cache_dirty_tag_cb)(struct Mesh *me, int 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 deleted file mode 100644 index aed8c44a031..00000000000 --- a/source/blender/blenkernel/BKE_mesh_types.h +++ /dev/null @@ -1,32 +0,0 @@ -/* - * 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 f726b48ebeb..6ed3b94b8e5 100644 --- a/source/blender/blenkernel/BKE_particle.h +++ b/source/blender/blenkernel/BKE_particle.h @@ -33,7 +33,6 @@ #include "DNA_particle_types.h" #include "BKE_customdata.h" -#include "BKE_mesh_types.h" #ifdef __cplusplus extern "C" { @@ -620,11 +619,10 @@ 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, eMeshBatchDirtyMode mode); +void BKE_particle_batch_cache_dirty_tag(struct ParticleSystem *psys, int mode); void BKE_particle_batch_cache_free(struct ParticleSystem *psys); -extern void (*BKE_particle_batch_cache_dirty_tag_cb)(struct ParticleSystem *psys, - eMeshBatchDirtyMode mode); +extern void (*BKE_particle_batch_cache_dirty_tag_cb)(struct ParticleSystem *psys, int 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 682797991bd..985a8cc3ca7 100644 --- a/source/blender/blenkernel/BKE_pointcloud.h +++ b/source/blender/blenkernel/BKE_pointcloud.h @@ -20,9 +20,6 @@ * \ingroup bke * \brief General operations for point-clouds. */ - -#include "BKE_mesh_types.h" - #ifdef __cplusplus extern "C" { #endif @@ -64,11 +61,10 @@ enum { BKE_POINTCLOUD_BATCH_DIRTY_ALL = 0, }; -void BKE_pointcloud_batch_cache_dirty_tag(struct PointCloud *pointcloud, eMeshBatchDirtyMode mode); +void BKE_pointcloud_batch_cache_dirty_tag(struct PointCloud *pointcloud, int mode); void BKE_pointcloud_batch_cache_free(struct PointCloud *pointcloud); -extern void (*BKE_pointcloud_batch_cache_dirty_tag_cb)(struct PointCloud *pointcloud, - eMeshBatchDirtyMode mode); +extern void (*BKE_pointcloud_batch_cache_dirty_tag_cb)(struct PointCloud *pointcloud, int 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 f48f417ab6d..2a272d06986 100644 --- a/source/blender/blenkernel/BKE_volume.h +++ b/source/blender/blenkernel/BKE_volume.h @@ -16,8 +16,6 @@ #pragma once -#include "BKE_mesh_types.h" - /** \file * \ingroup bke * \brief Volume datablock. @@ -66,11 +64,10 @@ enum { BKE_VOLUME_BATCH_DIRTY_ALL = 0, }; -void BKE_volume_batch_cache_dirty_tag(struct Volume *volume, eMeshBatchDirtyMode mode); +void BKE_volume_batch_cache_dirty_tag(struct Volume *volume, int mode); void BKE_volume_batch_cache_free(struct Volume *volume); -extern void (*BKE_volume_batch_cache_dirty_tag_cb)(struct Volume *volume, - eMeshBatchDirtyMode mode); +extern void (*BKE_volume_batch_cache_dirty_tag_cb)(struct Volume *volume, int 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 452f5835171..8a5b60fb0e8 100644 --- a/source/blender/blenkernel/intern/curve.c +++ b/source/blender/blenkernel/intern/curve.c @@ -5583,10 +5583,10 @@ void BKE_curve_eval_geometry(Depsgraph *depsgraph, Curve *curve) } /* Draw Engine */ -void (*BKE_curve_batch_cache_dirty_tag_cb)(Curve *cu, eMeshBatchDirtyMode mode) = NULL; +void (*BKE_curve_batch_cache_dirty_tag_cb)(Curve *cu, int mode) = NULL; void (*BKE_curve_batch_cache_free_cb)(Curve *cu) = NULL; -void BKE_curve_batch_cache_dirty_tag(Curve *cu, eMeshBatchDirtyMode mode) +void BKE_curve_batch_cache_dirty_tag(Curve *cu, int 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 09f6fa3fe27..313b0d192dc 100644 --- a/source/blender/blenkernel/intern/hair.c +++ b/source/blender/blenkernel/intern/hair.c @@ -402,10 +402,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, eMeshBatchDirtyMode mode) = NULL; +void (*BKE_hair_batch_cache_dirty_tag_cb)(Hair *hair, int mode) = NULL; void (*BKE_hair_batch_cache_free_cb)(Hair *hair) = NULL; -void BKE_hair_batch_cache_dirty_tag(Hair *hair, eMeshBatchDirtyMode mode) +void BKE_hair_batch_cache_dirty_tag(Hair *hair, int 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 b7b1fc4daec..fc0e337ec30 100644 --- a/source/blender/blenkernel/intern/lattice.c +++ b/source/blender/blenkernel/intern/lattice.c @@ -799,10 +799,10 @@ void BKE_lattice_eval_geometry(struct Depsgraph *UNUSED(depsgraph), Lattice *UNU } /* Draw Engine */ -void (*BKE_lattice_batch_cache_dirty_tag_cb)(Lattice *lt, eMeshBatchDirtyMode mode) = NULL; +void (*BKE_lattice_batch_cache_dirty_tag_cb)(Lattice *lt, int mode) = NULL; void (*BKE_lattice_batch_cache_free_cb)(Lattice *lt) = NULL; -void BKE_lattice_batch_cache_dirty_tag(Lattice *lt, eMeshBatchDirtyMode mode) +void BKE_lattice_batch_cache_dirty_tag(Lattice *lt, int 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 75d6d36159e..e60a5f7b616 100644 --- a/source/blender/blenkernel/intern/mball.c +++ b/source/blender/blenkernel/intern/mball.c @@ -737,10 +737,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, eMeshBatchDirtyMode mode) = NULL; +void (*BKE_mball_batch_cache_dirty_tag_cb)(MetaBall *mb, int mode) = NULL; void (*BKE_mball_batch_cache_free_cb)(MetaBall *mb) = NULL; -void BKE_mball_batch_cache_dirty_tag(MetaBall *mb, eMeshBatchDirtyMode mode) +void BKE_mball_batch_cache_dirty_tag(MetaBall *mb, int 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 150f7f19edc..b9eb3876dde 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, eMeshBatchDirtyMode mode) = NULL; +void (*BKE_mesh_batch_cache_dirty_tag_cb)(Mesh *me, int mode) = NULL; void (*BKE_mesh_batch_cache_free_cb)(Mesh *me) = NULL; -void BKE_mesh_batch_cache_dirty_tag(Mesh *me, eMeshBatchDirtyMode mode) +void BKE_mesh_batch_cache_dirty_tag(Mesh *me, int 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 88d3f8bf707..a4b9508320c 100644 --- a/source/blender/blenkernel/intern/particle.c +++ b/source/blender/blenkernel/intern/particle.c @@ -4934,11 +4934,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, - eMeshBatchDirtyMode mode) = NULL; +void (*BKE_particle_batch_cache_dirty_tag_cb)(ParticleSystem *psys, int mode) = NULL; void (*BKE_particle_batch_cache_free_cb)(ParticleSystem *psys) = NULL; -void BKE_particle_batch_cache_dirty_tag(ParticleSystem *psys, eMeshBatchDirtyMode mode) +void BKE_particle_batch_cache_dirty_tag(ParticleSystem *psys, int 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 1233dc28b10..78acf7251fa 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" @@ -382,11 +382,10 @@ void BKE_pointcloud_data_update(struct Depsgraph *depsgraph, struct Scene *scene } /* Draw Cache */ -void (*BKE_pointcloud_batch_cache_dirty_tag_cb)(PointCloud *pointcloud, - eMeshBatchDirtyMode mode) = NULL; +void (*BKE_pointcloud_batch_cache_dirty_tag_cb)(PointCloud *pointcloud, int mode) = NULL; void (*BKE_pointcloud_batch_cache_free_cb)(PointCloud *pointcloud) = NULL; -void BKE_pointcloud_batch_cache_dirty_tag(PointCloud *pointcloud, eMeshBatchDirtyMode mode) +void BKE_pointcloud_batch_cache_dirty_tag(PointCloud *pointcloud, int 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 e52352499cd..afbdda56181 100644 --- a/source/blender/blenkernel/intern/volume.cc +++ b/source/blender/blenkernel/intern/volume.cc @@ -1025,10 +1025,10 @@ void BKE_volume_grids_backup_restore(Volume *volume, VolumeGridVector *grids, co /* Draw Cache */ -void (*BKE_volume_batch_cache_dirty_tag_cb)(Volume *volume, eMeshBatchDirtyMode mode) = NULL; +void (*BKE_volume_batch_cache_dirty_tag_cb)(Volume *volume, int mode) = NULL; void (*BKE_volume_batch_cache_free_cb)(Volume *volume) = NULL; -void BKE_volume_batch_cache_dirty_tag(Volume *volume, eMeshBatchDirtyMode mode) +void BKE_volume_batch_cache_dirty_tag(Volume *volume, int mode) { if (volume->batch_cache) { BKE_volume_batch_cache_dirty_tag_cb(volume, mode); diff --git a/source/blender/draw/intern/draw_cache_impl.h b/source/blender/draw/intern/draw_cache_impl.h index 95cdb849e63..e5cc18f6e09 100644 --- a/source/blender/draw/intern/draw_cache_impl.h +++ b/source/blender/draw/intern/draw_cache_impl.h @@ -41,40 +41,38 @@ struct PointCloud; struct Volume; struct bGPdata; -#include "BKE_mesh_types.h" - /* Expose via BKE callbacks */ -void DRW_mball_batch_cache_dirty_tag(struct MetaBall *mb, eMeshBatchDirtyMode mode); +void DRW_mball_batch_cache_dirty_tag(struct MetaBall *mb, int mode); void DRW_mball_batch_cache_validate(struct MetaBall *mb); void DRW_mball_batch_cache_free(struct MetaBall *mb); -void DRW_curve_batch_cache_dirty_tag(struct Curve *cu, eMeshBatchDirtyMode mode); +void DRW_curve_batch_cache_dirty_tag(struct Curve *cu, int mode); void DRW_curve_batch_cache_validate(struct Curve *cu); void DRW_curve_batch_cache_free(struct Curve *cu); -void DRW_mesh_batch_cache_dirty_tag(struct Mesh *me, eMeshBatchDirtyMode mode); +void DRW_mesh_batch_cache_dirty_tag(struct Mesh *me, int mode); void DRW_mesh_batch_cache_validate(struct Mesh *me); void DRW_mesh_batch_cache_free(struct Mesh *me); -void DRW_lattice_batch_cache_dirty_tag(struct Lattice *lt, eMeshBatchDirtyMode mode); +void DRW_lattice_batch_cache_dirty_tag(struct Lattice *lt, int mode); void DRW_lattice_batch_cache_validate(struct Lattice *lt); void DRW_lattice_batch_cache_free(struct Lattice *lt); -void DRW_particle_batch_cache_dirty_tag(struct ParticleSystem *psys, eMeshBatchDirtyMode mode); +void DRW_particle_batch_cache_dirty_tag(struct ParticleSystem *psys, int mode); void DRW_particle_batch_cache_free(struct ParticleSystem *psys); void DRW_gpencil_batch_cache_dirty_tag(struct bGPdata *gpd); void DRW_gpencil_batch_cache_free(struct bGPdata *gpd); -void DRW_hair_batch_cache_dirty_tag(struct Hair *hair, eMeshBatchDirtyMode mode); +void DRW_hair_batch_cache_dirty_tag(struct Hair *hair, int mode); void DRW_hair_batch_cache_validate(struct Hair *hair); void DRW_hair_batch_cache_free(struct Hair *hair); -void DRW_pointcloud_batch_cache_dirty_tag(struct PointCloud *pointcloud, eMeshBatchDirtyMode mode); +void DRW_pointcloud_batch_cache_dirty_tag(struct PointCloud *pointcloud, int mode); void DRW_pointcloud_batch_cache_validate(struct PointCloud *pointcloud); void DRW_pointcloud_batch_cache_free(struct PointCloud *pointcloud); -void DRW_volume_batch_cache_dirty_tag(struct Volume *volume, eMeshBatchDirtyMode mode); +void DRW_volume_batch_cache_dirty_tag(struct Volume *volume, int mode); void DRW_volume_batch_cache_validate(struct Volume *volume); void DRW_volume_batch_cache_free(struct Volume *volume); diff --git a/source/blender/draw/intern/draw_cache_impl_curve.c b/source/blender/draw/intern/draw_cache_impl_curve.c index 01fe43e081f..938c26a9cdf 100644 --- a/source/blender/draw/intern/draw_cache_impl_curve.c +++ b/source/blender/draw/intern/draw_cache_impl_curve.c @@ -484,7 +484,7 @@ static CurveBatchCache *curve_batch_cache_get(Curve *cu) return cu->batch_cache; } -void DRW_curve_batch_cache_dirty_tag(Curve *cu, eMeshBatchDirtyMode mode) +void DRW_curve_batch_cache_dirty_tag(Curve *cu, int mode) { CurveBatchCache *cache = cu->batch_cache; if (cache == NULL) { diff --git a/source/blender/draw/intern/draw_cache_impl_hair.c b/source/blender/draw/intern/draw_cache_impl_hair.c index aeb53418392..327a92a997e 100644 --- a/source/blender/draw/intern/draw_cache_impl_hair.c +++ b/source/blender/draw/intern/draw_cache_impl_hair.c @@ -90,7 +90,7 @@ static HairBatchCache *hair_batch_cache_get(Hair *hair) return hair->batch_cache; } -void DRW_hair_batch_cache_dirty_tag(Hair *hair, eMeshBatchDirtyMode mode) +void DRW_hair_batch_cache_dirty_tag(Hair *hair, int mode) { HairBatchCache *cache = hair->batch_cache; if (cache == NULL) { diff --git a/source/blender/draw/intern/draw_cache_impl_lattice.c b/source/blender/draw/intern/draw_cache_impl_lattice.c index 0c5bbbb89f5..0f80b5159a7 100644 --- a/source/blender/draw/intern/draw_cache_impl_lattice.c +++ b/source/blender/draw/intern/draw_cache_impl_lattice.c @@ -294,7 +294,7 @@ static LatticeBatchCache *lattice_batch_cache_get(Lattice *lt) return lt->batch_cache; } -void DRW_lattice_batch_cache_dirty_tag(Lattice *lt, eMeshBatchDirtyMode mode) +void DRW_lattice_batch_cache_dirty_tag(Lattice *lt, int mode) { LatticeBatchCache *cache = lt->batch_cache; if (cache == NULL) { diff --git a/source/blender/draw/intern/draw_cache_impl_mesh.c b/source/blender/draw/intern/draw_cache_impl_mesh.c index 64879f438e3..66ead0ebcbf 100644 --- a/source/blender/draw/intern/draw_cache_impl_mesh.c +++ b/source/blender/draw/intern/draw_cache_impl_mesh.c @@ -618,7 +618,7 @@ static void mesh_batch_cache_discard_uvedit_select(MeshBatchCache *cache) cache->batch_ready &= ~MBC_EDITUV; } -void DRW_mesh_batch_cache_dirty_tag(Mesh *me, eMeshBatchDirtyMode mode) +void DRW_mesh_batch_cache_dirty_tag(Mesh *me, int mode) { MeshBatchCache *cache = me->runtime.batch_cache; if (cache == NULL) { diff --git a/source/blender/draw/intern/draw_cache_impl_metaball.c b/source/blender/draw/intern/draw_cache_impl_metaball.c index 91d9f134da2..53c31ac3de8 100644 --- a/source/blender/draw/intern/draw_cache_impl_metaball.c +++ b/source/blender/draw/intern/draw_cache_impl_metaball.c @@ -112,7 +112,7 @@ static MetaBallBatchCache *metaball_batch_cache_get(MetaBall *mb) return mb->batch_cache; } -void DRW_mball_batch_cache_dirty_tag(MetaBall *mb, eMeshBatchDirtyMode mode) +void DRW_mball_batch_cache_dirty_tag(MetaBall *mb, int mode) { MetaBallBatchCache *cache = mb->batch_cache; if (cache == NULL) { diff --git a/source/blender/draw/intern/draw_cache_impl_particles.c b/source/blender/draw/intern/draw_cache_impl_particles.c index e04da8e2686..52d1fcfdb80 100644 --- a/source/blender/draw/intern/draw_cache_impl_particles.c +++ b/source/blender/draw/intern/draw_cache_impl_particles.c @@ -157,7 +157,7 @@ static ParticleBatchCache *particle_batch_cache_get(ParticleSystem *psys) return psys->batch_cache; } -void DRW_particle_batch_cache_dirty_tag(ParticleSystem *psys, eMeshBatchDirtyMode mode) +void DRW_particle_batch_cache_dirty_tag(ParticleSystem *psys, int mode) { ParticleBatchCache *cache = psys->batch_cache; if (cache == NULL) { diff --git a/source/blender/draw/intern/draw_cache_impl_pointcloud.c b/source/blender/draw/intern/draw_cache_impl_pointcloud.c index bd34760ca4e..74020a228e7 100644 --- a/source/blender/draw/intern/draw_cache_impl_pointcloud.c +++ b/source/blender/draw/intern/draw_cache_impl_pointcloud.c @@ -106,7 +106,7 @@ static PointCloudBatchCache *pointcloud_batch_cache_get(PointCloud *pointcloud) return pointcloud->batch_cache; } -void DRW_pointcloud_batch_cache_dirty_tag(PointCloud *pointcloud, eMeshBatchDirtyMode mode) +void DRW_pointcloud_batch_cache_dirty_tag(PointCloud *pointcloud, int mode) { PointCloudBatchCache *cache = pointcloud->batch_cache; if (cache == NULL) { diff --git a/source/blender/draw/intern/draw_cache_impl_volume.c b/source/blender/draw/intern/draw_cache_impl_volume.c index b9eef066533..10bacadb199 100644 --- a/source/blender/draw/intern/draw_cache_impl_volume.c +++ b/source/blender/draw/intern/draw_cache_impl_volume.c @@ -107,7 +107,7 @@ static VolumeBatchCache *volume_batch_cache_get(Volume *volume) return volume->batch_cache; } -void DRW_volume_batch_cache_dirty_tag(Volume *volume, eMeshBatchDirtyMode mode) +void DRW_volume_batch_cache_dirty_tag(Volume *volume, int mode) { VolumeBatchCache *cache = volume->batch_cache; if (cache == NULL) { |