[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [28281] branches/render25: Render Branch: svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r28254 :28280
Brecht Van Lommel
brecht at blender.org
Mon Apr 19 12:01:17 CEST 2010
Revision: 28281
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=28281
Author: blendix
Date: 2010-04-19 12:01:17 +0200 (Mon, 19 Apr 2010)
Log Message:
-----------
Render Branch: svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r28254:28280
Modified Paths:
--------------
branches/render25/config/linux2-config.py
branches/render25/projectfiles_vc9/gameengine/gamelogic/SCA_GameLogic.vcproj
branches/render25/release/datafiles/blenderbuttons
branches/render25/release/scripts/io/engine_render_pov.py
branches/render25/release/scripts/io/netrender/client.py
branches/render25/release/scripts/op/presets.py
branches/render25/release/scripts/presets/interaction/maya.py
branches/render25/release/scripts/ui/properties_data_mesh.py
branches/render25/release/scripts/ui/properties_texture.py
branches/render25/release/scripts/ui/space_sequencer.py
branches/render25/source/blender/blenkernel/BKE_armature.h
branches/render25/source/blender/blenkernel/intern/armature.c
branches/render25/source/blender/blenkernel/intern/deform.c
branches/render25/source/blender/blenkernel/intern/sequencer.c
branches/render25/source/blender/editors/armature/editarmature.c
branches/render25/source/blender/editors/armature/poseobject.c
branches/render25/source/blender/editors/curve/curve_intern.h
branches/render25/source/blender/editors/datafiles/blenderbuttons.c
branches/render25/source/blender/editors/include/UI_icons.h
branches/render25/source/blender/editors/interface/interface_handlers.c
branches/render25/source/blender/editors/mesh/mesh_ops.c
branches/render25/source/blender/editors/space_file/file_draw.c
branches/render25/source/blender/editors/space_file/filelist.c
branches/render25/source/blender/editors/space_image/image_ops.c
branches/render25/source/blender/editors/space_sequencer/sequencer_ops.c
branches/render25/source/blender/editors/transform/transform.c
branches/render25/source/blender/makesrna/intern/rna_sequencer.c
branches/render25/source/blender/makesrna/intern/rna_space.c
branches/render25/source/blender/python/intern/bpy.c
branches/render25/source/nan_compile.mk
Modified: branches/render25/config/linux2-config.py
===================================================================
--- branches/render25/config/linux2-config.py 2010-04-19 09:50:02 UTC (rev 28280)
+++ branches/render25/config/linux2-config.py 2010-04-19 10:01:17 UTC (rev 28281)
@@ -175,10 +175,10 @@
##ifeq ($CPU),alpha)
## CFLAGS += -pipe -fPIC -funsigned-char -fno-strict-aliasing -mieee
-CCFLAGS = ['-pipe','-fPIC','-funsigned-char','-fno-strict-aliasing']
+CCFLAGS = ['-pipe','-fPIC','-funsigned-char','-fno-strict-aliasing','-D_LARGEFILE_SOURCE', '-D_FILE_OFFSET_BITS=64']
CPPFLAGS = []
-CXXFLAGS = ['-pipe','-fPIC','-funsigned-char','-fno-strict-aliasing']
+CXXFLAGS = ['-pipe','-fPIC','-funsigned-char','-fno-strict-aliasing','-D_LARGEFILE_SOURCE', '-D_FILE_OFFSET_BITS=64']
REL_CFLAGS = ['-O2']
REL_CCFLAGS = ['-O2']
##BF_DEPEND = True
Modified: branches/render25/projectfiles_vc9/gameengine/gamelogic/SCA_GameLogic.vcproj
===================================================================
--- branches/render25/projectfiles_vc9/gameengine/gamelogic/SCA_GameLogic.vcproj 2010-04-19 09:50:02 UTC (rev 28280)
+++ branches/render25/projectfiles_vc9/gameengine/gamelogic/SCA_GameLogic.vcproj 2010-04-19 10:01:17 UTC (rev 28281)
@@ -607,6 +607,14 @@
>
</File>
<File
+ RelativePath="..\..\..\source\gameengine\GameLogic\SCA_PythonKeyboard.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\source\gameengine\GameLogic\SCA_PythonMouse.cpp"
+ >
+ </File>
+ <File
RelativePath="..\..\..\source\gameengine\GameLogic\SCA_RandomActuator.cpp"
>
</File>
@@ -776,6 +784,14 @@
>
</File>
<File
+ RelativePath="..\..\..\source\gameengine\GameLogic\SCA_PythonKeyboard.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\source\gameengine\GameLogic\SCA_PythonMouse.h"
+ >
+ </File>
+ <File
RelativePath="..\..\..\source\gameengine\GameLogic\SCA_RandomActuator.h"
>
</File>
Modified: branches/render25/release/datafiles/blenderbuttons
===================================================================
(Binary files differ)
Modified: branches/render25/release/scripts/io/engine_render_pov.py
===================================================================
--- branches/render25/release/scripts/io/engine_render_pov.py 2010-04-19 09:50:02 UTC (rev 28280)
+++ branches/render25/release/scripts/io/engine_render_pov.py 2010-04-19 10:01:17 UTC (rev 28281)
@@ -880,6 +880,22 @@
except:
pass
del properties_material
+import properties_data_mesh
+for member in dir(properties_data_mesh):
+ subclass = getattr(properties_data_mesh, member)
+ try:
+ subclass.COMPAT_ENGINES.add('POVRAY_RENDER')
+ except:
+ pass
+del properties_data_mesh
+import properties_texture
+for member in dir(properties_texture):
+ subclass = getattr(properties_texture, member)
+ try:
+ subclass.COMPAT_ENGINES.add('POVRAY_RENDER')
+ except:
+ pass
+del properties_texture
class RenderButtonsPanel(bpy.types.Panel):
Modified: branches/render25/release/scripts/io/netrender/client.py
===================================================================
--- branches/render25/release/scripts/io/netrender/client.py 2010-04-19 09:50:02 UTC (rev 28280)
+++ branches/render25/release/scripts/io/netrender/client.py 2010-04-19 10:01:17 UTC (rev 28281)
@@ -284,3 +284,5 @@
#compatible("properties_render")
compatible("properties_world")
compatible("properties_material")
+compatible("properties_data_mesh")
+compatible("properties_texture")
Modified: branches/render25/release/scripts/op/presets.py
===================================================================
--- branches/render25/release/scripts/op/presets.py 2010-04-19 09:50:02 UTC (rev 28280)
+++ branches/render25/release/scripts/op/presets.py 2010-04-19 10:01:17 UTC (rev 28281)
@@ -198,6 +198,9 @@
"bpy.context.user_preferences.inputs.zoom_axis",
"bpy.context.user_preferences.inputs.view_rotation",
"bpy.context.user_preferences.inputs.invert_zoom_direction",
+ "bpy.context.user_preferences.inputs.emulate_numpad",
+ "bpy.context.user_preferences.inputs.emulate_3_button_mouse",
+ "bpy.context.user_preferences.inputs.continuous_mouse",
]
preset_subdir = "interaction"
Modified: branches/render25/release/scripts/presets/interaction/maya.py
===================================================================
--- branches/render25/release/scripts/presets/interaction/maya.py 2010-04-19 09:50:02 UTC (rev 28280)
+++ branches/render25/release/scripts/presets/interaction/maya.py 2010-04-19 10:01:17 UTC (rev 28281)
@@ -154,6 +154,7 @@
kmi.properties.enumerate = True
kmi.properties.extend = True
kmi = km.items.add('view3d.select_border', 'EVT_TWEAK_S', 'ANY')
+kmi.properties.extend = False
kmi = km.items.add('view3d.select_lasso', 'EVT_TWEAK_A', 'ANY', ctrl=True)
kmi = km.items.add('view3d.select_lasso', 'EVT_TWEAK_A', 'ANY', shift=True, ctrl=True)
kmi.properties.deselect = True
@@ -204,12 +205,96 @@
kmi.properties.rotate = True
kmi = km.items.add('view3d.enable_manipulator', 'R', 'PRESS')
kmi.properties.scale = True
+kmi = km.items.add('view3d.select_border', 'EVT_TWEAK_S', 'ANY', shift=True)
+kmi.properties.extend = True
+# Map Object Mode
+km = kc.add_keymap('Object Mode', space_type='EMPTY', region_type='WINDOW', modal=False)
+
+kmi = km.items.add('wm.context_cycle_enum', 'O', 'PRESS', shift=True)
+kmi.properties.path = 'tool_settings.proportional_editing_falloff'
+kmi = km.items.add('wm.context_toggle_enum', 'O', 'PRESS')
+kmi.properties.path = 'tool_settings.proportional_editing'
+kmi.properties.value_1 = 'DISABLED'
+kmi.properties.value_2 = 'ENABLED'
+kmi = km.items.add('view3d.game_start', 'P', 'PRESS')
+kmi = km.items.add('object.select_all', 'A', 'PRESS')
+kmi = km.items.add('object.select_inverse', 'I', 'PRESS', ctrl=True)
+kmi = km.items.add('object.select_linked', 'L', 'PRESS', shift=True)
+kmi = km.items.add('object.select_grouped', 'G', 'PRESS', shift=True)
+kmi = km.items.add('object.select_mirror', 'M', 'PRESS', shift=True, ctrl=True)
+kmi = km.items.add('object.select_hierarchy', 'LEFT_BRACKET', 'PRESS')
+kmi.properties.direction = 'PARENT'
+kmi = km.items.add('object.select_hierarchy', 'LEFT_BRACKET', 'PRESS', shift=True)
+kmi.properties.direction = 'PARENT'
+kmi.properties.extend = True
+kmi = km.items.add('object.select_hierarchy', 'RIGHT_BRACKET', 'PRESS')
+kmi.properties.direction = 'CHILD'
+kmi = km.items.add('object.select_hierarchy', 'RIGHT_BRACKET', 'PRESS', shift=True)
+kmi.properties.direction = 'CHILD'
+kmi.properties.extend = True
+kmi = km.items.add('object.parent_set', 'P', 'PRESS', ctrl=True)
+kmi = km.items.add('object.parent_no_inverse_set', 'P', 'PRESS', shift=True, ctrl=True)
+kmi = km.items.add('object.parent_clear', 'P', 'PRESS', alt=True)
+kmi = km.items.add('object.track_set', 'T', 'PRESS', ctrl=True)
+kmi = km.items.add('object.track_clear', 'T', 'PRESS', alt=True)
+kmi = km.items.add('object.constraint_add_with_targets', 'C', 'PRESS', shift=True, ctrl=True)
+kmi = km.items.add('object.constraints_clear', 'C', 'PRESS', ctrl=True, alt=True)
+kmi = km.items.add('object.location_clear', 'G', 'PRESS', alt=True)
+kmi = km.items.add('object.rotation_clear', 'R', 'PRESS', alt=True)
+kmi = km.items.add('object.scale_clear', 'S', 'PRESS', alt=True)
+kmi = km.items.add('object.origin_clear', 'O', 'PRESS', alt=True)
+kmi = km.items.add('object.restrictview_clear', 'H', 'PRESS', alt=True)
+kmi = km.items.add('object.restrictview_set', 'H', 'PRESS')
+kmi = km.items.add('object.restrictview_set', 'H', 'PRESS', shift=True)
+kmi.properties.unselected = True
+kmi = km.items.add('object.move_to_layer', 'M', 'PRESS')
+kmi = km.items.add('object.delete', 'X', 'PRESS')
+kmi = km.items.add('object.delete', 'DEL', 'PRESS')
+kmi = km.items.add('wm.call_menu', 'A', 'PRESS', shift=True)
+kmi.properties.name = 'INFO_MT_add'
+kmi = km.items.add('object.duplicates_make_real', 'A', 'PRESS', shift=True, ctrl=True)
+kmi = km.items.add('wm.call_menu', 'A', 'PRESS', ctrl=True)
+kmi.properties.name = 'VIEW3D_MT_object_apply'
+kmi = km.items.add('wm.call_menu', 'U', 'PRESS')
+kmi.properties.name = 'VIEW3D_MT_make_single_user'
+kmi = km.items.add('wm.call_menu', 'L', 'PRESS', ctrl=True)
+kmi.properties.name = 'VIEW3D_MT_make_links'
+kmi = km.items.add('object.duplicate_move', 'D', 'PRESS', shift=True)
+kmi = km.items.add('object.duplicate_move_linked', 'D', 'PRESS', alt=True)
+kmi = km.items.add('object.join', 'J', 'PRESS', ctrl=True)
+kmi = km.items.add('object.convert', 'C', 'PRESS', alt=True)
+kmi = km.items.add('object.proxy_make', 'P', 'PRESS', ctrl=True, alt=True)
+kmi = km.items.add('object.make_local', 'L', 'PRESS')
+kmi = km.items.add('anim.keyframe_insert_menu', 'I', 'PRESS')
+kmi = km.items.add('anim.keyframe_delete_v3d', 'I', 'PRESS', alt=True)
+kmi = km.items.add('anim.keying_set_active_set', 'I', 'PRESS', shift=True, ctrl=True, alt=True)
+kmi = km.items.add('group.create', 'G', 'PRESS', ctrl=True)
+kmi = km.items.add('group.objects_remove', 'G', 'PRESS', ctrl=True, alt=True)
+kmi = km.items.add('group.objects_add_active', 'G', 'PRESS', shift=True, ctrl=True)
+kmi = km.items.add('group.objects_remove_active', 'G', 'PRESS', shift=True, alt=True)
+kmi = km.items.add('wm.call_menu', 'W', 'PRESS', ctrl=True)
+kmi.properties.name = 'VIEW3D_MT_object_specials'
+kmi = km.items.add('object.subdivision_set', 'ZERO', 'PRESS', ctrl=True)
+kmi.properties.level = 0
+kmi = km.items.add('object.subdivision_set', 'ONE', 'PRESS', ctrl=True)
+kmi.properties.level = 1
+kmi = km.items.add('object.subdivision_set', 'TWO', 'PRESS', ctrl=True)
+kmi.properties.level = 2
+kmi = km.items.add('object.subdivision_set', 'THREE', 'PRESS', ctrl=True)
+kmi.properties.level = 3
+kmi = km.items.add('object.subdivision_set', 'FOUR', 'PRESS', ctrl=True)
+kmi.properties.level = 4
+kmi = km.items.add('object.subdivision_set', 'FIVE', 'PRESS', ctrl=True)
+kmi.properties.level = 5
+kmi = km.items.add('object.select_all', 'SELECTMOUSE', 'CLICK')
+kmi.properties.action = 'DESELECT'
+
# Map Mesh
km = kc.add_keymap('Mesh', space_type='EMPTY', region_type='WINDOW', modal=False)
kmi = km.items.add('mesh.loopcut_slide', 'R', 'PRESS', ctrl=True)
-kmi = km.items.add('mesh.loop_select', 'SELECTMOUSE', 'PRESS', alt=True)
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list