[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [33256] trunk/blender/source/blender: Cached smoke wasn' t being drawn on file load before going to simulation start frame.

[Janne Karhu]

Revision: 33256
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=33256
Author:   jhk
Date:     2010-11-23 15:04:05 +0100 (Tue, 23 Nov 2010)

Log Message:
-----------
Cached smoke wasn't being drawn on file load before going to simulation start frame.

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/smoke.c
    trunk/blender/source/blender/blenloader/intern/readfile.c
    trunk/blender/source/blender/makesdna/DNA_smoke_types.h

Modified: trunk/blender/source/blender/blenkernel/intern/smoke.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/smoke.c	2010-11-23 13:28:13 UTC (rev 33255)
+++ trunk/blender/source/blender/blenkernel/intern/smoke.c	2010-11-23 14:04:05 UTC (rev 33256)
@@ -1353,9 +1353,11 @@
 			}
 		}
 
-		if(!smd->domain->fluid && (framenr != startframe) && (cache->flag & PTCACHE_BAKED)==0)
+		if(!smd->domain->fluid && (framenr != startframe) && (smd->domain->flags & MOD_SMOKE_FILE_LOAD)==0 && (cache->flag & PTCACHE_BAKED)==0)
 			return;
 
+		smd->domain->flags &= ~MOD_SMOKE_FILE_LOAD;
+
 		if(framenr < startframe)
 			framenr = startframe;
 

Modified: trunk/blender/source/blender/blenloader/intern/readfile.c
===================================================================
--- trunk/blender/source/blender/blenloader/intern/readfile.c	2010-11-23 13:28:13 UTC (rev 33255)
+++ trunk/blender/source/blender/blenloader/intern/readfile.c	2010-11-23 14:04:05 UTC (rev 33256)
@@ -3644,6 +3644,8 @@
 					smd->domain->fluid_group = newlibadr_us(fd, ob->id.lib, smd->domain->fluid_group);
 
 					smd->domain->effector_weights->group = newlibadr(fd, ob->id.lib, smd->domain->effector_weights->group);
+
+					smd->domain->flags |= MOD_SMOKE_FILE_LOAD; /* flag for refreshing the simulation after loading */
 				}
 			}
 

Modified: trunk/blender/source/blender/makesdna/DNA_smoke_types.h
===================================================================
--- trunk/blender/source/blender/makesdna/DNA_smoke_types.h	2010-11-23 13:28:13 UTC (rev 33255)
+++ trunk/blender/source/blender/makesdna/DNA_smoke_types.h	2010-11-23 14:04:05 UTC (rev 33256)
@@ -35,6 +35,7 @@
 #define MOD_SMOKE_DISSOLVE_LOG (1<<3) /* using 1/x for dissolve */
 
 #define MOD_SMOKE_HIGH_SMOOTH (1<<5) /* smoothens high res emission*/
+#define MOD_SMOKE_FILE_LOAD (1<<6) /* flag for file load */
 
 /* noise */
 #define MOD_SMOKE_NOISEWAVE (1<<0)