Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Fri, 19 Jan 2018 07:03:43 +0000 (18:03 +1100)
committerCampbell Barton <ideasman42@gmail.com>
Fri, 19 Jan 2018 07:03:43 +0000 (18:03 +1100)
1  2 
source/blender/editors/screen/screen_draw.c
source/blender/editors/screen/screen_intern.h

index 4eb68d01df7f0916f5ea31f39874ed73eabc6f07,db5259f5865dad078880f764dd34c5fd19291390..df92ab86ef2f67d4c8438f8721797fc0b2950dc2
@@@ -31,8 -31,8 +31,9 @@@
  #ifndef __SCREEN_INTERN_H__
  #define __SCREEN_INTERN_H__
  
+ struct bContext;
  struct bContextDataResult;
 +struct Main;
  
  /* internal exports only */