diff options
| author | Dalai Felinto <dfelinto@gmail.com> | 2018-11-09 15:44:02 +0300 |
|---|---|---|
| committer | Dalai Felinto <dfelinto@gmail.com> | 2018-11-09 15:59:31 +0300 |
| commit | 88d621a68f943f105e2ddf81542b54ac261397e2 (patch) | |
| tree | 4c674b30e467270874370d035edb125cb30bef75 /source/blender/makesrna/intern/rna_ID.c | |
| parent | e49485a15cbce0e1f0dc1c72d742d08081a600f1 (diff) | |
BKE_id_is_in_gobal_main > BKE_id_is_in_global_main
Diffstat (limited to 'source/blender/makesrna/intern/rna_ID.c')
| -rw-r--r-- | source/blender/makesrna/intern/rna_ID.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/makesrna/intern/rna_ID.c b/source/blender/makesrna/intern/rna_ID.c index eeb9713b1d4..ab4bdc4e064 100644 --- a/source/blender/makesrna/intern/rna_ID.c +++ b/source/blender/makesrna/intern/rna_ID.c @@ -151,7 +151,7 @@ void rna_ID_name_set(PointerRNA *ptr, const char *value) { ID *id = (ID *)ptr->data; BLI_strncpy_utf8(id->name + 2, value, sizeof(id->name) - 2); - BLI_assert(BKE_id_is_in_gobal_main(id)); + BLI_assert(BKE_id_is_in_global_main(id)); BLI_libblock_ensure_unique_name(G_MAIN, id->name); } @@ -486,8 +486,8 @@ int rna_IDMaterials_assign_int(PointerRNA *ptr, int key, const PointerRNA *assig short *totcol = give_totcolp_id(id); Material *mat_id = assign_ptr->id.data; if (totcol && (key >= 0 && key < *totcol)) { - BLI_assert(BKE_id_is_in_gobal_main(id)); - BLI_assert(BKE_id_is_in_gobal_main(&mat_id->id)); + BLI_assert(BKE_id_is_in_global_main(id)); + BLI_assert(BKE_id_is_in_global_main(&mat_id->id)); assign_material_id(G_MAIN, id, mat_id, key + 1); return 1; } @@ -545,7 +545,7 @@ static void rna_IDMaterials_clear_id(ID *id, Main *bmain, bool remove_material_s static void rna_Library_filepath_set(PointerRNA *ptr, const char *value) { Library *lib = (Library *)ptr->data; - BLI_assert(BKE_id_is_in_gobal_main(&lib->id)); + BLI_assert(BKE_id_is_in_global_main(&lib->id)); BKE_library_filepath_set(G_MAIN, lib, value); } |