[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [16455] branches/fluidcontrol: svn merge -r 16369:16454 https://svn.blender.org/svnroot/bf-blender/trunk/ blender
Daniel Genrich
daniel.genrich at gmx.net
Wed Sep 10 13:04:07 CEST 2008
Revision: 16455
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=16455
Author: genscher
Date: 2008-09-10 13:04:07 +0200 (Wed, 10 Sep 2008)
Log Message:
-----------
svn merge -r 16369:16454 https://svn.blender.org/svnroot/bf-blender/trunk/blender
Modified Paths:
--------------
branches/fluidcontrol/CMake/macros.cmake
branches/fluidcontrol/CMakeLists.txt
branches/fluidcontrol/intern/ghost/GHOST_ISystem.h
branches/fluidcontrol/intern/ghost/GHOST_Types.h
branches/fluidcontrol/intern/ghost/intern/GHOST_SystemCarbon.cpp
branches/fluidcontrol/intern/ghost/intern/GHOST_SystemCarbon.h
branches/fluidcontrol/intern/ghost/intern/GHOST_SystemWin32.cpp
branches/fluidcontrol/intern/ghost/intern/GHOST_SystemWin32.h
branches/fluidcontrol/intern/ghost/intern/GHOST_SystemX11.cpp
branches/fluidcontrol/intern/ghost/intern/GHOST_SystemX11.h
branches/fluidcontrol/intern/ghost/intern/GHOST_WindowWin32.cpp
branches/fluidcontrol/intern/ghost/intern/GHOST_WindowX11.cpp
branches/fluidcontrol/intern/ghost/intern/GHOST_WindowX11.h
branches/fluidcontrol/projectfiles_vc7/blender/BPY_python/BPY_python.vcproj
branches/fluidcontrol/projectfiles_vc7/blender/blender.sln
branches/fluidcontrol/projectfiles_vc7/blender/blender.vcproj
branches/fluidcontrol/projectfiles_vc7/blender/blenkernel/BKE_blenkernel.vcproj
branches/fluidcontrol/projectfiles_vc7/blender/nodes/nodes.vcproj
branches/fluidcontrol/projectfiles_vc7/blender/radiosity/BRA_radiosity.vcproj
branches/fluidcontrol/projectfiles_vc7/blender/src/BL_src.vcproj
branches/fluidcontrol/projectfiles_vc7/gameengine/blenderhook/KX_blenderhook.vcproj
branches/fluidcontrol/projectfiles_vc7/gameengine/converter/KX_converter.vcproj
branches/fluidcontrol/projectfiles_vc7/gameengine/expression/EXP_expressions.vcproj
branches/fluidcontrol/projectfiles_vc7/gameengine/gamelogic/SCA_GameLogic.vcproj
branches/fluidcontrol/projectfiles_vc7/gameengine/ketsji/KX_ketsji.vcproj
branches/fluidcontrol/projectfiles_vc7/gameengine/physics/PHY_Physics/PHY_Bullet/PHY_Bullet.vcproj
branches/fluidcontrol/projectfiles_vc7/gameengine/rasterizer/openglrasterizer/RAS_openglrasterizer.vcproj
branches/fluidcontrol/release/datafiles/blenderbuttons
branches/fluidcontrol/release/scripts/object_find.py
branches/fluidcontrol/source/blender/blenkernel/BKE_action.h
branches/fluidcontrol/source/blender/blenkernel/intern/action.c
branches/fluidcontrol/source/blender/blenkernel/intern/armature.c
branches/fluidcontrol/source/blender/blenkernel/intern/constraint.c
branches/fluidcontrol/source/blender/blenkernel/intern/modifier.c
branches/fluidcontrol/source/blender/blenkernel/intern/object.c
branches/fluidcontrol/source/blender/blenkernel/intern/particle_system.c
branches/fluidcontrol/source/blender/blenkernel/intern/softbody.c
branches/fluidcontrol/source/blender/blenkernel/intern/subsurf_ccg.c
branches/fluidcontrol/source/blender/blenkernel/intern/suggestions.c
branches/fluidcontrol/source/blender/blenkernel/intern/text.c
branches/fluidcontrol/source/blender/blenlib/BLI_arithb.h
branches/fluidcontrol/source/blender/blenlib/SConscript
branches/fluidcontrol/source/blender/blenlib/intern/BLI_kdopbvh.c
branches/fluidcontrol/source/blender/blenlib/intern/arithb.c
branches/fluidcontrol/source/blender/blenloader/intern/readfile.c
branches/fluidcontrol/source/blender/blenloader/intern/writefile.c
branches/fluidcontrol/source/blender/gpu/GPU_material.h
branches/fluidcontrol/source/blender/gpu/intern/gpu_codegen.c
branches/fluidcontrol/source/blender/gpu/intern/gpu_draw.c
branches/fluidcontrol/source/blender/gpu/intern/gpu_material.c
branches/fluidcontrol/source/blender/gpu/intern/gpu_shader_material.glsl
branches/fluidcontrol/source/blender/gpu/intern/gpu_shader_material.glsl.c
branches/fluidcontrol/source/blender/include/BIF_drawseq.h
branches/fluidcontrol/source/blender/include/BIF_meshlaplacian.h
branches/fluidcontrol/source/blender/include/BIF_resources.h
branches/fluidcontrol/source/blender/include/BIF_space.h
branches/fluidcontrol/source/blender/include/blendef.h
branches/fluidcontrol/source/blender/makesdna/DNA_actuator_types.h
branches/fluidcontrol/source/blender/makesdna/DNA_ipo_types.h
branches/fluidcontrol/source/blender/makesdna/DNA_scene_types.h
branches/fluidcontrol/source/blender/makesdna/DNA_space_types.h
branches/fluidcontrol/source/blender/makesdna/DNA_userdef_types.h
branches/fluidcontrol/source/blender/makesdna/DNA_view3d_types.h
branches/fluidcontrol/source/blender/nodes/intern/CMP_nodes/CMP_tonemap.c
branches/fluidcontrol/source/blender/python/BPY_interface.c
branches/fluidcontrol/source/blender/python/api2_2x/Lamp.c
branches/fluidcontrol/source/blender/python/api2_2x/MTex.c
branches/fluidcontrol/source/blender/python/api2_2x/MTex.h
branches/fluidcontrol/source/blender/python/api2_2x/Material.c
branches/fluidcontrol/source/blender/python/api2_2x/Mathutils.c
branches/fluidcontrol/source/blender/python/api2_2x/Mathutils.h
branches/fluidcontrol/source/blender/python/api2_2x/Mesh.c
branches/fluidcontrol/source/blender/python/api2_2x/Particle.c
branches/fluidcontrol/source/blender/python/api2_2x/Texture.c
branches/fluidcontrol/source/blender/python/api2_2x/World.c
branches/fluidcontrol/source/blender/python/api2_2x/doc/Lamp.py
branches/fluidcontrol/source/blender/python/api2_2x/doc/Material.py
branches/fluidcontrol/source/blender/python/api2_2x/doc/Mesh.py
branches/fluidcontrol/source/blender/python/api2_2x/doc/Texture.py
branches/fluidcontrol/source/blender/python/api2_2x/doc/World.py
branches/fluidcontrol/source/blender/python/api2_2x/gen_utils.h
branches/fluidcontrol/source/blender/python/api2_2x/sceneSequence.c
branches/fluidcontrol/source/blender/render/intern/source/convertblender.c
branches/fluidcontrol/source/blender/render/intern/source/pipeline.c
branches/fluidcontrol/source/blender/render/intern/source/rendercore.c
branches/fluidcontrol/source/blender/render/intern/source/renderdatabase.c
branches/fluidcontrol/source/blender/render/intern/source/zbuf.c
branches/fluidcontrol/source/blender/src/blenderbuttons.c
branches/fluidcontrol/source/blender/src/buttons_editing.c
branches/fluidcontrol/source/blender/src/buttons_logic.c
branches/fluidcontrol/source/blender/src/buttons_object.c
branches/fluidcontrol/source/blender/src/buttons_shading.c
branches/fluidcontrol/source/blender/src/drawaction.c
branches/fluidcontrol/source/blender/src/drawgpencil.c
branches/fluidcontrol/source/blender/src/drawimage.c
branches/fluidcontrol/source/blender/src/drawipo.c
branches/fluidcontrol/source/blender/src/drawseq.c
branches/fluidcontrol/source/blender/src/drawview.c
branches/fluidcontrol/source/blender/src/editmesh_loop.c
branches/fluidcontrol/source/blender/src/editmesh_mods.c
branches/fluidcontrol/source/blender/src/editmesh_tools.c
branches/fluidcontrol/source/blender/src/editobject.c
branches/fluidcontrol/source/blender/src/editscreen.c
branches/fluidcontrol/source/blender/src/editsound.c
branches/fluidcontrol/source/blender/src/gpencil.c
branches/fluidcontrol/source/blender/src/header_image.c
branches/fluidcontrol/source/blender/src/header_node.c
branches/fluidcontrol/source/blender/src/header_view3d.c
branches/fluidcontrol/source/blender/src/keyval.c
branches/fluidcontrol/source/blender/src/meshlaplacian.c
branches/fluidcontrol/source/blender/src/resources.c
branches/fluidcontrol/source/blender/src/space.c
branches/fluidcontrol/source/blender/src/transform_orientations.c
branches/fluidcontrol/source/blender/src/usiblender.c
branches/fluidcontrol/source/blender/src/verse_image.c
branches/fluidcontrol/source/blender/src/view.c
branches/fluidcontrol/source/gameengine/Converter/BL_ActionActuator.cpp
branches/fluidcontrol/source/gameengine/Converter/BL_BlenderDataConversion.cpp
branches/fluidcontrol/source/gameengine/Converter/BL_ShapeActionActuator.cpp
branches/fluidcontrol/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
branches/fluidcontrol/source/gameengine/Converter/KX_ConvertActuators.cpp
branches/fluidcontrol/source/gameengine/Converter/KX_ConvertSensors.cpp
branches/fluidcontrol/source/gameengine/Expressions/Makefile
branches/fluidcontrol/source/gameengine/Expressions/PyObjectPlus.h
branches/fluidcontrol/source/gameengine/GameLogic/Makefile
branches/fluidcontrol/source/gameengine/GameLogic/SCA_ILogicBrick.cpp
branches/fluidcontrol/source/gameengine/GameLogic/SCA_JoystickSensor.cpp
branches/fluidcontrol/source/gameengine/GameLogic/SCA_PythonController.cpp
branches/fluidcontrol/source/gameengine/GamePlayer/CMakeLists.txt
branches/fluidcontrol/source/gameengine/GamePlayer/ghost/GPG_Application.cpp
branches/fluidcontrol/source/gameengine/GamePlayer/ghost/GPG_Application.h
branches/fluidcontrol/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
branches/fluidcontrol/source/gameengine/GamePlayer/netscape/test/resource/test.html
branches/fluidcontrol/source/gameengine/Ketsji/BL_BlenderShader.cpp
branches/fluidcontrol/source/gameengine/Ketsji/KX_CameraActuator.cpp
branches/fluidcontrol/source/gameengine/Ketsji/KX_ConstraintWrapper.cpp
branches/fluidcontrol/source/gameengine/Ketsji/KX_GameObject.cpp
branches/fluidcontrol/source/gameengine/Ketsji/KX_GameObject.h
branches/fluidcontrol/source/gameengine/Ketsji/KX_Light.cpp
branches/fluidcontrol/source/gameengine/Ketsji/KX_MeshProxy.cpp
branches/fluidcontrol/source/gameengine/Ketsji/KX_ParentActuator.cpp
branches/fluidcontrol/source/gameengine/Ketsji/KX_PhysicsObjectWrapper.cpp
branches/fluidcontrol/source/gameengine/Ketsji/KX_PyConstraintBinding.cpp
branches/fluidcontrol/source/gameengine/Ketsji/KX_PythonInit.cpp
branches/fluidcontrol/source/gameengine/Ketsji/KX_SCA_AddObjectActuator.cpp
branches/fluidcontrol/source/gameengine/Ketsji/KX_SCA_ReplaceMeshActuator.cpp
branches/fluidcontrol/source/gameengine/Ketsji/KX_SCA_ReplaceMeshActuator.h
branches/fluidcontrol/source/gameengine/Ketsji/KX_Scene.cpp
branches/fluidcontrol/source/gameengine/Ketsji/KX_TrackToActuator.cpp
branches/fluidcontrol/source/gameengine/Ketsji/KX_VehicleWrapper.cpp
branches/fluidcontrol/source/gameengine/Ketsji/KX_VisibilityActuator.cpp
branches/fluidcontrol/source/gameengine/Ketsji/KX_VisibilityActuator.h
branches/fluidcontrol/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp
branches/fluidcontrol/source/gameengine/PyDoc/KX_GameObject.py
branches/fluidcontrol/source/gameengine/PyDoc/KX_SCA_ReplaceMeshActuator.py
branches/fluidcontrol/source/gameengine/Rasterizer/RAS_MaterialBucket.cpp
Added Paths:
-----------
branches/fluidcontrol/projectfiles_vc7/blender/gpu/
branches/fluidcontrol/projectfiles_vc7/blender/gpu/BL_gpu.vcproj
branches/fluidcontrol/release/scripts/scripttemplate_gamelogic.py
branches/fluidcontrol/release/scripts/scripttemplate_gamelogic_basic.py
branches/fluidcontrol/source/gameengine/GamePlayer/xembed/
branches/fluidcontrol/source/gameengine/GamePlayer/xembed/CMakeLists.txt
branches/fluidcontrol/source/gameengine/GamePlayer/xembed/UnixShell.c
branches/fluidcontrol/source/gameengine/GamePlayer/xembed/blender_plugin_types.h
branches/fluidcontrol/source/gameengine/GamePlayer/xembed/npunix.c
Removed Paths:
-------------
branches/fluidcontrol/projectfiles_vc7/blender/gpu/BL_gpu.vcproj
branches/fluidcontrol/source/gameengine/GamePlayer/xembed/CMakeLists.txt
branches/fluidcontrol/source/gameengine/GamePlayer/xembed/UnixShell.c
branches/fluidcontrol/source/gameengine/GamePlayer/xembed/blender_plugin_types.h
branches/fluidcontrol/source/gameengine/GamePlayer/xembed/npunix.c
Modified: branches/fluidcontrol/CMake/macros.cmake
===================================================================
--- branches/fluidcontrol/CMake/macros.cmake 2008-09-10 10:53:38 UTC (rev 16454)
+++ branches/fluidcontrol/CMake/macros.cmake 2008-09-10 11:04:07 UTC (rev 16455)
@@ -39,7 +39,9 @@
MACRO(SETUP_LIBDIRS)
# see "cmake --help-policy CMP0003"
- CMAKE_POLICY(SET CMP0003 NEW)
+ if(COMMAND cmake_policy)
+ CMAKE_POLICY(SET CMP0003 NEW)
+ endif(COMMAND cmake_policy)
LINK_DIRECTORIES(${PYTHON_LIBPATH} ${SDL_LIBPATH} ${JPEG_LIBPATH} ${PNG_LIBPATH} ${ZLIB_LIBPATH} ${ICONV_LIBPATH} ${OPENEXR_LIBPATH} ${QUICKTIME_LIBPATH} ${FFMPEG_LIBPATH})
IF(WITH_INTERNATIONAL)
LINK_DIRECTORIES(${GETTEXT_LIBPATH})
Modified: branches/fluidcontrol/CMakeLists.txt
===================================================================
--- branches/fluidcontrol/CMakeLists.txt 2008-09-10 10:53:38 UTC (rev 16454)
+++ branches/fluidcontrol/CMakeLists.txt 2008-09-10 11:04:07 UTC (rev 16455)
@@ -64,6 +64,7 @@
OPTION(WITH_FFMPEG "Enable FFMPeg Support (http://ffmpeg.mplayerhq.hu/)" OFF)
OPTION(WITH_OPENAL "Enable OpenAL Support (http://www.openal.org)" ON)
OPTION(WITH_OPENMP "Enable OpenMP (has to be supported by the compiler)" OFF)
+OPTION(WITH_WEBPLUGIN "Enable Web Plugin (Mozilla-Unix only)" OFF)
IF(NOT WITH_GAMEENGINE AND WITH_PLAYER)
MESSAGE("WARNING: WITH_PLAYER needs WITH_GAMEENGINE")
@@ -457,6 +458,13 @@
SUBDIRS(source/creator)
#-----------------------------------------------------------------------------
+# Blender WebPlugin
+IF(WITH_WEBPLUGIN)
+ SET(MOZILLA_DIR "${CMAKE_SOURCE_DIR}/../gecko-sdk/" CACHE PATH "Gecko SDK path")
+ SET(WITH_PLAYER ON)
+ENDIF(WITH_WEBPLUGIN)
+
+#-----------------------------------------------------------------------------
# Blender Player
IF(WITH_PLAYER)
SUBDIRS(blenderplayer)
Modified: branches/fluidcontrol/intern/ghost/GHOST_ISystem.h
===================================================================
--- branches/fluidcontrol/intern/ghost/GHOST_ISystem.h 2008-09-10 10:53:38 UTC (rev 16454)
+++ branches/fluidcontrol/intern/ghost/GHOST_ISystem.h 2008-09-10 11:04:07 UTC (rev 16455)
@@ -224,13 +224,15 @@
* @param state The state of the window when opened.
* @param type The type of drawing context installed in this window.
* @param stereoVisual Create a stereo visual for quad buffered stereo.
+ * @param parentWindow Parent (embedder) window
* @return The new window (or 0 if creation failed).
*/
virtual GHOST_IWindow* createWindow(
const STR_String& title,
GHOST_TInt32 left, GHOST_TInt32 top, GHOST_TUns32 width, GHOST_TUns32 height,
GHOST_TWindowState state, GHOST_TDrawingContextType type,
- const bool stereoVisual) = 0;
+ const bool stereoVisual,
+ const GHOST_TEmbedderWindowID parentWindow = 0) = 0;
/**
* Dispose a window.
Modified: branches/fluidcontrol/intern/ghost/GHOST_Types.h
===================================================================
--- branches/fluidcontrol/intern/ghost/GHOST_Types.h 2008-09-10 10:53:38 UTC (rev 16454)
+++ branches/fluidcontrol/intern/ghost/GHOST_Types.h 2008-09-10 11:04:07 UTC (rev 16455)
@@ -100,6 +100,7 @@
GHOST_kWindowStateMaximized,
GHOST_kWindowStateMinimized,
GHOST_kWindowStateFullScreen,
+ GHOST_kWindowStateEmbedded,
GHOST_kWindowState8Normal = 8,
GHOST_kWindowState8Maximized,
GHOST_kWindowState8Minimized,
@@ -392,6 +393,15 @@
} GHOST_DisplaySetting;
+#ifdef _WIN32
+typedef long GHOST_TEmbedderWindowID;
+#endif // _WIN32
+
+#ifndef _WIN32
+// I can't use "Window" from "<X11/Xlib.h>" because it conflits with Window defined in winlay.h
+typedef int GHOST_TEmbedderWindowID;
+#endif // _WIN32
+
/**
* A timer task callback routine.
* @param task The timer task object.
Modified: branches/fluidcontrol/intern/ghost/intern/GHOST_SystemCarbon.cpp
===================================================================
--- branches/fluidcontrol/intern/ghost/intern/GHOST_SystemCarbon.cpp 2008-09-10 10:53:38 UTC (rev 16454)
+++ branches/fluidcontrol/intern/ghost/intern/GHOST_SystemCarbon.cpp 2008-09-10 11:04:07 UTC (rev 16455)
@@ -402,7 +402,8 @@
GHOST_TUns32 height,
GHOST_TWindowState state,
GHOST_TDrawingContextType type,
- bool stereoVisual
+ bool stereoVisual,
+ const GHOST_TEmbedderWindowID parentWindow
)
{
GHOST_IWindow* window = 0;
Modified: branches/fluidcontrol/intern/ghost/intern/GHOST_SystemCarbon.h
===================================================================
--- branches/fluidcontrol/intern/ghost/intern/GHOST_SystemCarbon.h 2008-09-10 10:53:38 UTC (rev 16454)
+++ branches/fluidcontrol/intern/ghost/intern/GHOST_SystemCarbon.h 2008-09-10 11:04:07 UTC (rev 16455)
@@ -103,6 +103,7 @@
* @param height The height the window.
* @param state The state of the window when opened.
* @param type The type of drawing context installed in this window.
+ * @param parentWindow Parent (embedder) window
* @return The new window (or 0 if creation failed).
*/
virtual GHOST_IWindow* createWindow(
@@ -113,7 +114,8 @@
GHOST_TUns32 height,
GHOST_TWindowState state,
GHOST_TDrawingContextType type,
- const bool stereoVisual
+ const bool stereoVisual,
+ const GHOST_TEmbedderWindowID parentWindow = 0
);
/***************************************************************************************
Modified: branches/fluidcontrol/intern/ghost/intern/GHOST_SystemWin32.cpp
===================================================================
--- branches/fluidcontrol/intern/ghost/intern/GHOST_SystemWin32.cpp 2008-09-10 10:53:38 UTC (rev 16454)
+++ branches/fluidcontrol/intern/ghost/intern/GHOST_SystemWin32.cpp 2008-09-10 11:04:07 UTC (rev 16455)
@@ -169,7 +169,7 @@
const STR_String& title,
GHOST_TInt32 left, GHOST_TInt32 top, GHOST_TUns32 width, GHOST_TUns32 height,
GHOST_TWindowState state, GHOST_TDrawingContextType type,
- bool stereoVisual)
+ bool stereoVisual, const GHOST_TEmbedderWindowID parentWindow )
{
GHOST_Window* window = 0;
window = new GHOST_WindowWin32 (title, left, top, width, height, state, type, stereoVisual);
Modified: branches/fluidcontrol/intern/ghost/intern/GHOST_SystemWin32.h
===================================================================
--- branches/fluidcontrol/intern/ghost/intern/GHOST_SystemWin32.h 2008-09-10 10:53:38 UTC (rev 16454)
+++ branches/fluidcontrol/intern/ghost/intern/GHOST_SystemWin32.h 2008-09-10 11:04:07 UTC (rev 16455)
@@ -109,13 +109,14 @@
* @param height The height the window.
* @param state The state of the window when opened.
* @param type The type of drawing context installed in this window.
+ * @param parentWindow Parent (embedder) window
* @return The new window (or 0 if creation failed).
*/
virtual GHOST_IWindow* createWindow(
const STR_String& title,
GHOST_TInt32 left, GHOST_TInt32 top, GHOST_TUns32 width, GHOST_TUns32 height,
GHOST_TWindowState state, GHOST_TDrawingContextType type,
- const bool stereoVisual);
+ const bool stereoVisual, const GHOST_TEmbedderWindowID parentWindow = 0 );
/***************************************************************************************
** Event management functionality
Modified: branches/fluidcontrol/intern/ghost/intern/GHOST_SystemX11.cpp
===================================================================
--- branches/fluidcontrol/intern/ghost/intern/GHOST_SystemX11.cpp 2008-09-10 10:53:38 UTC (rev 16454)
+++ branches/fluidcontrol/intern/ghost/intern/GHOST_SystemX11.cpp 2008-09-10 11:04:07 UTC (rev 16455)
@@ -191,6 +191,7 @@
* @param height The height the window.
* @param state The state of the window when opened.
* @param type The type of drawing context installed in this window.
+ * @param parentWindow Parent (embedder) window
* @return The new window (or 0 if creation failed).
*/
GHOST_IWindow*
@@ -203,14 +204,18 @@
GHOST_TUns32 height,
GHOST_TWindowState state,
GHOST_TDrawingContextType type,
- bool stereoVisual
+ bool stereoVisual,
+ const GHOST_TEmbedderWindowID parentWindow
){
GHOST_WindowX11 * window = 0;
if (!m_display) return 0;
+
+
+
window = new GHOST_WindowX11 (
- this,m_display,title, left, top, width, height, state, type, stereoVisual
+ this,m_display,title, left, top, width, height, state, parentWindow, type, stereoVisual
);
if (window) {
@@ -511,7 +516,9 @@
}
break;
}
-
+
+ case DestroyNotify:
+ ::exit(-1);
// We're not interested in the following things.(yet...)
case NoExpose :
case GraphicsExpose :
Modified: branches/fluidcontrol/intern/ghost/intern/GHOST_SystemX11.h
===================================================================
--- branches/fluidcontrol/intern/ghost/intern/GHOST_SystemX11.h 2008-09-10 10:53:38 UTC (rev 16454)
+++ branches/fluidcontrol/intern/ghost/intern/GHOST_SystemX11.h 2008-09-10 11:04:07 UTC (rev 16455)
@@ -108,6 +108,7 @@
* @param state The state of the window when opened.
* @param type The type of drawing context installed in this window.
* @param stereoVisual Create a stereo visual for quad buffered stereo.
+ * @param parentWindow Parent (embedder) window
* @return The new window (or 0 if creation failed).
*/
GHOST_IWindow*
@@ -119,9 +120,10 @@
GHOST_TUns32 height,
GHOST_TWindowState state,
GHOST_TDrawingContextType type,
- const bool stereoVisual
+ const bool stereoVisual,
+ const GHOST_TEmbedderWindowID parentWindow = 0
);
-
+
/**
* @section Interface Inherited from GHOST_ISystem
*/
Modified: branches/fluidcontrol/intern/ghost/intern/GHOST_WindowWin32.cpp
===================================================================
--- branches/fluidcontrol/intern/ghost/intern/GHOST_WindowWin32.cpp 2008-09-10 10:53:38 UTC (rev 16454)
+++ branches/fluidcontrol/intern/ghost/intern/GHOST_WindowWin32.cpp 2008-09-10 11:04:07 UTC (rev 16455)
@@ -437,7 +437,13 @@
// adding a glFinish() here is to prevent Geforce in 'full scene antialias' mode
// from antialising the Blender window. Officially a swapbuffers does a glFinish
// itself, so this feels really like a hack... but it won't harm. (ton)
- glFinish();
+ //
+ // disabled this because it is a performance killer for the game engine, glFinish
+ // forces synchronization with the graphics card and calling it is strongly
+ // discouraged for good performance. (brecht)
+ //
+ // glFinish();
+
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list