[Bf-blender-cvs] [aad7fc9557d] greasepencil-refactor: GPencil: Include original reference to layer in runtime data
Antonio Vazquez
noreply at git.blender.org
Tue Jan 28 23:00:02 CET 2020
Commit: aad7fc9557d0956707b6cc17c013f03beb4a9fc9
Author: Antonio Vazquez
Date: Tue Jan 28 10:19:53 2020 +0100
Branches: greasepencil-refactor
https://developer.blender.org/rBaad7fc9557d0956707b6cc17c013f03beb4a9fc9
GPencil: Include original reference to layer in runtime data
===================================================================
M source/blender/blenkernel/intern/gpencil.c
M source/blender/makesdna/DNA_gpencil_types.h
===================================================================
diff --git a/source/blender/blenkernel/intern/gpencil.c b/source/blender/blenkernel/intern/gpencil.c
index efc8fc886fd..686bf43eaec 100644
--- a/source/blender/blenkernel/intern/gpencil.c
+++ b/source/blender/blenkernel/intern/gpencil.c
@@ -3828,6 +3828,9 @@ void BKE_gpencil_update_orig_pointers(const Object *ob_orig, const Object *ob_ev
if (gpl_eval == NULL) {
continue;
}
+ /* Update layer reference pointers. */
+ gpl_eval->runtime.gpl_orig = (bGPDlayer *)gpl;
+
int frame_idx = -1;
LISTBASE_FOREACH (bGPDframe *, gpf_orig, &gpl->frames) {
frame_idx++;
diff --git a/source/blender/makesdna/DNA_gpencil_types.h b/source/blender/makesdna/DNA_gpencil_types.h
index d36835d4e04..2d717db94db 100644
--- a/source/blender/makesdna/DNA_gpencil_types.h
+++ b/source/blender/makesdna/DNA_gpencil_types.h
@@ -323,6 +323,8 @@ typedef struct bGPDlayer_Runtime {
/** Id for dynamic icon used to show annotation color preview for layer. */
int icon_id;
char _pad[4];
+ /** Original layer (used to dereference evaluated data) */
+ struct bGPDlayer *gpl_orig;
} bGPDlayer_Runtime;
/* Grease-Pencil Annotations - 'Layer' */
More information about the Bf-blender-cvs
mailing list