blender
/
blender
134
398
Fork 579
Code Issues 6.3k Pull Requests 750 Projects 19 Wiki Activity

Initial Grease Pencil 3.0 stage #106848

Merged
Falk David merged 224 commits from filedescriptor/blender:grease-pencil-v3 into main 2023-05-30 11:14:22 +02:00
Conversation 8 Commits 224 Files Changed 94 +11 -8
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 3bfc2ff49b - Show all commits

19
source/blender/makesdna/DNA_grease_pencil_types.h
View File

@ -73,11 +73,11 @@ typedef struct GreasePencilDrawingReference {
typedef struct GreasePencilLayerFramesMapStorage {
/* Array of `frames` keys (sorted in ascending order). */
int *keys;
int keys_num;
/* Array of `frames` values (order matches the keys array). */
int *values;
int values_num;
/* Size of the map (number of key-value pairs). */
int size;
char _pad[4];
} GreasePencilLayerFramesMapStorage;
/**
@ -136,20 +136,21 @@ typedef struct GreasePencilLayerTreeNode {
*/
uint8_t color[3];
/**
* Name of the layer/group. Dynamic length.
*/
char *name;
/**
* Flag. Used to set e.g. the selection, visibility, ... status.
*/
uint32_t flag;
/**
* Name of the layer/group. Dynamic length.
*/
char *name;
} GreasePencilLayerTreeNode;
typedef struct GreasePencilLayerTreeGroup {
GreasePencilLayerTreeNode base;
int children_num;
char _pad[4];
} GreasePencilLayerTreeGroup;
typedef struct GreasePencilLayerTreeLeaf {
@ -162,6 +163,7 @@ typedef struct GreasePencilLayerTreeStorage {
/* Array of tree nodes. Pre-order serialization of the layer tree. */
GreasePencilLayerTreeNode **nodes;
int nodes_num;
char _pad[4];
} GreasePencilLayerTreeStorage;
/**
@ -182,6 +184,7 @@ typedef struct GreasePencil {
#ifdef __cplusplus
blender::Span<GreasePencilDrawingOrReference> drawings() const;
#endif
char _pad[4];
#ifdef __cplusplus
/**