From 085e9e3bedf68f3c6b25c57c103367d02b25e5a9 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Sat, 23 Feb 2019 12:58:39 +1100 Subject: Cleanup: move variable declarations to headers Quiet undeclared variable warning. --- source/blender/blenkernel/BKE_curve.h | 3 +++ source/blender/blenkernel/BKE_gpencil.h | 3 +++ source/blender/blenkernel/BKE_lattice.h | 3 +++ source/blender/blenkernel/BKE_mball.h | 4 ++++ source/blender/blenkernel/BKE_mesh.h | 3 +++ source/blender/blenkernel/BKE_particle.h | 3 +++ source/blender/draw/intern/draw_manager.c | 24 +++++------------------- 7 files changed, 24 insertions(+), 19 deletions(-) diff --git a/source/blender/blenkernel/BKE_curve.h b/source/blender/blenkernel/BKE_curve.h index b5a4b0ff54c..f6ceea0d9cc 100644 --- a/source/blender/blenkernel/BKE_curve.h +++ b/source/blender/blenkernel/BKE_curve.h @@ -236,4 +236,7 @@ void BKE_curve_decimate_nurb( struct Nurb *nu, const unsigned int resolu, const float error_sq_max, const unsigned int error_target_len); +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); + #endif /* __BKE_CURVE_H__ */ diff --git a/source/blender/blenkernel/BKE_gpencil.h b/source/blender/blenkernel/BKE_gpencil.h index f1201bab811..a33f172b961 100644 --- a/source/blender/blenkernel/BKE_gpencil.h +++ b/source/blender/blenkernel/BKE_gpencil.h @@ -178,4 +178,7 @@ bool BKE_gpencil_smooth_stroke_uv(struct bGPDstroke *gps, int point_index, float void BKE_gpencil_get_range_selected(struct bGPDlayer *gpl, int *r_initframe, int *r_endframe); float BKE_gpencil_multiframe_falloff_calc(struct bGPDframe *gpf, int actnum, int f_init, int f_end, struct CurveMapping *cur_falloff); +extern void (*BKE_gpencil_batch_cache_dirty_tag_cb)(struct bGPdata *gpd); +extern void (*BKE_gpencil_batch_cache_free_cb)(struct bGPdata *gpd); + #endif /* __BKE_GPENCIL_H__ */ diff --git a/source/blender/blenkernel/BKE_lattice.h b/source/blender/blenkernel/BKE_lattice.h index 233b2724b46..d7597d61753 100644 --- a/source/blender/blenkernel/BKE_lattice.h +++ b/source/blender/blenkernel/BKE_lattice.h @@ -109,4 +109,7 @@ enum { 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, int mode); +extern void (*BKE_lattice_batch_cache_free_cb)(struct Lattice *lt); + #endif /* __BKE_LATTICE_H__ */ diff --git a/source/blender/blenkernel/BKE_mball.h b/source/blender/blenkernel/BKE_mball.h index 0b0ee6fd498..fc065279aa3 100644 --- a/source/blender/blenkernel/BKE_mball.h +++ b/source/blender/blenkernel/BKE_mball.h @@ -83,4 +83,8 @@ enum { 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, int mode); +extern void (*BKE_mball_batch_cache_free_cb)(struct MetaBall *mb); + + #endif diff --git a/source/blender/blenkernel/BKE_mesh.h b/source/blender/blenkernel/BKE_mesh.h index 90afaaf7408..d6b9f0a70ca 100644 --- a/source/blender/blenkernel/BKE_mesh.h +++ b/source/blender/blenkernel/BKE_mesh.h @@ -516,6 +516,9 @@ enum { 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, int mode); +extern void (*BKE_mesh_batch_cache_free_cb)(struct Mesh *me); + /* Inlines */ diff --git a/source/blender/blenkernel/BKE_particle.h b/source/blender/blenkernel/BKE_particle.h index 3f7c39af6bb..129bd1aaa2c 100644 --- a/source/blender/blenkernel/BKE_particle.h +++ b/source/blender/blenkernel/BKE_particle.h @@ -486,4 +486,7 @@ enum { 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, int mode); +extern void (*BKE_particle_batch_cache_free_cb)(struct ParticleSystem *psys); + #endif /* __BKE_PARTICLE_H__ */ diff --git a/source/blender/draw/intern/draw_manager.c b/source/blender/draw/intern/draw_manager.c index e8a7d362d16..166b499a56f 100644 --- a/source/blender/draw/intern/draw_manager.c +++ b/source/blender/draw/intern/draw_manager.c @@ -31,7 +31,12 @@ #include "BLF_api.h" #include "BKE_colortools.h" +#include "BKE_curve.h" #include "BKE_global.h" +#include "BKE_gpencil.h" +#include "BKE_lattice.h" +#include "BKE_mball.h" +#include "BKE_mesh.h" #include "BKE_object.h" #include "BKE_particle.h" #include "BKE_pointcache.h" @@ -2547,25 +2552,6 @@ void DRW_engines_register(void) /* setup callbacks */ { - /* BKE: mball.c */ - extern void *BKE_mball_batch_cache_dirty_tag_cb; - extern void *BKE_mball_batch_cache_free_cb; - /* BKE: curve.c */ - extern void *BKE_curve_batch_cache_dirty_tag_cb; - extern void *BKE_curve_batch_cache_free_cb; - /* BKE: mesh.c */ - extern void *BKE_mesh_batch_cache_dirty_tag_cb; - extern void *BKE_mesh_batch_cache_free_cb; - /* BKE: lattice.c */ - extern void *BKE_lattice_batch_cache_dirty_tag_cb; - extern void *BKE_lattice_batch_cache_free_cb; - /* BKE: particle.c */ - extern void *BKE_particle_batch_cache_dirty_tag_cb; - extern void *BKE_particle_batch_cache_free_cb; - /* BKE: gpencil.c */ - extern void *BKE_gpencil_batch_cache_dirty_tag_cb; - extern void *BKE_gpencil_batch_cache_free_cb; - BKE_mball_batch_cache_dirty_tag_cb = DRW_mball_batch_cache_dirty_tag; BKE_mball_batch_cache_free_cb = DRW_mball_batch_cache_free; -- cgit v1.2.3