[Bf-blender-cvs] [7fb68cf] master: Fix python module (bpy) compilation - broken since 8d084e8c

Dalai Felinto noreply at git.blender.org
Fri Oct 17 17:02:26 CEST 2014


Commit: 7fb68cf83f53d9986c7b761a4d4349a0d71c99da
Author: Dalai Felinto
Date:   Fri Oct 17 11:39:14 2014 -0300
Branches: master
https://developer.blender.org/rB7fb68cf83f53d9986c7b761a4d4349a0d71c99da

Fix python module (bpy) compilation - broken since 8d084e8c

(reported on bf-python mailing-list and in my github (!), let's hope in
the future we get more reports in developer.blender.org instead ;))

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

M	intern/ghost/intern/GHOST_WindowNULL.h

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

diff --git a/intern/ghost/intern/GHOST_WindowNULL.h b/intern/ghost/intern/GHOST_WindowNULL.h
index c848d77..0cdb161 100644
--- a/intern/ghost/intern/GHOST_WindowNULL.h
+++ b/intern/ghost/intern/GHOST_WindowNULL.h
@@ -53,7 +53,7 @@ public:
 	    const bool stereoVisual,
 	    const GHOST_TUns16 numOfAASamples
 	    ) :
-		GHOST_Window(width, height, state, type, stereoVisual, false, numOfAASamples),
+		GHOST_Window(width, height, state, stereoVisual, false, numOfAASamples),
 		m_system(system)
 	{
 		setTitle(title);
@@ -91,6 +91,12 @@ protected:
 
 private:
 	GHOST_SystemNULL *m_system;
+
+	/**
+	 * \param type	The type of rendering context create.
+	 * \return Indication of success.
+	 */
+	virtual GHOST_Context *newDrawingContext(GHOST_TDrawingContextType type) {return NULL;}
 };




More information about the Bf-blender-cvs mailing list