Revision: 39102
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=39102
Author: nazgul
Date: 2011-08-06 14:52:45 +0000 (Sat, 06 Aug 2011)
Log Message:
-----------
Merging r39050 through r39101 from trunk into soc-2011-tomato
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=39050
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=39101
Modified Paths:
--------------
branches/soc-2011-tomato/build_files/scons/config/darwin-config.py
branches/soc-2011-tomato/intern/ghost/intern/GHOST_SystemSDL.cpp
branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_userpref.py
branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_userpref_keymap.py
branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_view3d.py
branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_view3d_toolbar.py
branches/soc-2011-tomato/source/blender/blenkernel/intern/blender.c
branches/soc-2011-tomato/source/blender/blenloader/intern/readfile.c
branches/soc-2011-tomato/source/blender/blenloader/intern/writefile.c
branches/soc-2011-tomato/source/blender/editors/curve/editfont.c
branches/soc-2011-tomato/source/blender/editors/include/UI_interface.h
branches/soc-2011-tomato/source/blender/editors/interface/interface_handlers.c
branches/soc-2011-tomato/source/blender/editors/interface/interface_icons.c
branches/soc-2011-tomato/source/blender/editors/interface/interface_style.c
branches/soc-2011-tomato/source/blender/editors/interface/interface_widgets.c
branches/soc-2011-tomato/source/blender/editors/interface/resources.c
branches/soc-2011-tomato/source/blender/editors/object/object_edit.c
branches/soc-2011-tomato/source/blender/makesdna/DNA_userdef_types.h
branches/soc-2011-tomato/source/blender/makesdna/DNA_windowmanager_types.h
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_internal.h
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_scene.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_userdef.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_wm.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_wm_api.c
branches/soc-2011-tomato/source/blender/python/intern/bpy_operator.c
branches/soc-2011-tomato/source/blender/python/intern/bpy_rna.c
branches/soc-2011-tomato/source/blender/python/intern/bpy_rna.h
branches/soc-2011-tomato/source/blender/windowmanager/WM_api.h
branches/soc-2011-tomato/source/blender/windowmanager/intern/wm.c
branches/soc-2011-tomato/source/blender/windowmanager/intern/wm_event_system.c
branches/soc-2011-tomato/source/blender/windowmanager/intern/wm_files.c
branches/soc-2011-tomato/source/blender/windowmanager/intern/wm_keymap.c
branches/soc-2011-tomato/source/blender/windowmanager/intern/wm_operators.c
branches/soc-2011-tomato/source/blenderplayer/bad_level_call_stubs/stubs.c
Added Paths:
-----------
branches/soc-2011-tomato/source/blender/windowmanager/WM_keymap.h
Property Changed:
----------------
branches/soc-2011-tomato/
Property changes on: branches/soc-2011-tomato
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/blender:36831-39049
+ /trunk/blender:36831-39101
Modified: branches/soc-2011-tomato/build_files/scons/config/darwin-config.py
===================================================================
--- branches/soc-2011-tomato/build_files/scons/config/darwin-config.py
2011-08-06 14:49:01 UTC (rev 39101)
+++ branches/soc-2011-tomato/build_files/scons/config/darwin-config.py
2011-08-06 14:52:45 UTC (rev 39102)
@@ -21,14 +21,16 @@
MAC_PROC=commands.getoutput(cmd)
cmd = 'uname -r'
cmd_res=commands.getoutput(cmd)
-if cmd_res[0]=='7':
+if cmd_res[:2]=='7':
MAC_CUR_VER='10.3'
-elif cmd_res[0]=='8':
+elif cmd_res[:2]=='8':
MAC_CUR_VER='10.4'
-elif cmd_res[0]=='9':
+elif cmd_res[:2]=='9':
MAC_CUR_VER='10.5'
-elif cmd_res[0]=='10':
+elif cmd_res[:2]=='10':
MAC_CUR_VER='10.6'
+elif cmd_res[:2]=='11':
+ MAC_CUR_VER='10.7'
if MACOSX_ARCHITECTURE == 'x86_64' or MACOSX_ARCHITECTURE == 'ppc64':
USE_QTKIT=True # Carbon quicktime is not available for 64bit
@@ -37,8 +39,8 @@
# Default target OSX settings per architecture
# Can be customized
-if MACOSX_ARCHITECTURE == 'ppc':
-# ppc release are now made for 10.4
+if MACOSX_ARCHITECTURE == 'ppc' and MAC_CUR_VER == '10.4':
+# all releases are now made for 10.5 !
# MAC_MIN_VERS = '10.3'
# MACOSX_SDK='/Developer/SDKs/MacOSX10.3.9.sdk'
# LCGDIR = '#../lib/darwin-6.1-powerpc'
@@ -50,13 +52,21 @@
LCGDIR = '#../lib/darwin-8.0.0-powerpc'
CC = 'gcc-4.0'
CXX = 'g++-4.0'
-elif MACOSX_ARCHITECTURE == 'i386':
+elif MACOSX_ARCHITECTURE == 'i386' and MAC_CUR_VER == '10.4':
MAC_MIN_VERS = '10.4'
MACOSX_DEPLOYMENT_TARGET = '10.4'
MACOSX_SDK='/Developer/SDKs/MacOSX10.4u.sdk'
LCGDIR = '#../lib/darwin-8.x.i386'
CC = 'gcc-4.0'
CXX = 'g++-4.0'
+elif MAC_CUR_VER >= '10.6':
+ # OSX 10.6 and 10.7 developer tools do not come with sdk < 10.6 anymore
!
+ MAC_MIN_VERS = '10.6'
+ MACOSX_DEPLOYMENT_TARGET = '10.6'
+ MACOSX_SDK='/Developer/SDKs/MacOSX10.6.sdk'
+ LCGDIR = '#../lib/darwin-9.x.universal'
+ CC = 'llvm-gcc-4.2'
+ CXX = 'llvm-g++-4.2'
else :
MAC_MIN_VERS = '10.5'
MACOSX_DEPLOYMENT_TARGET = '10.5'
@@ -71,8 +81,8 @@
################### Dependency settings ##################
#############################################################################
-#Defaults openMP to true if compiler (currently only gcc 4.2) handles it
-if CC == 'gcc-4.2':
+#Defaults openMP to true if compiler handles it
+if CC == 'gcc-4.2' or CC == 'llvm-gcc-4.2':
WITH_BF_OPENMP = True # multithreading for fluids, cloth and smoke
else:
WITH_BF_OPENMP = False
Modified: branches/soc-2011-tomato/intern/ghost/intern/GHOST_SystemSDL.cpp
===================================================================
--- branches/soc-2011-tomato/intern/ghost/intern/GHOST_SystemSDL.cpp
2011-08-06 14:49:01 UTC (rev 39101)
+++ branches/soc-2011-tomato/intern/ghost/intern/GHOST_SystemSDL.cpp
2011-08-06 14:52:45 UTC (rev 39102)
@@ -180,6 +180,7 @@
GXMAP(type,SDL_SCANCODE_RCTRL, GHOST_kKeyRightControl);
GXMAP(type,SDL_SCANCODE_LALT, GHOST_kKeyLeftAlt);
GXMAP(type,SDL_SCANCODE_RALT, GHOST_kKeyRightAlt);
+ GXMAP(type,SDL_SCANCODE_LGUI, GHOST_kKeyOS);
GXMAP(type,SDL_SCANCODE_RGUI, GHOST_kKeyOS);
GXMAP(type,SDL_SCANCODE_INSERT, GHOST_kKeyInsert);
@@ -228,6 +229,7 @@
GXMAP(type,SDL_SCANCODE_AUDIONEXT, GHOST_kKeyMediaLast);
default:
+ printf("Unknown\n");
type= GHOST_kKeyUnknown;
break;
}
@@ -372,6 +374,7 @@
case SDL_KEYUP:
{
SDL_KeyboardEvent &sdl_sub_evt= sdl_event->key;
+ SDL_Keycode sym= sdl_sub_evt.keysym.sym;
GHOST_TEventType type= (sdl_sub_evt.state ==
SDL_PRESSED) ? GHOST_kEventKeyDown : GHOST_kEventKeyUp;
GHOST_WindowSDL *window=
findGhostWindow(SDL_GetWindowFromID(sdl_sub_evt.windowID));
@@ -379,7 +382,45 @@
GHOST_TKey gkey=
convertSDLKey(sdl_sub_evt.keysym.scancode);
/* note, the sdl_sub_evt.keysym.sym is truncated, for
unicode support ghost has to be modified */
- g_event= new GHOST_EventKey(getMilliSeconds(), type,
window, gkey, sdl_sub_evt.keysym.sym);
+ if(sym > 127) {
+ sym= 0;
+ }
+ else {
+ if(sdl_sub_evt.keysym.mod &
(KMOD_LSHIFT|KMOD_RSHIFT)) {
+ /* lame US keyboard assumptions */
+ if(sym >= 'a' && sym <= ('a' + 32)) {
+ sym -= 32;
+ }
+ else {
+ switch(sym) {
+ case '`': sym= '~';
break;
+ case '1': sym= '!';
break;
+ case '2': sym= '@';
break;
+ case '3': sym= '#';
break;
+ case '4': sym= '$';
break;
+ case '5': sym= '%';
break;
+ case '6': sym= '^';
break;
+ case '7': sym= '&';
break;
+ case '8': sym= '*';
break;
+ case '9': sym= '(';
break;
+ case '0': sym= ')';
break;
+ case '-': sym= '_';
break;
+ case '=': sym= '+';
break;
+ case '[': sym= '{';
break;
+ case ']': sym= '}';
break;
+ case '\\': sym= '|';
break;
+ case ';': sym= ':';
break;
+ case '\'': sym= '"';
break;
+ case ',': sym= '<';
break;
+ case '.': sym= '>';
break;
+ case '/': sym= '?';
break;
+ default:
break;
+ }
+ }
+ }
+ }
+
+ g_event= new GHOST_EventKey(getMilliSeconds(), type,
window, gkey, sym);
}
break;
}
Modified:
branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_userpref.py
===================================================================
--- branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_userpref.py
2011-08-06 14:49:01 UTC (rev 39101)
+++ branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_userpref.py
2011-08-06 14:52:45 UTC (rev 39102)
@@ -755,6 +755,31 @@
from bl_ui.space_userpref_keymap import InputKeyMapPanel
+class USERPREF_MT_ndof_settings(bpy.types.Menu):
+ # accessed from the window keybindings in C (only)
+ bl_label = "3D Mouse Settings"
+
+ def draw(self, context):
+ layout = self.layout
+ input_prefs = context.user_preferences.inputs
+
+ layout.separator()
+ layout.prop(input_prefs, "ndof_sensitivity")
+
+ if context.space_data.type == 'VIEW_3D':
+ layout.separator()
+ layout.prop(input_prefs, "ndof_show_guide")
+
+ layout.separator()
+ layout.label(text="orbit options")
+ layout.prop(input_prefs, "ndof_orbit_invert_axes")
+
+ layout.separator()
+ layout.label(text="fly options")
+ layout.prop(input_prefs, "ndof_fly_helicopter", icon='NDOF_FLY')
+ layout.prop(input_prefs, "ndof_lock_horizon", icon='NDOF_DOM')
+
+
class USERPREF_PT_input(bpy.types.Panel, InputKeyMapPanel):
bl_space_type = 'USER_PREFERENCES'
bl_label = "Input"
Modified:
branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_userpref_keymap.py
===================================================================
---
branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_userpref_keymap.py
2011-08-06 14:49:01 UTC (rev 39101)
+++
branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_userpref_keymap.py
2011-08-06 14:52:45 UTC (rev 39102)
@@ -191,10 +191,10 @@
if km.is_modal:
row.label(text="", icon='LINKED')
- if km.is_user_defined:
+ if km.is_user_modified:
row.operator("wm.keymap_restore", text="Restore")
else:
- row.operator("wm.keymap_edit", text="Edit")
+ row.label()
if km.show_expanded_children:
if children:
@@ -215,7 +215,6 @@
# "Add New" at end of keymap item list
col = self.indented_layout(col, level + 1)
subcol = col.split(percentage=0.2).column()
- subcol.enabled = km.is_user_defined
subcol.operator("wm.keyitem_add", text="Add New",
icon='ZOOMIN')
col.separator()
@@ -246,7 +245,7 @@
col = self.indented_layout(layout, level)
- if km.is_user_defined:
+ if kmi.show_expanded:
col = col.column(align=True)
box = col.box()
else:
@@ -259,7 +258,6 @@
row.prop(kmi, "show_expanded", text="", emboss=False)
row = split.row()
- row.enabled = km.is_user_defined
row.prop(kmi, "active", text="", emboss=False)
if km.is_modal:
@@ -268,7 +266,6 @@
row.label(text=kmi.name)
row = split.row()
- row.enabled = km.is_user_defined
row.prop(kmi, "map_type", text="")
if map_type == 'KEYBOARD':
row.prop(kmi, "type", text="", full_event=True)
@@ -285,18 +282,17 @@
else:
row.label()
- if not kmi.is_user_defined:
+ if (not kmi.is_user_defined) and kmi.is_user_modified:
op = row.operator("wm.keyitem_restore", text="", icon='BACK')
op.item_id = kmi.id
- op = row.operator("wm.keyitem_remove", text="", icon='X')
- op.item_id = kmi.id
+ else:
+ op = row.operator("wm.keyitem_remove", text="", icon='X')
+ op.item_id = kmi.id
# Expanded, additional event settings
if kmi.show_expanded:
box = col.box()
- box.enabled = km.is_user_defined
-
if map_type not in {'TEXTINPUT', 'TIMER'}:
split = box.split(percentage=0.4)
sub = split.row()
@@ -355,10 +351,10 @@
row.label()
row.label()
- if km.is_user_defined:
+ if km.is_user_modified:
row.operator("wm.keymap_restore", text="Restore")
else:
- row.operator("wm.keymap_edit", text="Edit")
+ row.label()
for kmi in filtered_items:
self.draw_kmi(display_keymaps, kc, km, kmi, col, 1)
@@ -366,7 +362,6 @@
# "Add New" at end of keymap item list
col = self.indented_layout(layout, 1)
subcol = col.split(percentage=0.2).column()
- subcol.enabled = km.is_user_defined
subcol.operator("wm.keyitem_add", text="Add New",
icon='ZOOMIN')
def draw_hierarchy(self, display_keymaps, layout):
@@ -375,8 +370,7 @@
def draw_keymaps(self, context, layout):
wm = context.window_manager
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
