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 | |
parent | e49485a15cbce0e1f0dc1c72d742d08081a600f1 (diff) |
BKE_id_is_in_gobal_main > BKE_id_is_in_global_main
Diffstat (limited to 'source/blender/makesrna/intern')
-rw-r--r-- | source/blender/makesrna/intern/rna_ID.c | 8 | ||||
-rw-r--r-- | source/blender/makesrna/intern/rna_armature.c | 4 | ||||
-rw-r--r-- | source/blender/makesrna/intern/rna_image.c | 2 | ||||
-rw-r--r-- | source/blender/makesrna/intern/rna_object.c | 12 | ||||
-rw-r--r-- | source/blender/makesrna/intern/rna_pose.c | 4 | ||||
-rw-r--r-- | source/blender/makesrna/intern/rna_scene.c | 2 | ||||
-rw-r--r-- | source/blender/makesrna/intern/rna_space.c | 2 |
7 files changed, 17 insertions, 17 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); } diff --git a/source/blender/makesrna/intern/rna_armature.c b/source/blender/makesrna/intern/rna_armature.c index ea39b1f46eb..c3e68cf0869 100644 --- a/source/blender/makesrna/intern/rna_armature.c +++ b/source/blender/makesrna/intern/rna_armature.c @@ -352,7 +352,7 @@ static void rna_EditBone_name_set(PointerRNA *ptr, const char *value) BLI_strncpy_utf8(newname, value, sizeof(ebone->name)); BLI_strncpy(oldname, ebone->name, sizeof(ebone->name)); - BLI_assert(BKE_id_is_in_gobal_main(&arm->id)); + BLI_assert(BKE_id_is_in_global_main(&arm->id)); ED_armature_bone_rename(G_MAIN, arm, oldname, newname); } @@ -366,7 +366,7 @@ static void rna_Bone_name_set(PointerRNA *ptr, const char *value) BLI_strncpy_utf8(newname, value, sizeof(bone->name)); BLI_strncpy(oldname, bone->name, sizeof(bone->name)); - BLI_assert(BKE_id_is_in_gobal_main(&arm->id)); + BLI_assert(BKE_id_is_in_global_main(&arm->id)); ED_armature_bone_rename(G_MAIN, arm, oldname, newname); } diff --git a/source/blender/makesrna/intern/rna_image.c b/source/blender/makesrna/intern/rna_image.c index d4535af52db..9d3699e220e 100644 --- a/source/blender/makesrna/intern/rna_image.c +++ b/source/blender/makesrna/intern/rna_image.c @@ -93,7 +93,7 @@ static void rna_Image_source_set(PointerRNA *ptr, int value) if (value != ima->source) { ima->source = value; - BLI_assert(BKE_id_is_in_gobal_main(&ima->id)); + BLI_assert(BKE_id_is_in_global_main(&ima->id)); BKE_image_signal(G_MAIN, ima, NULL, IMA_SIGNAL_SRC_CHANGE); DEG_id_tag_update(&ima->id, 0); } diff --git a/source/blender/makesrna/intern/rna_object.c b/source/blender/makesrna/intern/rna_object.c index ff2466d1b39..9ac5d73ed93 100644 --- a/source/blender/makesrna/intern/rna_object.c +++ b/source/blender/makesrna/intern/rna_object.c @@ -380,8 +380,8 @@ static void rna_Object_data_set(PointerRNA *ptr, PointerRNA value) return; } - BLI_assert(BKE_id_is_in_gobal_main(&ob->id)); - BLI_assert(BKE_id_is_in_gobal_main(id)); + BLI_assert(BKE_id_is_in_global_main(&ob->id)); + BLI_assert(BKE_id_is_in_global_main(id)); if (ob->type == OB_EMPTY) { if (ob->data) { @@ -810,8 +810,8 @@ static void rna_Object_active_material_set(PointerRNA *ptr, PointerRNA value) Object *ob = (Object *)ptr->id.data; DEG_id_tag_update(value.data, 0); - BLI_assert(BKE_id_is_in_gobal_main(&ob->id)); - BLI_assert(BKE_id_is_in_gobal_main(value.data)); + BLI_assert(BKE_id_is_in_global_main(&ob->id)); + BLI_assert(BKE_id_is_in_global_main(value.data)); assign_material(G_MAIN, ob, value.data, ob->actcol, BKE_MAT_ASSIGN_EXISTING); } @@ -1004,8 +1004,8 @@ static void rna_MaterialSlot_material_set(PointerRNA *ptr, PointerRNA value) Object *ob = (Object *)ptr->id.data; int index = (Material **)ptr->data - ob->mat; - BLI_assert(BKE_id_is_in_gobal_main(&ob->id)); - BLI_assert(BKE_id_is_in_gobal_main(value.data)); + BLI_assert(BKE_id_is_in_global_main(&ob->id)); + BLI_assert(BKE_id_is_in_global_main(value.data)); assign_material(G_MAIN, ob, value.data, index + 1, BKE_MAT_ASSIGN_EXISTING); } diff --git a/source/blender/makesrna/intern/rna_pose.c b/source/blender/makesrna/intern/rna_pose.c index 61a63bc939f..4b6a19ab063 100644 --- a/source/blender/makesrna/intern/rna_pose.c +++ b/source/blender/makesrna/intern/rna_pose.c @@ -300,8 +300,8 @@ static void rna_PoseChannel_name_set(PointerRNA *ptr, const char *value) BLI_strncpy_utf8(newname, value, sizeof(pchan->name)); BLI_strncpy(oldname, pchan->name, sizeof(pchan->name)); - BLI_assert(BKE_id_is_in_gobal_main(&ob->id)); - BLI_assert(BKE_id_is_in_gobal_main(ob->data)); + BLI_assert(BKE_id_is_in_global_main(&ob->id)); + BLI_assert(BKE_id_is_in_global_main(ob->data)); ED_armature_bone_rename(G_MAIN, ob->data, oldname, newname); } diff --git a/source/blender/makesrna/intern/rna_scene.c b/source/blender/makesrna/intern/rna_scene.c index 24889d97898..3a9ff73322a 100644 --- a/source/blender/makesrna/intern/rna_scene.c +++ b/source/blender/makesrna/intern/rna_scene.c @@ -1412,7 +1412,7 @@ void rna_ViewLayer_name_set(PointerRNA *ptr, const char *value) { Scene *scene = (Scene *)ptr->id.data; ViewLayer *view_layer = (ViewLayer *)ptr->data; - BLI_assert(BKE_id_is_in_gobal_main(&scene->id)); + BLI_assert(BKE_id_is_in_global_main(&scene->id)); BKE_view_layer_rename(G_MAIN, scene, view_layer, value); } diff --git a/source/blender/makesrna/intern/rna_space.c b/source/blender/makesrna/intern/rna_space.c index ea02fdac98d..6db4aa5b404 100644 --- a/source/blender/makesrna/intern/rna_space.c +++ b/source/blender/makesrna/intern/rna_space.c @@ -1060,7 +1060,7 @@ static void rna_SpaceImageEditor_image_set(PointerRNA *ptr, PointerRNA value) ViewLayer *view_layer = WM_window_get_active_view_layer(win); Object *obedit = OBEDIT_FROM_VIEW_LAYER(view_layer); - BLI_assert(BKE_id_is_in_gobal_main(value.data)); + BLI_assert(BKE_id_is_in_global_main(value.data)); ED_space_image_set(G_MAIN, sima, scene, obedit, (Image *)value.data); } |