diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2018-05-08 12:58:42 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2018-05-08 12:58:42 +0300 |
| commit | 59ce30f32b45a04eb352590fe719a30efa3f4a6a (patch) | |
| tree | 81d0793090e8578a24171eaabab2ada54e4cd3ad /source/blender/editors/space_clip/clip_ops.c | |
| parent | 433aaa8c2e8db5c8f65a8942c59d66d99d5fa340 (diff) | |
Tracking: Use bmain from context
Diffstat (limited to 'source/blender/editors/space_clip/clip_ops.c')
| -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 7d8dd629562..af5a33bbebe 100644 --- a/source/blender/editors/space_clip/clip_ops.c +++ b/source/blender/editors/space_clip/clip_ops.c @@ -196,8 +196,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); @@ -266,7 +267,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 { |