diff options
author | Julian Eisel <eiseljulian@gmail.com> | 2019-08-23 16:42:00 +0300 |
---|---|---|
committer | Julian Eisel <eiseljulian@gmail.com> | 2019-08-23 16:42:00 +0300 |
commit | adccfb33e54d7f2889ec216bd34770bb8d5abe7f (patch) | |
tree | fbb88c274782d4ea7b2ea2e38e2e094fe3f49c4b /source/blender/editors/space_graph | |
parent | 4e2be2f39e87f0379425915a5cfa77dc24c8f802 (diff) | |
parent | 8eb22968724b3ac9f6ccb426b08cb865cbbcef94 (diff) |
Merge branch 'master' into filebrowser_redesign
Diffstat (limited to 'source/blender/editors/space_graph')
-rw-r--r-- | source/blender/editors/space_graph/graph_buttons.c | 4 | ||||
-rw-r--r-- | source/blender/editors/space_graph/space_graph.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/editors/space_graph/graph_buttons.c b/source/blender/editors/space_graph/graph_buttons.c index c727c5225c9..b264a5cb260 100644 --- a/source/blender/editors/space_graph/graph_buttons.c +++ b/source/blender/editors/space_graph/graph_buttons.c @@ -1236,7 +1236,7 @@ static void graph_panel_drivers_popover(const bContext *C, Panel *pa) { uiLayout *layout = pa->layout; - PointerRNA ptr = {{NULL}}; + PointerRNA ptr = {NULL}; PropertyRNA *prop = NULL; int index = -1; uiBut *but = NULL; @@ -1258,7 +1258,7 @@ static void graph_panel_drivers_popover(const bContext *C, Panel *pa) /* Populate Panel - With a combination of the contents of the Driven and Driver panels */ if (fcu && fcu->driver) { - ID *id = ptr.id.data; + ID *id = ptr.owner_id; PointerRNA ptr_fcurve; RNA_pointer_create(id, &RNA_FCurve, fcu, &ptr_fcurve); diff --git a/source/blender/editors/space_graph/space_graph.c b/source/blender/editors/space_graph/space_graph.c index 6c5ebf77bf4..91e5ab61dd9 100644 --- a/source/blender/editors/space_graph/space_graph.c +++ b/source/blender/editors/space_graph/space_graph.c @@ -527,7 +527,7 @@ static void graph_region_message_subscribe(const struct bContext *UNUSED(C), * so just whitelist the entire structs for updates */ { - wmMsgParams_RNA msg_key_params = {{{0}}}; + wmMsgParams_RNA msg_key_params = {{0}}; StructRNA *type_array[] = { &RNA_DopeSheet, /* dopesheet filters */ |