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/creator | |
| 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/creator')
| -rw-r--r-- | source/creator/creator_args.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source/creator/creator_args.c b/source/creator/creator_args.c index 6973f500f84..657ea3f1eb3 100644 --- a/source/creator/creator_args.c +++ b/source/creator/creator_args.c @@ -1593,8 +1593,9 @@ static int arg_handle_python_text_run(int argc, const char **argv, void *data) /* workaround for scripts not getting a bpy.context.scene, causes internal errors elsewhere */ if (argc > 1) { + Main *bmain = CTX_data_main(C); /* Make the path absolute because its needed for relative linked blends to be found */ - struct Text *text = (struct Text *)BKE_libblock_find_name(ID_TXT, argv[1]); + struct Text *text = (struct Text *)BKE_libblock_find_name(bmain, ID_TXT, argv[1]); bool ok; if (text) { |