Commit: 6d58339973b6a3b5ccf972e67a07a4aac4904ced
Author: Brecht Van Lommel
Date: Thu Jan 24 19:44:43 2019 +0100
Branches: master
https://developer.blender.org/rB6d58339973b6a3b5ccf972e67a07a4aac4904ced
Fix smoke clipping being ignored by Cycles and not being editable after baking.
The value worked in 2.7, but not with copy-on-write in 2.8.
===================================================================
M release/scripts/startup/bl_ui/properties_physics_smoke.py
M source/blender/blenkernel/intern/smoke.c
M source/blender/makesrna/intern/rna_smoke.c
===================================================================
diff --git a/release/scripts/startup/bl_ui/properties_physics_smoke.py
b/release/scripts/startup/bl_ui/properties_physics_smoke.py
index 4fd79f26b0b..1f52f768676 100644
--- a/release/scripts/startup/bl_ui/properties_physics_smoke.py
+++ b/release/scripts/startup/bl_ui/properties_physics_smoke.py
@@ -96,16 +96,20 @@ class PHYSICS_PT_smoke_settings(PhysicButtonsPanel, Panel):
domain = md.domain_settings
flow = layout.grid_flow(row_major=True, columns=0,
even_columns=True, even_rows=False, align=False)
- flow.enabled = (not domain.point_cache.is_baked)
col = flow.column()
+ col.enabled = (not domain.point_cache.is_baked)
col.prop(domain, "resolution_max", text="Resolution Divisions")
col.prop(domain, "time_scale", text="Time Scale")
col.separator()
col = flow.column()
- col.prop(domain, "collision_extents", text="Border Collisions")
+ sub = col.row()
+ sub.enabled = (not domain.point_cache.is_baked)
+ sub.prop(domain, "collision_extents", text="Border Collisions")
+
+ # This can be tweaked after baking, for render.
col.prop(domain, "clipping", text="Empty Space")
elif md.smoke_type == 'FLOW':
diff --git a/source/blender/blenkernel/intern/smoke.c
b/source/blender/blenkernel/intern/smoke.c
index 918185e0ffb..2d404347cee 100644
--- a/source/blender/blenkernel/intern/smoke.c
+++ b/source/blender/blenkernel/intern/smoke.c
@@ -681,6 +681,8 @@ void smokeModifier_copy(const struct SmokeModifierData
*smd, struct SmokeModifie
if (sds->coba) {
tsds->coba = MEM_dupallocN(sds->coba);
}
+
+ tsds->clipping = sds->clipping;
}
else if (tsmd->flow) {
SmokeFlowSettings *tsfs = tsmd->flow;
diff --git a/source/blender/makesrna/intern/rna_smoke.c
b/source/blender/makesrna/intern/rna_smoke.c
index 65ff61096cc..49e014910f3 100644
--- a/source/blender/makesrna/intern/rna_smoke.c
+++ b/source/blender/makesrna/intern/rna_smoke.c
@@ -926,7 +926,7 @@ static void rna_def_smoke_domain_settings(BlenderRNA *brna)
RNA_def_property_range(prop, 0.0, 1.0);
RNA_def_property_ui_range(prop, 0.0, 1.0, 0.1, 3);
RNA_def_property_ui_text(prop, "Clipping",
- "Value under which voxels are considered empty
space to optimize caching or rendering");
+ "Value under which voxels are considered empty
space to optimize caching and rendering");
RNA_def_property_update(prop, NC_OBJECT | ND_MODIFIER, NULL);
}
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
