[Bf-blender-cvs] [c4d5ba4c7b] id_override_static: Merge branch 'master' into id_override_static

[Bastien Montagne]

Commit: c4d5ba4c7b1d2e293fc6c8a33558c87961ccd59f
Author: Bastien Montagne
Date:   Mon Feb 6 21:01:28 2017 +0100
Branches: id_override_static
https://developer.blender.org/rBc4d5ba4c7b1d2e293fc6c8a33558c87961ccd59f

Merge branch 'master' into id_override_static

Conflicts:
	source/blender/blenloader/intern/writefile.c

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



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

diff --cc source/blender/blenloader/intern/writefile.c
index 24e503e6ae,f467010f08..ed6b119b4a
--- a/source/blender/blenloader/intern/writefile.c
+++ b/source/blender/blenloader/intern/writefile.c
@@@ -1902,12 -1880,8 +1902,12 @@@ static void write_objects(WriteData *wd
  			writelist(wd, DATA, LinkData, &ob->pc_ids);
  			writelist(wd, DATA, LodLevel, &ob->lodlevels);
  
+ 			write_previews(wd, ob->preview);
++
 +			if (do_override) {
 +				BKE_override_operations_store_end(&ob->id);
 +			}
  		}
- 
- 		write_previews(wd, ob->preview);
  	}
  
  	mywrite_flush(wd);