dillongoostudios/goo-engine
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'blender-v4.1-release'

Browse Source
This commit is contained in:
Sebastian Parborg
2024-02-23 15:35:31 +01:00
parent 03833417b3 c75d2d09e3
commit 86c8c27974
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/blender/blenkernel/intern/cloth.cc
+2 -1
View File
@@ -592,7 +592,8 @@ int cloth_uses_vgroup(ClothModifierData *clmd)
(clmd->coll_parms->vgroup_objcol > 0)) ||
(clmd->sim_parms->vgroup_pressure > 0) || (clmd->sim_parms->vgroup_struct > 0) ||
(clmd->sim_parms->vgroup_bend > 0) || (clmd->sim_parms->vgroup_shrink > 0) ||
(clmd->sim_parms->vgroup_intern > 0) || (clmd->sim_parms->vgroup_mass > 0));
(clmd->sim_parms->vgroup_intern > 0) || (clmd->sim_parms->vgroup_mass > 0) ||
(clmd->sim_parms->vgroup_shear > 0));
}
/**
source/blender/editors/space_sequencer/sequencer_clipboard.cc
+1 -1
View File
@@ -150,7 +150,7 @@ static bool sequencer_write_copy_paste_file(Main *bmain_src,
scene_dst->ed = MEM_cnew<Editing>(__func__);
scene_dst->ed->seqbasep = &scene_dst->ed->seqbase;
SEQ_sequence_base_dupli_recursive(
scene_src, scene_dst, &scene_dst->ed->seqbase, &scene_src->ed->seqbase, 0, 0);
scene_src, scene_dst, &scene_dst->ed->seqbase, scene_src->ed->seqbasep, 0, 0);
BLI_duplicatelist(&scene_dst->ed->channels, &scene_src->ed->channels);
scene_dst->ed->displayed_channels = &scene_dst->ed->channels;