forked from bartvdbraak/blender
Fix [#31977] Export Animated Mesh, terminate baking in fluid-sim
* Elbeem exporter code now overrides user settings to No Slip in case the object is animated; * UI of fluid obstacles now disables slip settings when export animated is enabled; * Added in this later option's tooltip a mention that it enforces No Slip!
This commit is contained in:
parent
f42d606789
commit
971ffd8fad
@ -117,10 +117,14 @@ class PHYSICS_PT_fluid(PhysicButtonsPanel, Panel):
|
||||
col.prop(fluid, "use_animated_mesh")
|
||||
|
||||
col = split.column()
|
||||
col.label(text="Slip Type:")
|
||||
col.prop(fluid, "slip_type", text="")
|
||||
subsplit = col.split()
|
||||
subcol = subsplit.column()
|
||||
if fluid.use_animated_mesh:
|
||||
subcol.enabled = False
|
||||
subcol.label(text="Slip Type:")
|
||||
subcol.prop(fluid, "slip_type", text="")
|
||||
if fluid.slip_type == 'PARTIALSLIP':
|
||||
col.prop(fluid, "partial_slip_factor", slider=True, text="Amount")
|
||||
subcol.prop(fluid, "partial_slip_factor", slider=True, text="Amount")
|
||||
|
||||
col.label(text="Impact:")
|
||||
col.prop(fluid, "impact_factor", text="Factor")
|
||||
|
@ -567,11 +567,14 @@ static void export_fluid_objects(ListBase *fobjects, Scene *scene, int length)
|
||||
if (deform) {
|
||||
fsmesh.channelSizeVertices = length;
|
||||
fsmesh.channelVertices = fobj->VertexCache;
|
||||
|
||||
// remove channels
|
||||
|
||||
/* remove channels */
|
||||
fsmesh.channelTranslation =
|
||||
fsmesh.channelRotation =
|
||||
fsmesh.channelScale = NULL;
|
||||
fsmesh.channelScale = NULL;
|
||||
|
||||
/* Override user settings, only noslip is supported here! */
|
||||
fsmesh.obstacleType = FLUIDSIM_OBSTACLE_NOSLIP;
|
||||
}
|
||||
|
||||
elbeemAddMesh(&fsmesh);
|
||||
|
@ -461,8 +461,9 @@ static void rna_def_fluidsim_volume(StructRNA *srna)
|
||||
RNA_def_property_boolean_sdna(prop, NULL, "domainNovecgen", 0);
|
||||
RNA_def_property_clear_flag(prop, PROP_ANIMATABLE);
|
||||
RNA_def_property_ui_text(prop, "Export Animated Mesh",
|
||||
"Export this mesh as an animated one (slower, only use if really necessary [e.g. "
|
||||
"armatures or parented objects], animated pos/rot/scale F-Curves do not require it)");
|
||||
"Export this mesh as an animated one (slower and enforces No Splip, only use if really "
|
||||
"necessary [e.g. armatures or parented objects], animated pos/rot/scale F-Curves "
|
||||
"do not require it)");
|
||||
}
|
||||
|
||||
static void rna_def_fluidsim_active(StructRNA *srna)
|
||||
|
Loading…
Reference in New Issue
Block a user