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_info | |
| 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_info')
| -rw-r--r-- | source/blender/editors/space_info/info_ops.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/space_info/info_ops.c b/source/blender/editors/space_info/info_ops.c index b87a0de23b9..1cd3fef979b 100644 --- a/source/blender/editors/space_info/info_ops.c +++ b/source/blender/editors/space_info/info_ops.c @@ -301,7 +301,7 @@ static int unpack_item_exec(bContext *C, wmOperator *op) int method = RNA_enum_get(op->ptr, "method"); RNA_string_get(op->ptr, "id_name", idname); - id = BKE_libblock_find_name(type, idname); + id = BKE_libblock_find_name(bmain, type, idname); if (id == NULL) { BKE_report(op->reports, RPT_WARNING, "No packed file"); |