[Bf-blender-cvs] [2382484] opensubdiv-modifier: Merge branch 'master' into opensubdiv-modifier

[Sergey Sharybin]

Commit: 238248455b6c460741bec8187fa04689d7cf3f07
Author: Sergey Sharybin
Date:   Wed Jun 18 15:47:52 2014 +0600
https://developer.blender.org/rB238248455b6c460741bec8187fa04689d7cf3f07

Merge branch 'master' into opensubdiv-modifier

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



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

diff --cc source/blender/windowmanager/intern/wm_init_exit.c
index 967410f,f1c0457..5464dde
--- a/source/blender/windowmanager/intern/wm_init_exit.c
+++ b/source/blender/windowmanager/intern/wm_init_exit.c
@@@ -115,13 -115,13 +115,17 @@@
  #include "BKE_sound.h"
  #include "COM_compositor.h"
  
 +#ifdef WITH_OPENSUBDIV
 +#  include "opensubdiv_capi.h"
 +#endif
 +
  static void wm_init_reports(bContext *C)
  {
- 	BKE_reports_init(CTX_wm_reports(C), RPT_STORE);
+ 	ReportList *reports = CTX_wm_reports(C);
+ 
+ 	BLI_assert(!reports || BLI_listbase_is_empty(&reports->list));
+ 
+ 	BKE_reports_init(reports, RPT_STORE);
  }
  static void wm_free_reports(bContext *C)
  {