Commit: 5be17e92c56f84acc455f4c59f70148b1f002ffd Author: Hans Goudey Date: Mon Jun 28 22:47:29 2021 -0500 Branches: refactor-vertex-group-names https://developer.blender.org/rB5be17e92c56f84acc455f4c59f70148b1f002ffd
Merge branch 'master' into refactor-vertex-group-names =================================================================== =================================================================== diff --cc source/blender/blenkernel/BKE_blender_version.h index bac982708bc,110b9fc4252..d5baeb08ccc --- a/source/blender/blenkernel/BKE_blender_version.h +++ b/source/blender/blenkernel/BKE_blender_version.h @@@ -39,7 -39,7 +39,7 @@@ extern "C" /* Blender file format version. */ #define BLENDER_FILE_VERSION BLENDER_VERSION - #define BLENDER_FILE_SUBVERSION 5 -#define BLENDER_FILE_SUBVERSION 6 ++#define BLENDER_FILE_SUBVERSION 7 /* Minimum Blender version that supports reading file written with the current * version. Older Blender versions will test this and show a warning if the file diff --cc source/blender/blenkernel/intern/gpencil.c index ba6592996e8,459fc5e4c68..6321f6b8461 --- a/source/blender/blenkernel/intern/gpencil.c +++ b/source/blender/blenkernel/intern/gpencil.c @@@ -231,12 -227,10 +231,12 @@@ void BKE_gpencil_blend_read_data(BlendD } } + BLO_read_list(reader, &gpd->vertex_group_names); + - /* materials */ + /* Materials. */ BLO_read_pointer_array(reader, (void **)&gpd->mat); - /* relink layers */ + /* Relink layers. */ BLO_read_list(reader, &gpd->layers); LISTBASE_FOREACH (bGPDlayer *, gpl, &gpd->layers) { diff --cc source/blender/blenloader/intern/versioning_300.c index 718bd3a2405,84021755cef..261923d7109 --- a/source/blender/blenloader/intern/versioning_300.c +++ b/source/blender/blenloader/intern/versioning_300.c @@@ -140,10 -129,6 +143,10 @@@ void do_versions_after_linking_300(Mai assert_sorted_ids(bmain); } - if (!MAIN_VERSION_ATLEAST(bmain, 300, 5)) { ++ if (!MAIN_VERSION_ATLEAST(bmain, 300, 7)) { + move_vertex_group_names_to_object_data(bmain); + } + /** * Versioning code until next subversion bump goes here. * diff --cc source/blender/editors/object/object_vgroup.c index 4bea3925968,51a9a3676e7..a73e3b7bbc7 --- a/source/blender/editors/object/object_vgroup.c +++ b/source/blender/editors/object/object_vgroup.c @@@ -4036,11 -4065,10 +4036,11 @@@ static char *vgroup_init_remap(Object * static int vgroup_do_remap(Object *ob, const char *name_array, wmOperator *op) { MDeformVert *dvert = NULL; - bDeformGroup *def; - int defbase_tot = BLI_listbase_count(&ob->defbase); + const bDeformGroup *def; + const ListBase *defbase = BKE_object_defgroup_list_for_read(ob); + int defbase_tot = BLI_listbase_count(defbase); - /* needs a dummy index at the start*/ + /* Needs a dummy index at the start. */ int *sort_map_update = MEM_mallocN(sizeof(int) * (defbase_tot + 1), "sort vgroups"); int *sort_map = sort_map_update + 1; @@@ -4159,15 -4186,13 +4159,15 @@@ static int vertex_group_sort_exec(bCont int ret; int sort_type = RNA_enum_get(op->ptr, "sort_type"); - /*init remapping*/ + /* Init remapping. */ name_array = vgroup_init_remap(ob); + ListBase *defbase = BKE_object_defgroup_list_for_write(ob); + - /*sort vgroup names*/ + /* Sort vgroup names. */ switch (sort_type) { case SORT_TYPE_NAME: - BLI_listbase_sort(&ob->defbase, vgroup_sort_name); + BLI_listbase_sort(defbase, vgroup_sort_name); break; case SORT_TYPE_BONEHIERARCHY: vgroup_sort_bone_hierarchy(ob, NULL); _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org List details, subscription details or unsubscribe: https://lists.blender.org/mailman/listinfo/bf-blender-cvs