[Bf-blender-cvs] [90c14b1e44f] master: Merge branch 'blender-v3.3-release'

Bastien Montagne noreply at git.blender.org
Tue Aug 16 14:21:39 CEST 2022


Commit: 90c14b1e44fc9342067e4219c5026b7f24685498
Author: Bastien Montagne
Date:   Tue Aug 16 14:21:33 2022 +0200
Branches: master
https://developer.blender.org/rB90c14b1e44fc9342067e4219c5026b7f24685498

Merge branch 'blender-v3.3-release'

===================================================================



===================================================================

diff --cc source/blender/editors/space_outliner/outliner_draw.cc
index e67eab4e432,f8fbddd6d9d..add9a4df2e6
--- a/source/blender/editors/space_outliner/outliner_draw.cc
+++ b/source/blender/editors/space_outliner/outliner_draw.cc
@@@ -737,9 -738,10 +738,10 @@@ static void namebutton_fn(bContext *C, 
        switch (tselem->type) {
          case TSE_DEFGROUP: {
            Object *ob = (Object *)tselem->id;
 -          bDeformGroup *vg = reinterpret_cast<bDeformGroup *>(te->directdata);
 +          bDeformGroup *vg = static_cast<bDeformGroup *>(te->directdata);
            BKE_object_defgroup_unique_name(vg, ob);
            WM_msg_publish_rna_prop(mbus, &ob->id, vg, VertexGroup, name);
+           DEG_id_tag_update(tselem->id, ID_RECALC_COPY_ON_WRITE);
            break;
          }
          case TSE_NLA_ACTION: {
@@@ -801,9 -806,12 +806,11 @@@
            /* restore bone name */
            BLI_strncpy(newname, pchan->name, sizeof(pchan->name));
            BLI_strncpy(pchan->name, oldname, sizeof(pchan->name));
 -          ED_armature_bone_rename(
 -              bmain, reinterpret_cast<bArmature *>(ob->data), oldname, newname);
 +          ED_armature_bone_rename(bmain, static_cast<bArmature *>(ob->data), oldname, newname);
            WM_msg_publish_rna_prop(mbus, &arm->id, pchan->bone, Bone, name);
            WM_event_add_notifier(C, NC_OBJECT | ND_POSE, nullptr);
+           DEG_id_tag_update(tselem->id, ID_RECALC_COPY_ON_WRITE);
+           DEG_id_tag_update(&arm->id, ID_RECALC_COPY_ON_WRITE);
            break;
          }
          case TSE_POSEGRP: {



More information about the Bf-blender-cvs mailing list