[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [59438] branches/soc-2013-dingto: Merged revision(s) 59247-59437 from trunk/blender into soc-2013-dingto.
Thomas Dinges
blender at dingto.org
Fri Aug 23 21:13:32 CEST 2013
Revision: 59438
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=59438
Author: dingto
Date: 2013-08-23 19:13:32 +0000 (Fri, 23 Aug 2013)
Log Message:
-----------
Merged revision(s) 59247-59437 from trunk/blender into soc-2013-dingto.
Modified Paths:
--------------
branches/soc-2013-dingto/build_files/build_environment/install_deps.sh
branches/soc-2013-dingto/build_files/cmake/macros.cmake
branches/soc-2013-dingto/extern/recastnavigation/recast-capi.cpp
branches/soc-2013-dingto/extern/recastnavigation/recast-capi.h
branches/soc-2013-dingto/intern/cycles/app/cycles_xml.cpp
branches/soc-2013-dingto/intern/cycles/blender/addon/presets.py
branches/soc-2013-dingto/intern/cycles/blender/addon/properties.py
branches/soc-2013-dingto/intern/cycles/blender/addon/ui.py
branches/soc-2013-dingto/intern/cycles/blender/blender_curves.cpp
branches/soc-2013-dingto/intern/cycles/blender/blender_object.cpp
branches/soc-2013-dingto/intern/cycles/blender/blender_sync.cpp
branches/soc-2013-dingto/intern/cycles/device/device_cuda.cpp
branches/soc-2013-dingto/intern/cycles/device/device_task.h
branches/soc-2013-dingto/intern/cycles/kernel/kernel.cpp
branches/soc-2013-dingto/intern/cycles/kernel/kernel.cu
branches/soc-2013-dingto/intern/cycles/kernel/kernel_bvh.h
branches/soc-2013-dingto/intern/cycles/kernel/kernel_bvh_subsurface.h
branches/soc-2013-dingto/intern/cycles/kernel/kernel_emission.h
branches/soc-2013-dingto/intern/cycles/kernel/kernel_path.h
branches/soc-2013-dingto/intern/cycles/kernel/kernel_shader.h
branches/soc-2013-dingto/intern/cycles/kernel/kernel_sse2.cpp
branches/soc-2013-dingto/intern/cycles/kernel/kernel_sse3.cpp
branches/soc-2013-dingto/intern/cycles/kernel/kernel_types.h
branches/soc-2013-dingto/intern/cycles/kernel/osl/osl_shader.cpp
branches/soc-2013-dingto/intern/cycles/kernel/shaders/node_subsurface_scattering.osl
branches/soc-2013-dingto/intern/cycles/render/curves.cpp
branches/soc-2013-dingto/intern/cycles/render/curves.h
branches/soc-2013-dingto/intern/cycles/render/integrator.cpp
branches/soc-2013-dingto/intern/cycles/render/integrator.h
branches/soc-2013-dingto/intern/cycles/render/session.cpp
branches/soc-2013-dingto/intern/ghost/intern/GHOST_SystemPathsX11.cpp
branches/soc-2013-dingto/intern/ghost/intern/GHOST_SystemWin32.cpp
branches/soc-2013-dingto/intern/guardedalloc/CMakeLists.txt
branches/soc-2013-dingto/intern/guardedalloc/SConscript
branches/soc-2013-dingto/intern/guardedalloc/intern/mallocn.c
branches/soc-2013-dingto/intern/opencolorio/ocio_impl.cc
branches/soc-2013-dingto/release/datafiles/prvicons.png
branches/soc-2013-dingto/release/scripts/freestyle/style_modules/parameter_editor.py
branches/soc-2013-dingto/release/scripts/modules/bpy_types.py
branches/soc-2013-dingto/release/scripts/presets/cycles/sampling/final.py
branches/soc-2013-dingto/release/scripts/presets/cycles/sampling/preview.py
branches/soc-2013-dingto/release/scripts/startup/bl_operators/wm.py
branches/soc-2013-dingto/release/scripts/startup/bl_ui/properties_mask_common.py
branches/soc-2013-dingto/release/scripts/startup/bl_ui/space_clip.py
branches/soc-2013-dingto/release/scripts/startup/bl_ui/space_view3d.py
branches/soc-2013-dingto/source/blender/blenkernel/BKE_anim.h
branches/soc-2013-dingto/source/blender/blenkernel/BKE_armature.h
branches/soc-2013-dingto/source/blender/blenkernel/BKE_curve.h
branches/soc-2013-dingto/source/blender/blenkernel/BKE_displist.h
branches/soc-2013-dingto/source/blender/blenkernel/BKE_key.h
branches/soc-2013-dingto/source/blender/blenkernel/BKE_lattice.h
branches/soc-2013-dingto/source/blender/blenkernel/BKE_mball.h
branches/soc-2013-dingto/source/blender/blenkernel/BKE_mesh.h
branches/soc-2013-dingto/source/blender/blenkernel/BKE_modifier.h
branches/soc-2013-dingto/source/blender/blenkernel/BKE_object.h
branches/soc-2013-dingto/source/blender/blenkernel/BKE_particle.h
branches/soc-2013-dingto/source/blender/blenkernel/BKE_sequencer.h
branches/soc-2013-dingto/source/blender/blenkernel/CMakeLists.txt
branches/soc-2013-dingto/source/blender/blenkernel/SConscript
branches/soc-2013-dingto/source/blender/blenkernel/intern/DerivedMesh.c
branches/soc-2013-dingto/source/blender/blenkernel/intern/anim.c
branches/soc-2013-dingto/source/blender/blenkernel/intern/armature.c
branches/soc-2013-dingto/source/blender/blenkernel/intern/brush.c
branches/soc-2013-dingto/source/blender/blenkernel/intern/camera.c
branches/soc-2013-dingto/source/blender/blenkernel/intern/cdderivedmesh.c
branches/soc-2013-dingto/source/blender/blenkernel/intern/constraint.c
branches/soc-2013-dingto/source/blender/blenkernel/intern/curve.c
branches/soc-2013-dingto/source/blender/blenkernel/intern/depsgraph.c
branches/soc-2013-dingto/source/blender/blenkernel/intern/displist.c
branches/soc-2013-dingto/source/blender/blenkernel/intern/effect.c
branches/soc-2013-dingto/source/blender/blenkernel/intern/font.c
branches/soc-2013-dingto/source/blender/blenkernel/intern/key.c
branches/soc-2013-dingto/source/blender/blenkernel/intern/lattice.c
branches/soc-2013-dingto/source/blender/blenkernel/intern/material.c
branches/soc-2013-dingto/source/blender/blenkernel/intern/mball.c
branches/soc-2013-dingto/source/blender/blenkernel/intern/mesh.c
branches/soc-2013-dingto/source/blender/blenkernel/intern/modifier.c
branches/soc-2013-dingto/source/blender/blenkernel/intern/modifiers_bmesh.c
branches/soc-2013-dingto/source/blender/blenkernel/intern/navmesh_conversion.c
branches/soc-2013-dingto/source/blender/blenkernel/intern/object.c
branches/soc-2013-dingto/source/blender/blenkernel/intern/object_deform.c
branches/soc-2013-dingto/source/blender/blenkernel/intern/particle.c
branches/soc-2013-dingto/source/blender/blenkernel/intern/particle_system.c
branches/soc-2013-dingto/source/blender/blenkernel/intern/pbvh.c
branches/soc-2013-dingto/source/blender/blenkernel/intern/pbvh_bmesh.c
branches/soc-2013-dingto/source/blender/blenkernel/intern/sequencer.c
branches/soc-2013-dingto/source/blender/blenkernel/intern/sound.c
branches/soc-2013-dingto/source/blender/blenlib/BLI_callbacks.h
branches/soc-2013-dingto/source/blender/blenlib/BLI_fileops.h
branches/soc-2013-dingto/source/blender/blenlib/BLI_ghash.h
branches/soc-2013-dingto/source/blender/blenlib/BLI_math_geom.h
branches/soc-2013-dingto/source/blender/blenlib/BLI_math_interp.h
branches/soc-2013-dingto/source/blender/blenlib/BLI_math_rotation.h
branches/soc-2013-dingto/source/blender/blenlib/BLI_math_vector.h
branches/soc-2013-dingto/source/blender/blenlib/BLI_memarena.h
branches/soc-2013-dingto/source/blender/blenlib/BLI_threads.h
branches/soc-2013-dingto/source/blender/blenlib/BLI_winstuff.h
branches/soc-2013-dingto/source/blender/blenlib/CMakeLists.txt
branches/soc-2013-dingto/source/blender/blenlib/PIL_time.h
branches/soc-2013-dingto/source/blender/blenlib/intern/BLI_ghash.c
branches/soc-2013-dingto/source/blender/blenlib/intern/BLI_memarena.c
branches/soc-2013-dingto/source/blender/blenlib/intern/BLI_mempool.c
branches/soc-2013-dingto/source/blender/blenlib/intern/edgehash.c
branches/soc-2013-dingto/source/blender/blenlib/intern/math_geom.c
branches/soc-2013-dingto/source/blender/blenlib/intern/math_geom_inline.c
branches/soc-2013-dingto/source/blender/blenlib/intern/math_rotation.c
branches/soc-2013-dingto/source/blender/blenlib/intern/math_vector_inline.c
branches/soc-2013-dingto/source/blender/blenlib/intern/storage.c
branches/soc-2013-dingto/source/blender/blenlib/intern/threads.c
branches/soc-2013-dingto/source/blender/blenloader/intern/readfile.c
branches/soc-2013-dingto/source/blender/bmesh/CMakeLists.txt
branches/soc-2013-dingto/source/blender/bmesh/bmesh.h
branches/soc-2013-dingto/source/blender/bmesh/intern/bmesh_construct.c
branches/soc-2013-dingto/source/blender/bmesh/intern/bmesh_construct.h
branches/soc-2013-dingto/source/blender/bmesh/intern/bmesh_core.c
branches/soc-2013-dingto/source/blender/bmesh/intern/bmesh_core.h
branches/soc-2013-dingto/source/blender/bmesh/intern/bmesh_log.c
branches/soc-2013-dingto/source/blender/bmesh/intern/bmesh_log.h
branches/soc-2013-dingto/source/blender/bmesh/intern/bmesh_mesh_conv.c
branches/soc-2013-dingto/source/blender/bmesh/intern/bmesh_mods.c
branches/soc-2013-dingto/source/blender/bmesh/intern/bmesh_opdefines.c
branches/soc-2013-dingto/source/blender/bmesh/intern/bmesh_operators_private.h
branches/soc-2013-dingto/source/blender/bmesh/intern/bmesh_polygon.c
branches/soc-2013-dingto/source/blender/bmesh/intern/bmesh_queries.c
branches/soc-2013-dingto/source/blender/bmesh/intern/bmesh_queries.h
branches/soc-2013-dingto/source/blender/bmesh/operators/bmo_bevel.c
branches/soc-2013-dingto/source/blender/bmesh/operators/bmo_bridge.c
branches/soc-2013-dingto/source/blender/bmesh/operators/bmo_create.c
branches/soc-2013-dingto/source/blender/bmesh/operators/bmo_dissolve.c
branches/soc-2013-dingto/source/blender/bmesh/operators/bmo_dupe.c
branches/soc-2013-dingto/source/blender/bmesh/operators/bmo_edgenet.c
branches/soc-2013-dingto/source/blender/bmesh/operators/bmo_extrude.c
branches/soc-2013-dingto/source/blender/bmesh/operators/bmo_fill_edgeloop.c
branches/soc-2013-dingto/source/blender/bmesh/operators/bmo_fill_grid.c
branches/soc-2013-dingto/source/blender/bmesh/operators/bmo_fill_holes.c
branches/soc-2013-dingto/source/blender/bmesh/operators/bmo_hull.c
branches/soc-2013-dingto/source/blender/bmesh/operators/bmo_inset.c
branches/soc-2013-dingto/source/blender/bmesh/operators/bmo_poke.c
branches/soc-2013-dingto/source/blender/bmesh/operators/bmo_primitive.c
branches/soc-2013-dingto/source/blender/bmesh/operators/bmo_removedoubles.c
branches/soc-2013-dingto/source/blender/bmesh/operators/bmo_split_edges.c
branches/soc-2013-dingto/source/blender/bmesh/operators/bmo_symmetrize.c
branches/soc-2013-dingto/source/blender/bmesh/operators/bmo_triangulate.c
branches/soc-2013-dingto/source/blender/bmesh/operators/bmo_unsubdivide.c
branches/soc-2013-dingto/source/blender/bmesh/operators/bmo_utils.c
branches/soc-2013-dingto/source/blender/bmesh/operators/bmo_wireframe.c
branches/soc-2013-dingto/source/blender/bmesh/tools/bmesh_bevel.c
branches/soc-2013-dingto/source/blender/bmesh/tools/bmesh_decimate_unsubdivide.c
branches/soc-2013-dingto/source/blender/bmesh/tools/bmesh_edgenet.c
branches/soc-2013-dingto/source/blender/bmesh/tools/bmesh_edgesplit.c
branches/soc-2013-dingto/source/blender/collada/collada_utils.cpp
branches/soc-2013-dingto/source/blender/compositor/intern/COM_MemoryBuffer.cpp
branches/soc-2013-dingto/source/blender/compositor/operations/COM_PlaneTrackMaskOperation.cpp
branches/soc-2013-dingto/source/blender/compositor/operations/COM_PlaneTrackWarpImageOperation.cpp
branches/soc-2013-dingto/source/blender/editors/armature/armature_skinning.c
branches/soc-2013-dingto/source/blender/editors/datafiles/CMakeLists.txt
branches/soc-2013-dingto/source/blender/editors/gpencil/gpencil_edit.c
branches/soc-2013-dingto/source/blender/editors/interface/interface_layout.c
branches/soc-2013-dingto/source/blender/editors/interface/interface_templates.c
branches/soc-2013-dingto/source/blender/editors/mask/mask_edit.c
branches/soc-2013-dingto/source/blender/editors/mask/mask_intern.h
branches/soc-2013-dingto/source/blender/editors/mask/mask_ops.c
branches/soc-2013-dingto/source/blender/editors/mask/mask_relationships.c
branches/soc-2013-dingto/source/blender/editors/mesh/editmesh_inset.c
branches/soc-2013-dingto/source/blender/editors/mesh/editmesh_knife.c
branches/soc-2013-dingto/source/blender/editors/mesh/editmesh_path.c
branches/soc-2013-dingto/source/blender/editors/mesh/editmesh_rip.c
branches/soc-2013-dingto/source/blender/editors/mesh/editmesh_tools.c
branches/soc-2013-dingto/source/blender/editors/mesh/mesh_intern.h
branches/soc-2013-dingto/source/blender/editors/mesh/mesh_navmesh.c
branches/soc-2013-dingto/source/blender/editors/mesh/mesh_ops.c
branches/soc-2013-dingto/source/blender/editors/mesh/meshtools.c
branches/soc-2013-dingto/source/blender/editors/metaball/mball_edit.c
branches/soc-2013-dingto/source/blender/editors/object/object_add.c
branches/soc-2013-dingto/source/blender/editors/object/object_edit.c
branches/soc-2013-dingto/source/blender/editors/object/object_modifier.c
branches/soc-2013-dingto/source/blender/editors/object/object_vgroup.c
branches/soc-2013-dingto/source/blender/editors/render/render_internal.c
branches/soc-2013-dingto/source/blender/editors/sculpt_paint/paint_hide.c
branches/soc-2013-dingto/source/blender/editors/sculpt_paint/paint_image_proj.c
branches/soc-2013-dingto/source/blender/editors/sculpt_paint/paint_stroke.c
branches/soc-2013-dingto/source/blender/editors/sculpt_paint/sculpt.c
branches/soc-2013-dingto/source/blender/editors/space_buttons/buttons_texture.c
branches/soc-2013-dingto/source/blender/editors/space_clip/clip_draw.c
branches/soc-2013-dingto/source/blender/editors/space_clip/clip_ops.c
branches/soc-2013-dingto/source/blender/editors/space_graph/graph_edit.c
branches/soc-2013-dingto/source/blender/editors/space_image/image_ops.c
branches/soc-2013-dingto/source/blender/editors/space_image/space_image.c
branches/soc-2013-dingto/source/blender/editors/space_info/info_stats.c
branches/soc-2013-dingto/source/blender/editors/space_view3d/drawarmature.c
branches/soc-2013-dingto/source/blender/editors/space_view3d/drawobject.c
branches/soc-2013-dingto/source/blender/editors/space_view3d/view3d_draw.c
branches/soc-2013-dingto/source/blender/editors/space_view3d/view3d_iterators.c
branches/soc-2013-dingto/source/blender/editors/space_view3d/view3d_view.c
branches/soc-2013-dingto/source/blender/editors/transform/transform.c
branches/soc-2013-dingto/source/blender/editors/transform/transform.h
branches/soc-2013-dingto/source/blender/editors/transform/transform_constraints.c
branches/soc-2013-dingto/source/blender/editors/transform/transform_conversions.c
branches/soc-2013-dingto/source/blender/editors/transform/transform_generics.c
branches/soc-2013-dingto/source/blender/editors/transform/transform_snap.c
branches/soc-2013-dingto/source/blender/editors/util/crazyspace.c
branches/soc-2013-dingto/source/blender/freestyle/intern/stroke/StrokeShader.h
branches/soc-2013-dingto/source/blender/gpu/intern/gpu_buffers.c
branches/soc-2013-dingto/source/blender/imbuf/intern/IMB_colormanagement_intern.h
branches/soc-2013-dingto/source/blender/imbuf/intern/imageprocess.c
branches/soc-2013-dingto/source/blender/makesdna/DNA_curve_types.h
branches/soc-2013-dingto/source/blender/makesdna/DNA_key_types.h
branches/soc-2013-dingto/source/blender/makesdna/DNA_lattice_types.h
branches/soc-2013-dingto/source/blender/makesdna/DNA_meta_types.h
branches/soc-2013-dingto/source/blender/makesdna/DNA_object_types.h
branches/soc-2013-dingto/source/blender/makesdna/DNA_particle_types.h
branches/soc-2013-dingto/source/blender/makesdna/DNA_space_types.h
branches/soc-2013-dingto/source/blender/makesdna/intern/CMakeLists.txt
branches/soc-2013-dingto/source/blender/makesdna/intern/SConscript
branches/soc-2013-dingto/source/blender/makesrna/SConscript
branches/soc-2013-dingto/source/blender/makesrna/intern/CMakeLists.txt
branches/soc-2013-dingto/source/blender/makesrna/intern/rna_actuator.c
branches/soc-2013-dingto/source/blender/makesrna/intern/rna_define.c
branches/soc-2013-dingto/source/blender/makesrna/intern/rna_lamp.c
branches/soc-2013-dingto/source/blender/makesrna/intern/rna_main_api.c
branches/soc-2013-dingto/source/blender/makesrna/intern/rna_mesh.c
branches/soc-2013-dingto/source/blender/makesrna/intern/rna_meta.c
branches/soc-2013-dingto/source/blender/makesrna/intern/rna_scene.c
branches/soc-2013-dingto/source/blender/makesrna/intern/rna_space.c
branches/soc-2013-dingto/source/blender/makesrna/intern/rna_tracking.c
branches/soc-2013-dingto/source/blender/modifiers/intern/MOD_array.c
branches/soc-2013-dingto/source/blender/modifiers/intern/MOD_bevel.c
branches/soc-2013-dingto/source/blender/modifiers/intern/MOD_decimate.c
branches/soc-2013-dingto/source/blender/modifiers/intern/MOD_edgesplit.c
branches/soc-2013-dingto/source/blender/modifiers/intern/MOD_explode.c
branches/soc-2013-dingto/source/blender/modifiers/intern/MOD_particleinstance.c
branches/soc-2013-dingto/source/blender/modifiers/intern/MOD_skin.c
branches/soc-2013-dingto/source/blender/modifiers/intern/MOD_triangulate.c
branches/soc-2013-dingto/source/blender/python/bmesh/bmesh_py_types.c
branches/soc-2013-dingto/source/blender/python/bmesh/bmesh_py_types_customdata.c
branches/soc-2013-dingto/source/blender/python/intern/bpy_app_handlers.c
branches/soc-2013-dingto/source/blender/python/mathutils/mathutils_Vector.c
branches/soc-2013-dingto/source/blender/python/mathutils/mathutils_geometry.c
branches/soc-2013-dingto/source/blender/render/intern/source/convertblender.c
branches/soc-2013-dingto/source/blender/render/intern/source/pointdensity.c
branches/soc-2013-dingto/source/blender/windowmanager/intern/wm_init_exit.c
branches/soc-2013-dingto/source/creator/creator.c
branches/soc-2013-dingto/source/gameengine/Converter/BL_ShapeDeformer.cpp
branches/soc-2013-dingto/source/gameengine/GameLogic/SCA_IScene.cpp
branches/soc-2013-dingto/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
branches/soc-2013-dingto/source/gameengine/Ketsji/BL_ActionManager.h
branches/soc-2013-dingto/source/gameengine/Ketsji/KX_PythonInit.cpp
branches/soc-2013-dingto/source/gameengine/Ketsji/KX_RaySensor.h
branches/soc-2013-dingto/source/gameengine/Ketsji/KX_Scene.cpp
branches/soc-2013-dingto/source/gameengine/Rasterizer/RAS_MeshObject.cpp
branches/soc-2013-dingto/source/gameengine/Rasterizer/RAS_MeshObject.h
Added Paths:
-----------
branches/soc-2013-dingto/intern/atomic/
branches/soc-2013-dingto/source/blender/blenlib/BLI_sort.h
branches/soc-2013-dingto/source/blender/blenlib/intern/sort.c
branches/soc-2013-dingto/source/blender/bmesh/bmesh_tools.h
branches/soc-2013-dingto/source/blender/bmesh/operators/bmo_bisect_plane.c
branches/soc-2013-dingto/source/blender/bmesh/tools/bmesh_bisect_plane.c
branches/soc-2013-dingto/source/blender/bmesh/tools/bmesh_bisect_plane.h
Property Changed:
----------------
branches/soc-2013-dingto/
branches/soc-2013-dingto/source/blender/editors/interface/interface.c
branches/soc-2013-dingto/source/blender/editors/space_outliner/
Property changes on: branches/soc-2013-dingto
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/ge_dev:58091-58422
/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,49894,50052,50126,52854-52856,54573,58822,58989
/branches/soc-2013-depsgraph_mt:57516
/tags/blender-2.67b-release/blender:57122
/trunk/blender:57315-57365,57369-58448,58450,58452-58770,58779,58783-58855,58857,58859-59032,59035-59246
+ /branches/ge_dev:58091-58422
/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,49894,50052,50126,52854-52856,54573,58822,58989
/branches/soc-2013-depsgraph_mt:57516,57900,57939-57940,57945,57958-57961,58151,58155-58156,58169,58277-58279,58282-58283,58711,58787,58789,58796,59086-59087,59163,59166,59170,59181,59259-59260
/tags/blender-2.67b-release/blender:57122
/trunk/blender:57315-57365,57369-58448,58450,58452-58770,58779,58783-58855,58857,58859-59032,59035-59437
Modified: branches/soc-2013-dingto/build_files/build_environment/install_deps.sh
===================================================================
--- branches/soc-2013-dingto/build_files/build_environment/install_deps.sh 2013-08-23 19:00:04 UTC (rev 59437)
+++ branches/soc-2013-dingto/build_files/build_environment/install_deps.sh 2013-08-23 19:13:32 UTC (rev 59438)
@@ -212,6 +212,7 @@
OPENEXR_FORCE_REBUILD=false
OPENEXR_SKIP=false
_with_built_openexr=false
+_need_openexr_ldconfig=false
OIIO_VERSION="1.1.10"
OIIO_SOURCE="https://github.com/OpenImageIO/oiio/archive/Release-$OIIO_VERSION.tar.gz"
@@ -230,6 +231,7 @@
# OSL needs to be compiled for now!
OSL_VERSION="1.3.2"
+OSL_VERSION_MIN=$OSL_VERSION
OSL_SOURCE="https://github.com/imageworks/OpenShadingLanguage/archive/Release-$OSL_VERSION.tar.gz"
OSL_FORCE_REBUILD=false
OSL_SKIP=false
@@ -2776,7 +2778,7 @@
if [ $? -eq 0 ]; then
install_packages_ARCH llvm clang
have_llvm=true
- LLVM_VERSION=`check_package_version_ge_ARCH llvm`
+ LLVM_VERSION=`check_package_version_ge_ARCH llvm $LLVM_VERSION_MIN`
LLVM_VERSION_FOUND=$LLVM_VERSION
clean_LLVM
else
Modified: branches/soc-2013-dingto/build_files/cmake/macros.cmake
===================================================================
--- branches/soc-2013-dingto/build_files/cmake/macros.cmake 2013-08-23 19:00:04 UTC (rev 59437)
+++ branches/soc-2013-dingto/build_files/cmake/macros.cmake 2013-08-23 19:13:32 UTC (rev 59438)
@@ -799,4 +799,35 @@
unset(_file_from)
unset(_file_to)
unset(_file_to_path)
+
endmacro()
+
+macro(svg_to_png
+ file_from
+ file_to
+ dpi
+ list_to_add)
+
+ # remove ../'s
+ get_filename_component(_file_from ${CMAKE_CURRENT_SOURCE_DIR}/${file_from} REALPATH)
+ get_filename_component(_file_to ${CMAKE_CURRENT_SOURCE_DIR}/${file_to} REALPATH)
+
+ list(APPEND ${list_to_add} ${_file_to})
+
+ find_program(INKSCAPE_EXE inkscape)
+ mark_as_advanced(INKSCAPE_EXE)
+
+ if(INKSCAPE_EXE)
+ add_custom_command(
+ OUTPUT ${_file_to}
+ COMMAND ${INKSCAPE_EXE} ${_file_from} --export-dpi=${dpi} --without-gui --export-png=${_file_to}
+ DEPENDS ${_file_from} ${INKSCAPE_EXE}
+ )
+ else()
+ message(WARNING "Inkscape not found, could not re-generate ${_file_to} from ${_file_from}!")
+ endif()
+
+ unset(_file_from)
+ unset(_file_to)
+
+endmacro()
\ No newline at end of file
Modified: branches/soc-2013-dingto/extern/recastnavigation/recast-capi.cpp
===================================================================
--- branches/soc-2013-dingto/extern/recastnavigation/recast-capi.cpp 2013-08-23 19:00:04 UTC (rev 59437)
+++ branches/soc-2013-dingto/extern/recastnavigation/recast-capi.cpp 2013-08-23 19:13:32 UTC (rev 59438)
@@ -270,129 +270,3 @@
return dmesh->meshes;
}
-// qsort based on FreeBSD source (libkern\qsort.c)
-typedef int cmp_t(void *, const void *, const void *);
-static inline char *med3(char *, char *, char *, cmp_t *, void *);
-static inline void swapfunc(char *, char *, int, int);
-
-#define min(a, b) (a) < (b) ? a : b
-#define swapcode(TYPE, parmi, parmj, n) \
-{ \
- long i = (n) / sizeof(TYPE); \
- TYPE *pi = (TYPE *) (parmi); \
- TYPE *pj = (TYPE *) (parmj); \
- do { \
- TYPE t = *pi; \
- *pi++ = *pj; \
- *pj++ = t; \
- } while (--i > 0); \
-}
-#define SWAPINIT(a, es) swaptype = ((char *)a - (char *)0) % sizeof(long) || \
- es % sizeof(long) ? 2 : es == sizeof(long)? 0 : 1;
-
-static inline void swapfunc(char* a, char* b, int n, int swaptype)
-{
- if(swaptype <= 1)
- swapcode(long, a, b, n)
- else
- swapcode(char, a, b, n)
-}
-
-#define swap(a, b) \
- if (swaptype == 0) { \
- long t = *(long *)(a); \
- *(long *)(a) = *(long *)(b);\
- *(long *)(b) = t; \
- } else \
- swapfunc(a, b, es, swaptype)
-
-#define vecswap(a, b, n) if ((n) > 0) swapfunc(a, b, n, swaptype)
-#define CMP(t, x, y) (cmp((t), (x), (y)))
-
-static inline char *med3(char *a, char *b, char *c, cmp_t *cmp, void *thunk)
-{
- return CMP(thunk, a, b) < 0 ?
- (CMP(thunk, b, c) < 0 ? b : (CMP(thunk, a, c) < 0 ? c : a ))
- :(CMP(thunk, b, c) > 0 ? b : (CMP(thunk, a, c) < 0 ? a : c ));
-}
-
-void recast_qsort(void *a, size_t n, size_t es, void *thunk, cmp_t *cmp)
-{
- char *pa, *pb, *pc, *pd, *pl, *pm, *pn;
- int d, r, swaptype, swap_cnt;
-
-loop:
- SWAPINIT(a, es);
- swap_cnt = 0;
- if (n < 7) {
- for (pm = (char *)a + es; pm < (char *)a + n * es; pm += es)
- for (pl = pm;
- pl > (char *)a && CMP(thunk, pl - es, pl) > 0;
- pl -= es)
- swap(pl, pl - es);
- return;
- }
- pm = (char *)a + (n / 2) * es;
- if (n > 7) {
- pl = (char *)a;
- pn = (char *)a + (n - 1) * es;
- if (n > 40) {
- d = (n / 8) * es;
- pl = med3(pl, pl + d, pl + 2 * d, cmp, thunk);
- pm = med3(pm - d, pm, pm + d, cmp, thunk);
- pn = med3(pn - 2 * d, pn - d, pn, cmp, thunk);
- }
- pm = med3(pl, pm, pn, cmp, thunk);
- }
- swap((char *)a, pm);
- pa = pb = (char *)a + es;
-
- pc = pd = (char *)a + (n - 1) * es;
- for (;;) {
- while (pb <= pc && (r = CMP(thunk, pb, a)) <= 0) {
- if (r == 0) {
- swap_cnt = 1;
- swap(pa, pb);
- pa += es;
- }
- pb += es;
- }
- while (pb <= pc && (r = CMP(thunk, pc, a)) >= 0) {
- if (r == 0) {
- swap_cnt = 1;
- swap(pc, pd);
- pd -= es;
- }
- pc -= es;
- }
- if (pb > pc)
- break;
- swap(pb, pc);
- swap_cnt = 1;
- pb += es;
- pc -= es;
- }
- if (swap_cnt == 0) { /* Switch to insertion sort */
- for (pm = (char *)a + es; pm < (char *)a + n * es; pm += es)
- for (pl = pm;
- pl > (char *)a && CMP(thunk, pl - es, pl) > 0;
- pl -= es)
- swap(pl, pl - es);
- return;
- }
-
- pn = (char *)a + n * es;
- r = min(pa - (char *)a, pb - pa);
- vecswap((char *)a, pb - r, r);
- r = min(pd - pc, pn - pd - es);
- vecswap(pb, pn - r, r);
- if ((r = pb - pa) > es)
- recast_qsort(a, r / es, es, thunk, cmp);
- if ((r = pd - pc) > es) {
- /* Iterate rather than recurse to save stack space */
- a = pn - r;
- n = r / es;
- goto loop;
- }
-}
-
Modified: branches/soc-2013-dingto/extern/recastnavigation/recast-capi.h
===================================================================
--- branches/soc-2013-dingto/extern/recastnavigation/recast-capi.h 2013-08-23 19:00:04 UTC (rev 59437)
+++ branches/soc-2013-dingto/extern/recastnavigation/recast-capi.h 2013-08-23 19:13:32 UTC (rev 59438)
@@ -127,11 +127,6 @@
unsigned int *recast_polyMeshDetailGetMeshes(struct recast_polyMeshDetail *mesh, int *nmeshes);
-/* utility function: quick sort reentrant */
-typedef int recast_cmp_t(void *ctx, const void *a, const void *b);
-
-void recast_qsort(void *a, size_t n, size_t es, void *thunk, recast_cmp_t *cmp);
-
#ifdef __cplusplus
}
#endif
Modified: branches/soc-2013-dingto/intern/cycles/app/cycles_xml.cpp
===================================================================
--- branches/soc-2013-dingto/intern/cycles/app/cycles_xml.cpp 2013-08-23 19:00:04 UTC (rev 59437)
+++ branches/soc-2013-dingto/intern/cycles/app/cycles_xml.cpp 2013-08-23 19:13:32 UTC (rev 59438)
@@ -252,10 +252,14 @@
static void xml_read_integrator(const XMLReadState& state, pugi::xml_node node)
{
Integrator *integrator = state.scene->integrator;
+ bool branched = false;
- xml_read_bool(&integrator->progressive, node, "progressive");
+ xml_read_bool(&branched, node, "branched");
+
+ if(branched)
+ integrator->method == Integrator::BRANCHED_PATH;
- if(!integrator->progressive) {
+ if(integrator->method == Integrator::BRANCHED_PATH) {
xml_read_int(&integrator->diffuse_samples, node, "diffuse_samples");
xml_read_int(&integrator->glossy_samples, node, "glossy_samples");
xml_read_int(&integrator->transmission_samples, node, "transmission_samples");
Modified: branches/soc-2013-dingto/intern/cycles/blender/addon/presets.py
===================================================================
--- branches/soc-2013-dingto/intern/cycles/blender/addon/presets.py 2013-08-23 19:00:04 UTC (rev 59437)
+++ branches/soc-2013-dingto/intern/cycles/blender/addon/presets.py 2013-08-23 19:13:32 UTC (rev 59438)
@@ -67,7 +67,7 @@
"cycles.subsurface_samples",
"cycles.no_caustics",
"cycles.blur_glossy",
- "cycles.squared_samples",
+ "cycles.use_square_samples",
"cycles.progressive"
]
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list