[Bf-blender-cvs] [6c9f72c1b25] temp-gpencil-eval: GPencil: Fix missing edit points with modifiers
Antonio Vazquez
noreply at git.blender.org
Wed Jan 15 11:51:42 CET 2020
Commit: 6c9f72c1b25624625feda2f556566f07eb5d2c66
Author: Antonio Vazquez
Date: Wed Jan 15 11:51:36 2020 +0100
Branches: temp-gpencil-eval
https://developer.blender.org/rB6c9f72c1b25624625feda2f556566f07eb5d2c66
GPencil: Fix missing edit points with modifiers
The flag was updated in original datablock, but not in eval copy.
===================================================================
M source/blender/blenkernel/intern/gpencil_modifier.c
M source/blender/blenkernel/intern/object_update.c
===================================================================
diff --git a/source/blender/blenkernel/intern/gpencil_modifier.c b/source/blender/blenkernel/intern/gpencil_modifier.c
index 163b9c14d31..56d28c5a3f1 100644
--- a/source/blender/blenkernel/intern/gpencil_modifier.c
+++ b/source/blender/blenkernel/intern/gpencil_modifier.c
@@ -861,6 +861,7 @@ void BKE_gpencil_prepare_eval_data(Depsgraph *depsgraph, Scene *scene, Object *o
bGPdata *gpd_orig = ob->runtime.gpd_orig;
gpd_eval = ob->runtime.gpd_eval;
ob->data = ob->runtime.gpd_eval;
+ gpd_eval->flag = gpd_orig->flag;
int layer_index = -1;
for (bGPDlayer *gpl_orig = gpd_orig->layers.first; gpl_orig; gpl_orig = gpl_orig->next) {
diff --git a/source/blender/blenkernel/intern/object_update.c b/source/blender/blenkernel/intern/object_update.c
index fa1c8551867..fe1bac49ee0 100644
--- a/source/blender/blenkernel/intern/object_update.c
+++ b/source/blender/blenkernel/intern/object_update.c
@@ -154,6 +154,10 @@ void BKE_object_eval_transform_final(Depsgraph *depsgraph, Object *ob)
/* Assign evaluated version. */
if ((ob->type == OB_GPENCIL) && (ob->runtime.gpd_eval != NULL)) {
+ bGPdata *gpd = (bGPdata *)ob->data;
+ int flag = gpd->flag;
+ gpd = (bGPdata *)ob->runtime.gpd_eval;
+ gpd->flag = flag;
ob->data = ob->runtime.gpd_eval;
}
}
More information about the Bf-blender-cvs
mailing list