Merge branch 'blender-v4.0-release' into main

2023-10-17 11:46:45 -03:00
parent 6f125661e6 6ecef4d176
commit 5139a3a09f
1 changed files with 3 additions and 1 deletions
--- a/source/blender/editors/transform/transform_convert_nla.cc
+++ b/source/blender/editors/transform/transform_convert_nla.cc
@@ -621,13 +621,15 @@ static void createTransNlaData(bContext *C, TransInfo *t)
        if (tdn->handle == 2) {
          tdn += 2;
        }
-        else {
+        else if (tdn->handle) {
          tdn++;
        }
      }
    }
  }

+  BLI_assert(tdn <= (((TransDataNla *)tc->custom.type.data) + tc->data_len));
+
  /* cleanup temp list */
  ANIM_animdata_freelist(&anim_data);
 }