diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2018-05-08 12:59:22 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2018-05-08 12:59:22 +0300 |
| commit | 1d95dfc97b8d5c3761a18cda8fce647a0ea70249 (patch) | |
| tree | 9445f3eba3232af88516cbc4cc8862715829a338 /source/blender/editors/space_clip | |
| parent | 9401021f8be81f570e16f11d53535968ce82767b (diff) | |
| parent | 59ce30f32b45a04eb352590fe719a30efa3f4a6a (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/editors/space_clip')
| -rw-r--r-- | source/blender/editors/space_clip/clip_ops.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/source/blender/editors/space_clip/clip_ops.c b/source/blender/editors/space_clip/clip_ops.c index 4afec844f6d..0d9371a7784 100644 --- a/source/blender/editors/space_clip/clip_ops.c +++ b/source/blender/editors/space_clip/clip_ops.c @@ -197,8 +197,9 @@ static int open_exec(bContext *C, wmOperator *op) bool relative = RNA_boolean_get(op->ptr, "relative_path"); RNA_string_get(op->ptr, "directory", dir_only); - if (relative) - BLI_path_rel(dir_only, G.main->name); + if (relative) { + BLI_path_rel(dir_only, CTX_data_main(C)->name); + } prop = RNA_struct_find_property(op->ptr, "files"); RNA_property_collection_lookup_int(op->ptr, prop, 0, &fileptr); @@ -267,7 +268,7 @@ static int open_invoke(bContext *C, wmOperator *op, const wmEvent *UNUSED(event) if (clip) { BLI_strncpy(path, clip->name, sizeof(path)); - BLI_path_abs(path, G.main->name); + BLI_path_abs(path, CTX_data_main(C)->name); BLI_parent_dir(path); } else { |