Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/source
diff options
context:
space:
mode:
authorBrecht Van Lommel <brechtvanlommel@gmail.com>2019-01-24 21:44:43 +0300
committerBrecht Van Lommel <brechtvanlommel@gmail.com>2019-01-24 21:47:01 +0300
commit6d58339973b6a3b5ccf972e67a07a4aac4904ced (patch)
tree449edc2e48db8042b0ee7b2508dc87c22adb8601 /source
parent7b48e04b6e5949c87d37cb0a425ab1067c770d8c (diff)
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.
Diffstat (limited to 'source')
-rw-r--r--source/blender/blenkernel/intern/smoke.c2
-rw-r--r--source/blender/makesrna/intern/rna_smoke.c2
2 files changed, 3 insertions, 1 deletions
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);
}