[Bf-blender-cvs] [279dfe6] alembic_pointcache: Merge branch 'master' into alembic_pointcache

[Lukas Tönne]

Commit: 279dfe6a18d6f7e5a39d83643fe303f874665afd
Author: Lukas Tönne
Date:   Thu Mar 19 10:09:00 2015 +0100
Branches: alembic_pointcache
https://developer.blender.org/rB279dfe6a18d6f7e5a39d83643fe303f874665afd

Merge branch 'master' into alembic_pointcache

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



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

diff --cc source/blender/blenkernel/intern/library.c
index 43f9ef9,9cda4d9..a77ab86
--- a/source/blender/blenkernel/intern/library.c
+++ b/source/blender/blenkernel/intern/library.c
@@@ -624,9 -616,7 +625,8 @@@ int set_listbasepointers(Main *main, Li
  	lb[a++] = &(main->linestyle); /* referenced by scenes */
  	lb[a++] = &(main->scene);
  	lb[a++] = &(main->library);
 +	lb[a++] = &(main->cache_library);
  	lb[a++] = &(main->wm);
- 	lb[a++] = &(main->movieclip);
  	lb[a++] = &(main->mask);
  	
  	lb[a] = NULL;