[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [47387] branches/soc-2008-mxcurioni: Merged changes in the trunk up to revision 47381.
Tamito Kajiyama
rd6t-kjym at asahi-net.or.jp
Sun Jun 3 23:11:23 CEST 2012
Revision: 47387
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=47387
Author: kjym3
Date: 2012-06-03 21:11:10 +0000 (Sun, 03 Jun 2012)
Log Message:
-----------
Merged changes in the trunk up to revision 47381.
Conflicts resolved:
source/blender/blenloader/intern/readfile.c
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=47381
Modified Paths:
--------------
branches/soc-2008-mxcurioni/CMakeLists.txt
branches/soc-2008-mxcurioni/GNUmakefile
branches/soc-2008-mxcurioni/SConstruct
branches/soc-2008-mxcurioni/build_files/cmake/config/blender_lite.cmake
branches/soc-2008-mxcurioni/build_files/cmake/macros.cmake
branches/soc-2008-mxcurioni/build_files/scons/config/win32-vc-config.py
branches/soc-2008-mxcurioni/build_files/scons/config/win64-vc-config.py
branches/soc-2008-mxcurioni/extern/bullet2/CMakeLists.txt
branches/soc-2008-mxcurioni/extern/bullet2/src/BulletCollision/BroadphaseCollision/btQuantizedBvh.h
branches/soc-2008-mxcurioni/extern/bullet2/src/BulletDynamics/Character/btKinematicCharacterController.cpp
branches/soc-2008-mxcurioni/extern/bullet2/src/SConscript
branches/soc-2008-mxcurioni/extern/libredcode/codec.c
branches/soc-2008-mxcurioni/intern/boolop/intern/BOP_Face2Face.cpp
branches/soc-2008-mxcurioni/intern/cycles/CMakeLists.txt
branches/soc-2008-mxcurioni/intern/cycles/SConscript
branches/soc-2008-mxcurioni/intern/cycles/app/cycles_xml.cpp
branches/soc-2008-mxcurioni/intern/cycles/blender/blender_mesh.cpp
branches/soc-2008-mxcurioni/intern/cycles/blender/blender_object.cpp
branches/soc-2008-mxcurioni/intern/cycles/blender/blender_shader.cpp
branches/soc-2008-mxcurioni/intern/cycles/blender/blender_sync.cpp
branches/soc-2008-mxcurioni/intern/cycles/device/device_cuda.cpp
branches/soc-2008-mxcurioni/intern/cycles/device/device_opencl.cpp
branches/soc-2008-mxcurioni/intern/cycles/kernel/CMakeLists.txt
branches/soc-2008-mxcurioni/intern/cycles/kernel/SConscript
branches/soc-2008-mxcurioni/intern/cycles/kernel/kernel_bvh.h
branches/soc-2008-mxcurioni/intern/cycles/kernel/kernel_compat_cuda.h
branches/soc-2008-mxcurioni/intern/cycles/kernel/kernel_projection.h
branches/soc-2008-mxcurioni/intern/cycles/kernel/kernel_textures.h
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/bsdf_oren_nayar.cpp
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/nodes/CMakeLists.txt
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/nodes/node_musgrave_texture.osl
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/nodes/node_noise_texture.osl
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/nodes/node_voronoi_texture.osl
branches/soc-2008-mxcurioni/intern/cycles/kernel/svm/svm_noisetex.h
branches/soc-2008-mxcurioni/intern/cycles/kernel/svm/svm_tex_coord.h
branches/soc-2008-mxcurioni/intern/cycles/kernel/svm/svm_wave.h
branches/soc-2008-mxcurioni/intern/cycles/render/graph.cpp
branches/soc-2008-mxcurioni/intern/cycles/render/nodes.cpp
branches/soc-2008-mxcurioni/intern/cycles/render/object.cpp
branches/soc-2008-mxcurioni/intern/cycles/render/object.h
branches/soc-2008-mxcurioni/intern/cycles/util/util_thread.h
branches/soc-2008-mxcurioni/intern/cycles/util/util_transform.h
branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_Debug.h
branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_System.cpp
branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_SystemCarbon.cpp
branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_SystemCocoa.mm
branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_SystemWin32.cpp
branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_WindowCarbon.cpp
branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_WindowCocoa.mm
branches/soc-2008-mxcurioni/intern/ghost/test/multitest/EventToBuf.c
branches/soc-2008-mxcurioni/intern/ghost/test/multitest/MultiTest.c
branches/soc-2008-mxcurioni/intern/ghost/test/multitest/ScrollBar.c
branches/soc-2008-mxcurioni/intern/guardedalloc/intern/mallocn.c
branches/soc-2008-mxcurioni/intern/itasc/kdl/frames.hpp
branches/soc-2008-mxcurioni/intern/itasc/kdl/frames.inl
branches/soc-2008-mxcurioni/intern/itasc/kdl/segment.hpp
branches/soc-2008-mxcurioni/intern/itasc/kdl/tree.cpp
branches/soc-2008-mxcurioni/intern/itasc/kdl/tree.hpp
branches/soc-2008-mxcurioni/intern/smoke/intern/FLUID_3D_STATIC.cpp
branches/soc-2008-mxcurioni/intern/utfconv/utfconv.c
branches/soc-2008-mxcurioni/release/scripts/modules/bpy/utils.py
branches/soc-2008-mxcurioni/release/scripts/modules/bpy_extras/keyconfig_utils.py
branches/soc-2008-mxcurioni/release/scripts/presets/operator/wm.collada_export/second_life.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_operators/object.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_operators/wm.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_game.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/space_node.py
branches/soc-2008-mxcurioni/source/blender/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/SConscript
branches/soc-2008-mxcurioni/source/blender/blenfont/intern/blf.c
branches/soc-2008-mxcurioni/source/blender/blenfont/intern/blf_font.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_action.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_blender.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_node.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_sequencer.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_texture.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/CMakeLists.txt
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/blender.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/bullet.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/bvhutils.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/cdderivedmesh.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/collision.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/constraint.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/context.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/customdata.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/depsgraph.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/editderivedmesh.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/effect.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/fmodifier.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/group.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/image.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/ipo.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/lattice.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/library.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/material.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/mesh_validate.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/multires.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/particle.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/particle_system.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/pointcache.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/scene.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/seqeffects.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/sequencer.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/shrinkwrap.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/smoke.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/softbody.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/subsurf_ccg.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/text.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/texture.c
branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_ghash.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_lasso.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_vector.h
branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_path_util.h
branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_utildefines.h
branches/soc-2008-mxcurioni/source/blender/blenlib/PIL_time.h
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/bpath.c
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/edgehash.c
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/math_color.c
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/math_geom.c
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/math_vector.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/string_utf8.c
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/threads.c
branches/soc-2008-mxcurioni/source/blender/blenloader/intern/readfile.c
branches/soc-2008-mxcurioni/source/blender/blenloader/intern/runtime.c
branches/soc-2008-mxcurioni/source/blender/blenloader/intern/versioning_250.c
branches/soc-2008-mxcurioni/source/blender/blenloader/intern/writefile.c
branches/soc-2008-mxcurioni/source/blender/bmesh/intern/bmesh_core.c
branches/soc-2008-mxcurioni/source/blender/bmesh/intern/bmesh_queries.c
branches/soc-2008-mxcurioni/source/blender/bmesh/intern/bmesh_queries.h
branches/soc-2008-mxcurioni/source/blender/bmesh/operators/bmo_connect.c
branches/soc-2008-mxcurioni/source/blender/bmesh/operators/bmo_create.c
branches/soc-2008-mxcurioni/source/blender/collada/ArmatureExporter.cpp
branches/soc-2008-mxcurioni/source/blender/collada/ExportSettings.h
branches/soc-2008-mxcurioni/source/blender/collada/GeometryExporter.cpp
branches/soc-2008-mxcurioni/source/blender/collada/SceneExporter.cpp
branches/soc-2008-mxcurioni/source/blender/collada/collada.cpp
branches/soc-2008-mxcurioni/source/blender/collada/collada.h
branches/soc-2008-mxcurioni/source/blender/collada/collada_internal.cpp
branches/soc-2008-mxcurioni/source/blender/collada/collada_internal.h
branches/soc-2008-mxcurioni/source/blender/compositor/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/compositor/intern/COM_CPUDevice.cpp
branches/soc-2008-mxcurioni/source/blender/compositor/intern/COM_ExecutionGroup.cpp
branches/soc-2008-mxcurioni/source/blender/compositor/intern/COM_ExecutionGroup.h
branches/soc-2008-mxcurioni/source/blender/compositor/intern/COM_ExecutionSystem.cpp
branches/soc-2008-mxcurioni/source/blender/compositor/intern/COM_ExecutionSystemHelper.cpp
branches/soc-2008-mxcurioni/source/blender/compositor/intern/COM_MemoryBuffer.cpp
branches/soc-2008-mxcurioni/source/blender/compositor/intern/COM_MemoryBuffer.h
branches/soc-2008-mxcurioni/source/blender/compositor/intern/COM_MemoryProxy.cpp
branches/soc-2008-mxcurioni/source/blender/compositor/intern/COM_MemoryProxy.h
branches/soc-2008-mxcurioni/source/blender/compositor/intern/COM_NodeOperation.h
branches/soc-2008-mxcurioni/source/blender/compositor/intern/COM_OpenCLDevice.cpp
branches/soc-2008-mxcurioni/source/blender/compositor/intern/COM_WorkScheduler.cpp
branches/soc-2008-mxcurioni/source/blender/compositor/nodes/COM_BlurNode.cpp
branches/soc-2008-mxcurioni/source/blender/compositor/nodes/COM_DilateErodeNode.cpp
branches/soc-2008-mxcurioni/source/blender/compositor/nodes/COM_GlareNode.cpp
branches/soc-2008-mxcurioni/source/blender/compositor/nodes/COM_ImageNode.cpp
branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_AlphaOverMixedOperation.cpp
branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_BlurBaseOperation.cpp
branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_BlurBaseOperation.h
branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_ColorSpillOperation.cpp
branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_CompositorOperation.cpp
branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_ConvolutionEdgeFilterOperation.cpp
branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_ConvolutionFilterOperation.cpp
branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_DilateErodeOperation.cpp
branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_DilateErodeOperation.h
branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_FastGaussianBlurOperation.h
branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_GaussianBokehBlurOperation.cpp
branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_GaussianBokehBlurOperation.h
branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_GaussianXBlurOperation.cpp
branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_GaussianXBlurOperation.h
branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_GaussianYBlurOperation.cpp
branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_GaussianYBlurOperation.h
branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_GlareBaseOperation.h
branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_MathBaseOperation.cpp
branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_MathBaseOperation.h
branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_MovieClipOperation.cpp
branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_MovieDistortionOperation.h
branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_WriteBufferOperation.cpp
branches/soc-2008-mxcurioni/source/blender/editors/animation/anim_channels_defines.c
branches/soc-2008-mxcurioni/source/blender/editors/animation/anim_channels_edit.c
branches/soc-2008-mxcurioni/source/blender/editors/animation/drivers.c
branches/soc-2008-mxcurioni/source/blender/editors/animation/fmodifier_ui.c
branches/soc-2008-mxcurioni/source/blender/editors/animation/keyframes_edit.c
branches/soc-2008-mxcurioni/source/blender/editors/animation/keyframes_general.c
branches/soc-2008-mxcurioni/source/blender/editors/animation/keyframing.c
branches/soc-2008-mxcurioni/source/blender/editors/armature/BIF_generate.h
branches/soc-2008-mxcurioni/source/blender/editors/armature/editarmature.c
branches/soc-2008-mxcurioni/source/blender/editors/armature/editarmature_generate.c
branches/soc-2008-mxcurioni/source/blender/editors/armature/poselib.c
branches/soc-2008-mxcurioni/source/blender/editors/armature/poseobject.c
branches/soc-2008-mxcurioni/source/blender/editors/armature/reeb.c
branches/soc-2008-mxcurioni/source/blender/editors/curve/curve_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/curve/editcurve.c
branches/soc-2008-mxcurioni/source/blender/editors/datafiles/Bfont.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/ED_keyframes_edit.h
branches/soc-2008-mxcurioni/source/blender/editors/include/ED_keyframing.h
branches/soc-2008-mxcurioni/source/blender/editors/include/ED_object.h
branches/soc-2008-mxcurioni/source/blender/editors/include/ED_sequencer.h
branches/soc-2008-mxcurioni/source/blender/editors/include/ED_view3d.h
branches/soc-2008-mxcurioni/source/blender/editors/include/UI_resources.h
branches/soc-2008-mxcurioni/source/blender/editors/interface/interface.c
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_intern.h
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/interface/interface_templates.c
branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_widgets.c
branches/soc-2008-mxcurioni/source/blender/editors/interface/resources.c
branches/soc-2008-mxcurioni/source/blender/editors/interface/view2d.c
branches/soc-2008-mxcurioni/source/blender/editors/mesh/editmesh_add.c
branches/soc-2008-mxcurioni/source/blender/editors/mesh/editmesh_tools.c
branches/soc-2008-mxcurioni/source/blender/editors/mesh/mesh_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/metaball/mball_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/object/object_add.c
branches/soc-2008-mxcurioni/source/blender/editors/object/object_edit.c
branches/soc-2008-mxcurioni/source/blender/editors/object/object_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/object/object_relations.c
branches/soc-2008-mxcurioni/source/blender/editors/object/object_shapekey.c
branches/soc-2008-mxcurioni/source/blender/editors/physics/physics_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/render/render_internal.c
branches/soc-2008-mxcurioni/source/blender/editors/screen/screen_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/sculpt_paint/paint_image.c
branches/soc-2008-mxcurioni/source/blender/editors/sculpt_paint/paint_vertex.c
branches/soc-2008-mxcurioni/source/blender/editors/space_action/action_edit.c
branches/soc-2008-mxcurioni/source/blender/editors/space_api/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/editors/space_buttons/buttons_header.c
branches/soc-2008-mxcurioni/source/blender/editors/space_clip/clip_dopesheet_draw.c
branches/soc-2008-mxcurioni/source/blender/editors/space_graph/graph_edit.c
branches/soc-2008-mxcurioni/source/blender/editors/space_image/image_buttons.c
branches/soc-2008-mxcurioni/source/blender/editors/space_image/image_intern.h
branches/soc-2008-mxcurioni/source/blender/editors/space_image/image_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/space_image/space_image.c
branches/soc-2008-mxcurioni/source/blender/editors/space_info/info_draw.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_header.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_node/node_select.c
branches/soc-2008-mxcurioni/source/blender/editors/space_node/node_templates.c
branches/soc-2008-mxcurioni/source/blender/editors/space_node/space_node.c
branches/soc-2008-mxcurioni/source/blender/editors/space_outliner/outliner_draw.c
branches/soc-2008-mxcurioni/source/blender/editors/space_outliner/outliner_edit.c
branches/soc-2008-mxcurioni/source/blender/editors/space_outliner/outliner_intern.h
branches/soc-2008-mxcurioni/source/blender/editors/space_outliner/outliner_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/space_outliner/outliner_select.c
branches/soc-2008-mxcurioni/source/blender/editors/space_outliner/outliner_tools.c
branches/soc-2008-mxcurioni/source/blender/editors/space_outliner/outliner_tree.c
branches/soc-2008-mxcurioni/source/blender/editors/space_outliner/space_outliner.c
branches/soc-2008-mxcurioni/source/blender/editors/space_sequencer/sequencer_add.c
branches/soc-2008-mxcurioni/source/blender/editors/space_sequencer/sequencer_draw.c
branches/soc-2008-mxcurioni/source/blender/editors/space_sequencer/sequencer_edit.c
branches/soc-2008-mxcurioni/source/blender/editors/space_sequencer/sequencer_intern.h
branches/soc-2008-mxcurioni/source/blender/editors/space_sequencer/sequencer_select.c
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/drawobject.c
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/view3d_draw.c
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/view3d_select.c
branches/soc-2008-mxcurioni/source/blender/editors/transform/transform.c
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/util/undo.c
branches/soc-2008-mxcurioni/source/blender/editors/uvedit/uvedit_ops.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/ikplugin/intern/itasc_plugin.cpp
branches/soc-2008-mxcurioni/source/blender/imbuf/IMB_imbuf.h
branches/soc-2008-mxcurioni/source/blender/imbuf/IMB_imbuf_types.h
branches/soc-2008-mxcurioni/source/blender/imbuf/intern/anim_movie.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/targa.c
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_armature_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_node_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_object_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_scene_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_sequence_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_texture_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_userdef_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/intern/CMakeLists.txt
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_access.h
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/makesrna.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_armature.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_color.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_define.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_image_api.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_mesh.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_nodetree.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_object.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_pose.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_scene.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_scene_api.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_texture.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/modifiers/intern/MOD_mask.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_skin.c
branches/soc-2008-mxcurioni/source/blender/nodes/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/nodes/composite/node_composite_tree.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/node_composite_util.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/node_composite_util.h
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_alphaOver.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_blur.c
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_brightness.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_channelMatte.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_chromaMatte.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_colorMatte.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_colorSpill.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_colorbalance.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_composite.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_crop.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_curves.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_defocus.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_diffMatte.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_dilate.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_directionalblur.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_distanceMatte.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_filter.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_flip.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_gamma.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_glare.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_hueSatVal.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_huecorrect.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_idMask.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_invert.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_lensdist.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_levels.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_lummaMatte.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_mapUV.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_mapValue.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_math.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_mixrgb.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_movieclip.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_moviedistortion.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_normal.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_normalize.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_premulkey.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_rgb.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_rotate.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_scale.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_sepcombHSVA.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_sepcombRGBA.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_sepcombYCCA.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_sepcombYUVA.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_setalpha.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_splitViewer.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_stabilize2d.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_switch.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_texture.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_tonemap.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_transform.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_translate.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_valToRgb.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_value.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_vecBlur.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_viewer.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_zcombine.c
branches/soc-2008-mxcurioni/source/blender/nodes/intern/node_common.c
branches/soc-2008-mxcurioni/source/blender/nodes/intern/node_exec.c
branches/soc-2008-mxcurioni/source/blender/nodes/shader/node_shader_tree.c
branches/soc-2008-mxcurioni/source/blender/nodes/shader/node_shader_util.c
branches/soc-2008-mxcurioni/source/blender/nodes/shader/node_shader_util.h
branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_add_shader.c
branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_attribute.c
branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_background.c
branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_brightness.c
branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_bsdf_anisotropic.c
branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_bsdf_diffuse.c
branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_bsdf_glass.c
branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_bsdf_glossy.c
branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_bsdf_translucent.c
branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_bsdf_transparent.c
branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_bsdf_velvet.c
branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_camera.c
branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_curves.c
branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_emission.c
branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_fresnel.c
branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_gamma.c
branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_geom.c
branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_geometry.c
branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_holdout.c
branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_hueSatVal.c
branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_invert.c
branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_layer_weight.c
branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_light_falloff.c
branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_light_path.c
branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_mapping.c
branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_material.c
branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_math.c
branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_mixRgb.c
branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_mix_shader.c
branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_normal.c
branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_object_info.c
branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_output.c
branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_output_lamp.c
branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_output_material.c
branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_output_world.c
branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_rgb.c
branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_sepcombRGB.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_checker.c
branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_tex_coord.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_gradient.c
branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_tex_image.c
branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_tex_magic.c
branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_tex_musgrave.c
branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_tex_noise.c
branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_tex_sky.c
branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_tex_voronoi.c
branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_tex_wave.c
branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_texture.c
branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_valToRgb.c
branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_value.c
branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_vectMath.c
branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_volume_isotropic.c
branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_volume_transparent.c
branches/soc-2008-mxcurioni/source/blender/nodes/texture/node_texture_tree.c
branches/soc-2008-mxcurioni/source/blender/nodes/texture/node_texture_util.h
branches/soc-2008-mxcurioni/source/blender/nodes/texture/nodes/node_texture_at.c
branches/soc-2008-mxcurioni/source/blender/nodes/texture/nodes/node_texture_bricks.c
branches/soc-2008-mxcurioni/source/blender/nodes/texture/nodes/node_texture_checker.c
branches/soc-2008-mxcurioni/source/blender/nodes/texture/nodes/node_texture_compose.c
branches/soc-2008-mxcurioni/source/blender/nodes/texture/nodes/node_texture_coord.c
branches/soc-2008-mxcurioni/source/blender/nodes/texture/nodes/node_texture_curves.c
branches/soc-2008-mxcurioni/source/blender/nodes/texture/nodes/node_texture_decompose.c
branches/soc-2008-mxcurioni/source/blender/nodes/texture/nodes/node_texture_distance.c
branches/soc-2008-mxcurioni/source/blender/nodes/texture/nodes/node_texture_hueSatVal.c
branches/soc-2008-mxcurioni/source/blender/nodes/texture/nodes/node_texture_image.c
branches/soc-2008-mxcurioni/source/blender/nodes/texture/nodes/node_texture_invert.c
branches/soc-2008-mxcurioni/source/blender/nodes/texture/nodes/node_texture_math.c
branches/soc-2008-mxcurioni/source/blender/nodes/texture/nodes/node_texture_mixRgb.c
branches/soc-2008-mxcurioni/source/blender/nodes/texture/nodes/node_texture_output.c
branches/soc-2008-mxcurioni/source/blender/nodes/texture/nodes/node_texture_proc.c
branches/soc-2008-mxcurioni/source/blender/nodes/texture/nodes/node_texture_rotate.c
branches/soc-2008-mxcurioni/source/blender/nodes/texture/nodes/node_texture_scale.c
branches/soc-2008-mxcurioni/source/blender/nodes/texture/nodes/node_texture_texture.c
branches/soc-2008-mxcurioni/source/blender/nodes/texture/nodes/node_texture_translate.c
branches/soc-2008-mxcurioni/source/blender/nodes/texture/nodes/node_texture_valToNor.c
branches/soc-2008-mxcurioni/source/blender/nodes/texture/nodes/node_texture_valToRgb.c
branches/soc-2008-mxcurioni/source/blender/nodes/texture/nodes/node_texture_viewer.c
branches/soc-2008-mxcurioni/source/blender/python/generic/py_capi_utils.c
branches/soc-2008-mxcurioni/source/blender/python/intern/bpy_props.c
branches/soc-2008-mxcurioni/source/blender/python/intern/bpy_rna.c
branches/soc-2008-mxcurioni/source/blender/quicktime/apple/quicktime_import.c
branches/soc-2008-mxcurioni/source/blender/render/intern/include/rendercore.h
branches/soc-2008-mxcurioni/source/blender/render/intern/include/renderdatabase.h
branches/soc-2008-mxcurioni/source/blender/render/intern/include/zbuf.h
branches/soc-2008-mxcurioni/source/blender/render/intern/source/convertblender.c
branches/soc-2008-mxcurioni/source/blender/render/intern/source/envmap.c
branches/soc-2008-mxcurioni/source/blender/render/intern/source/pixelblending.c
branches/soc-2008-mxcurioni/source/blender/render/intern/source/render_texture.c
branches/soc-2008-mxcurioni/source/blender/render/intern/source/renderdatabase.c
branches/soc-2008-mxcurioni/source/blender/render/intern/source/shadbuf.c
branches/soc-2008-mxcurioni/source/blender/render/intern/source/shadeoutput.c
branches/soc-2008-mxcurioni/source/blender/render/intern/source/strand.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_cursors.c
branches/soc-2008-mxcurioni/source/blender/windowmanager/intern/wm_event_system.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_subwindow.c
branches/soc-2008-mxcurioni/source/blender/windowmanager/intern/wm_window.c
branches/soc-2008-mxcurioni/source/blenderplayer/CMakeLists.txt
branches/soc-2008-mxcurioni/source/creator/CMakeLists.txt
branches/soc-2008-mxcurioni/source/creator/creator.c
branches/soc-2008-mxcurioni/source/gameengine/CMakeLists.txt
branches/soc-2008-mxcurioni/source/gameengine/Converter/BL_BlenderDataConversion.cpp
branches/soc-2008-mxcurioni/source/gameengine/Converter/BL_SkinDeformer.cpp
branches/soc-2008-mxcurioni/source/gameengine/Converter/BL_SkinDeformer.h
branches/soc-2008-mxcurioni/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
branches/soc-2008-mxcurioni/source/gameengine/GamePlayer/xembed/CMakeLists.txt
branches/soc-2008-mxcurioni/source/gameengine/GamePlayer/xembed/UnixShell.c
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_BulletPhysicsController.cpp
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_BulletPhysicsController.h
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_ConvertPhysicsObject.h
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_ConvertPhysicsObjects.cpp
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_Dome.h
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_IPhysicsController.cpp
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_IPhysicsController.h
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_Scene.cpp
branches/soc-2008-mxcurioni/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp
branches/soc-2008-mxcurioni/source/gameengine/Physics/Bullet/CcdPhysicsController.h
branches/soc-2008-mxcurioni/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp
branches/soc-2008-mxcurioni/source/gameengine/Physics/common/PHY_Pro.h
branches/soc-2008-mxcurioni/source/tests/CMakeLists.txt
branches/soc-2008-mxcurioni/source/tools/uncrustify.cfg
Added Paths:
-----------
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/nodes/node_checker_texture.osl
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/nodes/node_gradient_texture.osl
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/nodes/node_wave_texture.osl
branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_GlareGhostOperation.cpp
branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_GlareGhostOperation.h
Removed Paths:
-------------
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/nodes/node_blend_texture.osl
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/nodes/node_clouds_texture.osl
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/nodes/node_distorted_noise_texture.osl
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/nodes/node_marble_texture.osl
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/nodes/node_stucci_texture.osl
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/nodes/node_wood_texture.osl
branches/soc-2008-mxcurioni/release/plugins/
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_plugin_types.h
branches/soc-2008-mxcurioni/source/blender/blenpluginapi/
branches/soc-2008-mxcurioni/source/blender/compositor/intern/COM_MemoryManager.cpp
branches/soc-2008-mxcurioni/source/blender/compositor/intern/COM_MemoryManager.h
branches/soc-2008-mxcurioni/source/blender/compositor/intern/COM_MemoryManagerState.cpp
branches/soc-2008-mxcurioni/source/blender/compositor/intern/COM_MemoryManagerState.h
branches/soc-2008-mxcurioni/source/blender/compositor/intern/COM_NodeProgram.cpp
branches/soc-2008-mxcurioni/source/blender/compositor/intern/COM_NodeProgram.h
branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_LensGhostOperation.cpp
branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_LensGhostOperation.h
branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_LensGlowImageOperation.cpp
branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_LensGlowImageOperation.h
branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_LensGlowOperation.cpp
branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_LensGlowOperation.h
branches/soc-2008-mxcurioni/source/blender/editors/space_api/space.c
branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_dynamic.c
Property Changed:
----------------
branches/soc-2008-mxcurioni/
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_game.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/space_node.py
branches/soc-2008-mxcurioni/source/blender/editors/interface/interface.c
branches/soc-2008-mxcurioni/source/blender/editors/space_outliner/
branches/soc-2008-mxcurioni/source/tools/codereview_upload.py
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-47056
+ /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-47381
Modified: branches/soc-2008-mxcurioni/CMakeLists.txt
===================================================================
--- branches/soc-2008-mxcurioni/CMakeLists.txt 2012-06-03 20:23:41 UTC (rev 47386)
+++ branches/soc-2008-mxcurioni/CMakeLists.txt 2012-06-03 21:11:10 UTC (rev 47387)
@@ -1,4 +1,3 @@
-# -*- mode: cmake; indent-tabs-mode: t; -*-
# ***** BEGIN GPL LICENSE BLOCK *****
#
# This program is free software; you can redistribute it and/or
@@ -229,19 +228,16 @@
set(PYTHON_NUMPY_PATH "" CACHE PATH "Python to python site-packages or dist-packages containing 'numpy' module")
mark_as_advanced(PYTHON_NUMPY_PATH)
-option(WITH_MINGW64 "Use the 64-bit version of MinGW" OFF)
-mark_as_advanced(WITH_MINGW64)
+if(MINGW)
+ option(WITH_MINGW64 "Use the 64-bit version of MinGW" OFF)
+ mark_as_advanced(WITH_MINGW64)
+endif()
# Cycles
option(WITH_CYCLES "Enable cycles Render Engine" ON)
option(WITH_CYCLES_TEST "Build cycles test application" OFF)
option(WITH_CYCLES_CUDA_BINARIES "Build cycles CUDA binaries" OFF)
-if(WIN32 AND NOT CMAKE_CL_64 AND NOT WITH_MINGW64)
- set(PLATFORM_DEFAULT sm_20 sm_21)
-else()
- set(PLATFORM_DEFAULT sm_13 sm_20 sm_21)
-endif()
-set(CYCLES_CUDA_BINARIES_ARCH ${PLATFORM_DEFAULT} CACHE STRING "CUDA architectures to build binaries for")
+set(CYCLES_CUDA_BINARIES_ARCH sm_13 sm_20 sm_21 CACHE STRING "CUDA architectures to build binaries for")
mark_as_advanced(CYCLES_CUDA_BINARIES_ARCH)
unset(PLATFORM_DEFAULT)
@@ -557,7 +553,7 @@
endif()
mark_as_advanced(FFMPEG)
- set(FFMPEG_INCLUDE_DIRS ${FFMPEG}/include)
+ set(FFMPEG_INCLUDE_DIRS ${FFMPEG}/include ${FFMPEG}/include/ffmpeg)
mark_as_advanced(FFMPEG_LIBRARIES)
set(FFMPEG_LIBPATH ${FFMPEG}/lib)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D__STDC_CONSTANT_MACROS")
@@ -1105,7 +1101,7 @@
if(WITH_CODEC_FFMPEG)
set(FFMPEG ${LIBDIR}/ffmpeg)
- set(FFMPEG_INCLUDE_DIRS ${FFMPEG}/include ${FFMPEG}/include)
+ set(FFMPEG_INCLUDE_DIRS ${FFMPEG}/include)
if(WITH_MINGW64)
set(FFMPEG_LIBRARIES avcodec.dll avformat.dll avdevice.dll avutil.dll swscale.dll swresample.dll)
else()
Modified: branches/soc-2008-mxcurioni/GNUmakefile
===================================================================
--- branches/soc-2008-mxcurioni/GNUmakefile 2012-06-03 20:23:41 UTC (rev 47386)
+++ branches/soc-2008-mxcurioni/GNUmakefile 2012-06-03 21:11:10 UTC (rev 47387)
@@ -109,9 +109,12 @@
@echo
@echo Configuring Blender ...
- if test ! -f $(BUILD_DIR)/CMakeCache.txt ; then \
- $(CMAKE_CONFIG); \
- fi
+ # if test ! -f $(BUILD_DIR)/CMakeCache.txt ; then \
+ # $(CMAKE_CONFIG); \
+ # fi
+
+ # do this always incase of failed initial build, could be smarter here...
+ $(CMAKE_CONFIG)
@echo
@echo Building Blender ...
Modified: branches/soc-2008-mxcurioni/SConstruct
===================================================================
--- branches/soc-2008-mxcurioni/SConstruct 2012-06-03 20:23:41 UTC (rev 47386)
+++ branches/soc-2008-mxcurioni/SConstruct 2012-06-03 21:11:10 UTC (rev 47387)
@@ -667,42 +667,6 @@
scriptinstall.append(env.Install(dir=dir, source=source))
-#-- plugins
-pluglist = []
-plugtargetlist = []
-for tp, tn, tf in os.walk('release/plugins'):
- if '.svn' in tn:
- tn.remove('.svn')
- if '_svn' in tn:
- tn.remove('_svn')
- df = tp[8:] # remove 'release/'
- for f in tf:
- pluglist.append(os.path.join(tp, f))
- plugtargetlist.append( os.path.join(env['BF_INSTALLDIR'], VERSION, df, f) )
-
-
-# header files for plugins
-pluglist.append('source/blender/blenpluginapi/documentation.h')
-plugtargetlist.append(os.path.join(env['BF_INSTALLDIR'], VERSION, 'plugins', 'include', 'documentation.h'))
-pluglist.append('source/blender/blenpluginapi/externdef.h')
-plugtargetlist.append(os.path.join(env['BF_INSTALLDIR'], VERSION, 'plugins', 'include', 'externdef.h'))
-pluglist.append('source/blender/blenpluginapi/floatpatch.h')
-plugtargetlist.append(os.path.join(env['BF_INSTALLDIR'], VERSION, 'plugins', 'include', 'floatpatch.h'))
-pluglist.append('source/blender/blenpluginapi/iff.h')
-plugtargetlist.append(os.path.join(env['BF_INSTALLDIR'], VERSION, 'plugins', 'include', 'iff.h'))
-pluglist.append('source/blender/blenpluginapi/plugin.h')
-plugtargetlist.append(os.path.join(env['BF_INSTALLDIR'], VERSION, 'plugins', 'include', 'plugin.h'))
-pluglist.append('source/blender/blenpluginapi/util.h')
-plugtargetlist.append(os.path.join(env['BF_INSTALLDIR'], VERSION, 'plugins', 'include', 'util.h'))
-pluglist.append('source/blender/blenpluginapi/plugin.DEF')
-plugtargetlist.append(os.path.join(env['BF_INSTALLDIR'], VERSION, 'plugins', 'include', 'plugin.def'))
-
-plugininstall = []
-# plugins in blender 2.5 don't work at the moment.
-#for targetdir,srcfile in zip(plugtargetlist, pluglist):
-# td, tf = os.path.split(targetdir)
-# plugininstall.append(env.Install(dir=td, source=srcfile))
-
textlist = []
texttargetlist = []
for tp, tn, tf in os.walk('release/text'):
@@ -716,11 +680,11 @@
textinstall = env.Install(dir=env['BF_INSTALLDIR'], source=textlist)
if env['OURPLATFORM']=='darwin':
- allinstall = [blenderinstall, plugininstall, textinstall]
+ allinstall = [blenderinstall, textinstall]
elif env['OURPLATFORM']=='linux':
- allinstall = [blenderinstall, dotblenderinstall, scriptinstall, plugininstall, textinstall, iconinstall]
+ allinstall = [blenderinstall, dotblenderinstall, scriptinstall, textinstall, iconinstall]
else:
- allinstall = [blenderinstall, dotblenderinstall, scriptinstall, plugininstall, textinstall]
+ allinstall = [blenderinstall, dotblenderinstall, scriptinstall, textinstall]
if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'win64-vc', 'linuxcross'):
dllsources = []
Modified: branches/soc-2008-mxcurioni/build_files/cmake/config/blender_lite.cmake
===================================================================
--- branches/soc-2008-mxcurioni/build_files/cmake/config/blender_lite.cmake 2012-06-03 20:23:41 UTC (rev 47386)
+++ branches/soc-2008-mxcurioni/build_files/cmake/config/blender_lite.cmake 2012-06-03 21:11:10 UTC (rev 47387)
@@ -17,6 +17,7 @@
set(WITH_LIBMV OFF CACHE FORCE BOOL)
set(WITH_CARVE OFF CACHE FORCE BOOL)
set(WITH_GAMEENGINE OFF CACHE FORCE BOOL)
+set(WITH_GHOST_XDND OFF CACHE FORCE BOOL)
set(WITH_IK_ITASC OFF CACHE FORCE BOOL)
set(WITH_IMAGE_CINEON OFF CACHE FORCE BOOL)
set(WITH_IMAGE_DDS OFF CACHE FORCE BOOL)
Modified: branches/soc-2008-mxcurioni/build_files/cmake/macros.cmake
===================================================================
--- branches/soc-2008-mxcurioni/build_files/cmake/macros.cmake 2012-06-03 20:23:41 UTC (rev 47386)
+++ branches/soc-2008-mxcurioni/build_files/cmake/macros.cmake 2012-06-03 21:11:10 UTC (rev 47387)
@@ -1,6 +1,28 @@
-# -*- mode: cmake; indent-tabs-mode: t; -*-
+# ***** BEGIN GPL LICENSE BLOCK *****
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+#
+# The Original Code is Copyright (C) 2006, Blender Foundation
+# All rights reserved.
+#
+# The Original Code is: all of this file.
+#
+# Contributor(s): Jacques Beaurain.
+#
+# ***** END GPL LICENSE BLOCK *****
-
# foo_bar.spam --> foo_barMySuffix.spam
macro(file_suffix
file_name_new file_name file_suffix
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-06-03 20:23:41 UTC (rev 47386)
+++ branches/soc-2008-mxcurioni/build_files/scons/config/win32-vc-config.py 2012-06-03 21:11:10 UTC (rev 47387)
@@ -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_20', 'sm_21'] # don't build sm_13 until the compile can fit in 32bit process again :)
+BF_CYCLES_CUDA_BINARIES_ARCH = ['sm_13', 'sm_20', 'sm_21', 'sm_30']
#Ray trace optimization
WITH_BF_RAYOPTIMIZATION = True
Modified: branches/soc-2008-mxcurioni/build_files/scons/config/win64-vc-config.py
===================================================================
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list