diff options
| author | Ray Molenkamp <github@lazydodo.com> | 2022-11-10 01:23:52 +0300 |
|---|---|---|
| committer | Ray Molenkamp <github@lazydodo.com> | 2022-11-10 01:23:52 +0300 |
| commit | 24bd098dbaf8d26511cb416badb8489d1fcfe00b (patch) | |
| tree | 53e8f3f468da28fc80550db57d62afb16c6bb569 /source/blender/blenkernel/intern/context.c | |
| parent | 32aebe8c55963d42a6b541e266e85cac25f96311 (diff) | |
| parent | d49dec896aaae5e2cdb5f2e2926f3bd010f4a0fe (diff) | |
Merge remote-tracking branch 'origin/master' into tmp-vfx-platform-2023
Diffstat (limited to 'source/blender/blenkernel/intern/context.c')
| -rw-r--r-- | source/blender/blenkernel/intern/context.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/context.c b/source/blender/blenkernel/intern/context.c index 1d6092849cc..0ddd53ccb99 100644 --- a/source/blender/blenkernel/intern/context.c +++ b/source/blender/blenkernel/intern/context.c @@ -1495,7 +1495,7 @@ AssetHandle CTX_wm_asset_handle(const bContext *C, bool *r_is_valid) * require returning a non-owning pointer, which we don't have in the Asset Browser (yet). */ FileDirEntry *file = (FileDirEntry *)CTX_data_pointer_get_type(C, "active_file", &RNA_FileSelectEntry).data; - if (file && file->asset_data) { + if (file && file->asset) { *r_is_valid = true; return (AssetHandle){.file_data = file}; } |