diff options
author | Bastien Montagne <montagne29@wanadoo.fr> | 2018-05-31 17:21:47 +0300 |
---|---|---|
committer | Bastien Montagne <montagne29@wanadoo.fr> | 2018-05-31 17:21:47 +0300 |
commit | eb1feb9f4a62e3caca4b72964c9fdd8187df53e5 (patch) | |
tree | 2c6b18ee72db4a386bf68425cc40620f9d49c48f /source/blender/editors/space_node | |
parent | 0b396bc15bd4433bfe9b8c6ffbc87d312d2426c1 (diff) | |
parent | 16100f8261770e367b0892bb38c778699ed609fe (diff) |
Merge branch 'master' into blender2.8
Conflicts:
source/blender/editors/object/object_add.c
source/blender/editors/object/object_select.c
source/blender/editors/space_outliner/outliner_edit.c
Diffstat (limited to 'source/blender/editors/space_node')
-rw-r--r-- | source/blender/editors/space_node/node_add.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/editors/space_node/node_add.c b/source/blender/editors/space_node/node_add.c index c200c5a7612..956fea9b44a 100644 --- a/source/blender/editors/space_node/node_add.c +++ b/source/blender/editors/space_node/node_add.c @@ -400,6 +400,7 @@ static int node_add_mask_poll(bContext *C) static int node_add_mask_exec(bContext *C, wmOperator *op) { + Main *bmain = CTX_data_main(C); SpaceNode *snode = CTX_wm_space_node(C); bNode *node; ID *mask = NULL; @@ -407,7 +408,7 @@ static int node_add_mask_exec(bContext *C, wmOperator *op) /* check input variables */ char name[MAX_ID_NAME - 2]; RNA_string_get(op->ptr, "name", name); - mask = BKE_libblock_find_name(ID_MSK, name); + mask = BKE_libblock_find_name(bmain, ID_MSK, name); if (!mask) { BKE_reportf(op->reports, RPT_ERROR, "Mask '%s' not found", name); return OPERATOR_CANCELLED; |