[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [58830] trunk/blender/source/blender: Fix [#35541]: Point cache doesn' t load existing frames from disk if cache file name is changed.

[Miika Hamalainen]

Revision: 58830
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=58830
Author:   miikah
Date:     2013-08-02 16:39:50 +0000 (Fri, 02 Aug 2013)
Log Message:
-----------
Fix [#35541]: Point cache doesn't load existing frames from disk if cache file name is changed.

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/pointcache.c
    trunk/blender/source/blender/makesrna/intern/rna_object_force.c

Modified: trunk/blender/source/blender/blenkernel/intern/pointcache.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/pointcache.c	2013-08-02 15:58:11 UTC (rev 58829)
+++ trunk/blender/source/blender/blenkernel/intern/pointcache.c	2013-08-02 16:39:50 UTC (rev 58830)
@@ -3578,6 +3578,11 @@
 		cache->flag &= ~(PTCACHE_OUTDATED|PTCACHE_FRAMES_SKIPPED);
 	}
 
+	/* make sure all new frames are loaded */
+	if (cache->cached_frames) {
+		MEM_freeN(cache->cached_frames);
+		cache->cached_frames=NULL;
+	}
 	BKE_ptcache_update_info(pid);
 }
 

Modified: trunk/blender/source/blender/makesrna/intern/rna_object_force.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_object_force.c	2013-08-02 15:58:11 UTC (rev 58829)
+++ trunk/blender/source/blender/makesrna/intern/rna_object_force.c	2013-08-02 16:39:50 UTC (rev 58830)
@@ -184,6 +184,7 @@
 		BKE_ptcache_load_external(pid);
 
 		DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
+		WM_main_add_notifier(NC_OBJECT | ND_POINTCACHE, ob);
 	}
 	else {
 		for (pid = pidlist.first; pid; pid = pid->next) {