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

[Bastien Montagne]

Commit: e1fc14c358a949a6aa1ffaac4b1e03c2b0fe5254
Author: Bastien Montagne
Date:   Mon Feb 6 20:54:08 2017 +0100
Branches: id_override_static
https://developer.blender.org/rBe1fc14c358a949a6aa1ffaac4b1e03c2b0fe5254

Merge branch 'master' into id_override_static

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



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

diff --cc source/blender/blenloader/intern/writefile.c
index 5e71a7e399,abdc5fcf67..24e503e6ae
--- a/source/blender/blenloader/intern/writefile.c
+++ b/source/blender/blenloader/intern/writefile.c
@@@ -1855,13 -1823,8 +1843,10 @@@ static void write_modifiers(WriteData *
  
  static void write_objects(WriteData *wd, ListBase *idbase)
  {
- 	Object *ob;
- 
- 	ob = idbase->first;
- 	while (ob) {
+ 	for (Object *ob = idbase->first; ob; ob = ob->id.next) {
  		if (ob->id.us > 0 || wd->current) {
 +			const bool do_override = !wd->current && ob->id.override && BKE_override_operations_store_start(&ob->id);
 +
  			/* write LibData */
  			writestruct(wd, ID_OB, Object, 1, ob);
  			write_iddata(wd, &ob->id);