[Bf-blender-cvs] [229761a] soc-2014-viewport_context: Merge branch 'soc-2014-viewport_context' of git.blender.org:blender into soc-2014-viewport_context
Jason Wilkins
noreply at git.blender.org
Sun Jul 27 18:45:57 CEST 2014
Commit: 229761accd1f54d51e92bbc276350a58e2759929
Author: Jason Wilkins
Date: Sun Jul 27 11:33:14 2014 -0500
Branches: soc-2014-viewport_context
https://developer.blender.org/rB229761accd1f54d51e92bbc276350a58e2759929
Merge branch 'soc-2014-viewport_context' of git.blender.org:blender into soc-2014-viewport_context
===================================================================
===================================================================
diff --cc intern/glew-mx/glew-mx.h
index 55dd7ac,fab33d1..d0795a2
--- a/intern/glew-mx/glew-mx.h
+++ b/intern/glew-mx/glew-mx.h
@@@ -58,14 -58,11 +58,14 @@@ void mxDestroyContext(GLEWContext *ctx)
#else
+typedef struct GLEWContext GLEWContext;
+
/* don't use NULL here (mightn't be defined)*/
+#define mxGetContext() ((GLEWContext *)0)
#define mxSetContext(ctx) ((void)ctx)
-#define mxCreateContext() ((void *)0)
+#define mxCreateContext() ((GLEWContext *)0)
#define mxDestroyContext(ctx) ((void)ctx)
- #endif /* GLEW_MX */
+ #endif /* WITH_GLEW_MX */
#endif /* __GLEW_MX_H__ */
More information about the Bf-blender-cvs
mailing list