Merge branch 'blender-v4.0-release'

This commit is contained in:
Richard Antalik
2023-11-03 02:06:08 +01:00
2 changed files with 7 additions and 1 deletions

View File

@@ -6,6 +6,7 @@
* \ingroup edcurves
*/
#include "BLI_path_util.h"
#include "BLI_string.h"
#include "ED_curves.hh"
@@ -553,7 +554,7 @@ static std::string run_node_group_get_name(wmOperatorType * /*ot*/, PointerRNA *
ptr, "relative_asset_identifier", nullptr, 0, &len);
BLI_SCOPED_DEFER([&]() { MEM_SAFE_FREE(library_asset_identifier); })
StringRef ref(library_asset_identifier, len);
return ref.drop_prefix(ref.find_last_of('/') + 1);
return ref.drop_prefix(ref.find_last_of(SEP_STR) + 1);
}
void GEOMETRY_OT_execute_node_group(wmOperatorType *ot)

View File

@@ -511,6 +511,8 @@ Sequence *SEQ_add_movie_strip(Main *bmain, Scene *scene, ListBase *seqbase, SeqL
seq_add_set_name(scene, seq, load_data);
seq_add_generic_update(scene, seq);
/* Prevent high memory usage when adding many files at once. */
SEQ_relations_sequence_free_anim(seq);
MEM_freeN(anim_arr);
return seq;
}
@@ -626,6 +628,9 @@ void SEQ_add_reload_new_file(Main *bmain, Scene *scene, Sequence *seq, const boo
if (seq->len < 0) {
seq->len = 0;
}
/* Prevent high memory usage when reloading many files at once. */
SEQ_relations_sequence_free_anim(seq);
break;
}
case SEQ_TYPE_MOVIECLIP: