[Bf-blender-cvs] [03c68dc] soc-2016-layer_manager: Merge branch 'master' into soc-2016-layer_manager

[Julian Eisel]

Commit: 03c68dc9bb0b40ff2f528d74e3df2c6ea4b584e1
Author: Julian Eisel
Date:   Fri Jun 17 19:23:31 2016 +0200
Branches: soc-2016-layer_manager
https://developer.blender.org/rB03c68dc9bb0b40ff2f528d74e3df2c6ea4b584e1

Merge branch 'master' into soc-2016-layer_manager

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



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

diff --cc source/blender/blenloader/intern/readfile.c
index 01b3efd,b11f309..4e0810f
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@@ -5607,10 -5616,9 +5615,9 @@@ static void lib_link_scene(FileData *fd
  			
  			sce->toolsettings->particle.shape_object = newlibadr(fd, sce->id.lib, sce->toolsettings->particle.shape_object);
  			
 -			for (base = sce->base.first; base; base = next) {
 +			for (Base *base = sce->base.first, *next; base; base = next) {
  				next = base->next;
  				
- 				/* base->object= newlibadr_us(fd, sce->id.lib, base->object); */
  				base->object = newlibadr_us(fd, sce->id.lib, base->object);
  				
  				if (base->object == NULL) {