Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDalai Felinto <dfelinto@gmail.com>2013-09-16 17:24:28 +0400
committerDalai Felinto <dfelinto@gmail.com>2013-09-16 17:24:28 +0400
commit7ee94deaf58196d2ac86311b29759f55181626c1 (patch)
tree0a2dcd4fa3c23abbc13d82475465faf918b5a794 /release/scripts/startup/bl_ui/properties_game.py
parent2676781a1c56fa8cf56336fc606ea20d2ceaa0ec (diff)
partial bugfix: [#36501] Blenderplayer can not change video resolution in Mac OSX
OSX support for native desktop resolution changing is not simple as for Windows or Linux. The 'fix' here is at the interface level only. Refer to the original bug report for the suggested native workaround, test patch and problems.
Diffstat (limited to 'release/scripts/startup/bl_ui/properties_game.py')
-rw-r--r--release/scripts/startup/bl_ui/properties_game.py11
1 files changed, 8 insertions, 3 deletions
diff --git a/release/scripts/startup/bl_ui/properties_game.py b/release/scripts/startup/bl_ui/properties_game.py
index 025d86204f2..3470c9577af 100644
--- a/release/scripts/startup/bl_ui/properties_game.py
+++ b/release/scripts/startup/bl_ui/properties_game.py
@@ -290,7 +290,9 @@ class RENDER_PT_game_player(RenderButtonsPanel, Panel):
COMPAT_ENGINES = {'BLENDER_GAME'}
def draw(self, context):
+ import sys
layout = self.layout
+ not_osx = sys.platform != "darwin"
gs = context.scene.game_settings
@@ -301,14 +303,17 @@ class RENDER_PT_game_player(RenderButtonsPanel, Panel):
row = layout.row()
row.label(text="Resolution:")
row = layout.row(align=True)
+ row.active = not_osx or not gs.show_fullscreen
row.prop(gs, "resolution_x", slider=False, text="X")
row.prop(gs, "resolution_y", slider=False, text="Y")
row = layout.row()
col = row.column()
col.prop(gs, "show_fullscreen")
- col = row.column()
- col.prop(gs, "use_desktop")
- col.active = gs.show_fullscreen
+
+ if not_osx:
+ col = row.column()
+ col.prop(gs, "use_desktop")
+ col.active = gs.show_fullscreen
col = layout.column()
col.label(text="Quality:")