[Bf-blender-cvs] [8098dc3d108] greasepencil-object: Replace DRW_gpencil_batch_cache_dirty() with DEG_id_tag_update
Antonio Vazquez
noreply at git.blender.org
Tue May 1 13:48:22 CEST 2018
Commit: 8098dc3d108cef46876f863c683140e5ea07e057
Author: Antonio Vazquez
Date: Tue May 1 13:44:17 2018 +0200
Branches: greasepencil-object
https://developer.blender.org/rB8098dc3d108cef46876f863c683140e5ea07e057
Replace DRW_gpencil_batch_cache_dirty() with DEG_id_tag_update
===================================================================
M source/blender/blenkernel/intern/gpencil.c
M source/blender/blenkernel/intern/object_update.c
M source/blender/blenloader/intern/versioning_280.c
M source/blender/editors/animation/anim_channels_defines.c
M source/blender/editors/gpencil/gpencil_data.c
M source/blender/editors/gpencil/gpencil_edit.c
M source/blender/editors/gpencil/gpencil_fill.c
M source/blender/editors/gpencil/gpencil_interpolate.c
M source/blender/editors/gpencil/gpencil_paint.c
M source/blender/editors/gpencil/gpencil_primitive.c
M source/blender/editors/gpencil/gpencil_select.c
M source/blender/editors/gpencil/gpencil_undo.c
M source/blender/editors/object/object_modifier.c
M source/blender/editors/object/object_transform.c
M source/blender/editors/transform/transform_conversions.c
M source/blender/makesrna/intern/rna_gpencil.c
===================================================================
diff --git a/source/blender/blenkernel/intern/gpencil.c b/source/blender/blenkernel/intern/gpencil.c
index 20ff1b04910..ca04e9d6ba9 100644
--- a/source/blender/blenkernel/intern/gpencil.c
+++ b/source/blender/blenkernel/intern/gpencil.c
@@ -1300,7 +1300,7 @@ void BKE_gpencil_transform(bGPdata *gpd, float mat[4][4])
}
- BKE_gpencil_batch_cache_dirty(gpd);
+ DEG_id_tag_update(&gpd->id, OB_RECALC_OB | OB_RECALC_DATA);
}
/* ************************************************** */
@@ -1682,7 +1682,8 @@ void BKE_gpencil_material_index_remove(bGPdata *gpd, int index)
}
}
}
- BKE_gpencil_batch_cache_dirty(gpd);
+
+ DEG_id_tag_update(&gpd->id, OB_RECALC_OB | OB_RECALC_DATA);
}
void BKE_gpencil_material_remap(struct bGPdata *gpd, const unsigned int *remap, unsigned int remap_len)
diff --git a/source/blender/blenkernel/intern/object_update.c b/source/blender/blenkernel/intern/object_update.c
index 07f511ca7aa..b29b74c28a3 100644
--- a/source/blender/blenkernel/intern/object_update.c
+++ b/source/blender/blenkernel/intern/object_update.c
@@ -30,6 +30,7 @@
#include "DNA_anim_types.h"
#include "DNA_constraint_types.h"
#include "DNA_group_types.h"
+#include "DNA_gpencil_types.h"
#include "DNA_key_types.h"
#include "DNA_material_types.h"
#include "DNA_mesh_types.h"
@@ -336,7 +337,8 @@ void BKE_object_eval_uber_data(Depsgraph *depsgraph,
BKE_mball_batch_cache_dirty(ob->data, BKE_MBALL_BATCH_DIRTY_ALL);
break;
case OB_GPENCIL:
- BKE_gpencil_batch_cache_dirty(ob->data);
+ bGPdata *gpd = ob->data;
+ DEG_id_tag_update(&gpd->id, OB_RECALC_OB | OB_RECALC_DATA);
break;
}
diff --git a/source/blender/blenloader/intern/versioning_280.c b/source/blender/blenloader/intern/versioning_280.c
index 0fe3196dacc..f567e5af1da 100644
--- a/source/blender/blenloader/intern/versioning_280.c
+++ b/source/blender/blenloader/intern/versioning_280.c
@@ -79,6 +79,8 @@
#include "BLO_readfile.h"
#include "readfile.h"
+#include "DEG_depsgraph.h"
+
#include "MEM_guardedalloc.h"
@@ -741,7 +743,7 @@ void do_versions_after_linking_280(Main *main)
}
/* set cache as dirty */
- BKE_gpencil_batch_cache_dirty(ob->data);
+ DEG_id_tag_update(&gpd->id, OB_RECALC_OB | OB_RECALC_DATA);
scene->gpd = NULL;
}
diff --git a/source/blender/editors/animation/anim_channels_defines.c b/source/blender/editors/animation/anim_channels_defines.c
index 04c7d69c9ca..7801acb6c36 100644
--- a/source/blender/editors/animation/anim_channels_defines.c
+++ b/source/blender/editors/animation/anim_channels_defines.c
@@ -80,6 +80,8 @@
#include "BIF_gl.h"
+#include "DEG_depsgraph.h"
+
#include "WM_api.h"
#include "WM_types.h"
@@ -4048,7 +4050,8 @@ static void achannel_setting_flush_widget_cb(bContext *C, void *ale_npoin, void
if (ale_setting->type == ANIMTYPE_GPLAYER) {
/* draw cache updates for settings that affect the visible strokes */
if (setting == ACHANNEL_SETTING_VISIBLE) {
- BKE_gpencil_batch_cache_dirty((bGPdata *)ale_setting->id);
+ bGPdata *gpd = (bGPdata *)ale_setting->id;
+ DEG_id_tag_update(&gpd->id, OB_RECALC_OB | OB_RECALC_DATA);
}
/* UI updates */
diff --git a/source/blender/editors/gpencil/gpencil_data.c b/source/blender/editors/gpencil/gpencil_data.c
index 584ae47a007..ba58695132f 100644
--- a/source/blender/editors/gpencil/gpencil_data.c
+++ b/source/blender/editors/gpencil/gpencil_data.c
@@ -261,7 +261,7 @@ static int gp_layer_remove_exec(bContext *C, wmOperator *op)
BKE_gpencil_layer_delete(gpd, gpl);
/* notifiers */
- BKE_gpencil_batch_cache_dirty(gpd);
+ DEG_id_tag_update(&gpd->id, OB_RECALC_OB | OB_RECALC_DATA);
WM_event_add_notifier(C, NC_GPENCIL | ND_DATA | NA_EDITED, NULL);
return OPERATOR_FINISHED;
@@ -301,7 +301,7 @@ static int gp_layer_move_exec(bContext *C, wmOperator *op)
BLI_assert(ELEM(direction, -1, 0, 1)); /* we use value below */
if (BLI_listbase_link_move(&gpd->layers, gpl, direction)) {
- BKE_gpencil_batch_cache_dirty(gpd);
+ DEG_id_tag_update(&gpd->id, OB_RECALC_OB | OB_RECALC_DATA);
WM_event_add_notifier(C, NC_GPENCIL | ND_DATA | NA_EDITED, NULL);
}
@@ -352,7 +352,7 @@ static int gp_layer_copy_exec(bContext *C, wmOperator *UNUSED(op))
BKE_gpencil_layer_setactive(gpd, new_layer);
/* notifiers */
- BKE_gpencil_batch_cache_dirty(gpd);
+ DEG_id_tag_update(&gpd->id, OB_RECALC_OB | OB_RECALC_DATA);
WM_event_add_notifier(C, NC_GPENCIL | ND_DATA | NA_EDITED, NULL);
return OPERATOR_FINISHED;
@@ -403,7 +403,7 @@ static int gp_frame_duplicate_exec(bContext *C, wmOperator *op)
}
/* notifiers */
- BKE_gpencil_batch_cache_dirty(gpd);
+ DEG_id_tag_update(&gpd->id, OB_RECALC_OB | OB_RECALC_DATA);
WM_event_add_notifier(C, NC_GPENCIL | ND_DATA | NA_EDITED, NULL);
return OPERATOR_FINISHED;
@@ -487,7 +487,7 @@ static int gp_frame_clean_fill_exec(bContext *C, wmOperator *op)
/* notifiers */
if (changed) {
- BKE_gpencil_batch_cache_dirty(gpd);
+ DEG_id_tag_update(&gpd->id, OB_RECALC_OB | OB_RECALC_DATA);
WM_event_add_notifier(C, NC_GPENCIL | ND_DATA | NA_EDITED, NULL);
}
@@ -545,7 +545,7 @@ static int gp_hide_exec(bContext *C, wmOperator *op)
}
/* notifiers */
- BKE_gpencil_batch_cache_dirty(gpd);
+ DEG_id_tag_update(&gpd->id, OB_RECALC_OB | OB_RECALC_DATA);
WM_event_add_notifier(C, NC_GPENCIL | ND_DATA | NA_EDITED, NULL);
return OPERATOR_FINISHED;
@@ -633,7 +633,7 @@ static int gp_reveal_exec(bContext *C, wmOperator *op)
}
/* notifiers */
- BKE_gpencil_batch_cache_dirty(gpd);
+ DEG_id_tag_update(&gpd->id, OB_RECALC_OB | OB_RECALC_DATA);
WM_event_add_notifier(C, NC_GPENCIL | ND_DATA | NA_EDITED, NULL);
return OPERATOR_FINISHED;
@@ -674,7 +674,7 @@ static int gp_lock_all_exec(bContext *C, wmOperator *UNUSED(op))
}
/* notifiers */
- BKE_gpencil_batch_cache_dirty(gpd);
+ DEG_id_tag_update(&gpd->id, OB_RECALC_OB | OB_RECALC_DATA);
WM_event_add_notifier(C, NC_GPENCIL | ND_DATA | NA_EDITED, NULL);
return OPERATOR_FINISHED;
@@ -712,7 +712,7 @@ static int gp_unlock_all_exec(bContext *C, wmOperator *UNUSED(op))
}
/* notifiers */
- BKE_gpencil_batch_cache_dirty(gpd);
+ DEG_id_tag_update(&gpd->id, OB_RECALC_OB | OB_RECALC_DATA);
WM_event_add_notifier(C, NC_GPENCIL | ND_DATA | NA_EDITED, NULL);
return OPERATOR_FINISHED;
@@ -785,7 +785,7 @@ static int gp_isolate_layer_exec(bContext *C, wmOperator *op)
}
/* notifiers */
- BKE_gpencil_batch_cache_dirty(gpd);
+ DEG_id_tag_update(&gpd->id, OB_RECALC_OB | OB_RECALC_DATA);
WM_event_add_notifier(C, NC_GPENCIL | ND_DATA | NA_EDITED, NULL);
return OPERATOR_FINISHED;
@@ -850,7 +850,7 @@ static int gp_merge_layer_exec(bContext *C, wmOperator *op)
BLI_ghash_free(gh_frames_cur, NULL, NULL);
/* notifiers */
- BKE_gpencil_batch_cache_dirty(gpd);
+ DEG_id_tag_update(&gpd->id, OB_RECALC_OB | OB_RECALC_DATA);
WM_event_add_notifier(C, NC_GPENCIL | ND_DATA | NA_EDITED, NULL);
return OPERATOR_FINISHED;
@@ -912,7 +912,7 @@ static int gp_layer_change_exec(bContext *C, wmOperator *op)
BKE_gpencil_layer_setactive(gpd, gpl);
/* updates */
- BKE_gpencil_batch_cache_dirty(gpd);
+ DEG_id_tag_update(&gpd->id, OB_RECALC_OB | OB_RECALC_DATA);
WM_event_add_notifier(C, NC_GPENCIL | ND_DATA | NA_EDITED, NULL);
return OPERATOR_FINISHED;
@@ -1049,7 +1049,7 @@ static int gp_stroke_arrange_exec(bContext *C, wmOperator *op)
}
/* notifiers */
- BKE_gpencil_batch_cache_dirty(gpd);
+ DEG_id_tag_update(&gpd->id, OB_RECALC_OB | OB_RECALC_DATA);
WM_event_add_notifier(C, NC_GPENCIL | ND_DATA | NA_EDITED, NULL);
return OPERATOR_FINISHED;
@@ -1133,7 +1133,7 @@ static int gp_stroke_change_color_exec(bContext *C, wmOperator *UNUSED(op))
CTX_DATA_END;
/* notifiers */
- BKE_gpencil_batch_cache_dirty(gpd);
+ DEG_id_tag_update(&gpd->id, OB_RECALC_OB | OB_RECALC_DATA);
WM_event_add_notifier(C, NC_GPENCIL | ND_DATA | NA_EDITED, NULL);
return OPERATOR_FINISHED;
@@ -1196,7 +1196,7 @@ static int gp_stroke_lock_color_exec(bContext *C, wmOperator *UNUSED(op))
}
}
/* notifiers */
- BKE_gpencil_batch_cache_dirty(gpd);
+ DEG_id_tag_update(&gpd->id, OB_RECALC_OB | OB_RECALC_DATA);
WM_event_add_notifier(C, NC_GPENCIL | ND_DATA | NA_EDITED, NULL);
return OPERATOR_FINISHED;
@@ -1370,7 +1370,7 @@ static int gp_convert_scene_to_object_exec(bContext *C, wmOperator *UNUSED(op))
scene->gpd = NULL;
/* notifiers */
- BKE_gpencil_batch_cache_dirty(gpd);
+ DEG_id_tag_update(&gpd->id, OB_RECALC_OB | OB_RECALC_DATA);
WM_event_add_notifier(C, NC_GPENCIL | ND_DATA | NA_EDITED | ND_SPACE_PROPERTIES, NULL);
return OPERATOR_FINISHED;
@@ -1438,7 +1438,8 @@ static int gpencil_vertex_group_assign_exec(bContext *C, wmOperator *UNUSED(op))
ED_gpencil_vgroup_assign(C, ob, ts->vgroup_weight);
/* notifiers */
- BKE_gpencil_batch_cache_dirty(ob->data);
+ bGPdata *gpd = ob->data;
+ DEG_id_tag_update(&gpd->id, OB_RECALC_OB | OB_RECALC_DATA);
WM_event_add_notifier(C, NC_GPENCIL | ND_DATA | NA_EDITED | ND_SPACE_PROPERTIES, NULL);
return OPERATOR_FINISHED;
@@ -1471,7 +1472,8 @@ static int gpencil_vertex_group_remove_from_exec(bContext *C, wmOperator *UNUSED
ED_gpencil_vgroup_remove(C, ob);
/* notifiers */
- BKE_gpencil_batch_cache_dirty(ob->data); // XXX: Review this (aligorith)
+ bGPdata *gpd = ob->data;
+ DEG_id_tag_update(&gpd->id, OB_RECALC_OB | OB_RECALC_DATA);
WM_event_add_notifier(C, NC_GPENCIL | ND_DATA | NA_EDITED | ND_SPACE_PROPERTIES, NULL);
return OPERATOR_FINISHED;
@@ -1504,7 +1506,8 @@ static int gpencil_vertex_group_select_exec(bContext *C, wmOperator *UNUSED(op))
ED_gpencil_vgroup_select(C, ob);
/* notifiers */
- BKE_gpencil_batch_cache_dirty(ob->data);
+ bGPdata *gpd = ob->data;
+ DEG_id_tag_update(&gpd->id, OB_RECALC_OB | OB_RECALC_DATA);
WM_event_add_notifier(C, NC_GPENCIL | ND_DATA | NA_EDITED | ND_SPACE_PROPERTIES, NULL);
return OPERATOR_FINISHED;
@@ -1536,7 +1539,8 @@ static int gpencil_vertex_group_deselect_exec(bContext *C, wmOperator *UNUSED(op
ED_gpencil_vgroup_deselect(C, ob);
/* notifiers */
- BKE_gpencil_batch_cache_dirty(ob->data);
+ bGPdata *gpd = ob->data;
+ DEG_id_tag_update(&gpd->id, OB_RECALC_OB | OB_RECALC_DATA);
WM_event_add_notifier(C, NC_GPENCIL | ND_DAT
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list