[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [60470] branches/soc-2013-depsgraph_mt: Merging r60198 through r60467 from trunk into soc-2013-depsgraph_mt
Sergey Sharybin
sergey.vfx at gmail.com
Tue Oct 1 10:19:32 CEST 2013
Revision: 60470
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=60470
Author: nazgul
Date: 2013-10-01 08:19:31 +0000 (Tue, 01 Oct 2013)
Log Message:
-----------
Merging r60198 through r60467 from trunk into soc-2013-depsgraph_mt
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=60198
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=60467
Modified Paths:
--------------
branches/soc-2013-depsgraph_mt/CMakeLists.txt
branches/soc-2013-depsgraph_mt/GNUmakefile
branches/soc-2013-depsgraph_mt/SConstruct
branches/soc-2013-depsgraph_mt/build_files/build_environment/install_deps.sh
branches/soc-2013-depsgraph_mt/build_files/cmake/macros.cmake
branches/soc-2013-depsgraph_mt/build_files/scons/config/darwin-config.py
branches/soc-2013-depsgraph_mt/build_files/scons/tools/Blender.py
branches/soc-2013-depsgraph_mt/doc/python_api/examples/bpy.props.5.py
branches/soc-2013-depsgraph_mt/doc/python_api/examples/bpy.types.UIList.1.py
branches/soc-2013-depsgraph_mt/doc/python_api/examples/bpy.types.UIList.2.py
branches/soc-2013-depsgraph_mt/doc/python_api/rst/bge.logic.rst
branches/soc-2013-depsgraph_mt/doc/python_api/sphinx_doc_gen.py
branches/soc-2013-depsgraph_mt/extern/libmv/libmv/multiview/fundamental.cc
branches/soc-2013-depsgraph_mt/extern/libmv/libmv/multiview/fundamental.h
branches/soc-2013-depsgraph_mt/extern/libmv/libmv/multiview/homography.cc
branches/soc-2013-depsgraph_mt/extern/libmv/libmv/multiview/homography.h
branches/soc-2013-depsgraph_mt/extern/libmv/libmv/simple_pipeline/keyframe_selection.cc
branches/soc-2013-depsgraph_mt/extern/libmv/libmv-capi.cc
branches/soc-2013-depsgraph_mt/extern/libmv/libmv-capi.h
branches/soc-2013-depsgraph_mt/extern/libmv/libmv-capi_stub.cc
branches/soc-2013-depsgraph_mt/intern/cycles/blender/addon/ui.py
branches/soc-2013-depsgraph_mt/intern/cycles/blender/blender_curves.cpp
branches/soc-2013-depsgraph_mt/intern/cycles/blender/blender_shader.cpp
branches/soc-2013-depsgraph_mt/intern/cycles/bvh/bvh_build.cpp
branches/soc-2013-depsgraph_mt/intern/cycles/device/device_cuda.cpp
branches/soc-2013-depsgraph_mt/intern/cycles/device/device_opencl.cpp
branches/soc-2013-depsgraph_mt/intern/cycles/kernel/closure/bsdf_hair.h
branches/soc-2013-depsgraph_mt/intern/cycles/kernel/kernel_accumulate.h
branches/soc-2013-depsgraph_mt/intern/cycles/kernel/kernel_bvh.h
branches/soc-2013-depsgraph_mt/intern/cycles/kernel/kernel_compat_cuda.h
branches/soc-2013-depsgraph_mt/intern/cycles/kernel/kernel_globals.h
branches/soc-2013-depsgraph_mt/intern/cycles/kernel/kernel_passes.h
branches/soc-2013-depsgraph_mt/intern/cycles/kernel/kernel_path.h
branches/soc-2013-depsgraph_mt/intern/cycles/kernel/kernel_primitive.h
branches/soc-2013-depsgraph_mt/intern/cycles/kernel/kernel_shader.h
branches/soc-2013-depsgraph_mt/intern/cycles/kernel/shaders/stdosl.h
branches/soc-2013-depsgraph_mt/intern/cycles/render/nodes.cpp
branches/soc-2013-depsgraph_mt/intern/cycles/render/nodes.h
branches/soc-2013-depsgraph_mt/intern/elbeem/CMakeLists.txt
branches/soc-2013-depsgraph_mt/intern/elbeem/SConscript
branches/soc-2013-depsgraph_mt/intern/elbeem/intern/attributes.h
branches/soc-2013-depsgraph_mt/intern/elbeem/intern/controlparticles.h
branches/soc-2013-depsgraph_mt/intern/elbeem/intern/isosurface.h
branches/soc-2013-depsgraph_mt/intern/elbeem/intern/mvmcoords.h
branches/soc-2013-depsgraph_mt/intern/elbeem/intern/ntl_blenderdumper.h
branches/soc-2013-depsgraph_mt/intern/elbeem/intern/ntl_bsptree.h
branches/soc-2013-depsgraph_mt/intern/elbeem/intern/ntl_geometryclass.h
branches/soc-2013-depsgraph_mt/intern/elbeem/intern/ntl_geometrymodel.h
branches/soc-2013-depsgraph_mt/intern/elbeem/intern/ntl_geometryobject.h
branches/soc-2013-depsgraph_mt/intern/elbeem/intern/ntl_geometryshader.h
branches/soc-2013-depsgraph_mt/intern/elbeem/intern/ntl_lighting.h
branches/soc-2013-depsgraph_mt/intern/elbeem/intern/ntl_matrices.h
branches/soc-2013-depsgraph_mt/intern/elbeem/intern/ntl_ray.h
branches/soc-2013-depsgraph_mt/intern/elbeem/intern/ntl_vector3dim.h
branches/soc-2013-depsgraph_mt/intern/elbeem/intern/ntl_world.h
branches/soc-2013-depsgraph_mt/intern/elbeem/intern/parametrizer.h
branches/soc-2013-depsgraph_mt/intern/elbeem/intern/particletracer.cpp
branches/soc-2013-depsgraph_mt/intern/elbeem/intern/particletracer.h
branches/soc-2013-depsgraph_mt/intern/elbeem/intern/simulation_object.cpp
branches/soc-2013-depsgraph_mt/intern/elbeem/intern/simulation_object.h
branches/soc-2013-depsgraph_mt/intern/elbeem/intern/solver_class.h
branches/soc-2013-depsgraph_mt/intern/elbeem/intern/solver_control.cpp
branches/soc-2013-depsgraph_mt/intern/elbeem/intern/solver_control.h
branches/soc-2013-depsgraph_mt/intern/elbeem/intern/solver_interface.cpp
branches/soc-2013-depsgraph_mt/intern/elbeem/intern/solver_interface.h
branches/soc-2013-depsgraph_mt/intern/elbeem/intern/solver_main.cpp
branches/soc-2013-depsgraph_mt/intern/ghost/SConscript
branches/soc-2013-depsgraph_mt/intern/ghost/intern/GHOST_DisplayManagerCocoa.mm
branches/soc-2013-depsgraph_mt/intern/ghost/intern/GHOST_SystemCocoa.mm
branches/soc-2013-depsgraph_mt/intern/ghost/intern/GHOST_SystemWin32.cpp
branches/soc-2013-depsgraph_mt/intern/ghost/intern/GHOST_WindowCocoa.h
branches/soc-2013-depsgraph_mt/intern/ghost/intern/GHOST_WindowWin32.cpp
branches/soc-2013-depsgraph_mt/intern/locale/boost_locale_wrapper.cpp
branches/soc-2013-depsgraph_mt/intern/utfconv/utf_winfunc.c
branches/soc-2013-depsgraph_mt/release/datafiles/preview_cycles.blend
branches/soc-2013-depsgraph_mt/release/scripts/freestyle/style_modules/ChainingIterators.py
branches/soc-2013-depsgraph_mt/release/scripts/freestyle/style_modules/PredicatesB1D.py
branches/soc-2013-depsgraph_mt/release/scripts/freestyle/style_modules/PredicatesU1D.py
branches/soc-2013-depsgraph_mt/release/scripts/freestyle/style_modules/parameter_editor.py
branches/soc-2013-depsgraph_mt/release/scripts/freestyle/style_modules/shaders.py
branches/soc-2013-depsgraph_mt/release/scripts/modules/bpy/path.py
branches/soc-2013-depsgraph_mt/release/scripts/modules/bpy_extras/mesh_utils.py
branches/soc-2013-depsgraph_mt/release/scripts/modules/bpy_types.py
branches/soc-2013-depsgraph_mt/release/scripts/modules/rna_info.py
branches/soc-2013-depsgraph_mt/release/scripts/presets/keyconfig/maya.py
branches/soc-2013-depsgraph_mt/release/scripts/startup/bl_operators/node.py
branches/soc-2013-depsgraph_mt/release/scripts/startup/bl_operators/uvcalc_lightmap.py
branches/soc-2013-depsgraph_mt/release/scripts/startup/bl_operators/wm.py
branches/soc-2013-depsgraph_mt/release/scripts/startup/bl_ui/__init__.py
branches/soc-2013-depsgraph_mt/release/scripts/startup/bl_ui/properties_data_modifier.py
branches/soc-2013-depsgraph_mt/release/scripts/startup/bl_ui/properties_freestyle.py
branches/soc-2013-depsgraph_mt/release/scripts/startup/bl_ui/properties_physics_common.py
branches/soc-2013-depsgraph_mt/release/scripts/startup/bl_ui/properties_texture.py
branches/soc-2013-depsgraph_mt/release/scripts/startup/bl_ui/space_info.py
branches/soc-2013-depsgraph_mt/release/scripts/startup/bl_ui/space_sequencer.py
branches/soc-2013-depsgraph_mt/release/scripts/startup/bl_ui/space_text.py
branches/soc-2013-depsgraph_mt/release/scripts/templates_py/ui_list.py
branches/soc-2013-depsgraph_mt/release/text/readme.html
branches/soc-2013-depsgraph_mt/source/blender/blenkernel/BKE_customdata.h
branches/soc-2013-depsgraph_mt/source/blender/blenkernel/BKE_mesh.h
branches/soc-2013-depsgraph_mt/source/blender/blenkernel/BKE_modifier.h
branches/soc-2013-depsgraph_mt/source/blender/blenkernel/BKE_ocean.h
branches/soc-2013-depsgraph_mt/source/blender/blenkernel/BKE_texture.h
branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/CCGSubSurf.h
branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/anim.c
branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/boids.c
branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/bpath.c
branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/customdata.c
branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/depsgraph.c
branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/freestyle.c
branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/gpencil.c
branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/idprop.c
branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/library.c
branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/mesh.c
branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/mesh_validate.c
branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/modifier.c
branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/modifiers_bmesh.c
branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/object.c
branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/packedFile.c
branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/particle_system.c
branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/pbvh_intern.h
branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/rigidbody.c
branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/screen.c
branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/sequencer.c
branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/smoke.c
branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/texture.c
branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/tracking.c
branches/soc-2013-depsgraph_mt/source/blender/blenlib/BLI_alloca.h
branches/soc-2013-depsgraph_mt/source/blender/blenlib/BLI_convexhull2d.h
branches/soc-2013-depsgraph_mt/source/blender/blenlib/BLI_math_interp.h
branches/soc-2013-depsgraph_mt/source/blender/blenlib/PIL_time_utildefines.h
branches/soc-2013-depsgraph_mt/source/blender/blenlib/intern/math_geom.c
branches/soc-2013-depsgraph_mt/source/blender/blenlib/intern/path_util.c
branches/soc-2013-depsgraph_mt/source/blender/blenloader/intern/readfile.c
branches/soc-2013-depsgraph_mt/source/blender/blenloader/intern/writefile.c
branches/soc-2013-depsgraph_mt/source/blender/bmesh/intern/bmesh_construct.c
branches/soc-2013-depsgraph_mt/source/blender/bmesh/intern/bmesh_core.c
branches/soc-2013-depsgraph_mt/source/blender/bmesh/intern/bmesh_mesh.h
branches/soc-2013-depsgraph_mt/source/blender/bmesh/intern/bmesh_opdefines.c
branches/soc-2013-depsgraph_mt/source/blender/bmesh/intern/bmesh_operators.c
branches/soc-2013-depsgraph_mt/source/blender/bmesh/intern/bmesh_polygon.c
branches/soc-2013-depsgraph_mt/source/blender/bmesh/operators/bmo_beautify.c
branches/soc-2013-depsgraph_mt/source/blender/bmesh/operators/bmo_bridge.c
branches/soc-2013-depsgraph_mt/source/blender/bmesh/operators/bmo_edgenet.c
branches/soc-2013-depsgraph_mt/source/blender/bmesh/tools/bmesh_bevel.c
branches/soc-2013-depsgraph_mt/source/blender/bmesh/tools/bmesh_triangulate.h
branches/soc-2013-depsgraph_mt/source/blender/collada/DocumentImporter.cpp
branches/soc-2013-depsgraph_mt/source/blender/collada/MeshImporter.cpp
branches/soc-2013-depsgraph_mt/source/blender/compositor/COM_compositor.h
branches/soc-2013-depsgraph_mt/source/blender/compositor/COM_defines.h
branches/soc-2013-depsgraph_mt/source/blender/compositor/intern/COM_Debug.cpp
branches/soc-2013-depsgraph_mt/source/blender/compositor/nodes/COM_ImageNode.cpp
branches/soc-2013-depsgraph_mt/source/blender/compositor/nodes/COM_ImageNode.h
branches/soc-2013-depsgraph_mt/source/blender/compositor/nodes/COM_OutputFileNode.cpp
branches/soc-2013-depsgraph_mt/source/blender/compositor/operations/COM_MultilayerImageOperation.cpp
branches/soc-2013-depsgraph_mt/source/blender/compositor/operations/COM_MultilayerImageOperation.h
branches/soc-2013-depsgraph_mt/source/blender/compositor/operations/COM_OutputFileOperation.cpp
branches/soc-2013-depsgraph_mt/source/blender/editors/animation/anim_filter.c
branches/soc-2013-depsgraph_mt/source/blender/editors/curve/editfont.c
branches/soc-2013-depsgraph_mt/source/blender/editors/include/ED_lattice.h
branches/soc-2013-depsgraph_mt/source/blender/editors/interface/interface_handlers.c
branches/soc-2013-depsgraph_mt/source/blender/editors/interface/interface_ops.c
branches/soc-2013-depsgraph_mt/source/blender/editors/interface/interface_templates.c
branches/soc-2013-depsgraph_mt/source/blender/editors/interface/view2d_ops.c
branches/soc-2013-depsgraph_mt/source/blender/editors/mesh/editmesh_bisect.c
branches/soc-2013-depsgraph_mt/source/blender/editors/mesh/editmesh_knife.c
branches/soc-2013-depsgraph_mt/source/blender/editors/mesh/editmesh_select.c
branches/soc-2013-depsgraph_mt/source/blender/editors/mesh/editmesh_tools.c
branches/soc-2013-depsgraph_mt/source/blender/editors/mesh/editmesh_utils.c
branches/soc-2013-depsgraph_mt/source/blender/editors/mesh/meshtools.c
branches/soc-2013-depsgraph_mt/source/blender/editors/object/object_bake.c
branches/soc-2013-depsgraph_mt/source/blender/editors/object/object_edit.c
branches/soc-2013-depsgraph_mt/source/blender/editors/object/object_group.c
branches/soc-2013-depsgraph_mt/source/blender/editors/object/object_hook.c
branches/soc-2013-depsgraph_mt/source/blender/editors/object/object_transform.c
branches/soc-2013-depsgraph_mt/source/blender/editors/physics/particle_edit.c
branches/soc-2013-depsgraph_mt/source/blender/editors/render/render_internal.c
branches/soc-2013-depsgraph_mt/source/blender/editors/render/render_opengl.c
branches/soc-2013-depsgraph_mt/source/blender/editors/render/render_shading.c
branches/soc-2013-depsgraph_mt/source/blender/editors/screen/area.c
branches/soc-2013-depsgraph_mt/source/blender/editors/screen/screen_edit.c
branches/soc-2013-depsgraph_mt/source/blender/editors/screen/screendump.c
branches/soc-2013-depsgraph_mt/source/blender/editors/sculpt_paint/paint_image.c
branches/soc-2013-depsgraph_mt/source/blender/editors/sculpt_paint/paint_utils.c
branches/soc-2013-depsgraph_mt/source/blender/editors/sculpt_paint/paint_vertex.c
branches/soc-2013-depsgraph_mt/source/blender/editors/sculpt_paint/sculpt.c
branches/soc-2013-depsgraph_mt/source/blender/editors/space_clip/tracking_ops.c
branches/soc-2013-depsgraph_mt/source/blender/editors/space_console/console_ops.c
branches/soc-2013-depsgraph_mt/source/blender/editors/space_image/image_ops.c
branches/soc-2013-depsgraph_mt/source/blender/editors/space_info/textview.h
branches/soc-2013-depsgraph_mt/source/blender/editors/space_node/drawnode.c
branches/soc-2013-depsgraph_mt/source/blender/editors/space_node/node_view.c
branches/soc-2013-depsgraph_mt/source/blender/editors/space_outliner/outliner_tree.c
branches/soc-2013-depsgraph_mt/source/blender/editors/space_sequencer/sequencer_draw.c
branches/soc-2013-depsgraph_mt/source/blender/editors/space_sequencer/sequencer_edit.c
branches/soc-2013-depsgraph_mt/source/blender/editors/space_sequencer/sequencer_modifier.c
branches/soc-2013-depsgraph_mt/source/blender/editors/space_sequencer/sequencer_select.c
branches/soc-2013-depsgraph_mt/source/blender/editors/space_sequencer/sequencer_view.c
branches/soc-2013-depsgraph_mt/source/blender/editors/space_text/space_text.c
branches/soc-2013-depsgraph_mt/source/blender/editors/space_text/text_ops.c
branches/soc-2013-depsgraph_mt/source/blender/editors/space_view3d/drawobject.c
branches/soc-2013-depsgraph_mt/source/blender/editors/space_view3d/view3d_edit.c
branches/soc-2013-depsgraph_mt/source/blender/editors/space_view3d/view3d_select.c
branches/soc-2013-depsgraph_mt/source/blender/editors/space_view3d/view3d_view.c
branches/soc-2013-depsgraph_mt/source/blender/editors/transform/transform_conversions.c
branches/soc-2013-depsgraph_mt/source/blender/editors/transform/transform_generics.c
branches/soc-2013-depsgraph_mt/source/blender/editors/transform/transform_manipulator.c
branches/soc-2013-depsgraph_mt/source/blender/editors/transform/transform_ops.c
branches/soc-2013-depsgraph_mt/source/blender/editors/util/crazyspace.c
branches/soc-2013-depsgraph_mt/source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp
branches/soc-2013-depsgraph_mt/source/blender/freestyle/intern/stroke/StrokeRep.cpp
branches/soc-2013-depsgraph_mt/source/blender/gpu/intern/gpu_material.c
branches/soc-2013-depsgraph_mt/source/blender/gpu/shaders/gpu_shader_material.glsl
branches/soc-2013-depsgraph_mt/source/blender/makesdna/DNA_mesh_types.h
branches/soc-2013-depsgraph_mt/source/blender/makesdna/DNA_node_types.h
branches/soc-2013-depsgraph_mt/source/blender/makesdna/DNA_object_types.h
branches/soc-2013-depsgraph_mt/source/blender/makesdna/DNA_texture_types.h
branches/soc-2013-depsgraph_mt/source/blender/makesdna/intern/CMakeLists.txt
branches/soc-2013-depsgraph_mt/source/blender/makesrna/RNA_access.h
branches/soc-2013-depsgraph_mt/source/blender/makesrna/RNA_define.h
branches/soc-2013-depsgraph_mt/source/blender/makesrna/intern/CMakeLists.txt
branches/soc-2013-depsgraph_mt/source/blender/makesrna/intern/makesrna.c
branches/soc-2013-depsgraph_mt/source/blender/makesrna/intern/rna_ID.c
branches/soc-2013-depsgraph_mt/source/blender/makesrna/intern/rna_access.c
branches/soc-2013-depsgraph_mt/source/blender/makesrna/intern/rna_action.c
branches/soc-2013-depsgraph_mt/source/blender/makesrna/intern/rna_animation.c
branches/soc-2013-depsgraph_mt/source/blender/makesrna/intern/rna_boid.c
branches/soc-2013-depsgraph_mt/source/blender/makesrna/intern/rna_color.c
branches/soc-2013-depsgraph_mt/source/blender/makesrna/intern/rna_constraint.c
branches/soc-2013-depsgraph_mt/source/blender/makesrna/intern/rna_curve.c
branches/soc-2013-depsgraph_mt/source/blender/makesrna/intern/rna_define.c
branches/soc-2013-depsgraph_mt/source/blender/makesrna/intern/rna_dynamicpaint.c
branches/soc-2013-depsgraph_mt/source/blender/makesrna/intern/rna_fcurve.c
branches/soc-2013-depsgraph_mt/source/blender/makesrna/intern/rna_gpencil.c
branches/soc-2013-depsgraph_mt/source/blender/makesrna/intern/rna_internal.h
branches/soc-2013-depsgraph_mt/source/blender/makesrna/intern/rna_key.c
branches/soc-2013-depsgraph_mt/source/blender/makesrna/intern/rna_lamp.c
branches/soc-2013-depsgraph_mt/source/blender/makesrna/intern/rna_linestyle.c
branches/soc-2013-depsgraph_mt/source/blender/makesrna/intern/rna_main_api.c
branches/soc-2013-depsgraph_mt/source/blender/makesrna/intern/rna_material.c
branches/soc-2013-depsgraph_mt/source/blender/makesrna/intern/rna_mesh.c
branches/soc-2013-depsgraph_mt/source/blender/makesrna/intern/rna_mesh_api.c
branches/soc-2013-depsgraph_mt/source/blender/makesrna/intern/rna_mesh_utils.h
branches/soc-2013-depsgraph_mt/source/blender/makesrna/intern/rna_modifier.c
branches/soc-2013-depsgraph_mt/source/blender/makesrna/intern/rna_nla.c
branches/soc-2013-depsgraph_mt/source/blender/makesrna/intern/rna_nodetree.c
branches/soc-2013-depsgraph_mt/source/blender/makesrna/intern/rna_object.c
branches/soc-2013-depsgraph_mt/source/blender/makesrna/intern/rna_object_force.c
branches/soc-2013-depsgraph_mt/source/blender/makesrna/intern/rna_particle.c
branches/soc-2013-depsgraph_mt/source/blender/makesrna/intern/rna_pose.c
branches/soc-2013-depsgraph_mt/source/blender/makesrna/intern/rna_rigidbody.c
branches/soc-2013-depsgraph_mt/source/blender/makesrna/intern/rna_scene.c
branches/soc-2013-depsgraph_mt/source/blender/makesrna/intern/rna_screen.c
branches/soc-2013-depsgraph_mt/source/blender/makesrna/intern/rna_sculpt_paint.c
branches/soc-2013-depsgraph_mt/source/blender/makesrna/intern/rna_sequencer.c
branches/soc-2013-depsgraph_mt/source/blender/makesrna/intern/rna_smoke.c
branches/soc-2013-depsgraph_mt/source/blender/makesrna/intern/rna_space.c
branches/soc-2013-depsgraph_mt/source/blender/makesrna/intern/rna_test.c
branches/soc-2013-depsgraph_mt/source/blender/makesrna/intern/rna_texture.c
branches/soc-2013-depsgraph_mt/source/blender/makesrna/intern/rna_tracking.c
branches/soc-2013-depsgraph_mt/source/blender/makesrna/intern/rna_ui.c
branches/soc-2013-depsgraph_mt/source/blender/makesrna/intern/rna_userdef.c
branches/soc-2013-depsgraph_mt/source/blender/makesrna/intern/rna_wm.c
branches/soc-2013-depsgraph_mt/source/blender/makesrna/intern/rna_wm_api.c
branches/soc-2013-depsgraph_mt/source/blender/modifiers/intern/MOD_meshcache_util.h
branches/soc-2013-depsgraph_mt/source/blender/modifiers/intern/MOD_uvproject.c
branches/soc-2013-depsgraph_mt/source/blender/nodes/NOD_common.h
branches/soc-2013-depsgraph_mt/source/blender/nodes/NOD_static_types.h
branches/soc-2013-depsgraph_mt/source/blender/nodes/composite/nodes/node_composite_mapValue.c
branches/soc-2013-depsgraph_mt/source/blender/nodes/shader/node_shader_util.c
branches/soc-2013-depsgraph_mt/source/blender/nodes/shader/nodes/node_shader_gamma.c
branches/soc-2013-depsgraph_mt/source/blender/nodes/shader/nodes/node_shader_mapping.c
branches/soc-2013-depsgraph_mt/source/blender/nodes/shader/nodes/node_shader_tex_brick.c
branches/soc-2013-depsgraph_mt/source/blender/nodes/shader/nodes/node_shader_tex_checker.c
branches/soc-2013-depsgraph_mt/source/blender/nodes/shader/nodes/node_shader_tex_environment.c
branches/soc-2013-depsgraph_mt/source/blender/nodes/shader/nodes/node_shader_tex_gradient.c
branches/soc-2013-depsgraph_mt/source/blender/nodes/shader/nodes/node_shader_tex_image.c
branches/soc-2013-depsgraph_mt/source/blender/nodes/shader/nodes/node_shader_tex_magic.c
branches/soc-2013-depsgraph_mt/source/blender/nodes/shader/nodes/node_shader_tex_musgrave.c
branches/soc-2013-depsgraph_mt/source/blender/nodes/shader/nodes/node_shader_tex_noise.c
branches/soc-2013-depsgraph_mt/source/blender/nodes/shader/nodes/node_shader_tex_sky.c
branches/soc-2013-depsgraph_mt/source/blender/nodes/shader/nodes/node_shader_tex_voronoi.c
branches/soc-2013-depsgraph_mt/source/blender/nodes/shader/nodes/node_shader_tex_wave.c
branches/soc-2013-depsgraph_mt/source/blender/python/bmesh/bmesh_py_types.h
branches/soc-2013-depsgraph_mt/source/blender/python/generic/blf_py_api.h
branches/soc-2013-depsgraph_mt/source/blender/python/generic/idprop_py_api.c
branches/soc-2013-depsgraph_mt/source/blender/python/generic/py_capi_utils.c
branches/soc-2013-depsgraph_mt/source/blender/python/generic/py_capi_utils.h
branches/soc-2013-depsgraph_mt/source/blender/python/intern/bpy.h
branches/soc-2013-depsgraph_mt/source/blender/python/intern/bpy_driver.c
branches/soc-2013-depsgraph_mt/source/blender/python/intern/bpy_interface.c
branches/soc-2013-depsgraph_mt/source/blender/python/intern/bpy_intern_string.h
branches/soc-2013-depsgraph_mt/source/blender/python/intern/bpy_props.c
branches/soc-2013-depsgraph_mt/source/blender/python/intern/bpy_rna.c
branches/soc-2013-depsgraph_mt/source/blender/python/intern/bpy_rna_anim.h
branches/soc-2013-depsgraph_mt/source/blender/python/intern/bpy_rna_callback.h
branches/soc-2013-depsgraph_mt/source/blender/python/intern/gpu.h
branches/soc-2013-depsgraph_mt/source/blender/quicktime/apple/qtkit_export.m
branches/soc-2013-depsgraph_mt/source/blender/quicktime/apple/qtkit_import.m
branches/soc-2013-depsgraph_mt/source/blender/render/intern/include/texture.h
branches/soc-2013-depsgraph_mt/source/blender/render/intern/source/bake.c
branches/soc-2013-depsgraph_mt/source/blender/render/intern/source/rayshade.c
branches/soc-2013-depsgraph_mt/source/blender/render/intern/source/shadbuf.c
branches/soc-2013-depsgraph_mt/source/blender/windowmanager/WM_api.h
branches/soc-2013-depsgraph_mt/source/blender/windowmanager/WM_keymap.h
branches/soc-2013-depsgraph_mt/source/blender/windowmanager/WM_types.h
branches/soc-2013-depsgraph_mt/source/blender/windowmanager/intern/wm_event_system.c
branches/soc-2013-depsgraph_mt/source/blender/windowmanager/intern/wm_jobs.c
branches/soc-2013-depsgraph_mt/source/blender/windowmanager/intern/wm_keymap.c
branches/soc-2013-depsgraph_mt/source/blender/windowmanager/intern/wm_operators.c
branches/soc-2013-depsgraph_mt/source/blender/windowmanager/intern/wm_window.c
branches/soc-2013-depsgraph_mt/source/blenderplayer/bad_level_call_stubs/stubs.c
branches/soc-2013-depsgraph_mt/source/creator/CMakeLists.txt
branches/soc-2013-depsgraph_mt/source/gameengine/GameLogic/Joystick/SCA_Joystick.cpp
branches/soc-2013-depsgraph_mt/source/gameengine/Ketsji/KX_TouchEventManager.cpp
branches/soc-2013-depsgraph_mt/source/tools/check_style_c.py
Added Paths:
-----------
branches/soc-2013-depsgraph_mt/doc/python_api/examples/bpy.types.bpy_prop_collection.foreach_get.py
branches/soc-2013-depsgraph_mt/doc/python_api/examples/bpy.types.bpy_prop_collection.foreach_set.py
branches/soc-2013-depsgraph_mt/source/blender/collada/version.conf
branches/soc-2013-depsgraph_mt/source/tools/check_descriptions.py
Property Changed:
----------------
branches/soc-2013-depsgraph_mt/
branches/soc-2013-depsgraph_mt/source/blender/editors/interface/interface.c
branches/soc-2013-depsgraph_mt/source/blender/editors/space_outliner/
Property changes on: branches/soc-2013-depsgraph_mt
___________________________________________________________________
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-dingto:57424,57487,57507,57525,57599,57670,57918-57919,57981,58091,58245,58253,58587,58772,58774-58775,58828,58835,59032,59214,59220,59251,59601
/tags/blender-2.67b-release/blender:57122
/trunk/blender:57395-60197
+ /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-dingto:57424,57487,57507,57525,57599,57670,57918-57919,57981,58091,58245,58253,58587,58772,58774-58775,58828,58835,59032,59214,59220,59251,59601
/tags/blender-2.67b-release/blender:57122
/trunk/blender:57395-60467
Modified: branches/soc-2013-depsgraph_mt/CMakeLists.txt
===================================================================
--- branches/soc-2013-depsgraph_mt/CMakeLists.txt 2013-10-01 08:18:43 UTC (rev 60469)
+++ branches/soc-2013-depsgraph_mt/CMakeLists.txt 2013-10-01 08:19:31 UTC (rev 60470)
@@ -453,7 +453,7 @@
set_and_warn(WITH_OPENAL OFF) # depends on AUDASPACE
set_and_warn(WITH_GAMEENGINE OFF) # depends on AUDASPACE
-elseif(WITH_CYCLES OR WITH_MOD_BOOLEAN OR WITH_AUDASPACE OR WITH_INTERNATIONAL)
+elseif(WITH_CYCLES OR WITH_OPENIMAGEIO OR WITH_MOD_BOOLEAN OR WITH_AUDASPACE OR WITH_INTERNATIONAL)
# Keep enabled
else()
# Enabled but we don't need it
@@ -795,33 +795,38 @@
find_program(LLVM_CONFIG llvm-config)
endif()
endif()
- execute_process(COMMAND ${LLVM_CONFIG} --version
- OUTPUT_VARIABLE LLVM_VERSION
- OUTPUT_STRIP_TRAILING_WHITESPACE)
- execute_process(COMMAND ${LLVM_CONFIG} --prefix
- OUTPUT_VARIABLE LLVM_DIRECTORY
- OUTPUT_STRIP_TRAILING_WHITESPACE)
- execute_process(COMMAND ${LLVM_CONFIG} --libdir
- OUTPUT_VARIABLE LLVM_LIB_DIR
- OUTPUT_STRIP_TRAILING_WHITESPACE)
+ if(NOT DEFINED LLVM_VERSION)
+ execute_process(COMMAND ${LLVM_CONFIG} --version
+ OUTPUT_VARIABLE LLVM_VERSION
+ OUTPUT_STRIP_TRAILING_WHITESPACE)
+ set(LLVM_VERSION ${LLVM_VERSION} CACHE STRING "Version of LLVM to use")
+ endif()
+ if(NOT DEFINED LLVM_DIRECTORY)
+ execute_process(COMMAND ${LLVM_CONFIG} --prefix
+ OUTPUT_VARIABLE LLVM_DIRECTORY
+ OUTPUT_STRIP_TRAILING_WHITESPACE)
+ set(LLVM_DIRECTORY ${LLVM_DIRECTORY} CACHE PATH "Path to the LLVM installation")
+ endif()
+ if(NOT DEFINED LLVM_LIBPATH)
+ execute_process(COMMAND ${LLVM_CONFIG} --libdir
+ OUTPUT_VARIABLE LLVM_LIBPATH
+ OUTPUT_STRIP_TRAILING_WHITESPACE)
+ set(LLVM_LIBPATH ${LLVM_LIBPATH} CACHE PATH "Path to the LLVM library path")
+ endif()
+
if(LLVM_STATIC)
find_library(LLVM_LIBRARY
NAMES LLVMAnalysis # first of a whole bunch of libs to get
- PATHS ${LLVM_LIB_DIR})
+ PATHS ${LLVM_LIBPATH})
else()
find_library(LLVM_LIBRARY
NAMES LLVM-${LLVM_VERSION}
- PATHS ${LLVM_LIB_DIR})
+ PATHS ${LLVM_LIBPATH})
endif()
- message(STATUS "LLVM version = ${LLVM_VERSION}")
- message(STATUS "LLVM dir = ${LLVM_DIRECTORY}")
- message(STATUS "LLVM lib dir = ${LLVM_LIB_DIR}")
- set(LLVM_VERSION ${LLVM_VERSION} CACHE STRING "Version of LLVM to use")
- set(LLVM_DIRECTORY ${LLVM_DIRECTORY} CACHE PATH "Path to the LLVM installation")
- if(LLVM_LIBRARY AND LLVM_DIRECTORY AND LLVM_LIB_DIR)
+ if(LLVM_LIBRARY AND LLVM_DIRECTORY AND LLVM_LIBPATH)
if(LLVM_STATIC)
# if static LLVM libraries were requested, use llvm-config to generate
# the list of what libraries we need, and substitute that in the right
@@ -829,7 +834,7 @@
execute_process(COMMAND ${LLVM_CONFIG} --libfiles
OUTPUT_VARIABLE LLVM_LIBRARY
OUTPUT_STRIP_TRAILING_WHITESPACE)
- string(REPLACE " " ";" LLVM_LIBRARY ${LLVM_LIBRARY})
+ string(REPLACE " " ";" LLVM_LIBRARY "${LLVM_LIBRARY}")
endif()
else()
message(FATAL_ERROR "LLVM not found.")
@@ -1446,7 +1451,7 @@
if(WITH_LLVM)
set(LLVM_DIRECTORY ${LIBDIR}/llvm CACHE PATH "Path to the LLVM installation")
- set(LLVM_LIB_DIR ${LLVM_DIRECTORY}/lib)
+ set(LLVM_LIBPATH ${LLVM_DIRECTORY}/lib)
# Explicitly set llvm lib order.
#---- WARNING ON GCC ORDER OF LIBS IS IMPORTANT, DO NOT CHANGE! ---------
set(LLVM_LIBRARY LLVMSelectionDAG LLVMCodeGen LLVMScalarOpts LLVMAnalysis LLVMArchive
@@ -1740,13 +1745,13 @@
OUTPUT_VARIABLE LLVM_DIRECTORY
OUTPUT_STRIP_TRAILING_WHITESPACE)
execute_process(COMMAND ${LLVM_CONFIG} --libdir
- OUTPUT_VARIABLE LLVM_LIB_DIR
+ OUTPUT_VARIABLE LLVM_LIBPATH
OUTPUT_STRIP_TRAILING_WHITESPACE)
find_library(LLVM_LIBRARY
NAMES LLVMAnalysis # first of a whole bunch of libs to get
- PATHS ${LLVM_LIB_DIR})
+ PATHS ${LLVM_LIBPATH})
- if(LLVM_LIBRARY AND LLVM_DIRECTORY AND LLVM_LIB_DIR)
+ if(LLVM_LIBRARY AND LLVM_DIRECTORY AND LLVM_LIBPATH)
if(LLVM_STATIC)
# if static LLVM libraries were requested, use llvm-config to generate
# the list of what libraries we need, and substitute that in the right
@@ -1820,22 +1825,22 @@
if(WITH_CYCLES)
if(NOT WITH_OPENIMAGEIO)
- message(FATAL_ERROR "Cycles reqires WITH_OPENIMAGEIO, the library may not have been found. Configure OIIO or disable WITH_CYCLES")
+ message(FATAL_ERROR "Cycles requires WITH_OPENIMAGEIO, the library may not have been found. Configure OIIO or disable WITH_CYCLES")
endif()
if(NOT WITH_BOOST)
- message(FATAL_ERROR "Cycles reqires WITH_BOOST, the library may not have been found. Configure BOOST or disable WITH_CYCLES")
+ message(FATAL_ERROR "Cycles requires WITH_BOOST, the library may not have been found. Configure BOOST or disable WITH_CYCLES")
endif()
if(WITH_CYCLES_OSL)
if(NOT WITH_LLVM)
- message(FATAL_ERROR "Cycles OSL reqires WITH_LLVM, the library may not have been found. Configure LLVM or disable WITH_CYCLES_OSL")
+ message(FATAL_ERROR "Cycles OSL requires WITH_LLVM, the library may not have been found. Configure LLVM or disable WITH_CYCLES_OSL")
endif()
endif()
endif()
if(WITH_INTERNATIONAL)
if(NOT WITH_BOOST)
- message(FATAL_ERROR "Internationalization reqires WITH_BOOST, the library may not have been found. Configure BOOST or disable WITH_INTERNATIONAL")
+ message(FATAL_ERROR "Internationalization requires WITH_BOOST, the library may not have been found. Configure BOOST or disable WITH_INTERNATIONAL")
endif()
endif()
Modified: branches/soc-2013-depsgraph_mt/GNUmakefile
===================================================================
--- branches/soc-2013-depsgraph_mt/GNUmakefile 2013-10-01 08:18:43 UTC (rev 60469)
+++ branches/soc-2013-depsgraph_mt/GNUmakefile 2013-10-01 08:19:31 UTC (rev 60470)
@@ -182,6 +182,7 @@
@echo " * check_spelling_c_qtc - same as check_spelling_c but outputs QtCreator tasks format"
@echo " * check_spelling_osl - check for spelling errors (OSL only)"
@echo " * check_spelling_py - check for spelling errors (Python only)"
+ @echo " * check_descriptions - check for duplicate/invalid descriptions"
@echo ""
@echo "Utilities (not associated with building blender)"
@echo " * icons - updates PNG icons from SVG files."
@@ -313,6 +314,9 @@
check_spelling_osl:
cd $(BUILD_DIR) ; PYTHONIOENCODING=utf_8 python3 $(BLENDER_DIR)/source/tools/spell_check_source.py $(BLENDER_DIR)/intern/cycles/kernel/shaders
+check_descriptions:
+ $(BUILD_DIR)/bin/blender --background -noaudio --factory-startup --python $(BLENDER_DIR)/source/tools/check_descriptions.py
+
# -----------------------------------------------------------------------------
# Utilities
#
Modified: branches/soc-2013-depsgraph_mt/SConstruct
===================================================================
--- branches/soc-2013-depsgraph_mt/SConstruct 2013-10-01 08:18:43 UTC (rev 60469)
+++ branches/soc-2013-depsgraph_mt/SConstruct 2013-10-01 08:19:31 UTC (rev 60470)
@@ -322,7 +322,10 @@
if env['WITH_BF_CYCLES_OSL'] == 1:
OSX_OSL_LIBPATH = Dir(env.subst(env['BF_OSL_LIBPATH'])).abspath
# we need 2 variants of passing the oslexec with the force_load option, string and list type atm
- env.Append(LINKFLAGS=['-L'+OSX_OSL_LIBPATH,'-loslcomp','-force_load '+ OSX_OSL_LIBPATH +'/liboslexec.a','-loslquery'])
+ if env['CC'][:-2].endswith('4.8'):
+ env.Append(LINKFLAGS=['-L'+OSX_OSL_LIBPATH,'-loslcomp','-loslexec','-loslquery'])
+ else:
+ env.Append(LINKFLAGS=['-L'+OSX_OSL_LIBPATH,'-loslcomp','-force_load '+ OSX_OSL_LIBPATH +'/liboslexec.a','-loslquery'])
env.Append(BF_PROGRAM_LINKFLAGS=['-Xlinker','-force_load','-Xlinker',OSX_OSL_LIBPATH +'/liboslexec.a'])
# Trying to get rid of eventually clashes, we export some explicite as local symbols
@@ -906,6 +909,11 @@
for f in tf:
textlist.append(tp+os.sep+f)
+# Font licenses
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list