Commit: 1f1eedf8ad90da3c2ca9eb1d4554a895cbcaf506
Author: Antonioya
Date: Mon Apr 8 16:23:58 2019 +0200
Branches: master
https://developer.blender.org/rB1f1eedf8ad90da3c2ca9eb1d4554a895cbcaf506
GPencil: Mark Object gpd field as Deprecated
This field is only used to read old files, but it's not used anymore, so it's
better mark as deprecated to avoid wrong uses.
===================================================================
M source/blender/blenkernel/intern/library_query.c
M source/blender/editors/space_outliner/outliner_tree.c
M source/blender/makesdna/DNA_object_types.h
===================================================================
diff --git a/source/blender/blenkernel/intern/library_query.c
b/source/blender/blenkernel/intern/library_query.c
index 453cbe16de0..cdbbc404538 100644
--- a/source/blender/blenkernel/intern/library_query.c
+++ b/source/blender/blenkernel/intern/library_query.c
@@ -581,7 +581,7 @@ static void library_foreach_ID_link(
}
data.cb_flag = data_cb_flag;
- CALLBACK_INVOKE(object->gpd, IDWALK_CB_USER);
+ /* Note that ob->gpd is deprecated, so no need
to handle it here. */
CALLBACK_INVOKE(object->instance_collection,
IDWALK_CB_USER);
if (object->pd) {
diff --git a/source/blender/editors/space_outliner/outliner_tree.c
b/source/blender/editors/space_outliner/outliner_tree.c
index 72e9236636e..a4e512d6846 100644
--- a/source/blender/editors/space_outliner/outliner_tree.c
+++ b/source/blender/editors/space_outliner/outliner_tree.c
@@ -331,8 +331,6 @@ static void outliner_add_object_contents(SpaceOutliner
*soops, TreeElement *te,
outliner_add_element(soops, &te->subtree, ob->proxy, te,
TSE_PROXY, 0);
}
- outliner_add_element(soops, &te->subtree, ob->gpd, te, 0, 0);
-
outliner_add_element(soops, &te->subtree, ob->data, te, 0, 0);
if (ob->pose) {
diff --git a/source/blender/makesdna/DNA_object_types.h
b/source/blender/makesdna/DNA_object_types.h
index 9f2118d9cc0..c8684f42963 100644
--- a/source/blender/makesdna/DNA_object_types.h
+++ b/source/blender/makesdna/DNA_object_types.h
@@ -202,7 +202,7 @@ typedef struct Object {
void *data;
/** Grease Pencil data. */
- struct bGPdata *gpd;
+ struct bGPdata *gpd DNA_DEPRECATED; // XXX deprecated... replaced by
gpencil object, keep for readfile
/** Settings for visualization of object-transform animation. */
bAnimVizSettings avs;
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
