Orange: tuesday sync with bf-blender

diff --cc source/blender/blenkernel/intern/effect.c
Simple merge

diff --cc source/blender/renderconverter/intern/convertBlenderScene.c
Simple merge

diff --cc source/blender/src/space.c
index 32c1feb971879102fb0f9c2ea2e4e05262a61981,5c07f1ba341badd98ae0f5c1391e37a6e39a35fc..9228455371e528eab8c45f60ee582cc7deea48fd
--- 1/source/blender/src/space.c
--- 2/source/blender/src/space.c
+++ b/source/blender/src/space.c
@@@ -89,6 -89,6 +89,7 @@@
  #include "BIF_editarmature.h"
  #include "BIF_editconstraint.h"
  #include "BIF_editfont.h"
++#include "BIF_editgroup.h"
  #include "BIF_editkey.h"
  #include "BIF_editlattice.h"
  #include "BIF_editmesh.h"