blender
/
blender
136
404
Fork 586
Code Issues 6.2k Pull Requests 758 Projects 19 Wiki Activity

Rename: *_batch_cache_dirty > *_batch_cache_dirty_tag

This commit is contained in:
Dalai Felinto 2018-08-23 10:14:29 -03:00
parent 25c918196c
commit 613523d5f5
42 changed files with 88 additions and 88 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/blenkernel/BKE_curve.h
View File

@ -231,7 +231,7 @@ enum {
BKE_CURVE_BATCH_DIRTY_ALL = 0,
BKE_CURVE_BATCH_DIRTY_SELECT,
};
void BKE_curve_batch_cache_dirty(struct Curve *cu, int mode);
void BKE_curve_batch_cache_dirty_tag(struct Curve *cu, int mode);
void BKE_curve_batch_cache_free(struct Curve *cu);
/* curve_decimate.c */

2
source/blender/blenkernel/BKE_gpencil.h
View File

@ -68,7 +68,7 @@ bool BKE_gpencil_free_frame_runtime_data(struct bGPDframe *derived_gpf);
void BKE_gpencil_free_derived_frames(struct bGPdata *gpd);
void BKE_gpencil_free(struct bGPdata *gpd, bool free_all);
void BKE_gpencil_batch_cache_dirty(struct bGPdata *gpd);
void BKE_gpencil_batch_cache_dirty_tag(struct bGPdata *gpd);
void BKE_gpencil_batch_cache_free(struct bGPdata *gpd);
void BKE_gpencil_stroke_sync_selection(struct bGPDstroke *gps);

2
source/blender/blenkernel/BKE_lattice.h
View File

@ -111,7 +111,7 @@ enum {
BKE_LATTICE_BATCH_DIRTY_ALL = 0,
BKE_LATTICE_BATCH_DIRTY_SELECT,
};
void BKE_lattice_batch_cache_dirty(struct Lattice *lt, int mode);
void BKE_lattice_batch_cache_dirty_tag(struct Lattice *lt, int mode);
void BKE_lattice_batch_cache_free(struct Lattice *lt);
#endif /* __BKE_LATTICE_H__ */

2
source/blender/blenkernel/BKE_mball.h
View File

@ -81,7 +81,7 @@ struct Depsgraph;
enum {
BKE_MBALL_BATCH_DIRTY_ALL = 0,
};
void BKE_mball_batch_cache_dirty(struct MetaBall *mb, int mode);
void BKE_mball_batch_cache_dirty_tag(struct MetaBall *mb, int mode);
void BKE_mball_batch_cache_free(struct MetaBall *mb);
#endif

2
source/blender/blenkernel/BKE_mesh.h
View File

@ -513,7 +513,7 @@ enum {
BKE_MESH_BATCH_DIRTY_SHADING,
BKE_MESH_BATCH_DIRTY_SCULPT_COORDS,
};
void BKE_mesh_batch_cache_dirty(struct Mesh *me, int mode);
void BKE_mesh_batch_cache_dirty_tag(struct Mesh *me, int mode);
void BKE_mesh_batch_cache_free(struct Mesh *me);

2
source/blender/blenkernel/BKE_object.h
View File

@ -308,7 +308,7 @@ struct MovieClip *BKE_object_movieclip_get(struct Scene *scene, struct Object *o
void BKE_object_runtime_reset(struct Object *object);
void BKE_object_batch_cache_dirty(struct Object *ob);
void BKE_object_batch_cache_dirty_tag(struct Object *ob);
/* this function returns a superset of the scenes selection based on relationships */

2
source/blender/blenkernel/BKE_particle.h
View File

@ -474,5 +474,5 @@ void BKE_particle_system_eval_init(struct Depsgraph *depsgraph,
enum {
BKE_PARTICLE_BATCH_DIRTY_ALL = 0,
};
void BKE_particle_batch_cache_dirty(struct ParticleSystem *psys, int mode);
void BKE_particle_batch_cache_dirty_tag(struct ParticleSystem *psys, int mode);
void BKE_particle_batch_cache_free(struct ParticleSystem *psys);

6
source/blender/blenkernel/intern/curve.c
View File

@ -5368,13 +5368,13 @@ void BKE_curve_eval_geometry(Depsgraph *depsgraph,
}
/* Draw Engine */
void (*BKE_curve_batch_cache_dirty_cb)(Curve *cu, int 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(Curve *cu, int mode)
void BKE_curve_batch_cache_dirty_tag(Curve *cu, int mode)
{
if (cu->batch_cache) {
BKE_curve_batch_cache_dirty_cb(cu, mode);
BKE_curve_batch_cache_dirty_tag_cb(cu, mode);
}
}
void BKE_curve_batch_cache_free(Curve *cu)

2
source/blender/blenkernel/intern/deform.c
View File

@ -75,7 +75,7 @@ bDeformGroup *BKE_defgroup_new(Object *ob, const char *name)
defgroup_unique_name(defgroup, ob);
if (ob->type != OB_GPENCIL) {
BKE_mesh_batch_cache_dirty(ob->data, BKE_MESH_BATCH_DIRTY_ALL);
BKE_mesh_batch_cache_dirty_tag(ob->data, BKE_MESH_BATCH_DIRTY_ALL);
}
return defgroup;

6
source/blender/blenkernel/intern/gpencil.c
View File

@ -71,14 +71,14 @@
/* ************************************************** */
/* Draw Engine */
void(*BKE_gpencil_batch_cache_dirty_cb)(bGPdata *gpd) = NULL;
void(*BKE_gpencil_batch_cache_dirty_tag_cb)(bGPdata *gpd) = NULL;
void(*BKE_gpencil_batch_cache_free_cb)(bGPdata *gpd) = NULL;
void BKE_gpencil_batch_cache_dirty(bGPdata *gpd)
void BKE_gpencil_batch_cache_dirty_tag(bGPdata *gpd)
{
if (gpd) {
DEG_id_tag_update(&gpd->id, OB_RECALC_DATA);
BKE_gpencil_batch_cache_dirty_cb(gpd);
BKE_gpencil_batch_cache_dirty_tag_cb(gpd);
}
}

6
source/blender/blenkernel/intern/lattice.c
View File

@ -1254,13 +1254,13 @@ void BKE_lattice_eval_geometry(struct Depsgraph *UNUSED(depsgraph),
}
/* Draw Engine */
void (*BKE_lattice_batch_cache_dirty_cb)(Lattice *lt, int 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(Lattice *lt, int mode)
void BKE_lattice_batch_cache_dirty_tag(Lattice *lt, int mode)
{
if (lt->batch_cache) {
BKE_lattice_batch_cache_dirty_cb(lt, mode);
BKE_lattice_batch_cache_dirty_tag_cb(lt, mode);
}
}
void BKE_lattice_batch_cache_free(Lattice *lt)

6
source/blender/blenkernel/intern/mball.c
View File

@ -565,13 +565,13 @@ void BKE_mball_select_swap(struct MetaBall *mb)
/* Draw Engine */
void (*BKE_mball_batch_cache_dirty_cb)(MetaBall *mb, int 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(MetaBall *mb, int mode)
void BKE_mball_batch_cache_dirty_tag(MetaBall *mb, int mode)
{
if (mb->batch_cache) {
BKE_mball_batch_cache_dirty_cb(mb, mode);
BKE_mball_batch_cache_dirty_tag_cb(mb, mode);
}
}
void BKE_mball_batch_cache_free(MetaBall *mb)

6
source/blender/blenkernel/intern/mesh_runtime.c
View File

@ -205,13 +205,13 @@ void BKE_mesh_runtime_clear_geometry(Mesh *mesh)
* \{ */
/* Draw Engine */
void (*BKE_mesh_batch_cache_dirty_cb)(Mesh *me, int 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(Mesh *me, int mode)
void BKE_mesh_batch_cache_dirty_tag(Mesh *me, int mode)
{
if (me->runtime.batch_cache) {
BKE_mesh_batch_cache_dirty_cb(me, mode);
BKE_mesh_batch_cache_dirty_tag_cb(me, mode);
}
}
void BKE_mesh_batch_cache_free(Mesh *me)

2
source/blender/blenkernel/intern/object_deform.c
View File

@ -412,7 +412,7 @@ void BKE_object_defgroup_remove(Object *ob, bDeformGroup *defgroup)
else
object_defgroup_remove_object_mode(ob, defgroup);
BKE_mesh_batch_cache_dirty(ob->data, BKE_MESH_BATCH_DIRTY_ALL);
BKE_mesh_batch_cache_dirty_tag(ob->data, BKE_MESH_BATCH_DIRTY_ALL);
}
}

24
source/blender/blenkernel/intern/object_update.c
View File

@ -302,25 +302,25 @@ void BKE_object_eval_uber_transform(Depsgraph *depsgraph, Object *object)
BKE_object_eval_proxy_copy(depsgraph, object);
}
void BKE_object_batch_cache_dirty(Object *ob)
void BKE_object_batch_cache_dirty_tag(Object *ob)
{
switch (ob->type) {
case OB_MESH:
BKE_mesh_batch_cache_dirty(ob->data, BKE_MESH_BATCH_DIRTY_ALL);
BKE_mesh_batch_cache_dirty_tag(ob->data, BKE_MESH_BATCH_DIRTY_ALL);
break;
case OB_LATTICE:
BKE_lattice_batch_cache_dirty(ob->data, BKE_LATTICE_BATCH_DIRTY_ALL);
BKE_lattice_batch_cache_dirty_tag(ob->data, BKE_LATTICE_BATCH_DIRTY_ALL);
break;
case OB_CURVE:
case OB_FONT:
case OB_SURF:
BKE_curve_batch_cache_dirty(ob->data, BKE_CURVE_BATCH_DIRTY_ALL);
BKE_curve_batch_cache_dirty_tag(ob->data, BKE_CURVE_BATCH_DIRTY_ALL);
break;
case OB_MBALL:
BKE_mball_batch_cache_dirty(ob->data, BKE_MBALL_BATCH_DIRTY_ALL);
BKE_mball_batch_cache_dirty_tag(ob->data, BKE_MBALL_BATCH_DIRTY_ALL);
break;
case OB_GPENCIL:
BKE_gpencil_batch_cache_dirty(ob->data);
BKE_gpencil_batch_cache_dirty_tag(ob->data);
break;
}
}
@ -332,7 +332,7 @@ void BKE_object_eval_uber_data(Depsgraph *depsgraph,
DEG_debug_print_eval(depsgraph, __func__, ob->id.name, ob);
BLI_assert(ob->type != OB_ARMATURE);
BKE_object_handle_data_update(depsgraph, scene, ob);
BKE_object_batch_cache_dirty(ob);
BKE_object_batch_cache_dirty_tag(ob);
}
void BKE_object_eval_cloth(Depsgraph *depsgraph,
@ -363,7 +363,7 @@ void BKE_object_eval_update_shading(Depsgraph *depsgraph, Object *object)
{
DEG_debug_print_eval(depsgraph, __func__, object->id.name, object);
if (object->type == OB_MESH) {
BKE_mesh_batch_cache_dirty(object->data, BKE_MESH_BATCH_DIRTY_SHADING);
BKE_mesh_batch_cache_dirty_tag(object->data, BKE_MESH_BATCH_DIRTY_SHADING);
}
}
@ -372,15 +372,15 @@ void BKE_object_data_select_update(Depsgraph *depsgraph, ID *object_data)
DEG_debug_print_eval(depsgraph, __func__, object_data->name, object_data);
switch (GS(object_data->name)) {
case ID_ME:
BKE_mesh_batch_cache_dirty((Mesh *)object_data,
BKE_mesh_batch_cache_dirty_tag((Mesh *)object_data,
BKE_CURVE_BATCH_DIRTY_SELECT);
break;
case ID_CU:
BKE_curve_batch_cache_dirty((Curve *)object_data,
BKE_curve_batch_cache_dirty_tag((Curve *)object_data,
BKE_CURVE_BATCH_DIRTY_SELECT);
break;
case ID_LT:
BKE_lattice_batch_cache_dirty((struct Lattice *)object_data,
BKE_lattice_batch_cache_dirty_tag((struct Lattice *)object_data,
BKE_CURVE_BATCH_DIRTY_SELECT);
break;
default:
@ -423,7 +423,7 @@ void BKE_object_eval_flush_base_flags(Depsgraph *depsgraph,
psys != NULL;
psys = psys->next)
{
BKE_particle_batch_cache_dirty(psys, BKE_PARTICLE_BATCH_DIRTY_ALL);
BKE_particle_batch_cache_dirty_tag(psys, BKE_PARTICLE_BATCH_DIRTY_ALL);
}
}
}

2
source/blender/blenkernel/intern/paint.c
View File

@ -993,7 +993,7 @@ void BKE_sculpt_update_mesh_elements(
}
/* 2.8x - avoid full mesh update! */
BKE_mesh_batch_cache_dirty(me, BKE_MESH_BATCH_DIRTY_SCULPT_COORDS);
BKE_mesh_batch_cache_dirty_tag(me, BKE_MESH_BATCH_DIRTY_SCULPT_COORDS);
}
int BKE_sculpt_mask_layers_ensure(Object *ob, MultiresModifierData *mmd)

6
source/blender/blenkernel/intern/particle.c
View File

@ -4349,13 +4349,13 @@ void psys_apply_hair_lattice(Depsgraph *depsgraph, Scene *scene, Object *ob, Par
/* Draw Engine */
void (*BKE_particle_batch_cache_dirty_cb)(ParticleSystem *psys, int 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(ParticleSystem *psys, int mode)
void BKE_particle_batch_cache_dirty_tag(ParticleSystem *psys, int mode)
{
if (psys->batch_cache) {
BKE_particle_batch_cache_dirty_cb(psys, mode);
BKE_particle_batch_cache_dirty_tag_cb(psys, mode);
}
}
void BKE_particle_batch_cache_free(ParticleSystem *psys)

2
source/blender/blenkernel/intern/particle_system.c
View File

@ -4399,7 +4399,7 @@ void particle_system_update(struct Depsgraph *depsgraph, Scene *scene, Object *o
/* save matrix for duplicators, at rendertime the actual dupliobject's matrix is used so don't update! */
invert_m4_m4(psys->imat, ob->obmat);
BKE_particle_batch_cache_dirty(psys, BKE_PARTICLE_BATCH_DIRTY_ALL);
BKE_particle_batch_cache_dirty_tag(psys, BKE_PARTICLE_BATCH_DIRTY_ALL);
}
/* ID looper */

2
source/blender/draw/engines/gpencil/gpencil_cache_utils.c
View File

@ -298,7 +298,7 @@ GpencilBatchCache *gpencil_batch_cache_get(Object *ob, int cfra)
}
/* set cache as dirty */
void DRW_gpencil_batch_cache_dirty(bGPdata *gpd)
void DRW_gpencil_batch_cache_dirty_tag(bGPdata *gpd)
{
if (gpd->runtime.batch_cache_data == NULL) {
return;

12
source/blender/draw/intern/draw_cache_impl.h
View File

@ -44,22 +44,22 @@ struct MetaBall;
struct bGPdata;
/* Expose via BKE callbacks */
void DRW_mball_batch_cache_dirty(struct MetaBall *mb, int mode);
void DRW_mball_batch_cache_dirty_tag(struct MetaBall *mb, int mode);
void DRW_mball_batch_cache_free(struct MetaBall *mb);
void DRW_curve_batch_cache_dirty(struct Curve *cu, int mode);
void DRW_curve_batch_cache_dirty_tag(struct Curve *cu, int mode);
void DRW_curve_batch_cache_free(struct Curve *cu);
void DRW_mesh_batch_cache_dirty(struct Mesh *me, int mode);
void DRW_mesh_batch_cache_dirty_tag(struct Mesh *me, int mode);
void DRW_mesh_batch_cache_free(struct Mesh *me);
void DRW_lattice_batch_cache_dirty(struct Lattice *lt, int mode);
void DRW_lattice_batch_cache_dirty_tag(struct Lattice *lt, int mode);
void DRW_lattice_batch_cache_free(struct Lattice *lt);
void DRW_particle_batch_cache_dirty(struct ParticleSystem *psys, int 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(struct bGPdata *gpd);
void DRW_gpencil_batch_cache_dirty_tag(struct bGPdata *gpd);
void DRW_gpencil_batch_cache_free(struct bGPdata *gpd);
/* Curve */

2
source/blender/draw/intern/draw_cache_impl_curve.c
View File

@ -422,7 +422,7 @@ static CurveBatchCache *curve_batch_cache_get(Curve *cu)
return cu->batch_cache;
}
void DRW_curve_batch_cache_dirty(Curve *cu, int mode)
void DRW_curve_batch_cache_dirty_tag(Curve *cu, int mode)
{
CurveBatchCache *cache = cu->batch_cache;
if (cache == NULL) {

2
source/blender/draw/intern/draw_cache_impl_lattice.c
View File

@ -361,7 +361,7 @@ static LatticeBatchCache *lattice_batch_cache_get(Lattice *lt)
return lt->batch_cache;
}
void DRW_lattice_batch_cache_dirty(Lattice *lt, int mode)
void DRW_lattice_batch_cache_dirty_tag(Lattice *lt, int mode)
{
LatticeBatchCache *cache = lt->batch_cache;
if (cache == NULL) {

2
source/blender/draw/intern/draw_cache_impl_mesh.c
View File

@ -1734,7 +1734,7 @@ static MeshBatchCache *mesh_batch_cache_get(Mesh *me)
return me->runtime.batch_cache;
}
void DRW_mesh_batch_cache_dirty(Mesh *me, int mode)
void DRW_mesh_batch_cache_dirty_tag(Mesh *me, int mode)
{
MeshBatchCache *cache = me->runtime.batch_cache;
if (cache == NULL) {

2
source/blender/draw/intern/draw_cache_impl_metaball.c
View File

@ -91,7 +91,7 @@ static MetaBallBatchCache *metaball_batch_cache_get(MetaBall *mb)
return mb->batch_cache;
}
void DRW_mball_batch_cache_dirty(MetaBall *mb, int mode)
void DRW_mball_batch_cache_dirty_tag(MetaBall *mb, int mode)
{
MetaBallBatchCache *cache = mb->batch_cache;
if (cache == NULL) {

2
source/blender/draw/intern/draw_cache_impl_particles.c
View File

@ -141,7 +141,7 @@ static ParticleBatchCache *particle_batch_cache_get(ParticleSystem *psys)
return psys->batch_cache;
}
void DRW_particle_batch_cache_dirty(ParticleSystem *psys, int mode)
void DRW_particle_batch_cache_dirty_tag(ParticleSystem *psys, int mode)
{
ParticleBatchCache *cache = psys->batch_cache;
if (cache == NULL) {

24
source/blender/draw/intern/draw_manager.c
View File

@ -2472,40 +2472,40 @@ void DRW_engines_register(void)
/* setup callbacks */
{
/* BKE: mball.c */
extern void *BKE_mball_batch_cache_dirty_cb;
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_cb;
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_cb;
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_cb;
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_cb;
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_cb;
extern void *BKE_gpencil_batch_cache_dirty_tag_cb;
extern void *BKE_gpencil_batch_cache_free_cb;
BKE_mball_batch_cache_dirty_cb = DRW_mball_batch_cache_dirty;
BKE_mball_batch_cache_dirty_tag_cb = DRW_mball_batch_cache_dirty_tag;
BKE_mball_batch_cache_free_cb = DRW_mball_batch_cache_free;
BKE_curve_batch_cache_dirty_cb = DRW_curve_batch_cache_dirty;
BKE_curve_batch_cache_dirty_tag_cb = DRW_curve_batch_cache_dirty_tag;
BKE_curve_batch_cache_free_cb = DRW_curve_batch_cache_free;
BKE_mesh_batch_cache_dirty_cb = DRW_mesh_batch_cache_dirty;
BKE_mesh_batch_cache_dirty_tag_cb = DRW_mesh_batch_cache_dirty_tag;
BKE_mesh_batch_cache_free_cb = DRW_mesh_batch_cache_free;
BKE_lattice_batch_cache_dirty_cb = DRW_lattice_batch_cache_dirty;
BKE_lattice_batch_cache_dirty_tag_cb = DRW_lattice_batch_cache_dirty_tag;
BKE_lattice_batch_cache_free_cb = DRW_lattice_batch_cache_free;
BKE_particle_batch_cache_dirty_cb = DRW_particle_batch_cache_dirty;
BKE_particle_batch_cache_dirty_tag_cb = DRW_particle_batch_cache_dirty_tag;
BKE_particle_batch_cache_free_cb = DRW_particle_batch_cache_free;
BKE_gpencil_batch_cache_dirty_cb = DRW_gpencil_batch_cache_dirty;
BKE_gpencil_batch_cache_dirty_tag_cb = DRW_gpencil_batch_cache_dirty_tag;
BKE_gpencil_batch_cache_free_cb = DRW_gpencil_batch_cache_free;
}
}

2
source/blender/draw/modes/paint_weight_mode.c
View File

@ -95,7 +95,7 @@ static void PAINT_WEIGHT_engine_init(void *UNUSED(vedata))
if (e_data.actdef != draw_ctx->obact->actdef) {
e_data.actdef = draw_ctx->obact->actdef;
BKE_mesh_batch_cache_dirty(draw_ctx->obact->data, BKE_MESH_BATCH_DIRTY_ALL);
BKE_mesh_batch_cache_dirty_tag(draw_ctx->obact->data, BKE_MESH_BATCH_DIRTY_ALL);
}
if (!e_data.weight_face_shader) {

2
source/blender/editors/curve/editfont.c
View File

@ -273,7 +273,7 @@ static void text_update_edited(bContext *C, Object *obedit, int mode)
}
}
BKE_curve_batch_cache_dirty(cu, BKE_CURVE_BATCH_DIRTY_SELECT);
BKE_curve_batch_cache_dirty_tag(cu, BKE_CURVE_BATCH_DIRTY_SELECT);
WM_event_add_notifier(C, NC_GEOM | ND_DATA, obedit->data);
}

2
source/blender/editors/gpencil/gpencil_old.c
View File

@ -162,7 +162,7 @@ static int gpencil_convert_old_files_exec(bContext *C, wmOperator *UNUSED(op))
ED_gpencil_setup_modes(C, gpd, 0);
/* set cache as dirty */
BKE_gpencil_batch_cache_dirty(ob->data);
BKE_gpencil_batch_cache_dirty_tag(ob->data);
scene->gpd = NULL;
}

4
source/blender/editors/mesh/editface.c
View File

@ -102,7 +102,7 @@ void paintface_flush_flags(Object *ob, short flag)
}
}
BKE_mesh_batch_cache_dirty(me, BKE_MESH_BATCH_DIRTY_ALL);
BKE_mesh_batch_cache_dirty_tag(me, BKE_MESH_BATCH_DIRTY_ALL);
}
void paintface_hide(Object *ob, const bool unselected)
@ -507,7 +507,7 @@ void paintvert_flush_flags(Object *ob)
}
}
BKE_mesh_batch_cache_dirty(me, BKE_MESH_BATCH_DIRTY_ALL);
BKE_mesh_batch_cache_dirty_tag(me, BKE_MESH_BATCH_DIRTY_ALL);
}
/* note: if the caller passes false to flush_flags, then they will need to run paintvert_flush_flags(ob) themselves */
void paintvert_deselect_all_visible(Object *ob, int action, bool flush_flags)

2
source/blender/editors/mesh/editmesh_polybuild.c
View File

@ -510,7 +510,7 @@ static int edbm_polybuild_hover_invoke(
}
BM_elem_select_set(bm, ele_hover, true);
BM_select_history_store(em->bm, ele_hover);
BKE_mesh_batch_cache_dirty(obedit->data, BKE_MESH_BATCH_DIRTY_SELECT);
BKE_mesh_batch_cache_dirty_tag(obedit->data, BKE_MESH_BATCH_DIRTY_SELECT);
ED_region_tag_redraw(vc.ar);

2
source/blender/editors/object/object_edit.c
View File

@ -1509,7 +1509,7 @@ static int shade_smooth_exec(bContext *C, wmOperator *op)
if (ob->type == OB_MESH) {
BKE_mesh_smooth_flag_set(ob, !clear);
BKE_mesh_batch_cache_dirty(ob->data, BKE_MESH_BATCH_DIRTY_ALL);
BKE_mesh_batch_cache_dirty_tag(ob->data, BKE_MESH_BATCH_DIRTY_ALL);
DEG_id_tag_update(&ob->id, OB_RECALC_DATA);
WM_event_add_notifier(C, NC_OBJECT | ND_DRAW, ob);

2
source/blender/editors/object/object_transform.c
View File

@ -1216,7 +1216,7 @@ static int object_origin_set_exec(bContext *C, wmOperator *op)
for (tob = bmain->object.first; tob; tob = tob->id.next) {
if (tob->data && (((ID *)tob->data)->tag & LIB_TAG_DOIT)) {
BKE_object_batch_cache_dirty(tob);
BKE_object_batch_cache_dirty_tag(tob);
DEG_id_tag_update(&tob->id, OB_RECALC_OB | OB_RECALC_DATA);
}
}

4
source/blender/editors/physics/particle_edit.c
View File

@ -4301,7 +4301,7 @@ static void brush_edit_apply(bContext *C, wmOperator *op, PointerRNA *itemptr)
if (edit->psys) {
WM_event_add_notifier(C, NC_OBJECT | ND_PARTICLE | NA_EDITED, ob);
BKE_particle_batch_cache_dirty(edit->psys, BKE_PARTICLE_BATCH_DIRTY_ALL);
BKE_particle_batch_cache_dirty_tag(edit->psys, BKE_PARTICLE_BATCH_DIRTY_ALL);
DEG_id_tag_update(&ob->id, DEG_TAG_SELECT_UPDATE);
}
else {
@ -4570,7 +4570,7 @@ static int shape_cut_exec(bContext *C, wmOperator *UNUSED(op))
if (edit->psys) {
WM_event_add_notifier(C, NC_OBJECT | ND_PARTICLE | NA_EDITED, ob);
BKE_particle_batch_cache_dirty(edit->psys, BKE_PARTICLE_BATCH_DIRTY_ALL);
BKE_particle_batch_cache_dirty_tag(edit->psys, BKE_PARTICLE_BATCH_DIRTY_ALL);
DEG_id_tag_update(&ob->id, DEG_TAG_SELECT_UPDATE);
}
else {

6
source/blender/editors/sculpt_paint/paint_vertex.c
View File

@ -2232,7 +2232,7 @@ static void wpaint_stroke_update_step(bContext *C, struct PaintStroke *stroke, P
/* also needed for "View Selected" on last stroke */
paint_last_stroke_update(scene, vc->ar, mval);
BKE_mesh_batch_cache_dirty(ob->data, BKE_MESH_BATCH_DIRTY_ALL);
BKE_mesh_batch_cache_dirty_tag(ob->data, BKE_MESH_BATCH_DIRTY_ALL);
DEG_id_tag_update(ob->data, 0);
WM_event_add_notifier(C, NC_OBJECT | ND_DRAW, ob);
@ -2405,7 +2405,7 @@ static int vpaint_mode_toggle_exec(bContext *C, wmOperator *op)
ED_object_vpaintmode_enter_ex(bmain, depsgraph, wm, scene, ob);
}
BKE_mesh_batch_cache_dirty(ob->data, BKE_MESH_BATCH_DIRTY_ALL);
BKE_mesh_batch_cache_dirty_tag(ob->data, BKE_MESH_BATCH_DIRTY_ALL);
/* update modifier stack for mapping requirements */
DEG_id_tag_update(&me->id, 0);
@ -3145,7 +3145,7 @@ static void vpaint_stroke_update_step(bContext *C, struct PaintStroke *stroke, P
swap_m4m4(vc->rv3d->persmat, mat);
BKE_mesh_batch_cache_dirty(ob->data, BKE_MESH_BATCH_DIRTY_ALL);
BKE_mesh_batch_cache_dirty_tag(ob->data, BKE_MESH_BATCH_DIRTY_ALL);
if (vp->paint.brush->vertexpaint_tool == PAINT_BLEND_SMEAR) {
memcpy(vpd->smear.color_prev, vpd->smear.color_curr, sizeof(uint) * ((Mesh *)ob->data)->totloop);

2
source/blender/editors/sculpt_paint/sculpt.c
View File

@ -4906,7 +4906,7 @@ static void sculpt_flush_update(bContext *C)
}
/* 2.8x - avoid full mesh update! */
BKE_mesh_batch_cache_dirty(ob->data, BKE_MESH_BATCH_DIRTY_SCULPT_COORDS);
BKE_mesh_batch_cache_dirty_tag(ob->data, BKE_MESH_BATCH_DIRTY_SCULPT_COORDS);
}
/* Returns whether the mouse/stylus is over the mesh (1)

2
source/blender/makesrna/intern/rna_curve_api.c
View File

@ -52,7 +52,7 @@ static void rna_Curve_transform(Curve *cu, float *mat, bool shape_keys)
static void rna_Curve_update_gpu_tag(Curve *cu)
{
BKE_curve_batch_cache_dirty(cu, BKE_CURVE_BATCH_DIRTY_ALL);
BKE_curve_batch_cache_dirty_tag(cu, BKE_CURVE_BATCH_DIRTY_ALL);
}
static float rna_Nurb_calc_length(Nurb *nu, int resolution_u)

2
source/blender/makesrna/intern/rna_lattice_api.c
View File

@ -50,7 +50,7 @@ static void rna_Lattice_transform(Lattice *lt, float *mat, bool shape_keys)
static void rna_Lattice_update_gpu_tag(Lattice *lt)
{
BKE_lattice_batch_cache_dirty(lt, BKE_LATTICE_BATCH_DIRTY_ALL);
BKE_lattice_batch_cache_dirty_tag(lt, BKE_LATTICE_BATCH_DIRTY_ALL);
}
#else

8
source/blender/makesrna/intern/rna_mesh.c
View File

@ -239,7 +239,7 @@ static void rna_Mesh_update_data_edit_color(Main *bmain, Scene *scene, PointerRN
static void rna_Mesh_update_data_edit_weight(Main *bmain, Scene *scene, PointerRNA *ptr)
{
BKE_mesh_batch_cache_dirty(rna_mesh(ptr), BKE_MESH_BATCH_DIRTY_ALL);
BKE_mesh_batch_cache_dirty_tag(rna_mesh(ptr), BKE_MESH_BATCH_DIRTY_ALL);
rna_Mesh_update_data(bmain, scene, ptr);
}
@ -247,7 +247,7 @@ static void rna_Mesh_update_data_edit_weight(Main *bmain, Scene *scene, PointerR
static void rna_Mesh_update_data_edit_active_color(Main *bmain, Scene *scene, PointerRNA *ptr)
{
BKE_mesh_batch_cache_dirty(rna_mesh(ptr), BKE_MESH_BATCH_DIRTY_ALL);
BKE_mesh_batch_cache_dirty_tag(rna_mesh(ptr), BKE_MESH_BATCH_DIRTY_ALL);
rna_Mesh_update_data(bmain, scene, ptr);
}
@ -277,7 +277,7 @@ static void rna_Mesh_update_vertmask(Main *bmain, Scene *scene, PointerRNA *ptr)
me->editflag &= ~ME_EDIT_PAINT_FACE_SEL;
}
BKE_mesh_batch_cache_dirty(me, BKE_MESH_BATCH_DIRTY_ALL);
BKE_mesh_batch_cache_dirty_tag(me, BKE_MESH_BATCH_DIRTY_ALL);
rna_Mesh_update_draw(bmain, scene, ptr);
}
@ -289,7 +289,7 @@ static void rna_Mesh_update_facemask(Main *bmain, Scene *scene, PointerRNA *ptr)
me->editflag &= ~ME_EDIT_PAINT_VERT_SEL;
}
BKE_mesh_batch_cache_dirty(me, BKE_MESH_BATCH_DIRTY_ALL);
BKE_mesh_batch_cache_dirty_tag(me, BKE_MESH_BATCH_DIRTY_ALL);
rna_Mesh_update_draw(bmain, scene, ptr);
}

2
source/blender/makesrna/intern/rna_mesh_api.c
View File

@ -217,7 +217,7 @@ static void rna_Mesh_split_faces(Mesh *mesh, bool free_loop_normals)
static void rna_Mesh_update_gpu_tag(Mesh *mesh)
{
BKE_mesh_batch_cache_dirty(mesh, BKE_MESH_BATCH_DIRTY_ALL);
BKE_mesh_batch_cache_dirty_tag(mesh, BKE_MESH_BATCH_DIRTY_ALL);
}

2
source/blender/makesrna/intern/rna_meta_api.c
View File

@ -52,7 +52,7 @@ static void rna_Meta_transform(struct MetaBall *mb, float *mat)
static void rna_Mball_update_gpu_tag(MetaBall *mb)
{
BKE_mball_batch_cache_dirty(mb, BKE_MBALL_BATCH_DIRTY_ALL);
BKE_mball_batch_cache_dirty_tag(mb, BKE_MBALL_BATCH_DIRTY_ALL);
}
#else

2
source/blender/makesrna/intern/rna_sculpt_paint.c
View File

@ -186,7 +186,7 @@ static void rna_ParticleEdit_redo(bContext *C, PointerRNA *UNUSED(ptr))
if (ob) DEG_id_tag_update(&ob->id, OB_RECALC_DATA);
BKE_particle_batch_cache_dirty(edit->psys, BKE_PARTICLE_BATCH_DIRTY_ALL);
BKE_particle_batch_cache_dirty_tag(edit->psys, BKE_PARTICLE_BATCH_DIRTY_ALL);
psys_free_path_cache(edit->psys, edit);
DEG_id_tag_update(&CTX_data_scene(C)->id, DEG_TAG_COPY_ON_WRITE);
}