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:
authorDaniel Genrich <daniel.genrich@gmx.net>2009-08-09 00:41:44 +0400
committerDaniel Genrich <daniel.genrich@gmx.net>2009-08-09 00:41:44 +0400
commit18121524dd626cc9fec510220ff5f808fe3bd5b9 (patch)
treefb3f8b3d709955a063a48ca66cad1ac15ae46150 /source/blender/blenloader
parentc4c0753dcc066296328344b7991b21dbb7089e74 (diff)
Smoke: fixing collision objects again (bug introduced in decoupling commit) - thanks to nudelZ for reporting
Diffstat (limited to 'source/blender/blenloader')
-rw-r--r--source/blender/blenloader/intern/readfile.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index 6bcb1109480..019392ebcb2 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -3665,7 +3665,11 @@ static void direct_link_modifiers(FileData *fd, ListBase *lb)
smd->domain->traybig = NULL;
smd->domain->bind = NULL;
smd->domain->max_textures = 0;
- smd->domain->viewsettings = 0; // reset view for new frame
+ // reset 3dview
+ if(smd->domain->viewsettings < MOD_SMOKE_VIEW_USEBIG)
+ smd->domain->viewsettings = 0;
+ else
+ smd->domain->viewsettings = MOD_SMOKE_VIEW_USEBIG;
}
else if(smd->type==MOD_SMOKE_TYPE_FLOW)
{