[Bf-blender-cvs] [c4837e5] alembic_basic_io: Merge branch 'master' into alembic_basic_io

Kévin Dietrich noreply at git.blender.org
Thu Jul 7 13:10:31 CEST 2016


Commit: c4837e5df579dd8e4dfd1a0a649b6393ff8347e8
Author: Kévin Dietrich
Date:   Thu Jul 7 12:30:45 2016 +0200
Branches: alembic_basic_io
https://developer.blender.org/rBc4837e5df579dd8e4dfd1a0a649b6393ff8347e8

Merge branch 'master' into alembic_basic_io

===================================================================



===================================================================

diff --cc source/blender/blenloader/intern/readfile.c
index ace4b65,68cc060..e7c8832
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@@ -114,9 -113,7 +114,8 @@@
  
  #include "BKE_action.h"
  #include "BKE_armature.h"
- #include "BKE_blender_version.h"
  #include "BKE_brush.h"
 +#include "BKE_cachefile.h"
  #include "BKE_cloth.h"
  #include "BKE_constraint.h"
  #include "BKE_context.h"
diff --cc source/blender/blenloader/intern/writefile.c
index 804ede9,a761a56..908173f
--- a/source/blender/blenloader/intern/writefile.c
+++ b/source/blender/blenloader/intern/writefile.c
@@@ -4063,9 -4061,11 +4077,12 @@@ static bool write_file_handle
  	write_paintcurves(wd, &mainvar->paintcurves);
  	write_gpencils(wd, &mainvar->gpencil);
  	write_linestyles(wd, &mainvar->linestyle);
 +	write_cachefiles(wd, &mainvar->cachefiles);
  	write_libraries(wd,  mainvar->next);
  
+ 	/* So changes above don't cause a 'DNA1' to be detected as changed on undo. */
+ 	mywrite_flush(wd);
+ 
  	if (write_flags & G_FILE_USERPREFS) {
  		write_userdef(wd);
  	}




More information about the Bf-blender-cvs mailing list