[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [56470] branches/soc-2011-tomato: Merging r56414 through r56469 from trunk into soc-2011-tomato
Sergey Sharybin
sergey.vfx at gmail.com
Thu May 2 15:40:01 CEST 2013
Revision: 56470
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=56470
Author: nazgul
Date: 2013-05-02 13:40:00 +0000 (Thu, 02 May 2013)
Log Message:
-----------
Merging r56414 through r56469 from trunk into soc-2011-tomato
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=56414
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=56469
Modified Paths:
--------------
branches/soc-2011-tomato/intern/cycles/blender/blender_python.cpp
branches/soc-2011-tomato/intern/locale/boost_locale_wrapper.cpp
branches/soc-2011-tomato/release/scripts/modules/console/complete_namespace.py
branches/soc-2011-tomato/release/scripts/presets/keyconfig/3dsmax.py
branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_render_layer.py
branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_image.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/BKE_brush.h
branches/soc-2011-tomato/source/blender/blenkernel/BKE_text.h
branches/soc-2011-tomato/source/blender/blenkernel/intern/DerivedMesh.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/brush.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/object.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/text.c
branches/soc-2011-tomato/source/blender/blenlib/BLI_math_color_blend.h
branches/soc-2011-tomato/source/blender/blenlib/BLI_utildefines.h
branches/soc-2011-tomato/source/blender/blenlib/intern/fileops.c
branches/soc-2011-tomato/source/blender/blenlib/intern/math_color_blend_inline.c
branches/soc-2011-tomato/source/blender/bmesh/intern/bmesh_opdefines.c
branches/soc-2011-tomato/source/blender/editors/include/ED_view3d.h
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_intern.h
branches/soc-2011-tomato/source/blender/editors/interface/interface_layout.c
branches/soc-2011-tomato/source/blender/editors/interface/interface_regions.c
branches/soc-2011-tomato/source/blender/editors/interface/interface_templates.c
branches/soc-2011-tomato/source/blender/editors/mesh/editmesh_knife.c
branches/soc-2011-tomato/source/blender/editors/mesh/editmesh_knife_project.c
branches/soc-2011-tomato/source/blender/editors/mesh/editmesh_select.c
branches/soc-2011-tomato/source/blender/editors/object/object_modifier.c
branches/soc-2011-tomato/source/blender/editors/object/object_relations.c
branches/soc-2011-tomato/source/blender/editors/render/render_opengl.c
branches/soc-2011-tomato/source/blender/editors/sculpt_paint/paint_cursor.c
branches/soc-2011-tomato/source/blender/editors/sculpt_paint/paint_image.c
branches/soc-2011-tomato/source/blender/editors/sculpt_paint/paint_image_2d.c
branches/soc-2011-tomato/source/blender/editors/sculpt_paint/paint_image_proj.c
branches/soc-2011-tomato/source/blender/editors/sculpt_paint/paint_ops.c
branches/soc-2011-tomato/source/blender/editors/sculpt_paint/paint_stroke.c
branches/soc-2011-tomato/source/blender/editors/sculpt_paint/paint_vertex.c
branches/soc-2011-tomato/source/blender/editors/space_buttons/buttons_texture.c
branches/soc-2011-tomato/source/blender/editors/space_console/console_ops.c
branches/soc-2011-tomato/source/blender/editors/space_nla/space_nla.c
branches/soc-2011-tomato/source/blender/editors/space_text/text_ops.c
branches/soc-2011-tomato/source/blender/editors/space_view3d/view3d_draw.c
branches/soc-2011-tomato/source/blender/editors/space_view3d/view3d_select.c
branches/soc-2011-tomato/source/blender/editors/transform/transform.c
branches/soc-2011-tomato/source/blender/editors/transform/transform.h
branches/soc-2011-tomato/source/blender/editors/transform/transform_constraints.c
branches/soc-2011-tomato/source/blender/editors/uvedit/uvedit_unwrap_ops.c
branches/soc-2011-tomato/source/blender/freestyle/FRS_freestyle.h
branches/soc-2011-tomato/source/blender/freestyle/intern/application/AppCanvas.cpp
branches/soc-2011-tomato/source/blender/freestyle/intern/application/AppConfig.cpp
branches/soc-2011-tomato/source/blender/freestyle/intern/application/Controller.cpp
branches/soc-2011-tomato/source/blender/freestyle/intern/blender_interface/BlenderTextureManager.cpp
branches/soc-2011-tomato/source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp
branches/soc-2011-tomato/source/blender/freestyle/intern/system/StringUtils.cpp
branches/soc-2011-tomato/source/blender/freestyle/intern/system/StringUtils.h
branches/soc-2011-tomato/source/blender/gpu/intern/gpu_buffers.c
branches/soc-2011-tomato/source/blender/imbuf/intern/openexr/openexr_api.cpp
branches/soc-2011-tomato/source/blender/imbuf/intern/rectop.c
branches/soc-2011-tomato/source/blender/makesdna/DNA_customdata_types.h
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_key.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_mesh.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_modifier.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_sequencer.c
branches/soc-2011-tomato/source/blender/python/bmesh/bmesh_py_types.c
branches/soc-2011-tomato/source/blender/python/bmesh/bmesh_py_types_customdata.c
branches/soc-2011-tomato/source/gameengine/Converter/BL_BlenderDataConversion.cpp
branches/soc-2011-tomato/source/gameengine/Ketsji/KX_PolyProxy.cpp
branches/soc-2011-tomato/source/gameengine/Rasterizer/RAS_Polygon.cpp
branches/soc-2011-tomato/source/gameengine/Rasterizer/RAS_Polygon.h
Added Paths:
-----------
branches/soc-2011-tomato/release/scripts/templates_osl/ramp_closure.osl
branches/soc-2011-tomato/release/scripts/templates_osl/temperature_to_rgb.osl
branches/soc-2011-tomato/release/scripts/templates_osl/toon_closure.osl
branches/soc-2011-tomato/release/scripts/templates_osl/wavelength_to_rgb.osl
Property Changed:
----------------
branches/soc-2011-tomato/
branches/soc-2011-tomato/source/blender/editors/interface/interface.c
branches/soc-2011-tomato/source/blender/editors/space_outliner/
Property changes on: branches/soc-2011-tomato
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/ge_harmony:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/vgroup_modifiers:38694-39989
/trunk/blender:36831-56413
+ /branches/ge_harmony:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/vgroup_modifiers:38694-39989
/trunk/blender:36831-56469
Modified: branches/soc-2011-tomato/intern/cycles/blender/blender_python.cpp
===================================================================
--- branches/soc-2011-tomato/intern/cycles/blender/blender_python.cpp 2013-05-02 10:21:39 UTC (rev 56469)
+++ branches/soc-2011-tomato/intern/cycles/blender/blender_python.cpp 2013-05-02 13:40:00 UTC (rev 56470)
@@ -258,6 +258,7 @@
if(param->isclosure) {
socket_type = "NodeSocketShader";
+ data_type = BL::NodeSocket::type_SHADER;
}
else if(param->type.vecsemantics == TypeDesc::COLOR) {
socket_type = "NodeSocketColor";
Modified: branches/soc-2011-tomato/intern/locale/boost_locale_wrapper.cpp
===================================================================
--- branches/soc-2011-tomato/intern/locale/boost_locale_wrapper.cpp 2013-05-02 10:21:39 UTC (rev 56469)
+++ branches/soc-2011-tomato/intern/locale/boost_locale_wrapper.cpp 2013-05-02 13:40:00 UTC (rev 56470)
@@ -62,34 +62,35 @@
try {
if (locale && locale[0]) {
_locale = gen(locale);
- std::locale::global(_locale);
}
else {
#ifdef __APPLE__
extern const char *user_locale; // pulled from Ghost_SystemCocoa
std::string locale_osx = user_locale + std::string(".UTF-8");
_locale = gen(locale_osx.c_str());
- std::locale::global(_locale);
#else
_locale = gen("");
- std::locale::global(_locale);
#endif
}
+ std::locale::global(_locale);
// Note: boost always uses "C" LC_NUMERIC by default!
- }
- catch(std::exception const &e) {
- std::cout << "bl_locale_set(" << locale << "): " << e.what() << " \n";
- }
- /* Generate the locale string (useful to know which locale we are actually using in case of "default" one). */
+ // Generate the locale string (useful to know which locale we are actually using in case of "default" one).
#define LOCALE_INFO std::use_facet<boost::locale::info>(_locale)
- locale_str = LOCALE_INFO.language();
- if (LOCALE_INFO.country() != "") {
- locale_str += "_" + LOCALE_INFO.country();
+ locale_str = LOCALE_INFO.language();
+ if (LOCALE_INFO.country() != "") {
+ locale_str += "_" + LOCALE_INFO.country();
+ }
+ if (LOCALE_INFO.variant() != "") {
+ locale_str += "@" + LOCALE_INFO.variant();
+ }
+
+#undef LOCALE_INFO
+
}
- if (LOCALE_INFO.variant() != "") {
- locale_str += "@" + LOCALE_INFO.variant();
+ catch(std::exception const &e) {
+ std::cout << "bl_locale_set(" << locale << "): " << e.what() << " \n";
}
}
Modified: branches/soc-2011-tomato/release/scripts/modules/console/complete_namespace.py
===================================================================
--- branches/soc-2011-tomato/release/scripts/modules/console/complete_namespace.py 2013-05-02 10:21:39 UTC (rev 56469)
+++ branches/soc-2011-tomato/release/scripts/modules/console/complete_namespace.py 2013-05-02 13:40:00 UTC (rev 56470)
@@ -96,12 +96,22 @@
if not hasattr(obj, '__getitem__'):
# obj is not a list or dictionary
return []
- if is_dict(obj):
+
+ obj_is_dict = is_dict(obj)
+
+ # rare objects have a __getitem__ but no __len__ (eg. BMEdge)
+ if not obj_is_dict:
+ try:
+ obj_len = len(obj)
+ except TypeError:
+ return []
+
+ if obj_is_dict:
# dictionary type
matches = ['%s[%r]' % (base, key) for key in sorted(obj.keys())]
else:
- # list type
- matches = ['%s[%d]' % (base, idx) for idx in range(len(obj))]
+ # list type,
+ matches = ['%s[%d]' % (base, idx) for idx in range(obj_len)]
if word != base:
matches = [match for match in matches if match.startswith(word)]
return matches
Modified: branches/soc-2011-tomato/release/scripts/presets/keyconfig/3dsmax.py
===================================================================
--- branches/soc-2011-tomato/release/scripts/presets/keyconfig/3dsmax.py 2013-05-02 10:21:39 UTC (rev 56469)
+++ branches/soc-2011-tomato/release/scripts/presets/keyconfig/3dsmax.py 2013-05-02 13:40:00 UTC (rev 56470)
@@ -4,6 +4,419 @@
wm = bpy.context.window_manager
kc = wm.keyconfigs.new('3dsmax')
+# Map Window
+km = kc.keymaps.new('Window', space_type='EMPTY', region_type='WINDOW', modal=False)
+
+kmi = km.keymap_items.new('wm.window_duplicate', 'W', 'PRESS', ctrl=True, alt=True)
+kmi = km.keymap_items.new('wm.read_homefile', 'N', 'PRESS', ctrl=True)
+kmi = km.keymap_items.new('wm.save_homefile', 'U', 'PRESS', ctrl=True)
+kmi = km.keymap_items.new('wm.call_menu', 'O', 'PRESS', shift=True, ctrl=True)
+kmi.properties.name = 'INFO_MT_file_open_recent'
+kmi = km.keymap_items.new('wm.open_mainfile', 'O', 'PRESS', ctrl=True)
+kmi = km.keymap_items.new('wm.open_mainfile', 'F1', 'PRESS')
+kmi = km.keymap_items.new('wm.link_append', 'O', 'PRESS', ctrl=True, alt=True)
+kmi = km.keymap_items.new('wm.link_append', 'F1', 'PRESS', shift=True)
+kmi.properties.link = False
+kmi.properties.instance_groups = False
+kmi = km.keymap_items.new('wm.save_mainfile', 'S', 'PRESS', ctrl=True)
+kmi = km.keymap_items.new('wm.save_mainfile', 'W', 'PRESS', ctrl=True)
+kmi = km.keymap_items.new('wm.save_as_mainfile', 'S', 'PRESS', shift=True, ctrl=True)
+kmi = km.keymap_items.new('wm.save_as_mainfile', 'F2', 'PRESS')
+kmi = km.keymap_items.new('wm.save_as_mainfile', 'S', 'PRESS', ctrl=True, alt=True)
+kmi.properties.copy = True
+kmi = km.keymap_items.new('wm.window_fullscreen_toggle', 'F11', 'PRESS', alt=True)
+kmi = km.keymap_items.new('wm.quit_blender', 'Q', 'PRESS', ctrl=True)
+kmi = km.keymap_items.new('wm.redraw_timer', 'T', 'PRESS', ctrl=True, alt=True)
+kmi = km.keymap_items.new('wm.debug_menu', 'D', 'PRESS', ctrl=True, alt=True)
+kmi = km.keymap_items.new('wm.search_menu', 'SPACE', 'PRESS')
+kmi = km.keymap_items.new('wm.call_menu', 'NDOF_BUTTON_MENU', 'PRESS')
+kmi.properties.name = 'USERPREF_MT_ndof_settings'
+kmi = km.keymap_items.new('wm.context_set_enum', 'F2', 'PRESS', shift=True)
+kmi.properties.data_path = 'area.type'
+kmi.properties.value = 'LOGIC_EDITOR'
+kmi = km.keymap_items.new('wm.context_set_enum', 'F3', 'PRESS', shift=True, ctrl=True)
+kmi.properties.data_path = 'area.type'
+kmi.properties.value = 'NODE_EDITOR'
+kmi = km.keymap_items.new('wm.context_set_enum', 'F4', 'PRESS', shift=True)
+kmi.properties.data_path = 'area.type'
+kmi.properties.value = 'CONSOLE'
+kmi = km.keymap_items.new('wm.context_set_enum', 'F5', 'PRESS', shift=True)
+kmi.properties.data_path = 'area.type'
+kmi.properties.value = 'VIEW_3D'
+kmi = km.keymap_items.new('wm.context_set_enum', 'F6', 'PRESS', shift=True)
+kmi.properties.data_path = 'area.type'
+kmi.properties.value = 'GRAPH_EDITOR'
+kmi = km.keymap_items.new('wm.context_set_enum', 'F7', 'PRESS', shift=True)
+kmi.properties.data_path = 'area.type'
+kmi.properties.value = 'PROPERTIES'
+kmi = km.keymap_items.new('wm.context_set_enum', 'F8', 'PRESS', shift=True)
+kmi.properties.data_path = 'area.type'
+kmi.properties.value = 'SEQUENCE_EDITOR'
+kmi = km.keymap_items.new('wm.context_set_enum', 'F9', 'PRESS', shift=True)
+kmi.properties.data_path = 'area.type'
+kmi.properties.value = 'OUTLINER'
+kmi = km.keymap_items.new('wm.context_set_enum', 'F10', 'PRESS', shift=True, ctrl=True)
+kmi.properties.data_path = 'area.type'
+kmi.properties.value = 'IMAGE_EDITOR'
+kmi = km.keymap_items.new('wm.context_set_enum', 'F11', 'PRESS', shift=True)
+kmi.properties.data_path = 'area.type'
+kmi.properties.value = 'TEXT_EDITOR'
+kmi = km.keymap_items.new('wm.context_set_enum', 'F12', 'PRESS', shift=True)
+kmi.properties.data_path = 'area.type'
+kmi.properties.value = 'DOPESHEET_EDITOR'
+kmi = km.keymap_items.new('wm.ndof_sensitivity_change', 'NDOF_BUTTON_PLUS', 'PRESS')
+kmi.properties.decrease = False
+kmi.properties.fast = False
+kmi = km.keymap_items.new('wm.ndof_sensitivity_change', 'NDOF_BUTTON_MINUS', 'PRESS')
+kmi.properties.decrease = True
+kmi.properties.fast = False
+kmi = km.keymap_items.new('wm.ndof_sensitivity_change', 'NDOF_BUTTON_PLUS', 'PRESS', shift=True)
+kmi.properties.decrease = False
+kmi.properties.fast = True
+kmi = km.keymap_items.new('wm.ndof_sensitivity_change', 'NDOF_BUTTON_MINUS', 'PRESS', shift=True)
+kmi.properties.decrease = True
+kmi.properties.fast = True
+kmi = km.keymap_items.new('info.reports_display_update', 'TIMER_REPORT', 'ANY', any=True)
+
+# Map Screen
+km = kc.keymaps.new('Screen', space_type='EMPTY', region_type='WINDOW', modal=False)
+
+kmi = km.keymap_items.new('screen.animation_step', 'TIMER0', 'ANY', any=True)
+kmi = km.keymap_items.new('screen.region_blend', 'TIMER', 'ANY', any=True)
+kmi = km.keymap_items.new('screen.screen_set', 'RIGHT_ARROW', 'PRESS', ctrl=True)
+kmi.properties.delta = 1
+kmi = km.keymap_items.new('screen.screen_set', 'LEFT_ARROW', 'PRESS', ctrl=True)
+kmi.properties.delta = -1
+kmi = km.keymap_items.new('screen.screen_full_area', 'UP_ARROW', 'PRESS', ctrl=True)
+kmi = km.keymap_items.new('screen.screen_full_area', 'DOWN_ARROW', 'PRESS', ctrl=True)
+kmi = km.keymap_items.new('screen.screen_full_area', 'SPACE', 'PRESS', shift=True)
+kmi = km.keymap_items.new('screen.screenshot', 'F3', 'PRESS', ctrl=True)
+kmi = km.keymap_items.new('screen.screencast', 'F3', 'PRESS', alt=True)
+kmi = km.keymap_items.new('screen.region_quadview', 'W', 'PRESS', alt=True)
+kmi = km.keymap_items.new('screen.repeat_history', 'F3', 'PRESS', shift=True)
+kmi = km.keymap_items.new('screen.repeat_last', 'R', 'PRESS', shift=True)
+kmi = km.keymap_items.new('screen.region_flip', 'F5', 'PRESS')
+kmi = km.keymap_items.new('screen.redo_last', 'F6', 'PRESS')
+kmi = km.keymap_items.new('script.reload', 'F8', 'PRESS')
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list