[Bf-blender-cvs] [7ff385d8545] greasepencil-refactor: Revert "GPencil: Fix missing edit points with modifiers"

[Antonio Vazquez]

Commit: 7ff385d8545bebbe104a2b06cf0f9827a2ab9b78
Author: Antonio Vazquez
Date:   Wed Jan 15 11:51:36 2020 +0100
Branches: greasepencil-refactor
https://developer.blender.org/rB7ff385d8545bebbe104a2b06cf0f9827a2ab9b78

Revert "GPencil: Fix missing edit points with modifiers"

This reverts commit 6c9f72c1b25624625feda2f556566f07eb5d2c66.

===================================================================

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 56d28c5a3f1..163b9c14d31 100644
--- a/source/blender/blenkernel/intern/gpencil_modifier.c
+++ b/source/blender/blenkernel/intern/gpencil_modifier.c
@@ -861,7 +861,6 @@ 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 fe1bac49ee0..fa1c8551867 100644
--- a/source/blender/blenkernel/intern/object_update.c
+++ b/source/blender/blenkernel/intern/object_update.c
@@ -154,10 +154,6 @@ 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;
   }
 }

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs