[Bf-committers] [Bf-blender-cvs] SVN commit: /data/svn/bf-blender [36802] branches/bmesh/blender: svn merge -r36725:36801 https://svn.blender.org/svnroot/bf-blender/trunk/ blender

joe joeedh at gmail.com
Tue May 24 03:20:27 CEST 2011


Thanks for doing these merges.

On Fri, May 20, 2011 at 10:52 AM, Campbell Barton <ideasman42 at gmail.com> wrote:
> Revision: 36802
>          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=36802
> Author:   campbellbarton
> Date:     2011-05-20 16:52:10 +0000 (Fri, 20 May 2011)
> Log Message:
> -----------
> svn merge -r36725:36801 https://svn.blender.org/svnroot/bf-blender/trunk/blender
>
> Revision Links:
> --------------
>    http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=36725
>
> Modified Paths:
> --------------
>    branches/bmesh/blender/build_files/buildbot/config/user-config-i686.py
>    branches/bmesh/blender/build_files/buildbot/config/user-config-x86_64.py
>    branches/bmesh/blender/release/scripts/modules/bpy/path.py
>    branches/bmesh/blender/release/scripts/modules/bpy/utils.py
>    branches/bmesh/blender/release/scripts/modules/bpy_extras/__init__.py
>    branches/bmesh/blender/release/scripts/modules/bpy_extras/view3d_utils.py
>    branches/bmesh/blender/release/scripts/startup/bl_ui/__init__.py
>    branches/bmesh/blender/release/scripts/startup/bl_ui/space_userpref.py
>    branches/bmesh/blender/release/scripts/startup/bl_ui/space_userpref_keymap.py
>    branches/bmesh/blender/source/blender/blenkernel/BKE_icons.h
>    branches/bmesh/blender/source/blender/blenkernel/BKE_object.h
>    branches/bmesh/blender/source/blender/blenkernel/BKE_screen.h
>    branches/bmesh/blender/source/blender/blenkernel/BKE_subsurf.h
>    branches/bmesh/blender/source/blender/blenkernel/BKE_world.h
>    branches/bmesh/blender/source/blender/blenkernel/intern/action.c
>    branches/bmesh/blender/source/blender/blenkernel/intern/blender.c
>    branches/bmesh/blender/source/blender/blenkernel/intern/fcurve.c
>    branches/bmesh/blender/source/blender/blenkernel/intern/icons.c
>    branches/bmesh/blender/source/blender/blenkernel/intern/material.c
>    branches/bmesh/blender/source/blender/blenkernel/intern/multires.c
>    branches/bmesh/blender/source/blender/blenkernel/intern/object.c
>    branches/bmesh/blender/source/blender/blenkernel/intern/screen.c
>    branches/bmesh/blender/source/blender/blenkernel/intern/sequencer.c
>    branches/bmesh/blender/source/blender/blenkernel/intern/shrinkwrap.c
>    branches/bmesh/blender/source/blender/blenkernel/intern/subsurf_ccg.c
>    branches/bmesh/blender/source/blender/blenkernel/intern/world.c
>    branches/bmesh/blender/source/blender/blenlib/BLI_math_geom.h
>    branches/bmesh/blender/source/blender/blenlib/BLI_math_matrix.h
>    branches/bmesh/blender/source/blender/blenlib/BLI_utildefines.h
>    branches/bmesh/blender/source/blender/blenlib/intern/bpath.c
>    branches/bmesh/blender/source/blender/blenlib/intern/math_geom.c
>    branches/bmesh/blender/source/blender/blenlib/intern/math_matrix.c
>    branches/bmesh/blender/source/blender/blenloader/BLO_readfile.h
>    branches/bmesh/blender/source/blender/blenloader/BLO_writefile.h
>    branches/bmesh/blender/source/blender/blenloader/intern/readblenentry.c
>    branches/bmesh/blender/source/blender/blenloader/intern/readfile.c
>    branches/bmesh/blender/source/blender/blenloader/intern/readfile.h
>    branches/bmesh/blender/source/blender/blenloader/intern/writefile.c
>    branches/bmesh/blender/source/blender/editors/animation/anim_channels_edit.c
>    branches/bmesh/blender/source/blender/editors/animation/anim_ops.c
>    branches/bmesh/blender/source/blender/editors/animation/keyingsets.c
>    branches/bmesh/blender/source/blender/editors/armature/editarmature.c
>    branches/bmesh/blender/source/blender/editors/armature/editarmature_sketch.c
>    branches/bmesh/blender/source/blender/editors/armature/poselib.c
>    branches/bmesh/blender/source/blender/editors/curve/editcurve.c
>    branches/bmesh/blender/source/blender/editors/gpencil/gpencil_edit.c
>    branches/bmesh/blender/source/blender/editors/gpencil/gpencil_paint.c
>    branches/bmesh/blender/source/blender/editors/include/ED_keyframing.h
>    branches/bmesh/blender/source/blender/editors/include/ED_view3d.h
>    branches/bmesh/blender/source/blender/editors/interface/interface_handlers.c
>    branches/bmesh/blender/source/blender/editors/interface/interface_layout.c
>    branches/bmesh/blender/source/blender/editors/interface/view2d.c
>    branches/bmesh/blender/source/blender/editors/interface/view2d_ops.c
>    branches/bmesh/blender/source/blender/editors/mesh/editbmesh_bvh.c
>    branches/bmesh/blender/source/blender/editors/mesh/knifetool.c
>    branches/bmesh/blender/source/blender/editors/physics/particle_edit.c
>    branches/bmesh/blender/source/blender/editors/render/CMakeLists.txt
>    branches/bmesh/blender/source/blender/editors/render/render_intern.h
>    branches/bmesh/blender/source/blender/editors/render/render_internal.c
>    branches/bmesh/blender/source/blender/editors/render/render_opengl.c
>    branches/bmesh/blender/source/blender/editors/render/render_preview.c
>    branches/bmesh/blender/source/blender/editors/render/render_shading.c
>    branches/bmesh/blender/source/blender/editors/screen/area.c
>    branches/bmesh/blender/source/blender/editors/screen/screen_ops.c
>    branches/bmesh/blender/source/blender/editors/screen/screendump.c
>    branches/bmesh/blender/source/blender/editors/sculpt_paint/paint_image.c
>    branches/bmesh/blender/source/blender/editors/sculpt_paint/paint_intern.h
>    branches/bmesh/blender/source/blender/editors/sculpt_paint/paint_stroke.c
>    branches/bmesh/blender/source/blender/editors/sculpt_paint/paint_utils.c
>    branches/bmesh/blender/source/blender/editors/sculpt_paint/paint_vertex.c
>    branches/bmesh/blender/source/blender/editors/sculpt_paint/sculpt.c
>    branches/bmesh/blender/source/blender/editors/space_action/action_select.c
>    branches/bmesh/blender/source/blender/editors/space_buttons/buttons_header.c
>    branches/bmesh/blender/source/blender/editors/space_buttons/buttons_intern.h
>    branches/bmesh/blender/source/blender/editors/space_buttons/space_buttons.c
>    branches/bmesh/blender/source/blender/editors/space_file/file_ops.c
>    branches/bmesh/blender/source/blender/editors/space_file/filelist.c
>    branches/bmesh/blender/source/blender/editors/space_graph/graph_draw.c
>    branches/bmesh/blender/source/blender/editors/space_graph/graph_ops.c
>    branches/bmesh/blender/source/blender/editors/space_graph/graph_select.c
>    branches/bmesh/blender/source/blender/editors/space_graph/space_graph.c
>    branches/bmesh/blender/source/blender/editors/space_image/image_ops.c
>    branches/bmesh/blender/source/blender/editors/space_image/space_image.c
>    branches/bmesh/blender/source/blender/editors/space_logic/space_logic.c
>    branches/bmesh/blender/source/blender/editors/space_nla/nla_channels.c
>    branches/bmesh/blender/source/blender/editors/space_nla/nla_select.c
>    branches/bmesh/blender/source/blender/editors/space_nla/space_nla.c
>    branches/bmesh/blender/source/blender/editors/space_node/node_edit.c
>    branches/bmesh/blender/source/blender/editors/space_node/node_select.c
>    branches/bmesh/blender/source/blender/editors/space_node/node_state.c
>    branches/bmesh/blender/source/blender/editors/space_node/space_node.c
>    branches/bmesh/blender/source/blender/editors/space_outliner/outliner.c
>    branches/bmesh/blender/source/blender/editors/space_sequencer/sequencer_add.c
>    branches/bmesh/blender/source/blender/editors/space_sequencer/sequencer_edit.c
>    branches/bmesh/blender/source/blender/editors/space_sequencer/sequencer_select.c
>    branches/bmesh/blender/source/blender/editors/space_sequencer/space_sequencer.c
>    branches/bmesh/blender/source/blender/editors/space_text/text_header.c
>    branches/bmesh/blender/source/blender/editors/space_time/space_time.c
>    branches/bmesh/blender/source/blender/editors/space_view3d/drawmesh.c
>    branches/bmesh/blender/source/blender/editors/space_view3d/space_view3d.c
>    branches/bmesh/blender/source/blender/editors/space_view3d/view3d_draw.c
>    branches/bmesh/blender/source/blender/editors/space_view3d/view3d_edit.c
>    branches/bmesh/blender/source/blender/editors/space_view3d/view3d_fly.c
>    branches/bmesh/blender/source/blender/editors/space_view3d/view3d_select.c
>    branches/bmesh/blender/source/blender/editors/space_view3d/view3d_view.c
>    branches/bmesh/blender/source/blender/editors/transform/transform.c
>    branches/bmesh/blender/source/blender/editors/transform/transform.h
>    branches/bmesh/blender/source/blender/editors/transform/transform_conversions.c
>    branches/bmesh/blender/source/blender/editors/transform/transform_generics.c
>    branches/bmesh/blender/source/blender/editors/transform/transform_input.c
>    branches/bmesh/blender/source/blender/editors/transform/transform_manipulator.c
>    branches/bmesh/blender/source/blender/editors/transform/transform_ops.c
>    branches/bmesh/blender/source/blender/editors/transform/transform_snap.c
>    branches/bmesh/blender/source/blender/editors/util/undo.c
>    branches/bmesh/blender/source/blender/editors/uvedit/uvedit_ops.c
>    branches/bmesh/blender/source/blender/imbuf/intern/png.c
>    branches/bmesh/blender/source/blender/makesdna/DNA_view3d_types.h
>    branches/bmesh/blender/source/blender/makesrna/RNA_access.h
>    branches/bmesh/blender/source/blender/makesrna/RNA_define.h
>    branches/bmesh/blender/source/blender/makesrna/RNA_types.h
>    branches/bmesh/blender/source/blender/makesrna/intern/makesrna.c
>    branches/bmesh/blender/source/blender/makesrna/intern/rna_ID.c
>    branches/bmesh/blender/source/blender/makesrna/intern/rna_access.c
>    branches/bmesh/blender/source/blender/makesrna/intern/rna_animation.c
>    branches/bmesh/blender/source/blender/makesrna/intern/rna_define.c
>    branches/bmesh/blender/source/blender/makesrna/intern/rna_internal.h
>    branches/bmesh/blender/source/blender/makesrna/intern/rna_internal_types.h
>    branches/bmesh/blender/source/blender/makesrna/intern/rna_render.c
>    branches/bmesh/blender/source/blender/makesrna/intern/rna_scene.c
>    branches/bmesh/blender/source/blender/makesrna/intern/rna_screen.c
>    branches/bmesh/blender/source/blender/makesrna/intern/rna_space.c
>    branches/bmesh/blender/source/blender/makesrna/intern/rna_ui.c
>    branches/bmesh/blender/source/blender/makesrna/intern/rna_wm.c
>    branches/bmesh/blender/source/blender/modifiers/intern/MOD_subsurf.c
>    branches/bmesh/blender/source/blender/modifiers/intern/MOD_uvproject.c
>    branches/bmesh/blender/source/blender/python/generic/mathutils_Matrix.c
>    branches/bmesh/blender/source/blender/python/generic/mathutils_geometry.c
>    branches/bmesh/blender/source/blender/python/intern/bpy_rna.c
>    branches/bmesh/blender/source/blender/render/extern/include/RE_pipeline.h
>    branches/bmesh/blender/source/blender/render/intern/source/rendercore.c
>    branches/bmesh/blender/source/blender/windowmanager/WM_api.h
>    branches/bmesh/blender/source/blender/windowmanager/intern/wm.c
>    branches/bmesh/blender/source/blender/windowmanager/intern/wm_files.c
>    branches/bmesh/blender/source/blender/windowmanager/intern/wm_init_exit.c
>    branches/bmesh/blender/source/blender/windowmanager/intern/wm_keymap.c
>    branches/bmesh/blender/source/blender/windowmanager/wm.h
>    branches/bmesh/blender/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
>    branches/bmesh/blender/source/gameengine/Converter/BL_BlenderDataConversion.cpp
>    branches/bmesh/blender/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
>
> Added Paths:
> -----------
>    branches/bmesh/blender/intern/tools/ui_snapshot.py
>    branches/bmesh/blender/source/blender/editors/render/render_update.c
>    branches/bmesh/blender/source/blender/editors/render/render_view.c
>
> Property Changed:
> ----------------
>    branches/bmesh/blender/
>    branches/bmesh/blender/release/scripts/startup/bl_operators/add_mesh_torus.py
>    branches/bmesh/blender/release/scripts/startup/bl_operators/uvcalc_smart_project.py
>    branches/bmesh/blender/release/scripts/startup/bl_operators/vertexpaint_dirt.py
>    branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_armature.py
>    branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_bone.py
>    branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_camera.py
>    branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_empty.py
>    branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_lamp.py
>    branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_lattice.py
>    branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_mesh.py
>    branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_metaball.py
>    branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_modifier.py
>    branches/bmesh/blender/release/scripts/startup/bl_ui/properties_game.py
>    branches/bmesh/blender/release/scripts/startup/bl_ui/properties_material.py
>    branches/bmesh/blender/release/scripts/startup/bl_ui/properties_particle.py
>    branches/bmesh/blender/release/scripts/startup/bl_ui/properties_physics_field.py
>    branches/bmesh/blender/release/scripts/startup/bl_ui/properties_physics_fluid.py
>    branches/bmesh/blender/release/scripts/startup/bl_ui/properties_physics_smoke.py
>    branches/bmesh/blender/release/scripts/startup/bl_ui/properties_texture.py
>    branches/bmesh/blender/release/scripts/startup/bl_ui/properties_world.py
>    branches/bmesh/blender/release/scripts/startup/bl_ui/space_node.py
>    branches/bmesh/blender/source/blender/editors/uvedit/uvedit_buttons.c
>
>
> Property changes on: branches/bmesh/blender
> ___________________________________________________________________
> Modified: svn:mergeinfo
>   - /trunk/blender:31524-36725
>   + /trunk/blender:31524-36801
>
> Modified: branches/bmesh/blender/build_files/buildbot/config/user-config-i686.py
> ===================================================================
> --- branches/bmesh/blender/build_files/buildbot/config/user-config-i686.py      2011-05-20 16:43:23 UTC (rev 36801)
> +++ branches/bmesh/blender/build_files/buildbot/config/user-config-i686.py      2011-05-20 16:52:10 UTC (rev 36802)
> @@ -29,7 +29,8 @@
>     '${BF_FFMPEG_LIBPATH}/libxvidcore.a ${BF_FFMPEG_LIBPATH}/libx264.a ${BF_FFMPEG_LIBPATH}/libmp3lame.a ' + \
>     '${BF_FFMPEG_LIBPATH}/libvpx.a ${BF_FFMPEG_LIBPATH}/libvorbis.a ${BF_FFMPEG_LIBPATH}/libogg.a ' + \
>     '${BF_FFMPEG_LIBPATH}/libvorbisenc.a ${BF_FFMPEG_LIBPATH}/libtheora.a ' + \
> -    '${BF_FFMPEG_LIBPATH}/libschroedinger-1.0.a ${BF_FFMPEG_LIBPATH}/liborc-0.4.a ${BF_FFMPEG_LIBPATH}/libdirac_encoder.a'
> +    '${BF_FFMPEG_LIBPATH}/libschroedinger-1.0.a ${BF_FFMPEG_LIBPATH}/liborc-0.4.a ${BF_FFMPEG_LIBPATH}/libdirac_encoder.a ' + \
> +    '${BF_FFMPEG_LIBPATH}/libfaad.a'
>
>  # Don't depend on system's libstdc++
>  WITH_BF_STATICCXX = True
>
> Modified: branches/bmesh/blender/build_files/buildbot/config/user-config-x86_64.py
> ===================================================================
> --- branches/bmesh/blender/build_files/buildbot/config/user-config-x86_64.py    2011-05-20 16:43:23 UTC (rev 36801)
> +++ branches/bmesh/blender/build_files/buildbot/config/user-config-x86_64.py    2011-05-20 16:52:10 UTC (rev 36802)
> @@ -29,7 +29,8 @@
>     '${BF_FFMPEG_LIBPATH}/libxvidcore.a ${BF_FFMPEG_LIBPATH}/libx264.a ${BF_FFMPEG_LIBPATH}/libmp3lame.a ' + \
>     '${BF_FFMPEG_LIBPATH}/libvpx.a ${BF_FFMPEG_LIBPATH}/libvorbis.a ${BF_FFMPEG_LIBPATH}/libogg.a ' + \
>     '${BF_FFMPEG_LIBPATH}/libvorbisenc.a ${BF_FFMPEG_LIBPATH}/libtheora.a ' + \
> -    '${BF_FFMPEG_LIBPATH}/libschroedinger-1.0.a ${BF_FFMPEG_LIBPATH}/liborc-0.4.a ${BF_FFMPEG_LIBPATH}/libdirac_encoder.a'
> +    '${BF_FFMPEG_LIBPATH}/libschroedinger-1.0.a ${BF_FFMPEG_LIBPATH}/liborc-0.4.a ${BF_FFMPEG_LIBPATH}/libdirac_encoder.a ' + \
> +    '${BF_FFMPEG_LIBPATH}/libfaad.a'
>
>  # Don't depend on system's libstdc++
>  WITH_BF_STATICCXX = True
>
> Copied: branches/bmesh/blender/intern/tools/ui_snapshot.py (from rev 36800, trunk/blender/intern/tools/ui_snapshot.py)
> ===================================================================
> --- branches/bmesh/blender/intern/tools/ui_snapshot.py                          (rev 0)
> +++ branches/bmesh/blender/intern/tools/ui_snapshot.py  2011-05-20 16:52:10 UTC (rev 36802)
> @@ -0,0 +1,152 @@
> +# $Id$
> +# ***** BEGIN GPL LICENSE BLOCK *****
> +#
> +# This program is free software; you can redistribute it and/or
> +# modify it under the terms of the GNU General Public License
> +# as published by the Free Software Foundation; either version 2
> +# of the License, or (at your option) any later version.
> +#
> +# This program is distributed in the hope that it will be useful,
> +# but WITHOUT ANY WARRANTY; without even the implied warranty of
> +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> +# GNU General Public License for more details.
> +#
> +# You should have received a copy of the GNU General Public License
> +# along with this program; if not, write to the Free Software Foundation,
> +# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
> +#
> +# Contributor(s): Campbell Barton
> +#
> +# ***** END GPL LICENSE BLOCK *****
> +
> +# screenshot panels, corrently only works for render, scene and world.
> +# needs some further work to setup blender contexts for all possible panels.
> +
> +import os
> +
> +REMOVE_CMP_IMAGES = True
> +TEMP_DIR = "/tmp"
> +
> +PROPERTY_MAPPING = {
> +    "armature_edit": '',
> +    "bone": '',
> +    "bone_constraint": '',
> +    "constraint": '',
> +    "curve_edit": '',
> +    "data": '',
> +    "imagepaint": '',
> +    "lattice_edit": '',
> +    "material": '',
> +    "mball_edit": '',
> +    "mesh_edit": '',
> +    "modifier": '',
> +    "object": 'OBJECT',
> +    "objectmode": '',
> +    "particle": '',
> +    "particlemode": '',
> +    "physics": '',
> +    "posemode": '',
> +    "render": 'RENDER',
> +    "scene": 'SCENE',
> +    "surface_edit": '',
> +    "text_edit": '',
> +    "texture": '',
> +    "vertexpaint": '',
> +    "weightpaint": '',
> +    "world": 'WORLD',
> +}
> +
> +# format: % (new, blank, out)
> +magick_command = 'convert "%s" "%s" \( -clone 0 -clone 1 -compose difference -composite -threshold 0 \) -delete 1 -alpha off -compose copy_opacity -composite -trim "%s" '
> +
> +import bpy
> +
> +def force_redraw():
> +    bpy.ops.wm.redraw_timer(type='DRAW_WIN_SWAP', iterations=1)
> +
> +def fake_poll(cls, context):
> +    return True
> +
> +def screenshot(path):
> +    force_redraw()
> +    bpy.ops.screen.screenshot(filepath=path)
> +
> +
> +def main():
> +    panel_subclasses = []
> +
> +    for cls_name in dir(bpy.types):
> +        cls = getattr(bpy.types, cls_name)
> +        if issubclass(cls, bpy.types.Panel):
> +            if bpy.types.Panel is cls:
> +                continue
> +
> +            panel_subclasses.append((cls, getattr(cls, "poll", None)))
> +
> +    for cls, poll in panel_subclasses:
> +        cls.poll = classmethod(fake_poll)
> +        cls.bl_options = set()  # so we dont get 'DEFAULT_CLOSED'
> +        bpy.utils.unregister_class(cls)
> +
> +    # collect context types
> +    button_contexts = {None}
> +    for cls, poll in panel_subclasses:
> +        button_contexts.add(getattr(cls, "bl_context", None))
> +    button_contexts.remove(None)
> +
> +    # get the properties space
> +    space_props = None
> +    for sa in bpy.context.screen.areas:
> +        space = sa.spaces.active
> +        if space.type == 'PROPERTIES':
> +            space_props = space
> +            break
> +    if space_props is None:
> +        raise Exception("no properties space type found")
> +
> +    for bl_context in sorted(button_contexts):
> +        print(list(sorted(button_contexts)))
> +        # TODO
> +        if bl_context in PROPERTY_SKIP:
> +            continue
> +
> +        prop_context = PROPERTY_MAPPING[bl_context]
> +        if not prop_context:
> +            print("    TODO, skipping", bl_context)
> +            continue
> +
> +        space_props.context = prop_context
> +
> +        for cls, poll in panel_subclasses:
> +            if cls.bl_space_type == 'PROPERTIES':
> +                if cls.bl_region_type == 'WINDOW':
> +                    if cls.bl_context == bl_context:
> +                        file_base = os.path.join(TEMP_DIR, "%s_%s" % (bl_context, "_" + cls.__name__.replace(".", "_")))
> +                        file_old = file_base + "_old.png"
> +                        file_new = file_base + "_new.png"
> +                        file_crop = file_base + ".png"
> +
> +                        screenshot(file_old)
> +
> +                        # we need a new unique name so old 'closed' settings dont get applied
> +                        idname = getattr(cls, "bl_idname", cls.__name__.split(".")[-1])
> +                        cls.bl_idname = idname + "_"
> +
> +                        bpy.utils.register_class(cls)
> +
> +                        screenshot(file_new)
> +
> +                        bpy.utils.unregister_class(cls)
> +
> +                        # screenshot magic
> +                        from os import system
> +                        system(magick_command % (file_new, file_old, file_crop))
> +
> +                        if REMOVE_CMP_IMAGES:
> +                            from os import remove
> +                            remove(file_old)
> +                            remove(file_new)
> +
> +
> +if __name__ == "__main__":
> +    main()
>
> Modified: branches/bmesh/blender/release/scripts/modules/bpy/path.py
> ===================================================================
> --- branches/bmesh/blender/release/scripts/modules/bpy/path.py  2011-05-20 16:43:23 UTC (rev 36801)
> +++ branches/bmesh/blender/release/scripts/modules/bpy/path.py  2011-05-20 16:52:10 UTC (rev 36802)
> @@ -135,7 +135,7 @@
>         filename = os.path.basename(path)  # filename may be a directory or a file
>         dirpath = os.path.dirname(path)
>
> -        suffix = ""
> +        suffix = path[:0]  # "" but ensure byte/str match
>         if not filename:  # dir ends with a slash?
>             if len(dirpath) < len(path):
>                 suffix = path[:len(path) - len(dirpath)]
>
> Modified: branches/bmesh/blender/release/scripts/modules/bpy/utils.py
> ===================================================================
> --- branches/bmesh/blender/release/scripts/modules/bpy/utils.py 2011-05-20 16:43:23 UTC (rev 36801)
> +++ branches/bmesh/blender/release/scripts/modules/bpy/utils.py 2011-05-20 16:52:10 UTC (rev 36802)
> @@ -379,7 +379,9 @@
>  def keyconfig_set(filepath):
>     from os.path import basename, splitext
>
> -    print("loading preset:", filepath)
> +    if _bpy.app.debug:
> +        print("loading preset:", filepath)
> +
>     keyconfigs = _bpy.context.window_manager.keyconfigs
>
>     keyconfigs_old = keyconfigs[:]
>
> Modified: branches/bmesh/blender/release/scripts/modules/bpy_extras/__init__.py
> ===================================================================
> --- branches/bmesh/blender/release/scripts/modules/bpy_extras/__init__.py       2011-05-20 16:43:23 UTC (rev 36801)
> +++ branches/bmesh/blender/release/scripts/modules/bpy_extras/__init__.py       2011-05-20 16:52:10 UTC (rev 36802)
> @@ -28,4 +28,4 @@
>     "image_utils",
>     "mesh_utils",
>     "view3d_utils",
> -)
> \ No newline at end of file
> +)
>
> Modified: branches/bmesh/blender/release/scripts/modules/bpy_extras/view3d_utils.py
> ===================================================================
> --- branches/bmesh/blender/release/scripts/modules/bpy_extras/view3d_utils.py   2011-05-20 16:43:23 UTC (rev 36801)
> +++ branches/bmesh/blender/release/scripts/modules/bpy_extras/view3d_utils.py   2011-05-20 16:52:10 UTC (rev 36802)
> @@ -36,14 +36,21 @@
>     """
>     from mathutils import Vector
>
> -    dx = (2.0 * coord[0] / region.width) - 1.0
> -    dy = (2.0 * coord[1] / region.height) - 1.0
> +    if rv3d.is_perspective:
> +        persinv = rv3d.perspective_matrix.inverted()
>
> -    viewvec = rv3d.view_matrix.inverted()[2].to_3d().normalized()
> -    perspinv_x, perspinv_y = rv3d.perspective_matrix.inverted().to_3x3()[0:2]
> -    return ((perspinv_x * dx + perspinv_y * dy) - viewvec).normalized()
> +        out = Vector(((2.0 * coord[0] / region.width) - 1.0,
> +                      (2.0 * coord[1] / region.height) - 1.0,
>
> @@ Diff output truncated at 10240 characters. @@
> _______________________________________________
> Bf-blender-cvs mailing list
> Bf-blender-cvs at blender.org
> http://lists.blender.org/mailman/listinfo/bf-blender-cvs
>


More information about the Bf-committers mailing list