Cycles: svn merge -r37904:37957 https://svn.blender.org/svnroot/bf-blender/trunk...
authorBrecht Van Lommel <brechtvanlommel@pandora.be>
Wed, 29 Jun 2011 19:14:37 +0000 (19:14 +0000)
committerBrecht Van Lommel <brechtvanlommel@pandora.be>
Wed, 29 Jun 2011 19:14:37 +0000 (19:14 +0000)
1  2 
CMakeLists.txt
source/blenderplayer/bad_level_call_stubs/stubs.c

diff --cc CMakeLists.txt
Simple merge
@@@ -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;}