[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [53121] trunk/blender/source/blender/ blenkernel/intern/pointcache.c: Fix #33600: copying objects with point caches did not copy the external,

Brecht Van Lommel brechtvanlommel at pandora.be
Tue Dec 18 15:05:56 CET 2012


Revision: 53121
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=53121
Author:   blendix
Date:     2012-12-18 14:05:54 +0000 (Tue, 18 Dec 2012)
Log Message:
-----------
Fix #33600: copying objects with point caches did not copy the external,
disk cache and lib path settings.

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

Modified: trunk/blender/source/blender/blenkernel/intern/pointcache.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/pointcache.c	2012-12-18 13:59:47 UTC (rev 53120)
+++ trunk/blender/source/blender/blenkernel/intern/pointcache.c	2012-12-18 14:05:54 UTC (rev 53121)
@@ -2782,7 +2782,8 @@
 		ncache->mem_cache.last = NULL;
 		ncache->cached_frames = NULL;
 
-		ncache->flag= 0;
+		/* flag is a mix of user settings and simulator/baking state */
+		ncache->flag= ncache->flag & (PTCACHE_DISK_CACHE|PTCACHE_EXTERNAL|PTCACHE_IGNORE_LIBPATH);
 		ncache->simframe= 0;
 	}
 	else {




More information about the Bf-blender-cvs mailing list