Commit: 88d621a68f943f105e2ddf81542b54ac261397e2 Author: Dalai Felinto Date: Fri Nov 9 10:44:02 2018 -0200 Branches: blender2.8 https://developer.blender.org/rB88d621a68f943f105e2ddf81542b54ac261397e2
BKE_id_is_in_gobal_main > BKE_id_is_in_global_main =================================================================== M source/blender/blenkernel/BKE_library.h M source/blender/blenkernel/intern/library.c M source/blender/makesrna/intern/rna_ID.c M source/blender/makesrna/intern/rna_armature.c M source/blender/makesrna/intern/rna_image.c M source/blender/makesrna/intern/rna_object.c M source/blender/makesrna/intern/rna_pose.c M source/blender/makesrna/intern/rna_scene.c M source/blender/makesrna/intern/rna_space.c M source/blender/python/bmesh/bmesh_py_types.c M source/blender/python/gpu/gpu_py_offscreen.c M source/blender/python/intern/bpy_rna_anim.c =================================================================== diff --git a/source/blender/blenkernel/BKE_library.h b/source/blender/blenkernel/BKE_library.h index b821d19c0d6..038e9377ba4 100644 --- a/source/blender/blenkernel/BKE_library.h +++ b/source/blender/blenkernel/BKE_library.h @@ -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); diff --git a/source/blender/blenkernel/intern/library.c b/source/blender/blenkernel/intern/library.c index 64227219683..aa6cbcc343e 100644 --- a/source/blender/blenkernel/intern/library.c +++ b/source/blender/blenkernel/intern/library.c @@ -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); 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); } diff --git a/source/blender/python/bmesh/bmesh_py_types.c b/source/blender/python/bmesh/bmesh_py_types.c index 3ce5a26de90..bde5bca5780 100644 --- a/source/blender/python/bmesh/bmesh_py_types.c +++ b/source/blender/python/bmesh/bmesh_py_types.c @@ -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, diff --git a/source/blender/python/gpu/gpu_py_offscreen.c b/source/blender/python/gpu/gpu_py_offscreen.c index 05e87cb0f53..f31b0e5eb3d 100644 --- a/source/blender/python/gpu/gpu_py_offscreen.c +++ b/source/blender/python/gpu/gpu_py_offscreen.c @@ -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); diff --git a/source/blender/python/intern/bpy_rna_anim.c b/source/blender/python/intern/bpy_rna_anim.c index ffc56fdf62c..3ba604d5271 100644 --- a/source/blender/python/intern/bpy_rna_anim.c +++ b/source/blender/python/intern/bpy_rna_anim.c @@ -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); _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org https://lists.blender.org/mailman/listinfo/bf-blender-cvs