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
diff options
context:
space:
mode:
authorBrecht Van Lommel <brechtvanlommel@pandora.be>2013-04-24 21:31:09 +0400
committerBrecht Van Lommel <brechtvanlommel@pandora.be>2013-04-24 21:31:09 +0400
commitdbeec2be86db5b4ba440175e59c52ff84eb98462 (patch)
tree8bedb75ea7937279d318b86f5eecc98f8e03a950 /source/blender/makesdna
parent64e28b21ba8472f4fd822b918d6e7d7c1be87dcb (diff)
Fix #34783: smoke simulation crash when changing frame while preview rendering.
Added a mutex lock for smoke data access. The render was already working with a copy of the volume data, so it's just a short lock to copy things and should not block the UI much.
Diffstat (limited to 'source/blender/makesdna')
-rw-r--r--source/blender/makesdna/DNA_smoke_types.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/source/blender/makesdna/DNA_smoke_types.h b/source/blender/makesdna/DNA_smoke_types.h
index 76ba3fcf7f8..fa31717b9e2 100644
--- a/source/blender/makesdna/DNA_smoke_types.h
+++ b/source/blender/makesdna/DNA_smoke_types.h
@@ -71,6 +71,7 @@
typedef struct SmokeDomainSettings {
struct SmokeModifierData *smd; /* for fast RNA access */
struct FLUID_3D *fluid;
+ void *fluid_mutex;
struct Group *fluid_group;
struct Group *eff_group; // UNUSED
struct Group *coll_group; // collision objects group