Merge branch 'master' into blender2.8
[blender.git] / source / blender / blenloader / intern / versioning_250.c
index 973591c49daec6abe4faba313264e7a77fe4f57d..4b628bf816a4cb79c82e032b5f11b77e823c68bb 100644 (file)
@@ -545,20 +545,6 @@ static void do_version_constraints_radians_degrees_250(ListBase *lb)
        }
 }
 
-/* NOTE: this version patch is intended for versions < 2.52.2, but was initially introduced in 2.27 already */
-static void do_versions_seq_unique_name_all_strips(Scene *sce, ListBase *seqbasep)
-{
-       Sequence * seq = seqbasep->first;
-
-       while (seq) {
-               BKE_sequence_base_unique_name_recursive(&sce->ed->seqbase, seq);
-               if (seq->seqbase.first) {
-                       do_versions_seq_unique_name_all_strips(sce, &seq->seqbase);
-               }
-               seq = seq->next;
-       }
-}
-
 static void do_version_bone_roll_256(Bone *bone)
 {
        Bone *child;
@@ -1029,10 +1015,6 @@ void blo_do_versions_250(FileData *fd, Library *lib, Main *bmain)
                                if (sce->r.frame_step == 0)
                                        sce->r.frame_step = 1;
 
-                               if (sce->ed && sce->ed->seqbase.first) {
-                                       do_versions_seq_unique_name_all_strips(sce, &sce->ed->seqbase);
-                               }
-
                                sce = sce->id.next;
                        }
                }