[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [42758] branches/bmesh/blender: svn merge ^/trunk/blender -r42742:42757
Campbell Barton
ideasman42 at gmail.com
Tue Dec 20 09:09:58 CET 2011
Revision: 42758
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=42758
Author: campbellbarton
Date: 2011-12-20 08:09:46 +0000 (Tue, 20 Dec 2011)
Log Message:
-----------
svn merge ^/trunk/blender -r42742:42757
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=42742
Modified Paths:
--------------
branches/bmesh/blender/release/scripts/startup/bl_operators/wm.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_game.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_particle.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_render.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_scene.py
branches/bmesh/blender/release/scripts/startup/bl_ui/space_logic.py
branches/bmesh/blender/source/blender/blenkernel/intern/DerivedMesh.c
branches/bmesh/blender/source/blender/blenlib/BLI_dynstr.h
branches/bmesh/blender/source/blender/blenlib/intern/BLI_dynstr.c
branches/bmesh/blender/source/blender/blenloader/intern/readfile.c
branches/bmesh/blender/source/blender/editors/screen/screen_ops.c
branches/bmesh/blender/source/blender/editors/sculpt_paint/paint_ops.c
branches/bmesh/blender/source/blender/makesdna/DNA_scene_types.h
branches/bmesh/blender/source/blender/makesrna/intern/rna_scene.c
branches/bmesh/blender/source/blender/python/intern/bpy_rna.c
branches/bmesh/blender/source/blender/python/mathutils/mathutils.c
branches/bmesh/blender/source/blender/python/mathutils/mathutils.h
branches/bmesh/blender/source/blender/python/mathutils/mathutils_Color.c
branches/bmesh/blender/source/blender/python/mathutils/mathutils_Euler.c
branches/bmesh/blender/source/blender/python/mathutils/mathutils_Matrix.c
branches/bmesh/blender/source/blender/python/mathutils/mathutils_Matrix.h
branches/bmesh/blender/source/blender/python/mathutils/mathutils_Quaternion.c
branches/bmesh/blender/source/blender/python/mathutils/mathutils_Vector.c
branches/bmesh/blender/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
branches/bmesh/blender/source/gameengine/BlenderRoutines/KX_BlenderInputDevice.h
branches/bmesh/blender/source/gameengine/BlenderRoutines/KX_BlenderKeyboardDevice.cpp
branches/bmesh/blender/source/gameengine/BlenderRoutines/KX_BlenderKeyboardDevice.h
branches/bmesh/blender/source/gameengine/Converter/BL_BlenderDataConversion.cpp
branches/bmesh/blender/source/gameengine/Converter/BL_BlenderDataConversion.h
branches/bmesh/blender/source/gameengine/Converter/KX_ConvertSensors.cpp
branches/bmesh/blender/source/gameengine/GamePlayer/common/GPC_KeyboardDevice.h
branches/bmesh/blender/source/gameengine/GamePlayer/ghost/GPG_Application.cpp
branches/bmesh/blender/source/gameengine/GamePlayer/ghost/GPG_Application.h
branches/bmesh/blender/source/gameengine/Ketsji/KX_KetsjiEngine.cpp
branches/bmesh/blender/source/gameengine/Ketsji/KX_KetsjiEngine.h
branches/bmesh/blender/source/gameengine/Ketsji/KX_PythonInit.cpp
branches/bmesh/blender/source/tests/CMakeLists.txt
Added Paths:
-----------
branches/bmesh/blender/source/tests/bl_pyapi_mathutils.py
Property Changed:
----------------
branches/bmesh/blender/
branches/bmesh/blender/release/
Property changes on: branches/bmesh/blender
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/soc-2011-cucumber:37517
/branches/soc-2011-tomato:42376,42378-42379,42397,42400
/trunk/blender:39992-42742
+ /branches/soc-2011-cucumber:37517
/branches/soc-2011-tomato:42376,42378-42379,42397,42400
/trunk/blender:39992-42757
Property changes on: branches/bmesh/blender/release
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/blender/release:31524-42516,42522-42548,42551-42585,42587-42655,42681-42742
+ /trunk/blender/release:31524-42516,42522-42548,42551-42585,42587-42655,42681-42757
Modified: branches/bmesh/blender/release/scripts/startup/bl_operators/wm.py
===================================================================
--- branches/bmesh/blender/release/scripts/startup/bl_operators/wm.py 2011-12-20 07:39:30 UTC (rev 42757)
+++ branches/bmesh/blender/release/scripts/startup/bl_operators/wm.py 2011-12-20 08:09:46 UTC (rev 42758)
@@ -29,6 +29,8 @@
from rna_prop_ui import rna_idprop_ui_prop_get, rna_idprop_ui_prop_clear
+import subprocess
+import os
class MESH_OT_delete_edgeloop(Operator):
'''Delete an edge loop by merging the faces on each side to a single face loop'''
@@ -1175,7 +1177,27 @@
return {'CANCELLED'}
+class WM_OT_blenderplayer_start(bpy.types.Operator):
+ '''Launches the Blenderplayer with the current blendfile'''
+ bl_idname = "wm.blenderplayer_start"
+ bl_label = "Start"
+
+ blender_bin_path = bpy.app.binary_path
+ blender_bin_dir = os.path.dirname(blender_bin_path)
+ ext = os.path.splitext(blender_bin_path)[-1]
+ player_path = os.path.join(blender_bin_dir, 'blenderplayer' + ext)
+
+ def execute(self, context):
+ import sys
+ if sys.platform == 'darwin':
+ self.player_path = os.path.join(self.blender_bin_dir, '../../../blenderplayer.app/Contents/MacOS/blenderplayer')
+
+ filepath = bpy.app.tempdir + "game.blend"
+ bpy.ops.wm.save_as_mainfile(filepath=filepath, check_existing=False, copy=True)
+ subprocess.call([self.player_path, filepath])
+ return {'FINISHED'}
+
class WM_OT_keyconfig_test(Operator):
"Test keyconfig for conflicts"
bl_idname = "wm.keyconfig_test"
Modified: branches/bmesh/blender/release/scripts/startup/bl_ui/properties_game.py
===================================================================
--- branches/bmesh/blender/release/scripts/startup/bl_ui/properties_game.py 2011-12-20 07:39:30 UTC (rev 42757)
+++ branches/bmesh/blender/release/scripts/startup/bl_ui/properties_game.py 2011-12-20 08:09:46 UTC (rev 42758)
@@ -244,16 +244,22 @@
return (rd.engine in cls.COMPAT_ENGINES)
-class RENDER_PT_game(RenderButtonsPanel, Panel):
- bl_label = "Game"
+class RENDER_PT_embedded(RenderButtonsPanel, bpy.types.Panel):
+ bl_label = "Embedded Player"
COMPAT_ENGINES = {'BLENDER_GAME'}
-
def draw(self, context):
layout = self.layout
+ rd = context.scene.render
+
row = layout.row()
row.operator("view3d.game_start", text="Start")
row.label()
+ row = layout.row()
+ row.label(text="Resolution:")
+ row = layout.row(align=True)
+ row.prop(rd, "resolution_x", slider=False, text="X")
+ row.prop(rd, "resolution_y", slider=False, text="Y")
class RENDER_PT_game_player(RenderButtonsPanel, Panel):
@@ -264,29 +270,23 @@
layout = self.layout
gs = context.scene.game_settings
-
- layout.prop(gs, "show_fullscreen")
-
- split = layout.split()
-
- col = split.column()
- col.label(text="Resolution:")
- sub = col.column(align=True)
- sub.prop(gs, "resolution_x", slider=False, text="X")
- sub.prop(gs, "resolution_y", slider=False, text="Y")
-
- col = split.column()
+
+ row = layout.row()
+ row.operator("wm.blenderplayer_start", text="Start")
+ row.prop(gs, "show_fullscreen")
+
+ row = layout.row()
+ row.label(text="Resolution:")
+ row = layout.row(align=True)
+ row.prop(gs, "resolution_x", slider=False, text="X")
+ row.prop(gs, "resolution_y", slider=False, text="Y")
+
+ col = layout.column()
col.label(text="Quality:")
- sub = col.column(align=True)
- sub.prop(gs, "depth", text="Bit Depth", slider=False)
- sub.prop(gs, "frequency", text="FPS", slider=False)
+ col = layout.column(align=True)
+ col.prop(gs, "depth", text="Bit Depth", slider=False)
+ col.prop(gs, "frequency", text="Refresh Rate", slider=False)
- # framing:
- col = layout.column()
- col.label(text="Framing:")
- col.row().prop(gs, "frame_type", expand=True)
- if gs.frame_type == 'LETTERBOX':
- col.prop(gs, "frame_color", text="")
class RENDER_PT_game_stereo(RenderButtonsPanel, Panel):
@@ -368,20 +368,24 @@
col.prop(gs, "use_glsl_extra_textures", text="Extra Textures")
-class RENDER_PT_game_performance(RenderButtonsPanel, Panel):
- bl_label = "Performance"
+class RENDER_PT_game_system(RenderButtonsPanel, Panel):
+ bl_label = "System"
COMPAT_ENGINES = {'BLENDER_GAME'}
def draw(self, context):
layout = self.layout
gs = context.scene.game_settings
- col = layout.column()
- row = col.row()
+ row = layout.row()
row.prop(gs, "use_frame_rate")
+ row.prop(gs, "restrict_animation_updates")
+
+ row = layout.row()
row.prop(gs, "use_display_lists")
- col.prop(gs, "restrict_animation_updates")
+ row = layout.row()
+ row.label("Exit Key")
+ row.prop(gs, "exit_key", text="", event=True)
class RENDER_PT_game_display(RenderButtonsPanel, Panel):
@@ -391,6 +395,9 @@
def draw(self, context):
layout = self.layout
+ row = layout.row()
+ row.prop(context.scene.render, "fps", text="Animation Frame Rate", slider=False)
+
gs = context.scene.game_settings
flow = layout.column_flow()
flow.prop(gs, "show_debug_properties", text="Debug Properties")
@@ -399,7 +406,13 @@
flow.prop(gs, "use_deprecation_warnings")
flow.prop(gs, "show_mouse", text="Mouse Cursor")
+ col = layout.column()
+ col.label(text="Framing:")
+ col.row().prop(gs, "frame_type", expand=True)
+ if gs.frame_type == 'LETTERBOX':
+ col.prop(gs, "frame_color", text="")
+
class SceneButtonsPanel():
bl_space_type = 'PROPERTIES'
bl_region_type = 'WINDOW'
@@ -463,7 +476,21 @@
row.prop(rd, "sample_dist")
row.prop(rd, "sample_max_error")
+class RENDER_PT_game_sound(RenderButtonsPanel, Panel):
+ bl_label = "Sound"
+ COMPAT_ENGINES = {'BLENDER_GAME'}
+ def draw(self, context):
+ layout = self.layout
+
+ scene = context.scene
+
+ layout.prop(scene, "audio_distance_model")
+
+ col = layout.column(align=True)
+ col.prop(scene, "audio_doppler_speed", text="Speed")
+ col.prop(scene, "audio_doppler_factor")
+
class WorldButtonsPanel():
bl_space_type = 'PROPERTIES'
bl_region_type = 'WINDOW'
Modified: branches/bmesh/blender/release/scripts/startup/bl_ui/properties_particle.py
===================================================================
--- branches/bmesh/blender/release/scripts/startup/bl_ui/properties_particle.py 2011-12-20 07:39:30 UTC (rev 42757)
+++ branches/bmesh/blender/release/scripts/startup/bl_ui/properties_particle.py 2011-12-20 08:09:46 UTC (rev 42758)
@@ -76,7 +76,7 @@
class PARTICLE_PT_context_particles(ParticleButtonsPanel, Panel):
bl_label = ""
bl_options = {'HIDE_HEADER'}
- COMPAT_ENGINES = {'BLENDER_RENDER'}
+ COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_GAME'}
@classmethod
def poll(cls, context):
@@ -85,6 +85,10 @@
def draw(self, context):
layout = self.layout
+
+ if context.scene.render.engine == "BLENDER_GAME":
+ layout.label("Not available in the Game Engine")
+ return
ob = context.object
psys = context.particle_system
Modified: branches/bmesh/blender/release/scripts/startup/bl_ui/properties_render.py
===================================================================
--- branches/bmesh/blender/release/scripts/startup/bl_ui/properties_render.py 2011-12-20 07:39:30 UTC (rev 42757)
+++ branches/bmesh/blender/release/scripts/startup/bl_ui/properties_render.py 2011-12-20 08:09:46 UTC (rev 42758)
@@ -51,7 +51,7 @@
@classmethod
def poll(cls, context):
rd = context.scene.render
- return (context.scene and rd.use_game_engine is False) and (rd.engine in cls.COMPAT_ENGINES)
+ return context.scene and (rd.engine in cls.COMPAT_ENGINES)
class RENDER_PT_render(RenderButtonsPanel, Panel):
@@ -553,7 +553,7 @@
class RENDER_PT_bake(RenderButtonsPanel, Panel):
bl_label = "Bake"
bl_options = {'DEFAULT_CLOSED'}
- COMPAT_ENGINES = {'BLENDER_RENDER'}
+ COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_GAME'}
def draw(self, context):
layout = self.layout
Modified: branches/bmesh/blender/release/scripts/startup/bl_ui/properties_scene.py
===================================================================
--- branches/bmesh/blender/release/scripts/startup/bl_ui/properties_scene.py 2011-12-20 07:39:30 UTC (rev 42757)
+++ branches/bmesh/blender/release/scripts/startup/bl_ui/properties_scene.py 2011-12-20 08:09:46 UTC (rev 42758)
@@ -29,12 +29,13 @@
@classmethod
def poll(cls, context):
- return context.scene
+ rd = context.scene.render
+ return context.scene and (rd.engine in cls.COMPAT_ENGINES)
class SCENE_PT_scene(SceneButtonsPanel, Panel):
bl_label = "Scene"
- COMPAT_ENGINES = {'BLENDER_RENDER'}
+ COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_GAME'}
def draw(self, context):
layout = self.layout
@@ -75,7 +76,7 @@
class SCENE_PT_unit(SceneButtonsPanel, Panel):
bl_label = "Units"
- COMPAT_ENGINES = {'BLENDER_RENDER'}
+ COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_GAME'}
def draw(self, context):
layout = self.layout
@@ -93,6 +94,7 @@
class SCENE_PT_keying_sets(SceneButtonsPanel, Panel):
bl_label = "Keying Sets"
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list