[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [51252] branches/soc-2012-fried_chicken: Merge from trunk r51234-r51251
Daniel Genrich
daniel.genrich at gmx.net
Wed Oct 10 13:32:28 CEST 2012
Revision: 51252
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=51252
Author: genscher
Date: 2012-10-10 11:32:27 +0000 (Wed, 10 Oct 2012)
Log Message:
-----------
Merge from trunk r51234-r51251
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=51234
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=51251
Modified Paths:
--------------
branches/soc-2012-fried_chicken/release/scripts/presets/keyconfig/maya.py
branches/soc-2012-fried_chicken/release/scripts/startup/bl_operators/wm.py
branches/soc-2012-fried_chicken/release/scripts/startup/bl_ui/space_dopesheet.py
branches/soc-2012-fried_chicken/release/scripts/startup/bl_ui/space_userpref.py
branches/soc-2012-fried_chicken/release/scripts/startup/bl_ui/space_view3d.py
branches/soc-2012-fried_chicken/release/scripts/startup/bl_ui/space_view3d_toolbar.py
branches/soc-2012-fried_chicken/source/blender/blenlib/BLI_math_vector.h
branches/soc-2012-fried_chicken/source/blender/blenlib/BLI_rect.h
branches/soc-2012-fried_chicken/source/blender/blenlib/BLI_string.h
branches/soc-2012-fried_chicken/source/blender/blenlib/BLI_string_utf8.h
branches/soc-2012-fried_chicken/source/blender/blenlib/intern/math_vector_inline.c
branches/soc-2012-fried_chicken/source/blender/blenlib/intern/rct.c
branches/soc-2012-fried_chicken/source/blender/blenlib/intern/string.c
branches/soc-2012-fried_chicken/source/blender/editors/animation/anim_filter.c
branches/soc-2012-fried_chicken/source/blender/editors/curve/editcurve.c
branches/soc-2012-fried_chicken/source/blender/editors/gpencil/gpencil_paint.c
branches/soc-2012-fried_chicken/source/blender/editors/include/ED_mesh.h
branches/soc-2012-fried_chicken/source/blender/editors/include/ED_object.h
branches/soc-2012-fried_chicken/source/blender/editors/include/ED_view3d.h
branches/soc-2012-fried_chicken/source/blender/editors/mesh/editmesh_knife.c
branches/soc-2012-fried_chicken/source/blender/editors/mesh/editmesh_loopcut.c
branches/soc-2012-fried_chicken/source/blender/editors/mesh/editmesh_select.c
branches/soc-2012-fried_chicken/source/blender/editors/mesh/editmesh_slide.c
branches/soc-2012-fried_chicken/source/blender/editors/mesh/meshtools.c
branches/soc-2012-fried_chicken/source/blender/editors/object/CMakeLists.txt
branches/soc-2012-fried_chicken/source/blender/editors/object/object_lattice.c
branches/soc-2012-fried_chicken/source/blender/editors/object/object_vgroup.c
branches/soc-2012-fried_chicken/source/blender/editors/render/render_preview.c
branches/soc-2012-fried_chicken/source/blender/editors/screen/screen_ops.c
branches/soc-2012-fried_chicken/source/blender/editors/space_view3d/drawobject.c
branches/soc-2012-fried_chicken/source/blender/editors/space_view3d/view3d_draw.c
branches/soc-2012-fried_chicken/source/blender/editors/space_view3d/view3d_edit.c
branches/soc-2012-fried_chicken/source/blender/editors/space_view3d/view3d_fly.c
branches/soc-2012-fried_chicken/source/blender/editors/space_view3d/view3d_select.c
branches/soc-2012-fried_chicken/source/blender/editors/space_view3d/view3d_view.c
branches/soc-2012-fried_chicken/source/blender/editors/uvedit/uvedit_smart_stitch.c
branches/soc-2012-fried_chicken/source/blender/makesdna/DNA_action_types.h
branches/soc-2012-fried_chicken/source/blender/makesrna/intern/rna_action.c
branches/soc-2012-fried_chicken/source/blender/render/intern/include/render_types.h
branches/soc-2012-fried_chicken/source/blender/render/intern/source/envmap.c
branches/soc-2012-fried_chicken/source/blender/render/intern/source/pipeline.c
branches/soc-2012-fried_chicken/source/blender/render/intern/source/render_texture.c
Added Paths:
-----------
branches/soc-2012-fried_chicken/source/blender/editors/object/object_iterators.c
Modified: branches/soc-2012-fried_chicken/release/scripts/presets/keyconfig/maya.py
===================================================================
--- branches/soc-2012-fried_chicken/release/scripts/presets/keyconfig/maya.py 2012-10-10 10:39:49 UTC (rev 51251)
+++ branches/soc-2012-fried_chicken/release/scripts/presets/keyconfig/maya.py 2012-10-10 11:32:27 UTC (rev 51252)
@@ -133,42 +133,42 @@
kmi.properties.data_path = 'space_data.viewport_shade'
kmi.properties.value_1 = 'TEXTURED'
kmi.properties.value_2 = 'SOLID'
-kmi = km.keymap_items.new('view3d.select', 'SELECTMOUSE', 'PRESS')
+kmi = km.keymap_items.new('view3d.select', 'SELECTMOUSE', 'RELEASE')
kmi.properties.extend = False
kmi.properties.center = False
kmi.properties.object = False
kmi.properties.enumerate = False
-kmi = km.keymap_items.new('view3d.select', 'SELECTMOUSE', 'PRESS', shift=True)
+kmi = km.keymap_items.new('view3d.select', 'SELECTMOUSE', 'RELEASE', shift=True)
kmi.properties.extend = True
kmi.properties.center = False
kmi.properties.object = False
kmi.properties.enumerate = False
-kmi = km.keymap_items.new('view3d.select', 'SELECTMOUSE', 'PRESS', ctrl=True)
+kmi = km.keymap_items.new('view3d.select', 'SELECTMOUSE', 'RELEASE', ctrl=True)
kmi.properties.extend = False
kmi.properties.center = True
kmi.properties.object = False
kmi.properties.enumerate = False
-kmi = km.keymap_items.new('view3d.select', 'SELECTMOUSE', 'PRESS', alt=True)
+kmi = km.keymap_items.new('view3d.select', 'SELECTMOUSE', 'RELEASE', alt=True)
kmi.properties.extend = False
kmi.properties.center = False
kmi.properties.object = False
kmi.properties.enumerate = True
-kmi = km.keymap_items.new('view3d.select', 'SELECTMOUSE', 'PRESS', shift=True, ctrl=True)
+kmi = km.keymap_items.new('view3d.select', 'SELECTMOUSE', 'RELEASE', shift=True, ctrl=True)
kmi.properties.extend = True
kmi.properties.center = True
kmi.properties.object = False
kmi.properties.enumerate = False
-kmi = km.keymap_items.new('view3d.select', 'SELECTMOUSE', 'PRESS', ctrl=True, alt=True)
+kmi = km.keymap_items.new('view3d.select', 'SELECTMOUSE', 'RELEASE', ctrl=True, alt=True)
kmi.properties.extend = False
kmi.properties.center = True
kmi.properties.object = False
kmi.properties.enumerate = True
-kmi = km.keymap_items.new('view3d.select', 'SELECTMOUSE', 'PRESS', shift=True, alt=True)
+kmi = km.keymap_items.new('view3d.select', 'SELECTMOUSE', 'RELEASE', shift=True, alt=True)
kmi.properties.extend = True
kmi.properties.center = False
kmi.properties.object = False
kmi.properties.enumerate = True
-kmi = km.keymap_items.new('view3d.select', 'SELECTMOUSE', 'PRESS', shift=True, ctrl=True, alt=True)
+kmi = km.keymap_items.new('view3d.select', 'SELECTMOUSE', 'RELEASE', shift=True, ctrl=True, alt=True)
kmi.properties.extend = True
kmi.properties.center = True
kmi.properties.object = False
Modified: branches/soc-2012-fried_chicken/release/scripts/startup/bl_operators/wm.py
===================================================================
--- branches/soc-2012-fried_chicken/release/scripts/startup/bl_operators/wm.py 2012-10-10 10:39:49 UTC (rev 51251)
+++ branches/soc-2012-fried_chicken/release/scripts/startup/bl_operators/wm.py 2012-10-10 11:32:27 UTC (rev 51252)
@@ -1668,7 +1668,7 @@
class WM_OT_addon_install(Operator):
"Install an addon"
bl_idname = "wm.addon_install"
- bl_label = "Install Addon..."
+ bl_label = "Install from File..."
overwrite = BoolProperty(
name="Overwrite",
Modified: branches/soc-2012-fried_chicken/release/scripts/startup/bl_ui/space_dopesheet.py
===================================================================
--- branches/soc-2012-fried_chicken/release/scripts/startup/bl_ui/space_dopesheet.py 2012-10-10 10:39:49 UTC (rev 51251)
+++ branches/soc-2012-fried_chicken/release/scripts/startup/bl_ui/space_dopesheet.py 2012-10-10 11:32:27 UTC (rev 51252)
@@ -29,6 +29,7 @@
def dopesheet_filter(layout, context, genericFiltersOnly=False):
dopesheet = context.space_data.dopesheet
is_nla = context.area.type == 'NLA_EDITOR'
+ is_drivers = (context.area.type == 'GRAPH_EDITOR' and context.space_data.mode == 'DRIVERS')
row = layout.row(align=True)
row.prop(dopesheet, "show_only_selected", text="")
@@ -37,6 +38,9 @@
if is_nla:
row.prop(dopesheet, "show_missing_nla", text="")
+ if is_drivers:
+ row.prop(dopesheet, "show_only_errors", text="")
+
if not genericFiltersOnly:
if bpy.data.groups:
row = layout.row(align=True)
Modified: branches/soc-2012-fried_chicken/release/scripts/startup/bl_ui/space_userpref.py
===================================================================
--- branches/soc-2012-fried_chicken/release/scripts/startup/bl_ui/space_userpref.py 2012-10-10 10:39:49 UTC (rev 51251)
+++ branches/soc-2012-fried_chicken/release/scripts/startup/bl_ui/space_userpref.py 2012-10-10 11:32:27 UTC (rev 51252)
@@ -92,7 +92,7 @@
layout.operator("wm.keyconfig_import")
layout.operator("wm.keyconfig_export")
elif userpref.active_section == 'ADDONS':
- layout.operator("wm.addon_install")
+ layout.operator("wm.addon_install", icon="FILESEL")
layout.menu("USERPREF_MT_addons_dev_guides")
elif userpref.active_section == 'THEMES':
layout.operator("ui.reset_default_theme")
Modified: branches/soc-2012-fried_chicken/release/scripts/startup/bl_ui/space_view3d.py
===================================================================
--- branches/soc-2012-fried_chicken/release/scripts/startup/bl_ui/space_view3d.py 2012-10-10 10:39:49 UTC (rev 51251)
+++ branches/soc-2012-fried_chicken/release/scripts/startup/bl_ui/space_view3d.py 2012-10-10 11:32:27 UTC (rev 51252)
@@ -1247,6 +1247,7 @@
layout.operator("object.vertex_group_clean", text="Clean")
layout.operator("object.vertex_group_levels", text="Levels")
layout.operator("object.vertex_group_blend", text="Blend")
+ layout.operator("object.vertex_group_transfer_weight", text="Transfer Weights")
layout.operator("object.vertex_group_limit_total", text="Limit Total")
layout.operator("object.vertex_group_fix", text="Fix Deforms")
Modified: branches/soc-2012-fried_chicken/release/scripts/startup/bl_ui/space_view3d_toolbar.py
===================================================================
--- branches/soc-2012-fried_chicken/release/scripts/startup/bl_ui/space_view3d_toolbar.py 2012-10-10 10:39:49 UTC (rev 51251)
+++ branches/soc-2012-fried_chicken/release/scripts/startup/bl_ui/space_view3d_toolbar.py 2012-10-10 11:32:27 UTC (rev 51252)
@@ -967,7 +967,7 @@
col.operator("object.vertex_group_clean", text="Clean")
col.operator("object.vertex_group_levels", text="Levels")
col.operator("object.vertex_group_blend", text="Blend")
- col.operator("object.vertex_group_transfer_weight", text="Transfer weight")
+ col.operator("object.vertex_group_transfer_weight", text="Transfer Weights")
col.operator("object.vertex_group_limit_total", text="Limit Total")
col.operator("object.vertex_group_fix", text="Fix Deforms")
Modified: branches/soc-2012-fried_chicken/source/blender/blenlib/BLI_math_vector.h
===================================================================
--- branches/soc-2012-fried_chicken/source/blender/blenlib/BLI_math_vector.h 2012-10-10 10:39:49 UTC (rev 51251)
+++ branches/soc-2012-fried_chicken/source/blender/blenlib/BLI_math_vector.h 2012-10-10 11:32:27 UTC (rev 51252)
@@ -140,12 +140,16 @@
MINLINE float len_squared_v2(const float v[2]);
MINLINE float len_squared_v3(const float v[3]);
+MINLINE float len_manhattan_v2(const float v[2]);
+MINLINE float len_manhattan_v3(const float v[3]);
MINLINE float len_v2(const float a[2]);
MINLINE float len_v2v2(const float a[2], const float b[2]);
MINLINE float len_squared_v2v2(const float a[2], const float b[2]);
+MINLINE float len_squared_v3v3(const float a[3], const float b[3]);
+MINLINE float len_manhattan_v2v2(const float a[2], const float b[2]);
+MINLINE float len_manhattan_v3v3(const float a[3], const float b[3]);
MINLINE float len_v3(const float a[3]);
MINLINE float len_v3v3(const float a[3], const float b[3]);
-MINLINE float len_squared_v3v3(const float a[3], const float b[3]);
MINLINE float normalize_v2(float r[2]);
MINLINE float normalize_v2_v2(float r[2], const float a[2]);
Modified: branches/soc-2012-fried_chicken/source/blender/blenlib/BLI_rect.h
===================================================================
--- branches/soc-2012-fried_chicken/source/blender/blenlib/BLI_rect.h 2012-10-10 10:39:49 UTC (rev 51251)
+++ branches/soc-2012-fried_chicken/source/blender/blenlib/BLI_rect.h 2012-10-10 11:32:27 UTC (rev 51252)
@@ -66,9 +66,7 @@
int BLI_rctf_isect_pt(const struct rctf *rect, const float x, const float y);
int BLI_rctf_isect_pt_v(const struct rctf *rect, const float xy[2]);
int BLI_rcti_isect_segment(const struct rcti *rect, const int s1[2], const int s2[2]);
-#if 0 /* NOT NEEDED YET */
-int BLI_rctf_isect_segment(struct rcti *rect, int s1[2], int s2[2]);
-#endif
+int BLI_rctf_isect_segment(const struct rctf *rect, const float s1[2], const float s2[2]);
void BLI_rctf_union(struct rctf *rctf1, const struct rctf *rctf2);
void BLI_rcti_union(struct rcti *rcti1, const struct rcti *rcti2);
void BLI_rcti_rctf_copy(struct rcti *dst, const struct rctf *src);
Modified: branches/soc-2012-fried_chicken/source/blender/blenlib/BLI_string.h
===================================================================
--- branches/soc-2012-fried_chicken/source/blender/blenlib/BLI_string.h 2012-10-10 10:39:49 UTC (rev 51251)
+++ branches/soc-2012-fried_chicken/source/blender/blenlib/BLI_string.h 2012-10-10 11:32:27 UTC (rev 51252)
@@ -74,7 +74,7 @@
* \param str2 second string for append
* \retval Returns dst
*/
-char *BLI_strdupcat(const char *str1, const char *str2)
+char *BLI_strdupcat(const char *__restrict str1, const char *__restrict str2)
#ifdef __GNUC__
__attribute__((warn_unused_result))
__attribute__((nonnull))
@@ -91,7 +91,7 @@
* the size of dst)
* \retval Returns dst
*/
-char *BLI_strncpy(char *dst, const char *src, const size_t maxncpy)
+char *BLI_strncpy(char *__restrict dst, const char *__restrict src, const size_t maxncpy)
#ifdef __GNUC__
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list