[Bf-blender-cvs] [54774521943] blender2.8: Merge branch 'master' into blender2.8
Campbell Barton
noreply at git.blender.org
Fri Jan 19 07:54:33 CET 2018
Commit: 547745219434d041633672e14da9c879d68532d4
Author: Campbell Barton
Date: Fri Jan 19 18:03:43 2018 +1100
Branches: blender2.8
https://developer.blender.org/rB547745219434d041633672e14da9c879d68532d4
Merge branch 'master' into blender2.8
===================================================================
===================================================================
diff --cc source/blender/editors/screen/screen_intern.h
index 4eb68d01df7,db5259f5865..df92ab86ef2
--- a/source/blender/editors/screen/screen_intern.h
+++ b/source/blender/editors/screen/screen_intern.h
@@@ -31,8 -31,8 +31,9 @@@
#ifndef __SCREEN_INTERN_H__
#define __SCREEN_INTERN_H__
+ struct bContext;
struct bContextDataResult;
+struct Main;
/* internal exports only */
More information about the Bf-blender-cvs
mailing list