[Bf-blender-cvs] [4c404688565] master: GPencil: Remove GP_DATA_PYTHON_UPDATED used by old engine

Antonio Vazquez noreply at git.blender.org
Mon Mar 30 18:56:59 CEST 2020


Commit: 4c4046885658f86293a524cac00cfcf5cf18b92f
Author: Antonio Vazquez
Date:   Mon Mar 30 18:54:41 2020 +0200
Branches: master
https://developer.blender.org/rB4c4046885658f86293a524cac00cfcf5cf18b92f

GPencil: Remove GP_DATA_PYTHON_UPDATED used by old engine

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

M	source/blender/draw/intern/draw_cache_impl_gpencil.c
M	source/blender/makesdna/DNA_gpencil_types.h
M	source/blender/makesrna/intern/rna_gpencil.c

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

diff --git a/source/blender/draw/intern/draw_cache_impl_gpencil.c b/source/blender/draw/intern/draw_cache_impl_gpencil.c
index 8d6d8c593f0..ad6d35f8c2a 100644
--- a/source/blender/draw/intern/draw_cache_impl_gpencil.c
+++ b/source/blender/draw/intern/draw_cache_impl_gpencil.c
@@ -72,12 +72,6 @@ static bool gpencil_batch_cache_valid(GpencilBatchCache *cache, bGPdata *gpd, in
 {
   bool valid = true;
 
-  /* Needs to be first to consume the flag. */
-  if (gpd->flag & GP_DATA_PYTHON_UPDATED) {
-    gpd->flag &= ~GP_DATA_PYTHON_UPDATED;
-    valid = false;
-  }
-
   if (cache == NULL) {
     return false;
   }
diff --git a/source/blender/makesdna/DNA_gpencil_types.h b/source/blender/makesdna/DNA_gpencil_types.h
index de66be3c1be..a3b1f315f04 100644
--- a/source/blender/makesdna/DNA_gpencil_types.h
+++ b/source/blender/makesdna/DNA_gpencil_types.h
@@ -661,8 +661,6 @@ typedef enum eGPdata_Flag {
 
   /* Autolock not active layers */
   GP_DATA_AUTOLOCK_LAYERS = (1 << 20),
-  /* Internal flag for python update */
-  GP_DATA_PYTHON_UPDATED = (1 << 21),
 } eGPdata_Flag;
 
 /* gpd->onion_flag */
diff --git a/source/blender/makesrna/intern/rna_gpencil.c b/source/blender/makesrna/intern/rna_gpencil.c
index 10a8f4cd9d2..4afa467d2e3 100644
--- a/source/blender/makesrna/intern/rna_gpencil.c
+++ b/source/blender/makesrna/intern/rna_gpencil.c
@@ -642,7 +642,6 @@ static void rna_GPencil_stroke_point_add(
     /* Calc geometry data. */
     BKE_gpencil_stroke_geometry_update(stroke);
 
-    gpd->flag |= GP_DATA_PYTHON_UPDATED;
     DEG_id_tag_update(&gpd->id,
                       ID_RECALC_TRANSFORM | ID_RECALC_GEOMETRY | ID_RECALC_COPY_ON_WRITE);
 
@@ -704,7 +703,6 @@ static void rna_GPencil_stroke_point_pop(ID *id,
   /* Calc geometry data. */
   BKE_gpencil_stroke_geometry_update(stroke);
 
-  gpd->flag |= GP_DATA_PYTHON_UPDATED;
   DEG_id_tag_update(&gpd->id, ID_RECALC_TRANSFORM | ID_RECALC_GEOMETRY | ID_RECALC_COPY_ON_WRITE);
 
   WM_main_add_notifier(NC_GPENCIL | NA_EDITED, NULL);



More information about the Bf-blender-cvs mailing list