[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [46789] branches/soc-2008-mxcurioni: Merged changes in the trunk up to revision 46787.
Tamito Kajiyama
rd6t-kjym at asahi-net.or.jp
Sat May 19 10:40:57 CEST 2012
Revision: 46789
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=46789
Author: kjym3
Date: 2012-05-19 08:40:56 +0000 (Sat, 19 May 2012)
Log Message:
-----------
Merged changes in the trunk up to revision 46787.
Conflicts resolved:
source/blender/blenkernel/intern/idcode.c
source/blender/blenloader/intern/readfile.c
source/blender/editors/include/ED_anim_api.h
source/blender/editors/include/UI_resources.h
source/blender/makesrna/intern/rna_main.c
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=46787
Modified Paths:
--------------
branches/soc-2008-mxcurioni/CMakeLists.txt
branches/soc-2008-mxcurioni/GNUmakefile
branches/soc-2008-mxcurioni/build_files/cmake/macros.cmake
branches/soc-2008-mxcurioni/build_files/cmake/packaging.cmake
branches/soc-2008-mxcurioni/build_files/package_spec/rpm/blender.spec.in
branches/soc-2008-mxcurioni/build_files/scons/config/win32-vc-config.py
branches/soc-2008-mxcurioni/build_files/scons/config/win64-mingw-config.py
branches/soc-2008-mxcurioni/build_files/scons/tools/btools.py
branches/soc-2008-mxcurioni/extern/bullet2/readme.txt
branches/soc-2008-mxcurioni/extern/bullet2/src/LinearMath/btSerializer.h
branches/soc-2008-mxcurioni/extern/eltopo/CMakeLists.txt
branches/soc-2008-mxcurioni/extern/eltopo/common/ccd_defs.h
branches/soc-2008-mxcurioni/extern/eltopo/eltopo3d/collisionpipeline.cpp
branches/soc-2008-mxcurioni/extern/eltopo/eltopo3d/dynamicsurface.cpp
branches/soc-2008-mxcurioni/extern/eltopo/eltopo3d/dynamicsurface.h
branches/soc-2008-mxcurioni/extern/eltopo/eltopo3d/eltopo.cpp
branches/soc-2008-mxcurioni/intern/audaspace/CMakeLists.txt
branches/soc-2008-mxcurioni/intern/cycles/blender/blender_session.cpp
branches/soc-2008-mxcurioni/intern/cycles/device/device.h
branches/soc-2008-mxcurioni/intern/cycles/device/device_cpu.cpp
branches/soc-2008-mxcurioni/intern/cycles/device/device_cuda.cpp
branches/soc-2008-mxcurioni/intern/cycles/device/device_multi.cpp
branches/soc-2008-mxcurioni/intern/cycles/device/device_opencl.cpp
branches/soc-2008-mxcurioni/intern/cycles/kernel/kernel_compat_cpu.h
branches/soc-2008-mxcurioni/intern/cycles/kernel/kernel_compat_cuda.h
branches/soc-2008-mxcurioni/intern/cycles/kernel/kernel_light.h
branches/soc-2008-mxcurioni/intern/cycles/kernel/kernel_textures.h
branches/soc-2008-mxcurioni/intern/cycles/kernel/kernel_types.h
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/nodes/node_camera.osl
branches/soc-2008-mxcurioni/intern/cycles/kernel/svm/svm.h
branches/soc-2008-mxcurioni/intern/cycles/kernel/svm/svm_attribute.h
branches/soc-2008-mxcurioni/intern/cycles/kernel/svm/svm_image.h
branches/soc-2008-mxcurioni/intern/cycles/kernel/svm/svm_tex_coord.h
branches/soc-2008-mxcurioni/intern/cycles/render/film.cpp
branches/soc-2008-mxcurioni/intern/cycles/render/image.cpp
branches/soc-2008-mxcurioni/intern/cycles/render/image.h
branches/soc-2008-mxcurioni/intern/cycles/render/mesh.cpp
branches/soc-2008-mxcurioni/intern/cycles/render/scene.cpp
branches/soc-2008-mxcurioni/intern/cycles/render/scene.h
branches/soc-2008-mxcurioni/intern/cycles/util/util_math.h
branches/soc-2008-mxcurioni/intern/elbeem/CMakeLists.txt
branches/soc-2008-mxcurioni/intern/elbeem/intern/ntl_blenderdumper.cpp
branches/soc-2008-mxcurioni/intern/elbeem/intern/ntl_geometryobject.cpp
branches/soc-2008-mxcurioni/intern/elbeem/intern/ntl_vector3dim.h
branches/soc-2008-mxcurioni/intern/elbeem/intern/ntl_world.cpp
branches/soc-2008-mxcurioni/intern/elbeem/intern/particletracer.cpp
branches/soc-2008-mxcurioni/intern/elbeem/intern/solver_adap.cpp
branches/soc-2008-mxcurioni/intern/elbeem/intern/solver_init.cpp
branches/soc-2008-mxcurioni/intern/elbeem/intern/solver_main.cpp
branches/soc-2008-mxcurioni/intern/elbeem/intern/solver_relax.h
branches/soc-2008-mxcurioni/intern/elbeem/intern/solver_util.cpp
branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_DisplayManagerX11.cpp
branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_DisplayManagerX11.h
branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_DropTargetX11.cpp
branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_DropTargetX11.h
branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_NDOFManagerX11.cpp
branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_SystemPathsX11.cpp
branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_SystemPathsX11.h
branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_SystemX11.cpp
branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_SystemX11.h
branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_WindowX11.cpp
branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_WindowX11.h
branches/soc-2008-mxcurioni/release/scripts/startup/bl_operators/console.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_operators/image.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_operators/object.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_operators/presets.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_operators/wm.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_animviz.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_data_armature.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_data_bone.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_data_modifier.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_object.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_paint_common.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_physics_field.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_scene.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_texture.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/space_clip.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/space_node.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/space_text.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/space_time.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/space_userpref.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/space_view3d.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/space_view3d_toolbar.py
branches/soc-2008-mxcurioni/source/blender/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/SConscript
branches/soc-2008-mxcurioni/source/blender/avi/AVI_avi.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_DerivedMesh.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_action.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_armature.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_blender.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_bmesh.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_bmfont.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_booleanops_mesh.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_brush.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_bullet.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_bvhutils.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_camera.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_ccg.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_cdderivedmesh.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_collision.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_colortools.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_constraint.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_context.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_curve.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_customdata.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_customdata_file.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_deform.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_depsgraph.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_displist.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_dynamicpaint.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_effect.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_fcurve.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_fluidsim.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_global.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_group.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_icons.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_idprop.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_image.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_key.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_lattice.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_library.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_main.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_material.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_mesh.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_modifier.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_movieclip.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_navmesh_conversion.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_nla.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_node.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_object.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_ocean.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_packedFile.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_particle.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_plugin_types.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_pointcache.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_report.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_scene.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_screen.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_script.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_sequencer.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_shrinkwrap.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_sketch.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_smoke.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_softbody.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_subsurf.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_texture.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_unit.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_utildefines.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_writeffmpeg.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/blenkernel/depsgraph_private.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/CCGSubSurf.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/DerivedMesh.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/action.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/anim_sys.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/armature.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/cdderivedmesh.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/cloth.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/collision.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/colortools.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/constraint.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/curve.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/customdata.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/customdata_file.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/deform.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/depsgraph.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/displist.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/dynamicpaint.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/editderivedmesh.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/font.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/icons.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/idcode.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/idprop.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/image.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/key.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/lattice.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/mball.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/mesh.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/multires.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/nla.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/node.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/object.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/ocean.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/particle_system.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/report.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/seqeffects.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/sketch.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/softbody.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/sound.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/subsurf_ccg.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/suggestions.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/tracking.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/writeavi.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/writeffmpeg.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/nla_private.h
branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_args.h
branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_array.h
branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_bitmap.h
branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_bpath.h
branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_callbacks.h
branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_dlrbTree.h
branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_dynlib.h
branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_dynstr.h
branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_edgehash.h
branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_fileops.h
branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_fileops_types.h
branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_fnmatch.h
branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_ghash.h
branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_graph.h
branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_gsqueue.h
branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_heap.h
branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_jitter.h
branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_kdopbvh.h
branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_kdtree.h
branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_linklist.h
branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_math_base.h
branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_math_color.h
branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_math_geom.h
branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_math_matrix.h
branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_math_rotation.h
branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_math_vector.h
branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_memarena.h
branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_noise.h
branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_path_util.h
branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_rand.h
branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_rect.h
branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_scanfill.h
branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_smallhash.h
branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_string.h
branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_string_utf8.h
branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_threads.h
branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_utildefines.h
branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_vfontdata.h
branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_winstuff.h
branches/soc-2008-mxcurioni/source/blender/blenlib/PIL_time.h
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/BLI_args.c
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/BLI_dynstr.c
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/BLI_ghash.c
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/BLI_heap.c
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/BLI_kdopbvh.c
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/BLI_kdtree.c
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/BLI_linklist.c
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/BLI_memarena.c
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/BLI_mempool.c
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/DLRB_tree.c
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/boxpack2d.c
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/bpath.c
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/callbacks.c
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/cpu.c
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/dynlib.c
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/edgehash.c
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/fileops.c
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/freetypefont.c
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/graph.c
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/gsqueue.c
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/jitter.c
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/listbase.c
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/math_geom.c
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/math_rotation.c
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/math_vector_inline.c
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/noise.c
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/path_util.c
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/pbvh.c
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/rand.c
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/rct.c
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/scanfill.c
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/smallhash.c
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/storage.c
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/string.c
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/threads.c
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/time.c
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/uvproject.c
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/voxel.c
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/winstuff.c
branches/soc-2008-mxcurioni/source/blender/blenloader/BLO_readfile.h
branches/soc-2008-mxcurioni/source/blender/blenloader/BLO_sys_types.h
branches/soc-2008-mxcurioni/source/blender/blenloader/intern/readblenentry.c
branches/soc-2008-mxcurioni/source/blender/blenloader/intern/readfile.c
branches/soc-2008-mxcurioni/source/blender/blenloader/intern/readfile.h
branches/soc-2008-mxcurioni/source/blender/blenloader/intern/undofile.c
branches/soc-2008-mxcurioni/source/blender/blenloader/intern/versioning_legacy.c
branches/soc-2008-mxcurioni/source/blender/bmesh/intern/bmesh_core.c
branches/soc-2008-mxcurioni/source/blender/bmesh/intern/bmesh_mesh.c
branches/soc-2008-mxcurioni/source/blender/bmesh/intern/bmesh_opdefines.c
branches/soc-2008-mxcurioni/source/blender/bmesh/intern/bmesh_operators.c
branches/soc-2008-mxcurioni/source/blender/bmesh/intern/bmesh_operators.h
branches/soc-2008-mxcurioni/source/blender/bmesh/intern/bmesh_polygon.c
branches/soc-2008-mxcurioni/source/blender/bmesh/intern/bmesh_walkers.c
branches/soc-2008-mxcurioni/source/blender/bmesh/intern/bmesh_walkers_impl.c
branches/soc-2008-mxcurioni/source/blender/bmesh/operators/bmo_create.c
branches/soc-2008-mxcurioni/source/blender/bmesh/operators/bmo_dupe.c
branches/soc-2008-mxcurioni/source/blender/bmesh/operators/bmo_hull.c
branches/soc-2008-mxcurioni/source/blender/bmesh/operators/bmo_removedoubles.c
branches/soc-2008-mxcurioni/source/blender/bmesh/operators/bmo_triangulate.c
branches/soc-2008-mxcurioni/source/blender/bmesh/operators/bmo_utils.c
branches/soc-2008-mxcurioni/source/blender/bmesh/tools/BME_bevel.c
branches/soc-2008-mxcurioni/source/blender/collada/GeometryExporter.cpp
branches/soc-2008-mxcurioni/source/blender/collada/GeometryExporter.h
branches/soc-2008-mxcurioni/source/blender/collada/MeshImporter.cpp
branches/soc-2008-mxcurioni/source/blender/collada/MeshImporter.h
branches/soc-2008-mxcurioni/source/blender/editors/animation/anim_filter.c
branches/soc-2008-mxcurioni/source/blender/editors/armature/editarmature.c
branches/soc-2008-mxcurioni/source/blender/editors/armature/editarmature_retarget.c
branches/soc-2008-mxcurioni/source/blender/editors/armature/editarmature_sketch.c
branches/soc-2008-mxcurioni/source/blender/editors/armature/meshlaplacian.c
branches/soc-2008-mxcurioni/source/blender/editors/armature/reeb.c
branches/soc-2008-mxcurioni/source/blender/editors/curve/editcurve.c
branches/soc-2008-mxcurioni/source/blender/editors/datafiles/startup.blend.c
branches/soc-2008-mxcurioni/source/blender/editors/gpencil/gpencil_paint.c
branches/soc-2008-mxcurioni/source/blender/editors/include/BIF_gl.h
branches/soc-2008-mxcurioni/source/blender/editors/include/BIF_glutil.h
branches/soc-2008-mxcurioni/source/blender/editors/include/ED_anim_api.h
branches/soc-2008-mxcurioni/source/blender/editors/include/ED_armature.h
branches/soc-2008-mxcurioni/source/blender/editors/include/ED_clip.h
branches/soc-2008-mxcurioni/source/blender/editors/include/ED_curve.h
branches/soc-2008-mxcurioni/source/blender/editors/include/ED_fileselect.h
branches/soc-2008-mxcurioni/source/blender/editors/include/ED_fluidsim.h
branches/soc-2008-mxcurioni/source/blender/editors/include/ED_gpencil.h
branches/soc-2008-mxcurioni/source/blender/editors/include/ED_keyframes_draw.h
branches/soc-2008-mxcurioni/source/blender/editors/include/ED_keyframes_edit.h
branches/soc-2008-mxcurioni/source/blender/editors/include/ED_keyframing.h
branches/soc-2008-mxcurioni/source/blender/editors/include/ED_markers.h
branches/soc-2008-mxcurioni/source/blender/editors/include/ED_mesh.h
branches/soc-2008-mxcurioni/source/blender/editors/include/ED_numinput.h
branches/soc-2008-mxcurioni/source/blender/editors/include/ED_object.h
branches/soc-2008-mxcurioni/source/blender/editors/include/ED_render.h
branches/soc-2008-mxcurioni/source/blender/editors/include/ED_screen.h
branches/soc-2008-mxcurioni/source/blender/editors/include/ED_screen_types.h
branches/soc-2008-mxcurioni/source/blender/editors/include/ED_sculpt.h
branches/soc-2008-mxcurioni/source/blender/editors/include/ED_sequencer.h
branches/soc-2008-mxcurioni/source/blender/editors/include/ED_space_api.h
branches/soc-2008-mxcurioni/source/blender/editors/include/ED_transform.h
branches/soc-2008-mxcurioni/source/blender/editors/include/ED_types.h
branches/soc-2008-mxcurioni/source/blender/editors/include/ED_util.h
branches/soc-2008-mxcurioni/source/blender/editors/include/ED_view3d.h
branches/soc-2008-mxcurioni/source/blender/editors/include/UI_interface.h
branches/soc-2008-mxcurioni/source/blender/editors/include/UI_interface_icons.h
branches/soc-2008-mxcurioni/source/blender/editors/include/UI_resources.h
branches/soc-2008-mxcurioni/source/blender/editors/include/UI_view2d.h
branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_draw.c
branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_handlers.c
branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_icons.c
branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_intern.h
branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_panel.c
branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_regions.c
branches/soc-2008-mxcurioni/source/blender/editors/mesh/editface.c
branches/soc-2008-mxcurioni/source/blender/editors/mesh/editmesh_bvh.c
branches/soc-2008-mxcurioni/source/blender/editors/mesh/editmesh_knife.c
branches/soc-2008-mxcurioni/source/blender/editors/mesh/editmesh_select.c
branches/soc-2008-mxcurioni/source/blender/editors/mesh/editmesh_tools.c
branches/soc-2008-mxcurioni/source/blender/editors/mesh/editmesh_utils.c
branches/soc-2008-mxcurioni/source/blender/editors/mesh/mesh_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/mesh/meshtools.c
branches/soc-2008-mxcurioni/source/blender/editors/metaball/mball_edit.c
branches/soc-2008-mxcurioni/source/blender/editors/object/object_add.c
branches/soc-2008-mxcurioni/source/blender/editors/object/object_constraint.c
branches/soc-2008-mxcurioni/source/blender/editors/object/object_select.c
branches/soc-2008-mxcurioni/source/blender/editors/object/object_transform.c
branches/soc-2008-mxcurioni/source/blender/editors/physics/particle_edit.c
branches/soc-2008-mxcurioni/source/blender/editors/render/render_update.c
branches/soc-2008-mxcurioni/source/blender/editors/screen/screen_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/sculpt_paint/paint_cursor.c
branches/soc-2008-mxcurioni/source/blender/editors/sculpt_paint/paint_hide.c
branches/soc-2008-mxcurioni/source/blender/editors/sculpt_paint/paint_image.c
branches/soc-2008-mxcurioni/source/blender/editors/sculpt_paint/paint_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/sculpt_paint/paint_vertex.c
branches/soc-2008-mxcurioni/source/blender/editors/sculpt_paint/sculpt.c
branches/soc-2008-mxcurioni/source/blender/editors/space_api/spacetypes.c
branches/soc-2008-mxcurioni/source/blender/editors/space_clip/clip_editor.c
branches/soc-2008-mxcurioni/source/blender/editors/space_clip/clip_intern.h
branches/soc-2008-mxcurioni/source/blender/editors/space_clip/space_clip.c
branches/soc-2008-mxcurioni/source/blender/editors/space_clip/tracking_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/space_file/file_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/space_file/fsmenu.c
branches/soc-2008-mxcurioni/source/blender/editors/space_file/fsmenu.h
branches/soc-2008-mxcurioni/source/blender/editors/space_file/space_file.c
branches/soc-2008-mxcurioni/source/blender/editors/space_image/image_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/space_logic/logic_buttons.c
branches/soc-2008-mxcurioni/source/blender/editors/space_node/drawnode.c
branches/soc-2008-mxcurioni/source/blender/editors/space_node/node_draw.c
branches/soc-2008-mxcurioni/source/blender/editors/space_node/node_edit.c
branches/soc-2008-mxcurioni/source/blender/editors/space_node/node_intern.h
branches/soc-2008-mxcurioni/source/blender/editors/space_node/node_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/space_sequencer/sequencer_edit.c
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/drawobject.c
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/drawvolume.c
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/view3d_draw.c
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/view3d_edit.c
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/view3d_intern.h
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/view3d_select.c
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/view3d_snap.c
branches/soc-2008-mxcurioni/source/blender/editors/transform/transform.c
branches/soc-2008-mxcurioni/source/blender/editors/transform/transform.h
branches/soc-2008-mxcurioni/source/blender/editors/transform/transform_conversions.c
branches/soc-2008-mxcurioni/source/blender/editors/transform/transform_generics.c
branches/soc-2008-mxcurioni/source/blender/editors/transform/transform_manipulator.c
branches/soc-2008-mxcurioni/source/blender/editors/transform/transform_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/uvedit/uvedit_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/uvedit/uvedit_parametrizer.c
branches/soc-2008-mxcurioni/source/blender/editors/uvedit/uvedit_unwrap_ops.c
branches/soc-2008-mxcurioni/source/blender/gpu/intern/gpu_buffers.c
branches/soc-2008-mxcurioni/source/blender/gpu/intern/gpu_codegen.c
branches/soc-2008-mxcurioni/source/blender/gpu/intern/gpu_extensions.c
branches/soc-2008-mxcurioni/source/blender/gpu/shaders/gpu_shader_material.glsl
branches/soc-2008-mxcurioni/source/blender/gpu/shaders/gpu_shader_material.glsl.c
branches/soc-2008-mxcurioni/source/blender/ikplugin/intern/itasc_plugin.cpp
branches/soc-2008-mxcurioni/source/blender/imbuf/intern/IMB_anim.h
branches/soc-2008-mxcurioni/source/blender/imbuf/intern/IMB_metadata.h
branches/soc-2008-mxcurioni/source/blender/imbuf/intern/allocimbuf.c
branches/soc-2008-mxcurioni/source/blender/imbuf/intern/anim_movie.c
branches/soc-2008-mxcurioni/source/blender/imbuf/intern/bmp.c
branches/soc-2008-mxcurioni/source/blender/imbuf/intern/cache.c
branches/soc-2008-mxcurioni/source/blender/imbuf/intern/cineon/cineon_dpx.c
branches/soc-2008-mxcurioni/source/blender/imbuf/intern/divers.c
branches/soc-2008-mxcurioni/source/blender/imbuf/intern/filetype.c
branches/soc-2008-mxcurioni/source/blender/imbuf/intern/filter.c
branches/soc-2008-mxcurioni/source/blender/imbuf/intern/imageprocess.c
branches/soc-2008-mxcurioni/source/blender/imbuf/intern/indexer.c
branches/soc-2008-mxcurioni/source/blender/imbuf/intern/indexer_dv.c
branches/soc-2008-mxcurioni/source/blender/imbuf/intern/iris.c
branches/soc-2008-mxcurioni/source/blender/imbuf/intern/jp2.c
branches/soc-2008-mxcurioni/source/blender/imbuf/intern/jpeg.c
branches/soc-2008-mxcurioni/source/blender/imbuf/intern/metadata.c
branches/soc-2008-mxcurioni/source/blender/imbuf/intern/moviecache.c
branches/soc-2008-mxcurioni/source/blender/imbuf/intern/openexr/openexr_multi.h
branches/soc-2008-mxcurioni/source/blender/imbuf/intern/png.c
branches/soc-2008-mxcurioni/source/blender/imbuf/intern/radiance_hdr.c
branches/soc-2008-mxcurioni/source/blender/imbuf/intern/readimage.c
branches/soc-2008-mxcurioni/source/blender/imbuf/intern/rotate.c
branches/soc-2008-mxcurioni/source/blender/imbuf/intern/scaling.c
branches/soc-2008-mxcurioni/source/blender/imbuf/intern/targa.c
branches/soc-2008-mxcurioni/source/blender/imbuf/intern/thumbs.c
branches/soc-2008-mxcurioni/source/blender/imbuf/intern/thumbs_blend.c
branches/soc-2008-mxcurioni/source/blender/imbuf/intern/tiff.c
branches/soc-2008-mxcurioni/source/blender/imbuf/intern/util.c
branches/soc-2008-mxcurioni/source/blender/imbuf/intern/writeimage.c
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_ID.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_meshdata_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_modifier_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_movieclip_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_node_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_scene_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_texture_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/intern/dna_genfile.c
branches/soc-2008-mxcurioni/source/blender/makesdna/intern/makesdna.c
branches/soc-2008-mxcurioni/source/blender/makesrna/RNA_types.h
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/makesrna.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_ID.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_access.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_action.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_actuator.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_animation.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_animation_api.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_animviz.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_armature.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_armature_api.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_boid.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_brush.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_camera.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_cloth.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_color.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_constraint.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_context.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_controller.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_curve.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_define.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_dynamicpaint.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_fcurve.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_fluidsim.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_gpencil.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_group.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_image.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_image_api.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_key.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_lamp.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_lattice.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_main.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_main_api.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_material.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_mesh.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_mesh_api.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_meta.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_modifier.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_movieclip.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_nla.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_nodetree.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_nodetree_types.h
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_object.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_object_api.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_object_force.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_packedfile.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_particle.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_pose.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_pose_api.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_property.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_render.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_rna.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_scene_api.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_screen.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_sculpt_paint.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_sensor.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_sequencer.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_sequencer_api.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_smoke.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_sound.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_space.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_text.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_text_api.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_texture.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_texture_api.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_timeline.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_tracking.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_ui.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_ui_api.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_userdef.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_wm.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_wm_api.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_world.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_boolean_util.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_build.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_cast.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_mask.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_mirror.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_remesh.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_screw.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_solidify.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_util.c
branches/soc-2008-mxcurioni/source/blender/nodes/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/nodes/NOD_composite.h
branches/soc-2008-mxcurioni/source/blender/nodes/SConscript
branches/soc-2008-mxcurioni/source/blender/nodes/composite/node_composite_tree.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_bilateralblur.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_brightness.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_displace.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_image.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_viewer.c
branches/soc-2008-mxcurioni/source/blender/nodes/shader/node_shader_tree.c
branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_squeeze.c
branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_tex_environment.c
branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_tex_image.c
branches/soc-2008-mxcurioni/source/blender/nodes/texture/node_texture_tree.c
branches/soc-2008-mxcurioni/source/blender/python/intern/bpy_interface.c
branches/soc-2008-mxcurioni/source/blender/python/intern/bpy_rna.c
branches/soc-2008-mxcurioni/source/blender/python/intern/bpy_rna_callback.c
branches/soc-2008-mxcurioni/source/blender/quicktime/apple/quicktime_export.c
branches/soc-2008-mxcurioni/source/blender/quicktime/apple/quicktime_import.c
branches/soc-2008-mxcurioni/source/blender/render/intern/include/strand.h
branches/soc-2008-mxcurioni/source/blender/render/intern/raytrace/bvh.h
branches/soc-2008-mxcurioni/source/blender/render/intern/raytrace/rayobject.cpp
branches/soc-2008-mxcurioni/source/blender/render/intern/raytrace/rayobject_blibvh.cpp
branches/soc-2008-mxcurioni/source/blender/render/intern/raytrace/rayobject_hint.h
branches/soc-2008-mxcurioni/source/blender/render/intern/raytrace/rayobject_qbvh.cpp
branches/soc-2008-mxcurioni/source/blender/render/intern/raytrace/rayobject_rtbuild.cpp
branches/soc-2008-mxcurioni/source/blender/render/intern/raytrace/rayobject_rtbuild.h
branches/soc-2008-mxcurioni/source/blender/render/intern/raytrace/rayobject_svbvh.cpp
branches/soc-2008-mxcurioni/source/blender/render/intern/raytrace/rayobject_vbvh.cpp
branches/soc-2008-mxcurioni/source/blender/render/intern/raytrace/reorganize.h
branches/soc-2008-mxcurioni/source/blender/render/intern/raytrace/svbvh.h
branches/soc-2008-mxcurioni/source/blender/render/intern/raytrace/vbvh.h
branches/soc-2008-mxcurioni/source/blender/render/intern/source/convertblender.c
branches/soc-2008-mxcurioni/source/blender/render/intern/source/occlusion.c
branches/soc-2008-mxcurioni/source/blender/render/intern/source/pipeline.c
branches/soc-2008-mxcurioni/source/blender/render/intern/source/rayshade.c
branches/soc-2008-mxcurioni/source/blender/render/intern/source/shadeinput.c
branches/soc-2008-mxcurioni/source/blender/render/intern/source/sss.c
branches/soc-2008-mxcurioni/source/blender/render/intern/source/strand.c
branches/soc-2008-mxcurioni/source/blender/render/intern/source/sunsky.c
branches/soc-2008-mxcurioni/source/blender/render/intern/source/texture_ocean.c
branches/soc-2008-mxcurioni/source/blender/render/intern/source/volume_precache.c
branches/soc-2008-mxcurioni/source/blender/render/intern/source/zbuf.c
branches/soc-2008-mxcurioni/source/blender/windowmanager/WM_api.h
branches/soc-2008-mxcurioni/source/blender/windowmanager/intern/wm.c
branches/soc-2008-mxcurioni/source/blender/windowmanager/intern/wm_gesture.c
branches/soc-2008-mxcurioni/source/blender/windowmanager/intern/wm_operators.c
branches/soc-2008-mxcurioni/source/blender/windowmanager/intern/wm_window.c
branches/soc-2008-mxcurioni/source/blender/windowmanager/wm_cursors.h
branches/soc-2008-mxcurioni/source/blenderplayer/bad_level_call_stubs/stubs.c
branches/soc-2008-mxcurioni/source/creator/CMakeLists.txt
branches/soc-2008-mxcurioni/source/creator/buildinfo.c
branches/soc-2008-mxcurioni/source/creator/creator.c
branches/soc-2008-mxcurioni/source/gameengine/Converter/BL_BlenderDataConversion.cpp
branches/soc-2008-mxcurioni/source/gameengine/GameLogic/SCA_PythonController.cpp
branches/soc-2008-mxcurioni/source/gameengine/GameLogic/SCA_RandomNumberGenerator.h
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_PythonInit.cpp
branches/soc-2008-mxcurioni/source/gameengine/VideoTexture/CMakeLists.txt
branches/soc-2008-mxcurioni/source/tools/GL/core.gl
branches/soc-2008-mxcurioni/source/tools/GL/extensions.gl
branches/soc-2008-mxcurioni/source/tools/GL/glreport.py
branches/soc-2008-mxcurioni/source/tools/check_style_c.py
branches/soc-2008-mxcurioni/source/tools/uncrustify.cfg
Added Paths:
-----------
branches/soc-2008-mxcurioni/extern/bullet2/patches/
branches/soc-2008-mxcurioni/intern/elbeem/intern/globals.h
branches/soc-2008-mxcurioni/source/blender/compositor/
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_bokehblur.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_bokehimage.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_boxmask.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_colorcorrection.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_ellipsemask.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_switch.c
branches/soc-2008-mxcurioni/source/blender/opencl/
branches/soc-2008-mxcurioni/source/tools/GL/agl.gl
branches/soc-2008-mxcurioni/source/tools/GL/cgl.gl
branches/soc-2008-mxcurioni/source/tools/GL/deprecated.gl
branches/soc-2008-mxcurioni/source/tools/GL/egl.gl
branches/soc-2008-mxcurioni/source/tools/GL/glX.gl
branches/soc-2008-mxcurioni/source/tools/GL/libraries.gl
branches/soc-2008-mxcurioni/source/tools/GL/wgl.gl
Removed Paths:
-------------
branches/soc-2008-mxcurioni/source/tools/GL/system.gl
Property Changed:
----------------
branches/soc-2008-mxcurioni/
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_data_armature.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_data_bone.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_data_modifier.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_physics_field.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_texture.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/space_node.py
branches/soc-2008-mxcurioni/source/blender/editors/render/render_update.c
Property changes on: branches/soc-2008-mxcurioni
___________________________________________________________________
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
/trunk/blender:34011-39896,39898-40096,40098-44221,44223-44419,44421-46557
+ /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
/trunk/blender:34011-39896,39898-40096,40098-44221,44223-44419,44421-46787
Modified: branches/soc-2008-mxcurioni/CMakeLists.txt
===================================================================
--- branches/soc-2008-mxcurioni/CMakeLists.txt 2012-05-18 21:13:22 UTC (rev 46788)
+++ branches/soc-2008-mxcurioni/CMakeLists.txt 2012-05-19 08:40:56 UTC (rev 46789)
@@ -291,8 +291,9 @@
message(STATUS "Setting compiler to: " ${CMAKE_XCODE_ATTRIBUTE_GCC_VERSION})
endif()
else() # unix makefile generator does not fill XCODE_VERSION var, so we get it with a command
- execute_process(COMMAND xcodebuild -version OUTPUT_VARIABLE XCODE_VERS_BUILDNR )
- STRING(SUBSTRING ${XCODE_VERS_BUILDNR} 6 3 XCODE_VERSION) # truncate away build-nr
+ execute_process(COMMAND xcodebuild -version OUTPUT_VARIABLE XCODE_VERS_BUILD_NR)
+ string(SUBSTRING "${XCODE_VERS_BUILD_NR}" 6 3 XCODE_VERSION) # truncate away build-nr
+ unset(XCODE_VERS_BUILD_NR)
endif()
message(STATUS "Detected Xcode-version: " ${XCODE_VERSION})
@@ -370,10 +371,6 @@
"because it is currently unsupported, remove this "
"line if youre a developer who wants to add support.")
endif()
-
- if((WITH_MINGW64) AND (WITH_OPENCOLLADA))
- message(FATAL_ERROR "MINGW64 still doesn't support: WITH_OPENCOLLADA/WITH_CODEC_FFMPEG")
- endif()
endif()
TEST_SSE_SUPPORT(COMPILER_SSE_FLAG COMPILER_SSE2_FLAG)
@@ -841,6 +838,17 @@
set(GETTEXT_LIBPATH ${GETTEXT}/lib)
set(GETTEXT_LIBRARIES gnu_gettext)
endif()
+
+ if(WITH_MOD_CLOTH_ELTOPO)
+ set(LAPACK ${LIBDIR}/lapack)
+ # set(LAPACK_INCLUDE_DIR ${LAPACK}/include)
+ set_lib_path(LAPACK_LIBPATH ${LAPACK}/lib)
+ set(LAPACK_LIBRARIES
+ ${LIBDIR}/lapack/lib/libf2c.lib
+ ${LIBDIR}/lapack/lib/clapack_nowrap.lib
+ ${LIBDIR}/lapack/lib/BLAS_nowrap.lib
+ )
+ endif()
set(PNG_LIBRARIES libpng)
set(JPEG_LIBRARIES libjpeg)
@@ -1015,8 +1023,10 @@
set(PLATFORM_CFLAGS "-pipe -funsigned-char -fno-strict-aliasing")
if(WITH_MINGW64)
- #Yes, the point for MinGW64 is moar optimization by default :)
- set(PLATFORM_CFLAGS "${PLATFORM_CFLAGS} -mmmx -msse -msse2 -ftree-vectorize")
+ #We need to take care though not to have these on debug builds because they may play funky with gdb
+ if(CMAKE_BUILD_TYPE MATCHES "Release")
+ set(PLATFORM_CFLAGS "${PLATFORM_CFLAGS} -mmmx -ftree-vectorize")
+ endif()
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fpermissive")
set(PLATFORM_LINKLIBS "${PLATFORM_LINKLIBS} -lpthread")
@@ -1081,7 +1091,11 @@
${LIBDIR}/opencollada/include/GeneratedSaxParser/include
)
set(OPENCOLLADA_LIBPATH ${OPENCOLLADA}/lib ${OPENCOLLADA}/lib)
- set(OPENCOLLADA_LIBRARIES OpenCOLLADAStreamWriter OpenCOLLADASaxFrameworkLoader OpenCOLLADAFramework OpenCOLLADABaseUtils GeneratedSaxParser UTF MathMLSolver expat pcre buffer ftoa)
+ if(WITH_MINGW64)
+ set(OPENCOLLADA_LIBRARIES OpenCOLLADAStreamWriter OpenCOLLADASaxFrameworkLoader OpenCOLLADAFramework OpenCOLLADABaseUtils GeneratedSaxParser UTF MathMLSolver pcre buffer ftoa xml)
+ else()
+ set(OPENCOLLADA_LIBRARIES OpenCOLLADAStreamWriter OpenCOLLADASaxFrameworkLoader OpenCOLLADAFramework OpenCOLLADABaseUtils GeneratedSaxParser UTF MathMLSolver expat pcre buffer ftoa)
+ endif()
set(PCRE_LIBRARIES pcre)
endif()
Modified: branches/soc-2008-mxcurioni/GNUmakefile
===================================================================
--- branches/soc-2008-mxcurioni/GNUmakefile 2012-05-18 21:13:22 UTC (rev 46788)
+++ branches/soc-2008-mxcurioni/GNUmakefile 2012-05-19 08:40:56 UTC (rev 46789)
@@ -216,7 +216,7 @@
test_style:
# run our own checks on C/C++ style
- PYTHONIOENCODING=utf_8 python3.2 $(BLENDER_DIR)/source/tools/check_style_c.py $(BLENDER_DIR)/source/blender $(BLENDER_DIR)/source/creator
+ PYTHONIOENCODING=utf_8 python3.2 $(BLENDER_DIR)/source/tools/check_style_c.py $(BLENDER_DIR)/source/blender $(BLENDER_DIR)/source/creator --no-length-check
# -----------------------------------------------------------------------------
# Project Files
Modified: branches/soc-2008-mxcurioni/build_files/cmake/macros.cmake
===================================================================
--- branches/soc-2008-mxcurioni/build_files/cmake/macros.cmake 2012-05-18 21:13:22 UTC (rev 46788)
+++ branches/soc-2008-mxcurioni/build_files/cmake/macros.cmake 2012-05-19 08:40:56 UTC (rev 46789)
@@ -214,7 +214,8 @@
${OPENGL_glu_LIBRARY}
${PNG_LIBRARIES}
${ZLIB_LIBRARIES}
- ${FREETYPE_LIBRARY})
+ ${FREETYPE_LIBRARY}
+ ${LAPACK_LIBRARIES})
# since we are using the local libs for python when compiling msvc projects, we need to add _d when compiling debug versions
if(WITH_PYTHON) # AND NOT WITH_PYTHON_MODULE # WIN32 needs
Modified: branches/soc-2008-mxcurioni/build_files/cmake/packaging.cmake
===================================================================
--- branches/soc-2008-mxcurioni/build_files/cmake/packaging.cmake 2012-05-18 21:13:22 UTC (rev 46788)
+++ branches/soc-2008-mxcurioni/build_files/cmake/packaging.cmake 2012-05-19 08:40:56 UTC (rev 46789)
@@ -1,5 +1,5 @@
set(PROJECT_DESCRIPTION "Blender is a very fast and versatile 3D modeller/renderer.")
-set(PROJECT_COPYRIGHT "Copyright (C) 2001-2011 Blender Foundation")
+set(PROJECT_COPYRIGHT "Copyright (C) 2001-2012 Blender Foundation")
set(PROJECT_CONTACT "foundation at blender.org")
set(PROJECT_VENDOR "Blender Foundation")
set(ORG_WEBSITE "www.blender.org")
@@ -31,7 +31,7 @@
# Force Package Name
-set(CPACK_PACKAGE_FILE_NAME ${PROJECT_NAME}-${BLENDER_VERSION}-r${BUILD_REV}-${CMAKE_SYSTEM_PROCESSOR})
+set(CPACK_PACKAGE_FILE_NAME ${PROJECT_NAME}-${MAJOR_VERSION}.${MINOR_VERSION}.${PATCH_VERSION}-1.r${BUILD_REV}-${CMAKE_SYSTEM_PROCESSOR})
if(CMAKE_SYSTEM_NAME MATCHES "Linux")
# RPM packages
Modified: branches/soc-2008-mxcurioni/build_files/package_spec/rpm/blender.spec.in
===================================================================
--- branches/soc-2008-mxcurioni/build_files/package_spec/rpm/blender.spec.in 2012-05-18 21:13:22 UTC (rev 46788)
+++ branches/soc-2008-mxcurioni/build_files/package_spec/rpm/blender.spec.in 2012-05-19 08:40:56 UTC (rev 46789)
@@ -1,6 +1,12 @@
# -*- rpm-spec -*-
%global __python %{__python3}
+%global blender_api @CPACK_PACKAGE_VERSION_MAJOR at .@CPACK_PACKAGE_VERSION_MINOR@
+%define _rpmdir @CPACK_RPM_DIRECTORY@
+%define _rpmfilename @CPACK_RPM_FILE_NAME@
+%define _unpackaged_files_terminate_build 0
+%define _topdir @CPACK_RPM_DIRECTORY@
+
BuildRoot: @CPACK_RPM_DIRECTORY@/@CPACK_PACKAGE_FILE_NAME@@CPACK_RPM_PACKAGE_COMPONENT_PART_PATH@
Summary: @CPACK_RPM_PACKAGE_SUMMARY@
Name: @CPACK_RPM_PACKAGE_NAME@
@@ -9,13 +15,18 @@
License: @CPACK_RPM_PACKAGE_LICENSE@
Group: @CPACK_RPM_PACKAGE_GROUP@
Vendor: @CPACK_RPM_PACKAGE_VENDOR@
-Epoch: 1
+Epoch: 1
-%define _rpmdir @CPACK_RPM_DIRECTORY@
-%define _rpmfilename @CPACK_RPM_FILE_NAME@
-%define _unpackaged_files_terminate_build 0
-%define _topdir @CPACK_RPM_DIRECTORY@
+Requires(post): desktop-file-utils
+Requires(post): shared-mime-info
+Requires(postun): desktop-file-utils
+Requires(postun): shared-mime-info
+Provides: blender(ABI) = %{blender_api}
+Provides: blender-fonts = %{?epoch:%{epoch}:}%{version}-%{release}
+
+Obsoletes: blender-fonts <= 2.49a-9
+
%description
Blender is an integrated 3d suite for modelling, animation, rendering,
post-production, interactive creation and playback (games). Blender has its
@@ -40,6 +51,10 @@
fi
mv "@CPACK_TOPLEVEL_DIRECTORY@/tmpBBroot" ${RPM_BUILD_ROOT}
+rm -f ${RPM_BUILD_ROOT}%{_bindir}/blender-thumbnailer.py
+
+%find_lang %{name}
+
%clean
rm -rf ${RPM_BUILD_ROOT}
@@ -57,14 +72,15 @@
%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor
fi || :
-%files
+%files -f blender.lang
%defattr(-,root,root,-)
%{_bindir}/%{name}
-%{_datadir}/%{name}/@CPACK_PACKAGE_VERSION_MAJOR at .@CPACK_PACKAGE_VERSION_MINOR@
+%{_datadir}/%{name}/%{blender_api}/datafiles/fonts
+%{_datadir}/%{name}/%{blender_api}/scripts
%{_datadir}/icons/hicolor/*/apps/%{name}.*
%{_datadir}/applications/%{name}.desktop
-%{_datadir}/doc/blender
-%{_mandir}/man1/blender.*
+%{_datadir}/doc/%{name}
+%{_mandir}/man1/%{name}.*
%changelog
@CPACK_RPM_SPEC_CHANGELOG@
Modified: branches/soc-2008-mxcurioni/build_files/scons/config/win32-vc-config.py
===================================================================
--- branches/soc-2008-mxcurioni/build_files/scons/config/win32-vc-config.py 2012-05-18 21:13:22 UTC (rev 46788)
+++ branches/soc-2008-mxcurioni/build_files/scons/config/win32-vc-config.py 2012-05-19 08:40:56 UTC (rev 46789)
@@ -165,7 +165,7 @@
#CUDA
WITH_BF_CYCLES_CUDA_BINARIES = False
#BF_CYCLES_CUDA_NVCC = "" # Path to the nvidia compiler
-BF_CYCLES_CUDA_BINARIES_ARCH = ['sm_13', 'sm_20', 'sm_21']
+BF_CYCLES_CUDA_BINARIES_ARCH = ['sm_20', 'sm_21'] # don't build sm_13 until the compile can fit in 32bit process again :)
#Ray trace optimization
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list