BKE_id_is_in_gobal_main > BKE_id_is_in_global_main
This commit is contained in:
parent
e49485a15c
commit
88d621a68f
|
@ -193,7 +193,7 @@ void BKE_library_make_local(
|
|||
void BKE_id_tag_set_atomic(struct ID *id, int tag);
|
||||
void BKE_id_tag_clear_atomic(struct ID *id, int tag);
|
||||
|
||||
bool BKE_id_is_in_gobal_main(struct ID *id);
|
||||
bool BKE_id_is_in_global_main(struct ID *id);
|
||||
|
||||
void BKE_id_ordered_list(struct ListBase *ordered_lb, const struct ListBase *lb);
|
||||
void BKE_id_reorder(const struct ListBase *lb, struct ID *id, struct ID *relative, bool after);
|
||||
|
|
|
@ -2215,7 +2215,7 @@ void BKE_id_tag_clear_atomic(ID *id, int tag)
|
|||
|
||||
/** Check that given ID pointer actually is in G_MAIN.
|
||||
* Main intended use is for debug asserts in places we cannot easily get rid of G_Main... */
|
||||
bool BKE_id_is_in_gobal_main(ID *id)
|
||||
bool BKE_id_is_in_global_main(ID *id)
|
||||
{
|
||||
/* We do not want to fail when id is NULL here, even though this is a bit strange behavior... */
|
||||
return (id == NULL || BLI_findindex(which_libbase(G_MAIN, GS(id->name)), id) != -1);
|
||||
|
|
|
@ -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);
|
||||
}
|
||||
|
||||
|
|
|
@ -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);
|
||||
}
|
||||
|
||||
|
|
|
@ -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);
|
||||
}
|
||||
|
|
|
@ -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);
|
||||
}
|
||||
|
||||
|
|
|
@ -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);
|
||||
}
|
||||
|
||||
|
|
|
@ -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);
|
||||
}
|
||||
|
||||
|
|
|
@ -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);
|
||||
}
|
||||
|
||||
|
|
|
@ -903,7 +903,7 @@ static PyObject *bpy_bmesh_to_mesh(BPy_BMesh *self, PyObject *args)
|
|||
|
||||
bm = self->bm;
|
||||
|
||||
BLI_assert(BKE_id_is_in_gobal_main(&me->id));
|
||||
BLI_assert(BKE_id_is_in_global_main(&me->id));
|
||||
BM_mesh_bm_to_me(
|
||||
G_MAIN, /* XXX UGLY! */
|
||||
bm, me,
|
||||
|
|
|
@ -226,7 +226,7 @@ static PyObject *bpygpu_offscreen_draw_view3d(BPyGPUOffScreen *self, PyObject *a
|
|||
return NULL;
|
||||
}
|
||||
|
||||
BLI_assert(BKE_id_is_in_gobal_main(&scene->id));
|
||||
BLI_assert(BKE_id_is_in_global_main(&scene->id));
|
||||
|
||||
depsgraph = BKE_scene_get_depsgraph(scene, view_layer, true);
|
||||
|
||||
|
|
|
@ -275,7 +275,7 @@ PyObject *pyrna_struct_keyframe_insert(BPy_StructRNA *self, PyObject *args, PyOb
|
|||
|
||||
BKE_reports_init(&reports, RPT_STORE);
|
||||
|
||||
BLI_assert(BKE_id_is_in_gobal_main(id));
|
||||
BLI_assert(BKE_id_is_in_global_main(id));
|
||||
result = insert_keyframe(G_MAIN, depsgraph, &reports, id, NULL, group_name, path_full, index, cfra, keytype, options);
|
||||
MEM_freeN((void *)path_full);
|
||||
|
||||
|
|
Loading…
Reference in New Issue