File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change 6666 <attribute name =" ls_tolerance" type =" float" conflict_allowed =" true" conflict_behavior =" min" />
6767 <attribute name =" noslip_iterations" type =" int" conflict_allowed =" true" conflict_behavior =" max" />
6868 <attribute name =" noslip_tolerance" type =" float" conflict_allowed =" true" conflict_behavior =" min" />
69- <attribute name =" mpr_iterations " type =" int" conflict_allowed =" true" conflict_behavior =" max" />
70- <attribute name =" mpr_tolerance " type =" float" conflict_allowed =" true" conflict_behavior =" min" />
69+ <attribute name =" ccd_iterations " type =" int" conflict_allowed =" true" conflict_behavior =" max" />
70+ <attribute name =" ccd_tolerance " type =" float" conflict_allowed =" true" conflict_behavior =" min" />
7171 <attribute name =" sdf_iterations" type =" int" conflict_allowed =" true" conflict_behavior =" max" />
7272 <attribute name =" sdf_initpoints" type =" int" conflict_allowed =" true" conflict_behavior =" max" />
7373 </attributes >
You can’t perform that action at this time.
0 commit comments