[Bf-blender-cvs] [4726aa3d5e5] greasepencil-object: Annotations: Repurpose an ancient/rarely-used flag to indicate that a GP datablock is used for annotations

Joshua Leung noreply at git.blender.org
Thu Jun 28 09:13:57 CEST 2018


Commit: 4726aa3d5e5f9f3f825b878d5573856ca9d9ecad
Author: Joshua Leung
Date:   Thu Jun 28 13:14:11 2018 +1200
Branches: greasepencil-object
https://developer.blender.org/rB4726aa3d5e5f9f3f825b878d5573856ca9d9ecad

Annotations: Repurpose an ancient/rarely-used flag to indicate that a GP datablock is used for annotations

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

M	source/blender/makesdna/DNA_gpencil_types.h

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

diff --git a/source/blender/makesdna/DNA_gpencil_types.h b/source/blender/makesdna/DNA_gpencil_types.h
index 616436b6215..55e16783ed3 100644
--- a/source/blender/makesdna/DNA_gpencil_types.h
+++ b/source/blender/makesdna/DNA_gpencil_types.h
@@ -364,8 +364,12 @@ typedef struct bGPdata {
  *       changes made during the porting process.
  */
 typedef enum eGPdata_Flag {
-	/* don't allow painting to occur at all */
-	/* GP_DATA_LMBPLOCK  = (1 << 0), */
+	/* datablock is used for "annotations"
+	 * NOTE: This flag used to be used in 2.4x, but should hardly ever have been set.
+	 *       We can use this freely now, as all GP datablocks from pre-2.8 will get
+	 *       set on file load (as many old use cases are for "annotations" only)
+	 */
+	GP_DATA_ANNOTATIONS = (1 << 0),
 
 	/* show debugging info in viewport (i.e. status print) */
 	GP_DATA_DISPINFO	= (1 << 1),



More information about the Bf-blender-cvs mailing list