Cycles: svn merge -r37904:37957 https://svn.blender.org/svnroot/bf-blender/trunk...

diff --cc CMakeLists.txt
Simple merge

diff --cc source/blenderplayer/bad_level_call_stubs/stubs.c
index a3bd6d91a635548ceccf3a16bae57755ae04985a,e496fa0fa8c0bf3ed4a1a1756d0e84938fb1eedc..5629f0d9668d01a607b35dc4d53f353f83e7d236
--- 1/source/blenderplayer/bad_level_call_stubs/stubs.c
--- 2/source/blenderplayer/bad_level_call_stubs/stubs.c
+++ b/source/blenderplayer/bad_level_call_stubs/stubs.c
@@@ -377,8 -377,7 +377,9 @@@ void RE_AcquireResultImage(struct Rende
  void RE_ReleaseResult(struct Render *re){}
  void RE_ReleaseResultImage(struct Render *re){}
  int RE_engine_test_break(struct RenderEngine *engine){return 0;}
 +void RE_engines_init() {}
 +void RE_engines_exit() {}
+ void RE_engine_report(struct RenderEngine *engine, int type, const char *msg) {}
  
  /* python */
  struct wmOperatorType *WM_operatortype_find(const char *idname, int quiet){return (struct wmOperatorType *) NULL;}