[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [43298] branches/bmesh/blender: svn merge ^/trunk/blender -r43278:43294
Campbell Barton
ideasman42 at gmail.com
Wed Jan 11 16:04:54 CET 2012
Revision: 43298
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=43298
Author: campbellbarton
Date: 2012-01-11 15:04:54 +0000 (Wed, 11 Jan 2012)
Log Message:
-----------
svn merge ^/trunk/blender -r43278:43294
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=43278
Modified Paths:
--------------
branches/bmesh/blender/CMakeLists.txt
branches/bmesh/blender/extern/libmv/CMakeLists.txt
branches/bmesh/blender/extern/libmv/SConscript
branches/bmesh/blender/extern/libmv/bundle.sh
branches/bmesh/blender/intern/cycles/blender/blender_object.cpp
branches/bmesh/blender/intern/cycles/device/device.cpp
branches/bmesh/blender/intern/cycles/device/device_cpu.cpp
branches/bmesh/blender/intern/ghost/intern/GHOST_DisplayManagerSDL.cpp
branches/bmesh/blender/intern/ghost/intern/GHOST_DisplayManagerX11.cpp
branches/bmesh/blender/source/blender/blenfont/BLF_api.h
branches/bmesh/blender/source/blender/blenkernel/BKE_armature.h
branches/bmesh/blender/source/blender/blenkernel/BKE_deform.h
branches/bmesh/blender/source/blender/blenkernel/BKE_node.h
branches/bmesh/blender/source/blender/blenkernel/BKE_sequencer.h
branches/bmesh/blender/source/blender/blenkernel/intern/boids.c
branches/bmesh/blender/source/blender/blenkernel/intern/customdata.c
branches/bmesh/blender/source/blender/blenkernel/intern/deform.c
branches/bmesh/blender/source/blender/blenkernel/intern/dynamicpaint.c
branches/bmesh/blender/source/blender/blenkernel/intern/image.c
branches/bmesh/blender/source/blender/blenkernel/intern/ipo.c
branches/bmesh/blender/source/blender/blenkernel/intern/library.c
branches/bmesh/blender/source/blender/blenkernel/intern/material.c
branches/bmesh/blender/source/blender/blenkernel/intern/mball.c
branches/bmesh/blender/source/blender/blenkernel/intern/object.c
branches/bmesh/blender/source/blender/blenkernel/intern/packedFile.c
branches/bmesh/blender/source/blender/blenkernel/intern/particle.c
branches/bmesh/blender/source/blender/blenkernel/intern/pointcache.c
branches/bmesh/blender/source/blender/blenkernel/intern/property.c
branches/bmesh/blender/source/blender/blenkernel/intern/sca.c
branches/bmesh/blender/source/blender/blenkernel/intern/seqeffects.c
branches/bmesh/blender/source/blender/blenkernel/intern/sequencer.c
branches/bmesh/blender/source/blender/blenkernel/intern/sound.c
branches/bmesh/blender/source/blender/blenkernel/intern/texture.c
branches/bmesh/blender/source/blender/blenkernel/intern/tracking.c
branches/bmesh/blender/source/blender/blenkernel/intern/writeffmpeg.c
branches/bmesh/blender/source/blender/blenlib/intern/path_util.c
branches/bmesh/blender/source/blender/blenlib/intern/storage.c
branches/bmesh/blender/source/blender/blenloader/intern/readfile.c
branches/bmesh/blender/source/blender/editors/animation/anim_draw.c
branches/bmesh/blender/source/blender/editors/animation/anim_ipo_utils.c
branches/bmesh/blender/source/blender/editors/armature/editarmature.c
branches/bmesh/blender/source/blender/editors/armature/editarmature_retarget.c
branches/bmesh/blender/source/blender/editors/armature/meshlaplacian.c
branches/bmesh/blender/source/blender/editors/armature/poseSlide.c
branches/bmesh/blender/source/blender/editors/armature/poselib.c
branches/bmesh/blender/source/blender/editors/armature/poseobject.c
branches/bmesh/blender/source/blender/editors/armature/reeb.c
branches/bmesh/blender/source/blender/editors/curve/editcurve.c
branches/bmesh/blender/source/blender/editors/gpencil/gpencil_buttons.c
branches/bmesh/blender/source/blender/editors/include/ED_armature.h
branches/bmesh/blender/source/blender/editors/interface/interface.c
branches/bmesh/blender/source/blender/editors/interface/interface_layout.c
branches/bmesh/blender/source/blender/editors/interface/interface_regions.c
branches/bmesh/blender/source/blender/editors/interface/interface_style.c
branches/bmesh/blender/source/blender/editors/interface/interface_templates.c
branches/bmesh/blender/source/blender/editors/interface/view2d.c
branches/bmesh/blender/source/blender/editors/mesh/mesh_data.c
branches/bmesh/blender/source/blender/editors/object/object_add.c
branches/bmesh/blender/source/blender/editors/object/object_constraint.c
branches/bmesh/blender/source/blender/editors/object/object_edit.c
branches/bmesh/blender/source/blender/editors/object/object_group.c
branches/bmesh/blender/source/blender/editors/object/object_hook.c
branches/bmesh/blender/source/blender/editors/object/object_modifier.c
branches/bmesh/blender/source/blender/editors/object/object_ops.c
branches/bmesh/blender/source/blender/editors/object/object_relations.c
branches/bmesh/blender/source/blender/editors/object/object_select.c
branches/bmesh/blender/source/blender/editors/physics/physics_fluid.c
branches/bmesh/blender/source/blender/editors/screen/area.c
branches/bmesh/blender/source/blender/editors/sculpt_paint/sculpt.c
branches/bmesh/blender/source/blender/editors/space_action/action_draw.c
branches/bmesh/blender/source/blender/editors/space_buttons/buttons_header.c
branches/bmesh/blender/source/blender/editors/space_clip/clip_draw.c
branches/bmesh/blender/source/blender/editors/space_file/file_draw.c
branches/bmesh/blender/source/blender/editors/space_file/filelist.c
branches/bmesh/blender/source/blender/editors/space_graph/graph_buttons.c
branches/bmesh/blender/source/blender/editors/space_graph/graph_draw.c
branches/bmesh/blender/source/blender/editors/space_image/image_buttons.c
branches/bmesh/blender/source/blender/editors/space_image/image_draw.c
branches/bmesh/blender/source/blender/editors/space_info/info_ops.c
branches/bmesh/blender/source/blender/editors/space_logic/logic_ops.c
branches/bmesh/blender/source/blender/editors/space_logic/logic_window.c
branches/bmesh/blender/source/blender/editors/space_nla/nla_draw.c
branches/bmesh/blender/source/blender/editors/space_node/drawnode.c
branches/bmesh/blender/source/blender/editors/space_node/node_draw.c
branches/bmesh/blender/source/blender/editors/space_node/node_edit.c
branches/bmesh/blender/source/blender/editors/space_outliner/outliner_draw.c
branches/bmesh/blender/source/blender/editors/space_outliner/outliner_edit.c
branches/bmesh/blender/source/blender/editors/space_outliner/outliner_tree.c
branches/bmesh/blender/source/blender/editors/space_sequencer/sequencer_draw.c
branches/bmesh/blender/source/blender/editors/space_text/text_draw.c
branches/bmesh/blender/source/blender/editors/space_view3d/drawanimviz.c
branches/bmesh/blender/source/blender/editors/space_view3d/drawmesh.c
branches/bmesh/blender/source/blender/editors/space_view3d/drawobject.c
branches/bmesh/blender/source/blender/editors/space_view3d/view3d_buttons.c
branches/bmesh/blender/source/blender/editors/space_view3d/view3d_draw.c
branches/bmesh/blender/source/blender/editors/space_view3d/view3d_edit.c
branches/bmesh/blender/source/blender/editors/transform/transform.c
branches/bmesh/blender/source/blender/editors/transform/transform.h
branches/bmesh/blender/source/blender/editors/transform/transform_constraints.c
branches/bmesh/blender/source/blender/editors/transform/transform_ops.c
branches/bmesh/blender/source/blender/editors/transform/transform_orientations.c
branches/bmesh/blender/source/blender/editors/util/ed_util.c
branches/bmesh/blender/source/blender/editors/util/numinput.c
branches/bmesh/blender/source/blender/editors/uvedit/uvedit_unwrap_ops.c
branches/bmesh/blender/source/blender/gpu/GPU_extensions.h
branches/bmesh/blender/source/blender/gpu/intern/gpu_extensions.c
branches/bmesh/blender/source/blender/gpu/intern/gpu_material.c
branches/bmesh/blender/source/blender/imbuf/intern/anim_movie.c
branches/bmesh/blender/source/blender/makesdna/DNA_ID.h
branches/bmesh/blender/source/blender/makesdna/DNA_action_types.h
branches/bmesh/blender/source/blender/makesdna/DNA_actuator_types.h
branches/bmesh/blender/source/blender/makesdna/DNA_armature_types.h
branches/bmesh/blender/source/blender/makesdna/DNA_constraint_types.h
branches/bmesh/blender/source/blender/makesdna/DNA_controller_types.h
branches/bmesh/blender/source/blender/makesdna/DNA_customdata_types.h
branches/bmesh/blender/source/blender/makesdna/DNA_defs.h
branches/bmesh/blender/source/blender/makesdna/DNA_dynamicpaint_types.h
branches/bmesh/blender/source/blender/makesdna/DNA_effect_types.h
branches/bmesh/blender/source/blender/makesdna/DNA_key_types.h
branches/bmesh/blender/source/blender/makesdna/DNA_lattice_types.h
branches/bmesh/blender/source/blender/makesdna/DNA_material_types.h
branches/bmesh/blender/source/blender/makesdna/DNA_modifier_types.h
branches/bmesh/blender/source/blender/makesdna/DNA_node_types.h
branches/bmesh/blender/source/blender/makesdna/DNA_object_force.h
branches/bmesh/blender/source/blender/makesdna/DNA_object_types.h
branches/bmesh/blender/source/blender/makesdna/DNA_particle_types.h
branches/bmesh/blender/source/blender/makesdna/DNA_property_types.h
branches/bmesh/blender/source/blender/makesdna/DNA_scene_types.h
branches/bmesh/blender/source/blender/makesdna/DNA_sensor_types.h
branches/bmesh/blender/source/blender/makesdna/DNA_sequence_types.h
branches/bmesh/blender/source/blender/makesdna/DNA_texture_types.h
branches/bmesh/blender/source/blender/makesdna/DNA_tracking_types.h
branches/bmesh/blender/source/blender/makesdna/DNA_view3d_types.h
branches/bmesh/blender/source/blender/makesdna/DNA_windowmanager_types.h
branches/bmesh/blender/source/blender/makesrna/intern/rna_actuator.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_image.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_modifier.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_nodetree.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_object.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_scene.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_tracking.c
branches/bmesh/blender/source/blender/modifiers/intern/MOD_armature.c
branches/bmesh/blender/source/blender/modifiers/intern/MOD_bevel.c
branches/bmesh/blender/source/blender/modifiers/intern/MOD_cast.c
branches/bmesh/blender/source/blender/modifiers/intern/MOD_curve.c
branches/bmesh/blender/source/blender/modifiers/intern/MOD_displace.c
branches/bmesh/blender/source/blender/modifiers/intern/MOD_hook.c
branches/bmesh/blender/source/blender/modifiers/intern/MOD_lattice.c
branches/bmesh/blender/source/blender/modifiers/intern/MOD_smooth.c
branches/bmesh/blender/source/blender/modifiers/intern/MOD_util.c
branches/bmesh/blender/source/blender/modifiers/intern/MOD_uvproject.c
branches/bmesh/blender/source/blender/modifiers/intern/MOD_wave.c
branches/bmesh/blender/source/blender/modifiers/intern/MOD_weightvg_util.c
branches/bmesh/blender/source/blender/modifiers/intern/MOD_weightvg_util.h
branches/bmesh/blender/source/blender/nodes/composite/node_composite_tree.c
branches/bmesh/blender/source/blender/nodes/texture/nodes/node_texture_output.c
branches/bmesh/blender/source/blender/python/generic/bpy_internal_import.c
branches/bmesh/blender/source/blender/python/generic/idprop_py_api.c
branches/bmesh/blender/source/blender/render/intern/include/render_types.h
branches/bmesh/blender/source/blender/windowmanager/intern/wm_operators.c
branches/bmesh/blender/source/blenderplayer/bad_level_call_stubs/stubs.c
branches/bmesh/blender/source/gameengine/Converter/KX_ConvertActuators.cpp
branches/bmesh/blender/source/gameengine/Ketsji/KX_CameraActuator.cpp
branches/bmesh/blender/source/gameengine/Ketsji/KX_CameraActuator.h
Property Changed:
----------------
branches/bmesh/blender/
branches/bmesh/blender/source/blender/editors/space_outliner/
Property changes on: branches/bmesh/blender
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/soc-2011-cucumber:37517,38384,38387,38403-38404,38407,42997-42998
/branches/soc-2011-tomato:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801
/trunk/blender:39992-43278
+ /branches/soc-2011-cucumber:37517,38384,38387,38403-38404,38407,42997-42998
/branches/soc-2011-tomato:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801
/trunk/blender:39992-43294
Modified: branches/bmesh/blender/CMakeLists.txt
===================================================================
--- branches/bmesh/blender/CMakeLists.txt 2012-01-11 14:43:46 UTC (rev 43297)
+++ branches/bmesh/blender/CMakeLists.txt 2012-01-11 15:04:54 UTC (rev 43298)
@@ -156,7 +156,7 @@
if(UNIX AND NOT APPLE)
option(WITH_X11_XINPUT "Enable X11 Xinput (tablet support and unicode input)" ON)
- option(WITH_X11_XF86VMODE "Enable X11 video mode switching" OFF)
+ option(WITH_X11_XF86VMODE "Enable X11 video mode switching" ON)
option(WITH_BUILTIN_GLEW "Use GLEW OpenGL wrapper library bundled with blender" ON)
option(WITH_XDG_USER_DIRS "Build with XDG Base Directory Specification (only config and documents for now)" OFF)
mark_as_advanced(WITH_XDG_USER_DIRS)
Modified: branches/bmesh/blender/extern/libmv/CMakeLists.txt
===================================================================
--- branches/bmesh/blender/extern/libmv/CMakeLists.txt 2012-01-11 14:43:46 UTC (rev 43297)
+++ branches/bmesh/blender/extern/libmv/CMakeLists.txt 2012-01-11 15:04:54 UTC (rev 43298)
@@ -22,7 +22,7 @@
#
# ***** END GPL LICENSE BLOCK *****
-# NOTEL This file is automatically generated by bundle.sh script
+# NOTE: This file is automatically generated by bundle.sh script
# If you're doing changes in this file, please update template
# in that script too
Modified: branches/bmesh/blender/extern/libmv/SConscript
===================================================================
--- branches/bmesh/blender/extern/libmv/SConscript 2012-01-11 14:43:46 UTC (rev 43297)
+++ branches/bmesh/blender/extern/libmv/SConscript 2012-01-11 15:04:54 UTC (rev 43298)
@@ -1,6 +1,6 @@
#!/usr/bin/python
-# NOTEL This file is automatically generated by bundle.sh script
+# NOTE: This file is automatically generated by bundle.sh script
# If you're doing changes in this file, please update template
# in that script too
Modified: branches/bmesh/blender/extern/libmv/bundle.sh
===================================================================
--- branches/bmesh/blender/extern/libmv/bundle.sh 2012-01-11 14:43:46 UTC (rev 43297)
+++ branches/bmesh/blender/extern/libmv/bundle.sh 2012-01-11 15:04:54 UTC (rev 43298)
@@ -113,7 +113,7 @@
#
# ***** END GPL LICENSE BLOCK *****
-# NOTEL This file is automatically generated by bundle.sh script
+# NOTE: This file is automatically generated by bundle.sh script
# If you're doing changes in this file, please update template
# in that script too
@@ -209,7 +209,7 @@
cat > SConscript << EOF
#!/usr/bin/python
-# NOTEL This file is automatically generated by bundle.sh script
+# NOTE: This file is automatically generated by bundle.sh script
# If you're doing changes in this file, please update template
# in that script too
Modified: branches/bmesh/blender/intern/cycles/blender/blender_object.cpp
===================================================================
--- branches/bmesh/blender/intern/cycles/blender/blender_object.cpp 2012-01-11 14:43:46 UTC (rev 43297)
+++ branches/bmesh/blender/intern/cycles/blender/blender_object.cpp 2012-01-11 15:04:54 UTC (rev 43298)
@@ -228,7 +228,12 @@
for(b_ob->dupli_list.begin(b_dup); b_dup != b_ob->dupli_list.end(); ++b_dup) {
Transform tfm = get_transform(b_dup->matrix());
- sync_object(*b_ob, b_index, b_dup->object(), tfm, ob_layer);
+ BL::Object b_dup_ob = b_dup->object();
+ bool dup_hide = (b_v3d)? b_dup_ob.hide(): b_dup_ob.hide_render();
+
+ if(!(b_dup->hide() || dup_hide))
+ sync_object(*b_ob, b_index, b_dup_ob, tfm, ob_layer);
+
b_index++;
}
Modified: branches/bmesh/blender/intern/cycles/device/device.cpp
===================================================================
--- branches/bmesh/blender/intern/cycles/device/device.cpp 2012-01-11 14:43:46 UTC (rev 43297)
+++ branches/bmesh/blender/intern/cycles/device/device.cpp 2012-01-11 15:04:54 UTC (rev 43298)
@@ -255,8 +255,6 @@
static bool devices_init = false;
if(!devices_init) {
- device_cpu_info(devices);
-
#ifdef WITH_CUDA
if(cuLibraryInit())
device_cuda_info(devices);
@@ -271,6 +269,8 @@
device_multi_info(devices);
#endif
+ device_cpu_info(devices);
+
#ifdef WITH_NETWORK
device_network_info(devices);
#endif
Modified: branches/bmesh/blender/intern/cycles/device/device_cpu.cpp
===================================================================
--- branches/bmesh/blender/intern/cycles/device/device_cpu.cpp 2012-01-11 14:43:46 UTC (rev 43297)
+++ branches/bmesh/blender/intern/cycles/device/device_cpu.cpp 2012-01-11 15:04:54 UTC (rev 43298)
@@ -272,7 +272,7 @@
info.id = "CPU";
info.num = 0;
- devices.push_back(info);
+ devices.insert(devices.begin(), info);
}
CCL_NAMESPACE_END
Modified: branches/bmesh/blender/intern/ghost/intern/GHOST_DisplayManagerSDL.cpp
===================================================================
--- branches/bmesh/blender/intern/ghost/intern/GHOST_DisplayManagerSDL.cpp 2012-01-11 14:43:46 UTC (rev 43297)
+++ branches/bmesh/blender/intern/ghost/intern/GHOST_DisplayManagerSDL.cpp 2012-01-11 15:04:54 UTC (rev 43298)
@@ -17,6 +17,11 @@
*
* Contributor(s): Campbell Barton
*
+ * Mode switching
+ * Copyright (C) 1997-2001 Id Software, Inc.
+ * Copyright (c) 1993-2011 Tim Riker
+ * Copyright (C) 2012 Alex Fraser
+ *
* ***** END GPL LICENSE BLOCK *****
*/
@@ -47,7 +52,19 @@
GHOST_TInt32& numSettings) const
{
GHOST_ASSERT(display < 1, "Only single display systems are currently supported.\n");
- numSettings= GHOST_TInt32(1);
+ int i;
+ SDL_Rect **vidmodes;
+
+ vidmodes = SDL_ListModes(NULL, SDL_HWSURFACE | SDL_OPENGL |
+ SDL_FULLSCREEN | SDL_HWPALETTE);
+ if (!vidmodes) {
+ fprintf(stderr, "Could not get available video modes: %s.\n",
+ SDL_GetError());
+ return GHOST_kFailure;
+ }
+ for (i = 0; vidmodes[i]; i++);
+ numSettings = GHOST_TInt32(i);
+
return GHOST_kSuccess;
}
@@ -56,19 +73,39 @@
GHOST_TInt32 index,
GHOST_DisplaySetting& setting) const
{
-
GHOST_ASSERT(display < 1, "Only single display systems are currently supported.\n");
- GHOST_ASSERT(index < 1, "Requested setting outside of valid range.\n");
- SDL_DisplayMode mode;
- SDL_GetDesktopDisplayMode(display, &mode);
+ int i;
+ SDL_Rect **vidmodes;
+ /* NULL is passed in here to get the modes for the current bit depth.
+ * Other bit depths may be possible; in that case, an SDL_PixelFormat struct
+ * should be passed in. To get a complete profile, all possible bit depths
+ * would need to be iterated over. - z0r */
+ vidmodes = SDL_ListModes(NULL, SDL_HWSURFACE | SDL_OPENGL |
+ SDL_FULLSCREEN | SDL_HWPALETTE);
+ if (!vidmodes) {
+ fprintf(stderr, "Could not get available video modes: %s.\n",
+ SDL_GetError());
+ return GHOST_kFailure;
+ }
+ for (i = 0; vidmodes[i]; i++);
+ GHOST_ASSERT(index < i, "Requested setting outside of valid range.\n");
- setting.xPixels= mode.w;
- setting.yPixels= mode.h;
- setting.bpp= SDL_BYTESPERPIXEL(mode.format);
- /* assume 60 when unset */
- setting.frequency= mode.refresh_rate ? mode.refresh_rate : 60;
+ setting.xPixels = vidmodes[index]->w;
+ setting.yPixels = vidmodes[index]->h;
+ SDL_Surface *surf;
+ surf = SDL_GetVideoSurface();
+ if (surf == NULL) {
+ fprintf(stderr, "Getting display setting: %s\n", SDL_GetError());
+ /* Just guess the bit depth */
+ setting.bpp = 32;
+ } else {
+ setting.bpp = surf->format->BitsPerPixel;
+ }
+ /* Just guess the frequency :( */
+ setting.frequency = 60;
+
return GHOST_kSuccess;
}
@@ -76,17 +113,100 @@
GHOST_DisplayManagerSDL::getCurrentDisplaySetting(GHOST_TUns8 display,
GHOST_DisplaySetting& setting) const
{
- return getDisplaySetting(display,GHOST_TInt32(0),setting);
+ SDL_Surface *surf;
+ const SDL_VideoInfo *info;
+
+ /* Note: not using SDL_GetDesktopDisplayMode because that does not return
+ * the current mode. Try to use GetVideoSurface first, as it seems more
+ * accurate. If that fails, try other methods. - z0r */
+ surf = SDL_GetVideoSurface();
+
+ if (surf != NULL) {
+ setting.xPixels = surf->w;
+ setting.yPixels = surf->h;
+ setting.bpp = surf->format->BitsPerPixel;
+ /* Just guess the frequency :( */
+ setting.frequency = 60;
+ } else {
+ /* This may happen if the surface hasn't been created yet, e.g. on
+ * application startup. */
+ info = SDL_GetVideoInfo();
+ setting.xPixels = info->current_w;
+ setting.yPixels = info->current_h;
+ setting.bpp = info->vfmt->BitsPerPixel;
+ /* Just guess the frequency :( */
+ setting.frequency = 60;
+ }
+
+ return GHOST_kSuccess;
}
GHOST_TSuccess
GHOST_DisplayManagerSDL:: setCurrentDisplaySetting(GHOST_TUns8 display,
const GHOST_DisplaySetting& setting)
{
- // This is never going to work robustly in X
- // but it's currently part of the full screen interface
- // we fudge it for now.
+ /*
+ * Mode switching code ported from Quake 2 version 3.21 and bzflag version
+ * 2.4.0:
+ * ftp://ftp.idsoftware.com/idstuff/source/q2source-3.21.zip
+ * See linux/gl_glx.c:GLimp_SetMode
+ * http://wiki.bzflag.org/BZFlag_Source
+ * See src/platform/SDLDisplay.cxx:SDLDisplay and createWindow
+ */
+ SDL_Surface *surf;
+ int best_fit, best_dist, dist, x, y;
+ SDL_Rect **vidmodes = SDL_ListModes(NULL, SDL_HWSURFACE | SDL_OPENGL |
+ SDL_FULLSCREEN | SDL_HWPALETTE);
+ if (!vidmodes) {
+ fprintf(stderr, "Could not get available video modes: %s.\n",
+ SDL_GetError());
+ }
+
+ best_dist = 9999999;
+ best_fit = -1;
+
+ if (vidmodes == (SDL_Rect **) -1) {
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list