[Bf-blender-cvs] [88dcc85] object_nodes: Merge branch 'master' into object_nodes

[Lukas Tönne]

Commit: 88dcc8566c11414e13cc5dd6b963d209565f2105
Author: Lukas Tönne
Date:   Wed Nov 18 09:27:08 2015 +0100
Branches: object_nodes
https://developer.blender.org/rB88dcc8566c11414e13cc5dd6b963d209565f2105

Merge branch 'master' into object_nodes

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



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

diff --cc source/blender/blenkernel/intern/effect.c
index d0e2ebf,3069601..683d404
--- a/source/blender/blenkernel/intern/effect.c
+++ b/source/blender/blenkernel/intern/effect.c
@@@ -65,8 -64,8 +65,9 @@@
  #include "BKE_cdderivedmesh.h"
  #include "BKE_effect.h"
  #include "BKE_global.h"
+ #include "BKE_library.h"
  #include "BKE_modifier.h"
 +#include "BKE_node.h"
  #include "BKE_object.h"
  #include "BKE_particle.h"
  #include "BKE_scene.h"