bartvdbraak/blender
1
0
Fork 4
Code Issues 4 Pull Requests 1 Actions 1 Packages Projects Releases Wiki Activity

Fix [#31977] Export Animated Mesh, terminate baking in fluid-sim

Browse Source 
* 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:
Bastien Montagne 2012-07-03 12:40:19 +00:00
parent f42d606789
commit 971ffd8fad
3 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
release/scripts/startup/bl_ui/properties_physics_fluid.py
View File

@ -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")

9
source/blender/editors/physics/physics_fluid.c
View File

@ -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);

5
source/blender/makesrna/intern/rna_fluidsim.c
View File

@ -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)