diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-09-19 05:14:36 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-09-19 05:14:36 +0300 |
| commit | f35e9f047a0381732a41ec331945b7a0654ee578 (patch) | |
| tree | 5be3c632483cf2bc2960b21789849af27c9b2b59 /source/blender/windowmanager/intern/wm_files_link.c | |
| parent | 0ad183bf0289c3b9b1af0cd581bc30435cae3800 (diff) | |
| parent | bb3ec3ebafbc2c0e5d8530148a433242e0adad30 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/windowmanager/intern/wm_files_link.c')
| -rw-r--r-- | source/blender/windowmanager/intern/wm_files_link.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/windowmanager/intern/wm_files_link.c b/source/blender/windowmanager/intern/wm_files_link.c index fb17de26703..53443087def 100644 --- a/source/blender/windowmanager/intern/wm_files_link.c +++ b/source/blender/windowmanager/intern/wm_files_link.c @@ -404,7 +404,7 @@ static int wm_link_append_exec(bContext *C, wmOperator *op) } if (!BLI_ghash_haskey(libraries, libname)) { - BLI_ghash_insert(libraries, BLI_strdup(libname), SET_INT_IN_POINTER(lib_idx)); + BLI_ghash_insert(libraries, BLI_strdup(libname), POINTER_FROM_INT(lib_idx)); lib_idx++; wm_link_append_data_library_add(lapp_data, libname); } @@ -425,7 +425,7 @@ static int wm_link_append_exec(bContext *C, wmOperator *op) continue; } - lib_idx = GET_INT_FROM_POINTER(BLI_ghash_lookup(libraries, libname)); + lib_idx = POINTER_AS_INT(BLI_ghash_lookup(libraries, libname)); item = wm_link_append_data_item_add(lapp_data, name, BKE_idcode_from_name(group), NULL); BLI_BITMAP_ENABLE(item->libraries, lib_idx); |