[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [50212] branches/soc-2012-fried_chicken: svn merge ^/trunk/blender -r50097:50211
Campbell Barton
ideasman42 at gmail.com
Sun Aug 26 01:05:59 CEST 2012
Revision: 50212
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=50212
Author: campbellbarton
Date: 2012-08-25 23:05:59 +0000 (Sat, 25 Aug 2012)
Log Message:
-----------
svn merge ^/trunk/blender -r50097:50211
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=50097
Modified Paths:
--------------
branches/soc-2012-fried_chicken/CMakeLists.txt
branches/soc-2012-fried_chicken/build_files/scons/config/win64-mingw-config.py
branches/soc-2012-fried_chicken/build_files/scons/tools/Blender.py
branches/soc-2012-fried_chicken/doc/python_api/rst/info_gotcha.rst
branches/soc-2012-fried_chicken/extern/recastnavigation/Recast/Source/RecastFilter.cpp
branches/soc-2012-fried_chicken/intern/cycles/bvh/bvh.cpp
branches/soc-2012-fried_chicken/release/scripts/modules/addon_utils.py
branches/soc-2012-fried_chicken/release/scripts/modules/blend_render_info.py
branches/soc-2012-fried_chicken/release/scripts/modules/bpy/utils.py
branches/soc-2012-fried_chicken/release/scripts/modules/bpy_extras/anim_utils.py
branches/soc-2012-fried_chicken/release/scripts/modules/rna_xml.py
branches/soc-2012-fried_chicken/release/scripts/startup/bl_operators/wm.py
branches/soc-2012-fried_chicken/release/scripts/startup/bl_ui/properties_particle.py
branches/soc-2012-fried_chicken/release/scripts/startup/bl_ui/space_sequencer.py
branches/soc-2012-fried_chicken/release/scripts/startup/bl_ui/space_view3d.py
branches/soc-2012-fried_chicken/release/scripts/templates/addon_add_object.py
branches/soc-2012-fried_chicken/release/scripts/templates/operator_mesh_add.py
branches/soc-2012-fried_chicken/source/blender/blenfont/intern/blf_font.c
branches/soc-2012-fried_chicken/source/blender/blenfont/intern/blf_glyph.c
branches/soc-2012-fried_chicken/source/blender/blenkernel/BKE_context.h
branches/soc-2012-fried_chicken/source/blender/blenkernel/BKE_material.h
branches/soc-2012-fried_chicken/source/blender/blenkernel/BKE_node.h
branches/soc-2012-fried_chicken/source/blender/blenkernel/BKE_screen.h
branches/soc-2012-fried_chicken/source/blender/blenkernel/BKE_sequencer.h
branches/soc-2012-fried_chicken/source/blender/blenkernel/intern/DerivedMesh.c
branches/soc-2012-fried_chicken/source/blender/blenkernel/intern/anim.c
branches/soc-2012-fried_chicken/source/blender/blenkernel/intern/armature.c
branches/soc-2012-fried_chicken/source/blender/blenkernel/intern/colortools.c
branches/soc-2012-fried_chicken/source/blender/blenkernel/intern/curve.c
branches/soc-2012-fried_chicken/source/blender/blenkernel/intern/customdata.c
branches/soc-2012-fried_chicken/source/blender/blenkernel/intern/dynamicpaint.c
branches/soc-2012-fried_chicken/source/blender/blenkernel/intern/fcurve.c
branches/soc-2012-fried_chicken/source/blender/blenkernel/intern/mask.c
branches/soc-2012-fried_chicken/source/blender/blenkernel/intern/mask_rasterize.c
branches/soc-2012-fried_chicken/source/blender/blenkernel/intern/material.c
branches/soc-2012-fried_chicken/source/blender/blenkernel/intern/mesh.c
branches/soc-2012-fried_chicken/source/blender/blenkernel/intern/nla.c
branches/soc-2012-fried_chicken/source/blender/blenkernel/intern/node.c
branches/soc-2012-fried_chicken/source/blender/blenkernel/intern/object.c
branches/soc-2012-fried_chicken/source/blender/blenkernel/intern/scene.c
branches/soc-2012-fried_chicken/source/blender/blenkernel/intern/seqmodifier.c
branches/soc-2012-fried_chicken/source/blender/blenkernel/intern/sequencer.c
branches/soc-2012-fried_chicken/source/blender/blenkernel/intern/subsurf_ccg.c
branches/soc-2012-fried_chicken/source/blender/blenlib/BLI_math_base.h
branches/soc-2012-fried_chicken/source/blender/blenlib/BLI_math_rotation.h
branches/soc-2012-fried_chicken/source/blender/blenlib/BLI_rect.h
branches/soc-2012-fried_chicken/source/blender/blenlib/BLI_utildefines.h
branches/soc-2012-fried_chicken/source/blender/blenlib/intern/math_rotation.c
branches/soc-2012-fried_chicken/source/blender/blenlib/intern/rct.c
branches/soc-2012-fried_chicken/source/blender/blenloader/intern/readfile.c
branches/soc-2012-fried_chicken/source/blender/bmesh/intern/bmesh_core.c
branches/soc-2012-fried_chicken/source/blender/bmesh/intern/bmesh_interp.c
branches/soc-2012-fried_chicken/source/blender/bmesh/intern/bmesh_interp.h
branches/soc-2012-fried_chicken/source/blender/bmesh/intern/bmesh_mesh_conv.c
branches/soc-2012-fried_chicken/source/blender/bmesh/intern/bmesh_mods.c
branches/soc-2012-fried_chicken/source/blender/bmesh/intern/bmesh_opdefines.c
branches/soc-2012-fried_chicken/source/blender/bmesh/operators/bmo_connect.c
branches/soc-2012-fried_chicken/source/blender/bmesh/operators/bmo_create.c
branches/soc-2012-fried_chicken/source/blender/bmesh/operators/bmo_utils.c
branches/soc-2012-fried_chicken/source/blender/compositor/CMakeLists.txt
branches/soc-2012-fried_chicken/source/blender/compositor/intern/COM_Converter.cpp
branches/soc-2012-fried_chicken/source/blender/compositor/nodes/COM_BlurNode.cpp
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_BlurBaseOperation.cpp
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_GaussianAlphaXBlurOperation.cpp
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_GaussianAlphaYBlurOperation.cpp
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_InpaintOperation.cpp
branches/soc-2012-fried_chicken/source/blender/editors/animation/fmodifier_ui.c
branches/soc-2012-fried_chicken/source/blender/editors/animation/keyframes_edit.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/UI_view2d.h
branches/soc-2012-fried_chicken/source/blender/editors/interface/interface.c
branches/soc-2012-fried_chicken/source/blender/editors/interface/interface_draw.c
branches/soc-2012-fried_chicken/source/blender/editors/interface/interface_handlers.c
branches/soc-2012-fried_chicken/source/blender/editors/interface/interface_intern.h
branches/soc-2012-fried_chicken/source/blender/editors/interface/interface_layout.c
branches/soc-2012-fried_chicken/source/blender/editors/interface/interface_ops.c
branches/soc-2012-fried_chicken/source/blender/editors/interface/interface_panel.c
branches/soc-2012-fried_chicken/source/blender/editors/interface/interface_regions.c
branches/soc-2012-fried_chicken/source/blender/editors/interface/interface_widgets.c
branches/soc-2012-fried_chicken/source/blender/editors/interface/view2d.c
branches/soc-2012-fried_chicken/source/blender/editors/interface/view2d_ops.c
branches/soc-2012-fried_chicken/source/blender/editors/mask/mask_add.c
branches/soc-2012-fried_chicken/source/blender/editors/mask/mask_select.c
branches/soc-2012-fried_chicken/source/blender/editors/mesh/editmesh_tools.c
branches/soc-2012-fried_chicken/source/blender/editors/render/render_internal.c
branches/soc-2012-fried_chicken/source/blender/editors/render/render_preview.c
branches/soc-2012-fried_chicken/source/blender/editors/screen/area.c
branches/soc-2012-fried_chicken/source/blender/editors/screen/glutil.c
branches/soc-2012-fried_chicken/source/blender/editors/screen/screen_edit.c
branches/soc-2012-fried_chicken/source/blender/editors/screen/screen_ops.c
branches/soc-2012-fried_chicken/source/blender/editors/screen/screendump.c
branches/soc-2012-fried_chicken/source/blender/editors/sculpt_paint/paint_cursor.c
branches/soc-2012-fried_chicken/source/blender/editors/sculpt_paint/paint_image.c
branches/soc-2012-fried_chicken/source/blender/editors/sculpt_paint/paint_ops.c
branches/soc-2012-fried_chicken/source/blender/editors/space_buttons/buttons_header.c
branches/soc-2012-fried_chicken/source/blender/editors/space_clip/clip_graph_ops.c
branches/soc-2012-fried_chicken/source/blender/editors/space_clip/tracking_ops.c
branches/soc-2012-fried_chicken/source/blender/editors/space_clip/tracking_select.c
branches/soc-2012-fried_chicken/source/blender/editors/space_file/file_ops.c
branches/soc-2012-fried_chicken/source/blender/editors/space_graph/graph_edit.c
branches/soc-2012-fried_chicken/source/blender/editors/space_image/image_buttons.c
branches/soc-2012-fried_chicken/source/blender/editors/space_image/image_edit.c
branches/soc-2012-fried_chicken/source/blender/editors/space_image/space_image.c
branches/soc-2012-fried_chicken/source/blender/editors/space_logic/logic_window.c
branches/soc-2012-fried_chicken/source/blender/editors/space_logic/space_logic.c
branches/soc-2012-fried_chicken/source/blender/editors/space_node/drawnode.c
branches/soc-2012-fried_chicken/source/blender/editors/space_node/node_add.c
branches/soc-2012-fried_chicken/source/blender/editors/space_node/node_draw.c
branches/soc-2012-fried_chicken/source/blender/editors/space_node/node_edit.c
branches/soc-2012-fried_chicken/source/blender/editors/space_node/node_group.c
branches/soc-2012-fried_chicken/source/blender/editors/space_node/node_intern.h
branches/soc-2012-fried_chicken/source/blender/editors/space_node/node_ops.c
branches/soc-2012-fried_chicken/source/blender/editors/space_node/node_relationships.c
branches/soc-2012-fried_chicken/source/blender/editors/space_node/node_select.c
branches/soc-2012-fried_chicken/source/blender/editors/space_node/node_view.c
branches/soc-2012-fried_chicken/source/blender/editors/space_outliner/outliner_edit.c
branches/soc-2012-fried_chicken/source/blender/editors/space_outliner/space_outliner.c
branches/soc-2012-fried_chicken/source/blender/editors/space_sequencer/CMakeLists.txt
branches/soc-2012-fried_chicken/source/blender/editors/space_sequencer/sequencer_draw.c
branches/soc-2012-fried_chicken/source/blender/editors/space_sequencer/sequencer_edit.c
branches/soc-2012-fried_chicken/source/blender/editors/space_sequencer/sequencer_intern.h
branches/soc-2012-fried_chicken/source/blender/editors/space_sequencer/sequencer_modifier.c
branches/soc-2012-fried_chicken/source/blender/editors/space_sequencer/sequencer_ops.c
branches/soc-2012-fried_chicken/source/blender/editors/space_text/text_draw.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_select.c
branches/soc-2012-fried_chicken/source/blender/editors/transform/transform.c
branches/soc-2012-fried_chicken/source/blender/editors/transform/transform_conversions.c
branches/soc-2012-fried_chicken/source/blender/editors/transform/transform_snap.c
branches/soc-2012-fried_chicken/source/blender/editors/uvedit/uvedit_ops.c
branches/soc-2012-fried_chicken/source/blender/editors/uvedit/uvedit_parametrizer.c
branches/soc-2012-fried_chicken/source/blender/ikplugin/SConscript
branches/soc-2012-fried_chicken/source/blender/imbuf/IMB_moviecache.h
branches/soc-2012-fried_chicken/source/blender/imbuf/IMB_thumbs.h
branches/soc-2012-fried_chicken/source/blender/imbuf/intern/dds/CMakeLists.txt
branches/soc-2012-fried_chicken/source/blender/imbuf/intern/dds/SConscript
branches/soc-2012-fried_chicken/source/blender/imbuf/intern/dds/dds_api.cpp
branches/soc-2012-fried_chicken/source/blender/imbuf/intern/indexer.c
branches/soc-2012-fried_chicken/source/blender/imbuf/intern/openexr/CMakeLists.txt
branches/soc-2012-fried_chicken/source/blender/imbuf/intern/openexr/SConscript
branches/soc-2012-fried_chicken/source/blender/imbuf/intern/openexr/openexr_api.cpp
branches/soc-2012-fried_chicken/source/blender/imbuf/intern/scaling.c
branches/soc-2012-fried_chicken/source/blender/imbuf/intern/tiff.c
branches/soc-2012-fried_chicken/source/blender/makesdna/DNA_curve_types.h
branches/soc-2012-fried_chicken/source/blender/makesdna/DNA_mask_types.h
branches/soc-2012-fried_chicken/source/blender/makesdna/DNA_particle_types.h
branches/soc-2012-fried_chicken/source/blender/makesdna/DNA_sequence_types.h
branches/soc-2012-fried_chicken/source/blender/makesrna/intern/rna_mask.c
branches/soc-2012-fried_chicken/source/blender/makesrna/intern/rna_nodetree.c
branches/soc-2012-fried_chicken/source/blender/makesrna/intern/rna_nodetree_types.h
branches/soc-2012-fried_chicken/source/blender/makesrna/intern/rna_object.c
branches/soc-2012-fried_chicken/source/blender/makesrna/intern/rna_particle.c
branches/soc-2012-fried_chicken/source/blender/makesrna/intern/rna_scene.c
branches/soc-2012-fried_chicken/source/blender/makesrna/intern/rna_sequencer.c
branches/soc-2012-fried_chicken/source/blender/modifiers/intern/MOD_boolean.c
branches/soc-2012-fried_chicken/source/blender/modifiers/intern/MOD_cast.c
branches/soc-2012-fried_chicken/source/blender/modifiers/intern/MOD_displace.c
branches/soc-2012-fried_chicken/source/blender/modifiers/intern/MOD_fluidsim.c
branches/soc-2012-fried_chicken/source/blender/modifiers/intern/MOD_lattice.c
branches/soc-2012-fried_chicken/source/blender/modifiers/intern/MOD_meshdeform.c
branches/soc-2012-fried_chicken/source/blender/modifiers/intern/MOD_particlesystem.c
branches/soc-2012-fried_chicken/source/blender/nodes/CMakeLists.txt
branches/soc-2012-fried_chicken/source/blender/nodes/NOD_composite.h
branches/soc-2012-fried_chicken/source/blender/nodes/composite/node_composite_tree.c
branches/soc-2012-fried_chicken/source/blender/nodes/composite/node_composite_util.c
branches/soc-2012-fried_chicken/source/blender/nodes/composite/nodes/node_composite_alphaOver.c
branches/soc-2012-fried_chicken/source/blender/nodes/composite/nodes/node_composite_bokehimage.c
branches/soc-2012-fried_chicken/source/blender/nodes/composite/nodes/node_composite_boxmask.c
branches/soc-2012-fried_chicken/source/blender/nodes/composite/nodes/node_composite_channelMatte.c
branches/soc-2012-fried_chicken/source/blender/nodes/composite/nodes/node_composite_chromaMatte.c
branches/soc-2012-fried_chicken/source/blender/nodes/composite/nodes/node_composite_colorMatte.c
branches/soc-2012-fried_chicken/source/blender/nodes/composite/nodes/node_composite_colorSpill.c
branches/soc-2012-fried_chicken/source/blender/nodes/composite/nodes/node_composite_colorbalance.c
branches/soc-2012-fried_chicken/source/blender/nodes/composite/nodes/node_composite_colorcorrection.c
branches/soc-2012-fried_chicken/source/blender/nodes/composite/nodes/node_composite_common.c
branches/soc-2012-fried_chicken/source/blender/nodes/composite/nodes/node_composite_crop.c
branches/soc-2012-fried_chicken/source/blender/nodes/composite/nodes/node_composite_curves.c
branches/soc-2012-fried_chicken/source/blender/nodes/composite/nodes/node_composite_defocus.c
branches/soc-2012-fried_chicken/source/blender/nodes/composite/nodes/node_composite_diffMatte.c
branches/soc-2012-fried_chicken/source/blender/nodes/composite/nodes/node_composite_dilate.c
branches/soc-2012-fried_chicken/source/blender/nodes/composite/nodes/node_composite_distanceMatte.c
branches/soc-2012-fried_chicken/source/blender/nodes/composite/nodes/node_composite_ellipsemask.c
branches/soc-2012-fried_chicken/source/blender/nodes/composite/nodes/node_composite_glare.c
branches/soc-2012-fried_chicken/source/blender/nodes/composite/nodes/node_composite_hueSatVal.c
branches/soc-2012-fried_chicken/source/blender/nodes/composite/nodes/node_composite_huecorrect.c
branches/soc-2012-fried_chicken/source/blender/nodes/composite/nodes/node_composite_image.c
branches/soc-2012-fried_chicken/source/blender/nodes/composite/nodes/node_composite_invert.c
branches/soc-2012-fried_chicken/source/blender/nodes/composite/nodes/node_composite_keying.c
branches/soc-2012-fried_chicken/source/blender/nodes/composite/nodes/node_composite_keyingscreen.c
branches/soc-2012-fried_chicken/source/blender/nodes/composite/nodes/node_composite_lensdist.c
branches/soc-2012-fried_chicken/source/blender/nodes/composite/nodes/node_composite_levels.c
branches/soc-2012-fried_chicken/source/blender/nodes/composite/nodes/node_composite_lummaMatte.c
branches/soc-2012-fried_chicken/source/blender/nodes/composite/nodes/node_composite_mapValue.c
branches/soc-2012-fried_chicken/source/blender/nodes/composite/nodes/node_composite_mask.c
branches/soc-2012-fried_chicken/source/blender/nodes/composite/nodes/node_composite_outputFile.c
branches/soc-2012-fried_chicken/source/blender/nodes/composite/nodes/node_composite_rotate.c
branches/soc-2012-fried_chicken/source/blender/nodes/composite/nodes/node_composite_splitViewer.c
branches/soc-2012-fried_chicken/source/blender/nodes/composite/nodes/node_composite_tonemap.c
branches/soc-2012-fried_chicken/source/blender/nodes/composite/nodes/node_composite_valToRgb.c
branches/soc-2012-fried_chicken/source/blender/nodes/intern/node_common.c
branches/soc-2012-fried_chicken/source/blender/nodes/shader/nodes/node_shader_attribute.c
branches/soc-2012-fried_chicken/source/blender/nodes/shader/nodes/node_shader_curves.c
branches/soc-2012-fried_chicken/source/blender/nodes/shader/nodes/node_shader_geom.c
branches/soc-2012-fried_chicken/source/blender/nodes/shader/nodes/node_shader_mapping.c
branches/soc-2012-fried_chicken/source/blender/nodes/shader/nodes/node_shader_material.c
branches/soc-2012-fried_chicken/source/blender/nodes/shader/nodes/node_shader_tex_checker.c
branches/soc-2012-fried_chicken/source/blender/nodes/shader/nodes/node_shader_tex_environment.c
branches/soc-2012-fried_chicken/source/blender/nodes/shader/nodes/node_shader_tex_gradient.c
branches/soc-2012-fried_chicken/source/blender/nodes/shader/nodes/node_shader_tex_image.c
branches/soc-2012-fried_chicken/source/blender/nodes/shader/nodes/node_shader_tex_magic.c
branches/soc-2012-fried_chicken/source/blender/nodes/shader/nodes/node_shader_tex_musgrave.c
branches/soc-2012-fried_chicken/source/blender/nodes/shader/nodes/node_shader_tex_noise.c
branches/soc-2012-fried_chicken/source/blender/nodes/shader/nodes/node_shader_tex_sky.c
branches/soc-2012-fried_chicken/source/blender/nodes/shader/nodes/node_shader_tex_voronoi.c
branches/soc-2012-fried_chicken/source/blender/nodes/shader/nodes/node_shader_tex_wave.c
branches/soc-2012-fried_chicken/source/blender/nodes/shader/nodes/node_shader_valToRgb.c
branches/soc-2012-fried_chicken/source/blender/nodes/texture/nodes/node_texture_bricks.c
branches/soc-2012-fried_chicken/source/blender/nodes/texture/nodes/node_texture_curves.c
branches/soc-2012-fried_chicken/source/blender/nodes/texture/nodes/node_texture_image.c
branches/soc-2012-fried_chicken/source/blender/nodes/texture/nodes/node_texture_output.c
branches/soc-2012-fried_chicken/source/blender/nodes/texture/nodes/node_texture_proc.c
branches/soc-2012-fried_chicken/source/blender/nodes/texture/nodes/node_texture_valToRgb.c
branches/soc-2012-fried_chicken/source/blender/python/bmesh/bmesh_py_types.c
branches/soc-2012-fried_chicken/source/blender/python/intern/bpy_operator.c
branches/soc-2012-fried_chicken/source/blender/python/intern/bpy_rna.c
branches/soc-2012-fried_chicken/source/blender/python/mathutils/mathutils_Euler.c
branches/soc-2012-fried_chicken/source/blender/python/mathutils/mathutils_Euler.h
branches/soc-2012-fried_chicken/source/blender/python/mathutils/mathutils_Matrix.c
branches/soc-2012-fried_chicken/source/blender/render/intern/source/convertblender.c
branches/soc-2012-fried_chicken/source/blender/render/intern/source/imagetexture.c
branches/soc-2012-fried_chicken/source/blender/render/intern/source/initrender.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
branches/soc-2012-fried_chicken/source/blender/render/intern/source/rendercore.c
branches/soc-2012-fried_chicken/source/blender/render/intern/source/shadbuf.c
branches/soc-2012-fried_chicken/source/blender/windowmanager/intern/wm_event_system.c
branches/soc-2012-fried_chicken/source/blender/windowmanager/intern/wm_playanim.c
branches/soc-2012-fried_chicken/source/blender/windowmanager/intern/wm_subwindow.c
branches/soc-2012-fried_chicken/source/blender/windowmanager/intern/wm_window.c
branches/soc-2012-fried_chicken/source/gameengine/Ketsji/BL_Texture.cpp
branches/soc-2012-fried_chicken/source/gameengine/SceneGraph/SG_ParentRelation.h
branches/soc-2012-fried_chicken/source/gameengine/VideoTexture/ImageBuff.cpp
branches/soc-2012-fried_chicken/source/gameengine/VideoTexture/ImageBuff.h
Property Changed:
----------------
branches/soc-2012-fried_chicken/
branches/soc-2012-fried_chicken/source/blender/editors/interface/interface.c
branches/soc-2012-fried_chicken/source/blender/editors/space_outliner/
Property changes on: branches/soc-2012-fried_chicken
___________________________________________________________________
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/soc-2011-tomato:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801,43872,44130,44141,44147-44149,44151-44152,44229-44230,45623-45625,46037,48089,48092,48551-48552,48679,48790,48792-48793,49076,49087,49292,49294,49466
/trunk/blender:46807-50097
+ /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/soc-2011-tomato:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801,43872,44130,44141,44147-44149,44151-44152,44229-44230,45623-45625,46037,48089,48092,48551-48552,48679,48790,48792-48793,49076,49087,49292,49294,49466
/trunk/blender:46807-50211
Modified: branches/soc-2012-fried_chicken/CMakeLists.txt
===================================================================
--- branches/soc-2012-fried_chicken/CMakeLists.txt 2012-08-25 22:51:30 UTC (rev 50211)
+++ branches/soc-2012-fried_chicken/CMakeLists.txt 2012-08-25 23:05:59 UTC (rev 50212)
@@ -1043,6 +1043,8 @@
set(PLATFORM_LINKLIBS "${PLATFORM_LINKLIBS} -lpthread")
add_definitions(-DFREE_WINDOWS64 -DMS_WIN64)
+ #Turn off OpenMP since it causes crashes on render for subsurfed/multiresolution meshes
+ set(WITH_OPENMP OFF)
endif()
add_definitions(-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE)
Modified: branches/soc-2012-fried_chicken/build_files/scons/config/win64-mingw-config.py
===================================================================
--- branches/soc-2012-fried_chicken/build_files/scons/config/win64-mingw-config.py 2012-08-25 22:51:30 UTC (rev 50211)
+++ branches/soc-2012-fried_chicken/build_files/scons/config/win64-mingw-config.py 2012-08-25 23:05:59 UTC (rev 50212)
@@ -170,7 +170,7 @@
BF_RAYOPTIMIZATION_SSE_FLAGS = ['-mmmx', '-msse', '-msse2']
#May produce errors with unsupported MinGW-w64 builds
-WITH_BF_OPENMP = True
+WITH_BF_OPENMP = False
##
CC = 'gcc'
Modified: branches/soc-2012-fried_chicken/build_files/scons/tools/Blender.py
===================================================================
--- branches/soc-2012-fried_chicken/build_files/scons/tools/Blender.py 2012-08-25 22:51:30 UTC (rev 50211)
+++ branches/soc-2012-fried_chicken/build_files/scons/tools/Blender.py 2012-08-25 23:05:59 UTC (rev 50212)
@@ -845,6 +845,8 @@
print bc.HEADER+'Configuring program '+bc.ENDC+bc.OKGREEN+progname+bc.ENDC
lenv = self.Clone()
lenv.Append(LINKFLAGS = lenv['PLATFORM_LINKFLAGS'])
+ if lenv['OURPLATFORM'] in ('win32-mingw', 'win64-mingw', 'linuxcross', 'cygwin', 'linux'):
+ lenv.Replace(LINK = '$CXX')
if lenv['OURPLATFORM'] in ('win32-vc', 'cygwin', 'win64-vc'):
if lenv['BF_DEBUG']:
lenv.Prepend(LINKFLAGS = ['/DEBUG','/PDB:'+progname+'.pdb','/NODEFAULTLIB:libcmt'])
Modified: branches/soc-2012-fried_chicken/doc/python_api/rst/info_gotcha.rst
===================================================================
--- branches/soc-2012-fried_chicken/doc/python_api/rst/info_gotcha.rst 2012-08-25 22:51:30 UTC (rev 50211)
+++ branches/soc-2012-fried_chicken/doc/python_api/rst/info_gotcha.rst 2012-08-25 23:05:59 UTC (rev 50212)
@@ -137,11 +137,11 @@
NGons and Tessellation Faces
============================
-Since 2.63 NGons are supported, this adds some complexity since in some cases you need to access triangles still (some exporters for example).
+Since 2.63 NGons are supported, this adds some complexity since in some cases you need to access triangles/quads still (some exporters for example).
There are now 3 ways to access faces:
-* :class:`bpy.types.MeshPolygon` - this is the data stricture which now stores faces in object mode (access as ``mesh.polygons`` rather then ``mesh.faces``).
+* :class:`bpy.types.MeshPolygon` - this is the data structure which now stores faces in object mode (access as ``mesh.polygons`` rather then ``mesh.faces``).
* :class:`bpy.types.MeshTessFace` - the result of triangulating (tessellated) polygons, the main method of face access in 2.62 or older (access as ``mesh.tessfaces``).
* :class:`bmesh.types.BMFace` - the polygons as used in editmode.
Modified: branches/soc-2012-fried_chicken/extern/recastnavigation/Recast/Source/RecastFilter.cpp
===================================================================
--- branches/soc-2012-fried_chicken/extern/recastnavigation/Recast/Source/RecastFilter.cpp 2012-08-25 22:51:30 UTC (rev 50211)
+++ branches/soc-2012-fried_chicken/extern/recastnavigation/Recast/Source/RecastFilter.cpp 2012-08-25 23:05:59 UTC (rev 50212)
@@ -128,7 +128,7 @@
rcSpan* ns = solid.spans[dx + dy*w];
int nbot = -walkableClimb;
int ntop = ns ? (int)ns->smin : MAX_HEIGHT;
- // Skip neightbour if the gap between the spans is too small.
+ // Skip neighbor if the gap between the spans is too small.
if (rcMin(top,ntop) - rcMax(bot,nbot) > walkableHeight)
minh = rcMin(minh, nbot - bot);
@@ -137,7 +137,7 @@
{
nbot = (int)ns->smax;
ntop = ns->next ? (int)ns->next->smin : MAX_HEIGHT;
- // Skip neightbour if the gap between the spans is too small.
+ // Skip neighbor if the gap between the spans is too small.
if (rcMin(top,ntop) - rcMax(bot,nbot) > walkableHeight)
{
minh = rcMin(minh, nbot - bot);
Modified: branches/soc-2012-fried_chicken/intern/cycles/bvh/bvh.cpp
===================================================================
--- branches/soc-2012-fried_chicken/intern/cycles/bvh/bvh.cpp 2012-08-25 22:51:30 UTC (rev 50211)
+++ branches/soc-2012-fried_chicken/intern/cycles/bvh/bvh.cpp 2012-08-25 23:05:59 UTC (rev 50212)
@@ -411,7 +411,7 @@
size_t nsize_bbox = (use_qbvh)? nsize-2: nsize-1;
int4 *bvh_nodes = &bvh->pack.nodes[0];
size_t bvh_nodes_size = bvh->pack.nodes.size();
- int *bvh_is_leaf = &bvh->pack.is_leaf[0];
+ int *bvh_is_leaf = (bvh->pack.is_leaf.size() != 0) ? &bvh->pack.is_leaf[0] : NULL;
for(size_t i = 0, j = 0; i < bvh_nodes_size; i+=nsize, j++) {
memcpy(pack_nodes + pack_nodes_offset, bvh_nodes + i, nsize_bbox*sizeof(int4));
@@ -419,7 +419,7 @@
/* modify offsets into arrays */
int4 data = bvh_nodes[i + nsize_bbox];
- if(bvh_is_leaf[j]) {
+ if(bvh_is_leaf && bvh_is_leaf[j]) {
data.x += tri_offset;
data.y += tri_offset;
}
Modified: branches/soc-2012-fried_chicken/release/scripts/modules/addon_utils.py
===================================================================
--- branches/soc-2012-fried_chicken/release/scripts/modules/addon_utils.py 2012-08-25 22:51:30 UTC (rev 50211)
+++ branches/soc-2012-fried_chicken/release/scripts/modules/addon_utils.py 2012-08-25 23:05:59 UTC (rev 50212)
@@ -275,6 +275,7 @@
try:
mod.register()
except:
+ print("Exception in module register(): %r" % getattr(mod, "__file__", module_name))
handle_error()
del sys.modules[module_name]
return None
@@ -316,6 +317,7 @@
try:
mod.unregister()
except:
+ print("Exception in module unregister(): %r" % getattr(mod, "__file__", module_name))
import traceback
traceback.print_exc()
else:
Modified: branches/soc-2012-fried_chicken/release/scripts/modules/blend_render_info.py
===================================================================
--- branches/soc-2012-fried_chicken/release/scripts/modules/blend_render_info.py 2012-08-25 22:51:30 UTC (rev 50211)
+++ branches/soc-2012-fried_chicken/release/scripts/modules/blend_render_info.py 2012-08-25 23:05:59 UTC (rev 50212)
@@ -86,6 +86,8 @@
scenes.append((start_frame, end_frame, scene_name))
+ blendfile.close()
+
return scenes
Modified: branches/soc-2012-fried_chicken/release/scripts/modules/bpy/utils.py
===================================================================
--- branches/soc-2012-fried_chicken/release/scripts/modules/bpy/utils.py 2012-08-25 22:51:30 UTC (rev 50211)
+++ branches/soc-2012-fried_chicken/release/scripts/modules/bpy/utils.py 2012-08-25 23:05:59 UTC (rev 50212)
@@ -33,6 +33,9 @@
"refresh_script_paths",
"register_class",
"register_module",
+ "register_manual_map",
+ "unregister_manual_map",
+ "manual_map",
"resource_path",
"script_path_user",
"script_path_pref",
@@ -56,7 +59,6 @@
_script_module_dirs = "startup", "modules"
-
def _test_import(module_name, loaded_modules):
use_time = _bpy.app.debug_python
@@ -595,3 +597,40 @@
traceback.print_exc()
if verbose:
print("done.\n")
+
+
+# -----------------------------------------------------------------------------
+# Manual lookups, each function has to return a basepath and a sequence
+# of...
+
+# we start with the built-in default mapping
+def _blender_default_map():
+ import sys
+ import rna_wiki_reference as ref_mod
+ ret = (ref_mod.url_manual_prefix, ref_mod.url_manual_mapping)
+ # avoid storing in memory
+ del sys.modules["rna_wiki_reference"]
+ return ret
+
+# hooks for doc lookups
+_manual_map = [_blender_default_map]
+
+def register_manual_map(manual_hook):
+ _manual_map.append(manual_hook)
+
+def unregister_manual_map(manual_hook):
+ _manual_map.remove(manual_hook)
+
+def manual_map():
+ # reverse so default is called last
+ for cb in reversed(_manual_map):
+ try:
+ prefix, url_manual_mapping = cb()
+ except:
+ print("Error calling %r" % cb)
+ import traceback
+ traceback.print_exc()
+ continue
+
+ yield prefix, url_manual_mapping
+
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list