[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [49987] branches/soc-2008-mxcurioni: Merged changes in the trunk up to revision 49986.
Tamito Kajiyama
rd6t-kjym at asahi-net.or.jp
Sat Aug 18 17:20:36 CEST 2012
Revision: 49987
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=49987
Author: kjym3
Date: 2012-08-18 15:20:35 +0000 (Sat, 18 Aug 2012)
Log Message:
-----------
Merged changes in the trunk up to revision 49986.
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=49986
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/cmake_netbeans_project.py
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/linux-config.py
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/build_files/scons/tools/Blender.py
branches/soc-2008-mxcurioni/build_files/scons/tools/btools.py
branches/soc-2008-mxcurioni/extern/eltopo/SConscript
branches/soc-2008-mxcurioni/extern/eltopo/common/runstats.h
branches/soc-2008-mxcurioni/intern/CMakeLists.txt
branches/soc-2008-mxcurioni/intern/container/CTR_HashedPtr.h
branches/soc-2008-mxcurioni/intern/ghost/GHOST_C-api.h
branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_C-api.cpp
branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_SystemCocoa.mm
branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_WindowCocoa.mm
branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_WindowWin32.h
branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_WindowX11.cpp
branches/soc-2008-mxcurioni/intern/guardedalloc/MEM_guardedalloc.h
branches/soc-2008-mxcurioni/intern/guardedalloc/intern/mallocn.c
branches/soc-2008-mxcurioni/intern/guardedalloc/test/simpletest/memtest.c
branches/soc-2008-mxcurioni/intern/iksolver/CMakeLists.txt
branches/soc-2008-mxcurioni/intern/iksolver/SConscript
branches/soc-2008-mxcurioni/intern/string/STR_String.h
branches/soc-2008-mxcurioni/release/datafiles/preview.blend
branches/soc-2008-mxcurioni/release/scripts/modules/bpy/path.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_operators/node.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_animviz.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_data_curve.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_data_lamp.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_data_modifier.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_mask_common.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_particle.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_physics_field.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/space_node.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/space_sequencer.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/avi/intern/avi.c
branches/soc-2008-mxcurioni/source/blender/blenfont/BLF_api.h
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/blenfont/intern/blf_internal_types.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_fcurve.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_material.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_object.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_sequencer.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/blenkernel/SConscript
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/DerivedMesh.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/armature.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/boids.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/constraint.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/dynamicpaint.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/editderivedmesh.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/fcurve.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/font.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/gpencil.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/image_gen.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/ipo.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/key.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/mask.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/material.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/mesh.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/object.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/sca.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/seqcache.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/tracking.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/unit.c
branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_array.h
branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_kdopbvh.h
branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_rect.h
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/math_geom.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/string_utf8.c
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/voronoi.c
branches/soc-2008-mxcurioni/source/blender/blenloader/intern/readfile.c
branches/soc-2008-mxcurioni/source/blender/blenloader/intern/writefile.c
branches/soc-2008-mxcurioni/source/blender/bmesh/intern/bmesh_construct.c
branches/soc-2008-mxcurioni/source/blender/bmesh/intern/bmesh_core.c
branches/soc-2008-mxcurioni/source/blender/bmesh/intern/bmesh_error.h
branches/soc-2008-mxcurioni/source/blender/bmesh/intern/bmesh_interp.c
branches/soc-2008-mxcurioni/source/blender/bmesh/intern/bmesh_marking.c
branches/soc-2008-mxcurioni/source/blender/bmesh/intern/bmesh_mods.c
branches/soc-2008-mxcurioni/source/blender/bmesh/intern/bmesh_operator_api.h
branches/soc-2008-mxcurioni/source/blender/bmesh/intern/bmesh_polygon.c
branches/soc-2008-mxcurioni/source/blender/bmesh/intern/bmesh_queries.c
branches/soc-2008-mxcurioni/source/blender/bmesh/intern/bmesh_structure.c
branches/soc-2008-mxcurioni/source/blender/bmesh/operators/bmo_create.c
branches/soc-2008-mxcurioni/source/blender/bmesh/operators/bmo_subdivide.c
branches/soc-2008-mxcurioni/source/blender/bmesh/tools/BME_bevel.c
branches/soc-2008-mxcurioni/source/blender/collada/ArmatureExporter.cpp
branches/soc-2008-mxcurioni/source/blender/collada/DocumentImporter.cpp
branches/soc-2008-mxcurioni/source/blender/collada/EffectExporter.cpp
branches/soc-2008-mxcurioni/source/blender/collada/GeometryExporter.cpp
branches/soc-2008-mxcurioni/source/blender/collada/ImageExporter.cpp
branches/soc-2008-mxcurioni/source/blender/collada/InstanceWriter.cpp
branches/soc-2008-mxcurioni/source/blender/collada/MaterialExporter.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/collada/collada_utils.cpp
branches/soc-2008-mxcurioni/source/blender/collada/collada_utils.h
branches/soc-2008-mxcurioni/source/blender/compositor/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/compositor/COM_compositor.h
branches/soc-2008-mxcurioni/source/blender/compositor/intern/COM_ChunkOrder.cpp
branches/soc-2008-mxcurioni/source/blender/compositor/intern/COM_ChunkOrder.h
branches/soc-2008-mxcurioni/source/blender/compositor/intern/COM_Converter.cpp
branches/soc-2008-mxcurioni/source/blender/compositor/intern/COM_ExecutionGroup.cpp
branches/soc-2008-mxcurioni/source/blender/compositor/intern/COM_ExecutionSystem.h
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_SocketReader.h
branches/soc-2008-mxcurioni/source/blender/compositor/intern/COM_WorkScheduler.cpp
branches/soc-2008-mxcurioni/source/blender/compositor/intern/COM_compositor.cpp
branches/soc-2008-mxcurioni/source/blender/compositor/nodes/COM_BlurNode.cpp
branches/soc-2008-mxcurioni/source/blender/compositor/nodes/COM_BokehBlurNode.cpp
branches/soc-2008-mxcurioni/source/blender/compositor/nodes/COM_GroupNode.cpp
branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_AntiAliasOperation.cpp
branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_BlurBaseOperation.cpp
branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_BokehBlurOperation.cpp
branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_BokehImageOperation.h
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_DisplaceOperation.cpp
branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_DoubleEdgeMaskOperation.cpp
branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_GaussianAlphaXBlurOperation.cpp
branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_GaussianAlphaYBlurOperation.cpp
branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_GaussianBokehBlurOperation.cpp
branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_GaussianXBlurOperation.cpp
branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_GaussianYBlurOperation.cpp
branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_InpaintOperation.cpp
branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_MapUVOperation.cpp
branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_MovieDistortionOperation.cpp
branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_MovieDistortionOperation.h
branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_OpenCLKernels.cl
branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_ProjectorLensDistortionOperation.cpp
branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_ReadBufferOperation.cpp
branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_ReadBufferOperation.h
branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_ScreenLensDistortionOperation.cpp
branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_ScreenLensDistortionOperation.h
branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_SetColorOperation.cpp
branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_SetColorOperation.h
branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_VectorBlurOperation.cpp
branches/soc-2008-mxcurioni/source/blender/editors/animation/anim_deps.c
branches/soc-2008-mxcurioni/source/blender/editors/animation/anim_filter.c
branches/soc-2008-mxcurioni/source/blender/editors/animation/fmodifier_ui.c
branches/soc-2008-mxcurioni/source/blender/editors/armature/editarmature.c
branches/soc-2008-mxcurioni/source/blender/editors/datafiles/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/editors/datafiles/SConscript
branches/soc-2008-mxcurioni/source/blender/editors/include/ED_datafiles.h
branches/soc-2008-mxcurioni/source/blender/editors/include/ED_image.h
branches/soc-2008-mxcurioni/source/blender/editors/include/ED_node.h
branches/soc-2008-mxcurioni/source/blender/editors/include/ED_object.h
branches/soc-2008-mxcurioni/source/blender/editors/include/ED_view3d.h
branches/soc-2008-mxcurioni/source/blender/editors/include/UI_view2d.h
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_ops.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/view2d_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/mesh/editface.c
branches/soc-2008-mxcurioni/source/blender/editors/mesh/editmesh_rip.c
branches/soc-2008-mxcurioni/source/blender/editors/object/object_bake.c
branches/soc-2008-mxcurioni/source/blender/editors/object/object_hook.c
branches/soc-2008-mxcurioni/source/blender/editors/object/object_intern.h
branches/soc-2008-mxcurioni/source/blender/editors/object/object_modifier.c
branches/soc-2008-mxcurioni/source/blender/editors/object/object_relations.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/object/object_vgroup.c
branches/soc-2008-mxcurioni/source/blender/editors/physics/dynamicpaint_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/physics/particle_edit.c
branches/soc-2008-mxcurioni/source/blender/editors/physics/physics_fluid.c
branches/soc-2008-mxcurioni/source/blender/editors/physics/physics_pointcache.c
branches/soc-2008-mxcurioni/source/blender/editors/render/render_internal.c
branches/soc-2008-mxcurioni/source/blender/editors/render/render_opengl.c
branches/soc-2008-mxcurioni/source/blender/editors/render/render_preview.c
branches/soc-2008-mxcurioni/source/blender/editors/screen/area.c
branches/soc-2008-mxcurioni/source/blender/editors/screen/screendump.c
branches/soc-2008-mxcurioni/source/blender/editors/sculpt_paint/paint_image.c
branches/soc-2008-mxcurioni/source/blender/editors/space_clip/clip_intern.h
branches/soc-2008-mxcurioni/source/blender/editors/space_clip/clip_ops.c
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_clip/tracking_select.c
branches/soc-2008-mxcurioni/source/blender/editors/space_file/filelist.c
branches/soc-2008-mxcurioni/source/blender/editors/space_graph/graph_edit.c
branches/soc-2008-mxcurioni/source/blender/editors/space_image/image_edit.c
branches/soc-2008-mxcurioni/source/blender/editors/space_image/image_ops.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_select.c
branches/soc-2008-mxcurioni/source/blender/editors/space_node/node_view.c
branches/soc-2008-mxcurioni/source/blender/editors/space_outliner/outliner_edit.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/space_sequencer.c
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/drawmesh.c
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/drawobject.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_view.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/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/gpu/SConscript
branches/soc-2008-mxcurioni/source/blender/gpu/intern/gpu_draw.c
branches/soc-2008-mxcurioni/source/blender/gpu/shaders/gpu_shader_sep_gaussian_blur_frag.glsl
branches/soc-2008-mxcurioni/source/blender/ikplugin/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/ikplugin/intern/ikplugin_api.c
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/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/divers.c
branches/soc-2008-mxcurioni/source/blender/imbuf/intern/indexer.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/openexr/openexr_api.cpp
branches/soc-2008-mxcurioni/source/blender/imbuf/intern/png.c
branches/soc-2008-mxcurioni/source/blender/imbuf/intern/readimage.c
branches/soc-2008-mxcurioni/source/blender/imbuf/intern/rectop.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/tiff.c
branches/soc-2008-mxcurioni/source/blender/imbuf/intern/util.c
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_action_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_constraint_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_sequence_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_space_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_view2d_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_view3d_types.h
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/makesrna.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_armature.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_main_api.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_sequencer.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_space.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_boolean_util.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_displace.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_trackpos.c
branches/soc-2008-mxcurioni/source/blender/python/bmesh/bmesh_py_ops.c
branches/soc-2008-mxcurioni/source/blender/render/intern/source/pixelblending.c
branches/soc-2008-mxcurioni/source/blender/render/intern/source/shadbuf.c
branches/soc-2008-mxcurioni/source/blender/windowmanager/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/windowmanager/SConscript
branches/soc-2008-mxcurioni/source/blender/windowmanager/WM_api.h
branches/soc-2008-mxcurioni/source/blender/windowmanager/WM_types.h
branches/soc-2008-mxcurioni/source/blender/windowmanager/intern/wm_apple.c
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_files.c
branches/soc-2008-mxcurioni/source/blender/windowmanager/intern/wm_init_exit.c
branches/soc-2008-mxcurioni/source/blender/windowmanager/intern/wm_jobs.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/blender/windowmanager/wm_event_types.h
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/BlenderRoutines/KX_BlenderRenderTools.cpp
branches/soc-2008-mxcurioni/source/gameengine/Expressions/PyObjectPlus.h
branches/soc-2008-mxcurioni/source/gameengine/Expressions/StringValue.h
branches/soc-2008-mxcurioni/source/gameengine/GameLogic/SCA_KeyboardSensor.cpp
branches/soc-2008-mxcurioni/source/gameengine/GamePlayer/common/GPC_RenderTools.cpp
branches/soc-2008-mxcurioni/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/BL_Texture.cpp
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_PythonInit.cpp
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_SCA_AddObjectActuator.h
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_SCA_EndObjectActuator.h
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_SCA_ReplaceMeshActuator.h
Added Paths:
-----------
branches/soc-2008-mxcurioni/release/datafiles/bfont.pfb
branches/soc-2008-mxcurioni/release/datafiles/prvicons.png
branches/soc-2008-mxcurioni/release/datafiles/startup.blend
branches/soc-2008-mxcurioni/source/blender/datatoc/
Removed Paths:
-------------
branches/soc-2008-mxcurioni/build_files/cmake/data_to_c.cmake
branches/soc-2008-mxcurioni/release/datafiles/.Bfont
branches/soc-2008-mxcurioni/release/datafiles/prvicons
branches/soc-2008-mxcurioni/source/blender/editors/datafiles/Bfont.c
branches/soc-2008-mxcurioni/source/blender/editors/datafiles/add.png.c
branches/soc-2008-mxcurioni/source/blender/editors/datafiles/bfont.ttf.c
branches/soc-2008-mxcurioni/source/blender/editors/datafiles/blender_icons.png.c
branches/soc-2008-mxcurioni/source/blender/editors/datafiles/blob.png.c
branches/soc-2008-mxcurioni/source/blender/editors/datafiles/blur.png.c
branches/soc-2008-mxcurioni/source/blender/editors/datafiles/bmonofont.ttf.c
branches/soc-2008-mxcurioni/source/blender/editors/datafiles/clay.png.c
branches/soc-2008-mxcurioni/source/blender/editors/datafiles/claystrips.png.c
branches/soc-2008-mxcurioni/source/blender/editors/datafiles/clone.png.c
branches/soc-2008-mxcurioni/source/blender/editors/datafiles/crease.png.c
branches/soc-2008-mxcurioni/source/blender/editors/datafiles/darken.png.c
branches/soc-2008-mxcurioni/source/blender/editors/datafiles/draw.png.c
branches/soc-2008-mxcurioni/source/blender/editors/datafiles/fill.png.c
branches/soc-2008-mxcurioni/source/blender/editors/datafiles/flatten.png.c
branches/soc-2008-mxcurioni/source/blender/editors/datafiles/grab.png.c
branches/soc-2008-mxcurioni/source/blender/editors/datafiles/inflate.png.c
branches/soc-2008-mxcurioni/source/blender/editors/datafiles/layer.png.c
branches/soc-2008-mxcurioni/source/blender/editors/datafiles/lighten.png.c
branches/soc-2008-mxcurioni/source/blender/editors/datafiles/mask.png.c
branches/soc-2008-mxcurioni/source/blender/editors/datafiles/mix.png.c
branches/soc-2008-mxcurioni/source/blender/editors/datafiles/multiply.png.c
branches/soc-2008-mxcurioni/source/blender/editors/datafiles/nudge.png.c
branches/soc-2008-mxcurioni/source/blender/editors/datafiles/pinch.png.c
branches/soc-2008-mxcurioni/source/blender/editors/datafiles/preview.blend.c
branches/soc-2008-mxcurioni/source/blender/editors/datafiles/prvicons.c
branches/soc-2008-mxcurioni/source/blender/editors/datafiles/scrape.png.c
branches/soc-2008-mxcurioni/source/blender/editors/datafiles/smear.png.c
branches/soc-2008-mxcurioni/source/blender/editors/datafiles/smooth.png.c
branches/soc-2008-mxcurioni/source/blender/editors/datafiles/snake_hook.png.c
branches/soc-2008-mxcurioni/source/blender/editors/datafiles/soften.png.c
branches/soc-2008-mxcurioni/source/blender/editors/datafiles/splash.png.c
branches/soc-2008-mxcurioni/source/blender/editors/datafiles/startup.blend.c
branches/soc-2008-mxcurioni/source/blender/editors/datafiles/subtract.png.c
branches/soc-2008-mxcurioni/source/blender/editors/datafiles/texdraw.png.c
branches/soc-2008-mxcurioni/source/blender/editors/datafiles/thumb.png.c
branches/soc-2008-mxcurioni/source/blender/editors/datafiles/twist.png.c
branches/soc-2008-mxcurioni/source/blender/editors/datafiles/vertexdraw.png.c
branches/soc-2008-mxcurioni/source/blender/gpu/shaders/gpu_shader_material.glsl.c
branches/soc-2008-mxcurioni/source/blender/gpu/shaders/gpu_shader_sep_gaussian_blur_frag.glsl.c
branches/soc-2008-mxcurioni/source/blender/gpu/shaders/gpu_shader_sep_gaussian_blur_vert.glsl.c
branches/soc-2008-mxcurioni/source/blender/gpu/shaders/gpu_shader_vertex.glsl.c
branches/soc-2008-mxcurioni/source/blender/gpu/shaders/gpu_shader_vsm_store_frag.glsl.c
branches/soc-2008-mxcurioni/source/blender/gpu/shaders/gpu_shader_vsm_store_vert.glsl.c
Property Changed:
----------------
branches/soc-2008-mxcurioni/
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_data_lamp.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_data_modifier.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_particle.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_physics_field.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/space_node.py
branches/soc-2008-mxcurioni/source/blender/editors/space_outliner/
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,48089,48092,48551-48552,48679,48790,48792-48793,49076,49087,49292,49294,49466
/trunk/blender:34011-39896,39898-40096,40098-44221,44223-44419,44421-47664,47667-49797
+ /branches/ge_harmony:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/soc-2011-tomato:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801,43872,44130,44141,44147-44149,44151-44152,44229-44230,45623-45625,46037,48089,48092,48551-48552,48679,48790,48792-48793,49076,49087,49292,49294,49466
/trunk/blender:34011-39896,39898-40096,40098-44221,44223-44419,44421-47664,47667-49986
Modified: branches/soc-2008-mxcurioni/CMakeLists.txt
===================================================================
--- branches/soc-2008-mxcurioni/CMakeLists.txt 2012-08-18 14:27:48 UTC (rev 49986)
+++ branches/soc-2008-mxcurioni/CMakeLists.txt 2012-08-18 15:20:35 UTC (rev 49987)
@@ -126,6 +126,7 @@
option(WITH_PYTHON_MODULE "Enable building as a python module which runs without a user interface, like running regular blender in background mode (experimental, only enable for development)" OFF)
option(WITH_BUILDINFO "Include extra build details (only disable for development & faster builds)" ON)
option(WITH_IK_ITASC "Enable ITASC IK solver (only disable for development & for incompatible C++ compilers)" ON)
+option(WITH_IK_SOLVER "Enable Legacy IK solver (only disable for development)" ON)
option(WITH_FFTW3 "Enable FFTW3 support (Used for smoke and audio effects)" OFF)
option(WITH_BULLET "Enable Bullet (Physics Engine)" ON)
option(WITH_GAMEENGINE "Enable Game Engine" ON)
@@ -976,9 +977,10 @@
# normally cached but not since we include them with blender
set(PYTHON_VERSION 3.2) # CACHE STRING)
set_lib_path(PYTHON "python")
- set(PYTHON_INCLUDE_DIR ${PYTHON}/include/python${PYTHON_VERSION})
set(PYTHON_LIBRARY ${PYTHON}/lib/python32.lib) #CACHE FILEPATH
-
+ #Shared includes for both vc2008 and vc2010
+ set(PYTHON_INCLUDE_DIR ${LIBDIR}/python/include/python${PYTHON_VERSION})
+
# uncached vars
set(PYTHON_INCLUDE_DIRS "${PYTHON_INCLUDE_DIR}")
set(PYTHON_LIBRARIES "${PYTHON_LIBRARY}")
@@ -988,7 +990,7 @@
set(BOOST ${LIBDIR}/boost)
set(BOOST_INCLUDE_DIR ${BOOST}/include)
if(MSVC10)
- set(BOOST_LIBPATH ${BOOST}/lib/vc_10)
+ set(BOOST_LIBPATH ${BOOST}/vc2010/lib)
set(BOOST_POSTFIX "vc100-mt-s-1_49.lib")
set(BOOST_DEBUG_POSTFIX "vc100-mt-sgd-1_49.lib")
else()
Modified: branches/soc-2008-mxcurioni/GNUmakefile
===================================================================
--- branches/soc-2008-mxcurioni/GNUmakefile 2012-08-18 14:27:48 UTC (rev 49986)
+++ branches/soc-2008-mxcurioni/GNUmakefile 2012-08-18 15:20:35 UTC (rev 49987)
@@ -19,9 +19,9 @@
#
# ##### END GPL LICENSE BLOCK #####
-# This Makefile does an out-of-source CMake build in ../build/`OS`_`CPU`
+# This Makefile does an out-of-source CMake build in ../build_`OS`_`CPU`
# eg:
-# ../build/Linux_i386
+# ../build_linux_i386
# This is for users who like to configure & build blender with a single command.
@@ -40,7 +40,7 @@
endif
ifndef BUILD_DIR
- BUILD_DIR:=$(shell dirname $(BLENDER_DIR))/build/$(OS_NCASE)
+ BUILD_DIR:=$(shell dirname $(BLENDER_DIR))/build_$(OS_NCASE)
endif
Modified: branches/soc-2008-mxcurioni/SConstruct
===================================================================
--- branches/soc-2008-mxcurioni/SConstruct 2012-08-18 14:27:48 UTC (rev 49986)
+++ branches/soc-2008-mxcurioni/SConstruct 2012-08-18 15:20:35 UTC (rev 49987)
@@ -450,9 +450,12 @@
###################################
if not os.path.isdir ( B.root_build_dir + 'data_headers'):
os.makedirs ( B.root_build_dir + 'data_headers' )
+if not os.path.isdir ( B.root_build_dir + 'data_sources'):
+ os.makedirs ( B.root_build_dir + 'data_sources' )
# use for includes
env['DATA_HEADERS'] = os.path.join(os.path.abspath(env['BF_BUILDDIR']), "data_headers")
-def ensure_data(FILE_FROM, FILE_TO, VAR_NAME):
+env['DATA_SOURCES'] = os.path.join(os.path.abspath(env['BF_BUILDDIR']), "data_sources")
+def data_to_c(FILE_FROM, FILE_TO, VAR_NAME):
if os.sep == "\\":
FILE_FROM = FILE_FROM.replace("/", "\\")
FILE_TO = FILE_TO.replace("/", "\\")
@@ -483,10 +486,70 @@
fpin.close()
fpout.close()
-ensure_data("source/blender/compositor/operations/COM_OpenCLKernels.cl",
- B.root_build_dir + "data_headers/COM_OpenCLKernels.cl.h",
- "clkernelstoh_COM_OpenCLKernels_cl")
+def data_to_c_simple(FILE_FROM):
+ filename_only = os.path.basename(FILE_FROM)
+ FILE_TO = os.path.join(env['DATA_SOURCES'], filename_only + ".c")
+ VAR_NAME = "datatoc_" + filename_only.replace(".", "_")
+
+ data_to_c(FILE_FROM, FILE_TO, VAR_NAME)
+
+data_to_c("source/blender/compositor/operations/COM_OpenCLKernels.cl",
+ B.root_build_dir + "data_headers/COM_OpenCLKernels.cl.h",
+ "datatoc_COM_OpenCLKernels_cl")
+
+data_to_c_simple("release/datafiles/startup.blend")
+data_to_c_simple("release/datafiles/preview.blend")
+
+# --- glsl ---
+data_to_c_simple("source/blender/gpu/shaders/gpu_shader_material.glsl")
+data_to_c_simple("source/blender/gpu/shaders/gpu_shader_vertex.glsl")
+data_to_c_simple("source/blender/gpu/shaders/gpu_shader_sep_gaussian_blur_frag.glsl")
+data_to_c_simple("source/blender/gpu/shaders/gpu_shader_sep_gaussian_blur_vert.glsl")
+data_to_c_simple("source/blender/gpu/shaders/gpu_shader_material.glsl")
+data_to_c_simple("source/blender/gpu/shaders/gpu_shader_vsm_store_frag.glsl")
+data_to_c_simple("source/blender/gpu/shaders/gpu_shader_vsm_store_vert.glsl")
+
+# --- blender ---
+data_to_c_simple("release/datafiles/bfont.pfb")
+data_to_c_simple("release/datafiles/bfont.ttf")
+data_to_c_simple("release/datafiles/bmonofont.ttf")
+
+data_to_c_simple("release/datafiles/splash.png")
+data_to_c_simple("release/datafiles/blender_icons.png")
+data_to_c_simple("release/datafiles/prvicons.png")
+
+data_to_c_simple("release/datafiles/brushicons/add.png")
+data_to_c_simple("release/datafiles/brushicons/blob.png")
+data_to_c_simple("release/datafiles/brushicons/blur.png")
+data_to_c_simple("release/datafiles/brushicons/clay.png")
+data_to_c_simple("release/datafiles/brushicons/claystrips.png")
+data_to_c_simple("release/datafiles/brushicons/clone.png")
+data_to_c_simple("release/datafiles/brushicons/crease.png")
+data_to_c_simple("release/datafiles/brushicons/darken.png")
+data_to_c_simple("release/datafiles/brushicons/draw.png")
+data_to_c_simple("release/datafiles/brushicons/fill.png")
+data_to_c_simple("release/datafiles/brushicons/flatten.png")
+data_to_c_simple("release/datafiles/brushicons/grab.png")
+data_to_c_simple("release/datafiles/brushicons/inflate.png")
+data_to_c_simple("release/datafiles/brushicons/layer.png")
+data_to_c_simple("release/datafiles/brushicons/lighten.png")
+data_to_c_simple("release/datafiles/brushicons/mask.png")
+data_to_c_simple("release/datafiles/brushicons/mix.png")
+data_to_c_simple("release/datafiles/brushicons/multiply.png")
+data_to_c_simple("release/datafiles/brushicons/nudge.png")
+data_to_c_simple("release/datafiles/brushicons/pinch.png")
+data_to_c_simple("release/datafiles/brushicons/scrape.png")
+data_to_c_simple("release/datafiles/brushicons/smear.png")
+data_to_c_simple("release/datafiles/brushicons/smooth.png")
+data_to_c_simple("release/datafiles/brushicons/snake_hook.png")
+data_to_c_simple("release/datafiles/brushicons/soften.png")
+data_to_c_simple("release/datafiles/brushicons/subtract.png")
+data_to_c_simple("release/datafiles/brushicons/texdraw.png")
+data_to_c_simple("release/datafiles/brushicons/thumb.png")
+data_to_c_simple("release/datafiles/brushicons/twist.png")
+data_to_c_simple("release/datafiles/brushicons/vertexdraw.png")
+
##### END DATAFILES ##########
Help(opts.GenerateHelpText(env))
Modified: branches/soc-2008-mxcurioni/build_files/cmake/cmake_netbeans_project.py
===================================================================
--- branches/soc-2008-mxcurioni/build_files/cmake/cmake_netbeans_project.py 2012-08-18 14:27:48 UTC (rev 49986)
+++ branches/soc-2008-mxcurioni/build_files/cmake/cmake_netbeans_project.py 2012-08-18 15:20:35 UTC (rev 49987)
@@ -24,7 +24,7 @@
"""
Example linux usage
- python .~/blenderSVN/blender/build_files/cmake/cmake_netbeans_project.py ~/blenderSVN/cmake
+ python3 ~/blenderSVN/blender/build_files/cmake/cmake_netbeans_project.py ~/blenderSVN/cmake
Windows not supported so far
"""
Modified: branches/soc-2008-mxcurioni/build_files/cmake/config/blender_lite.cmake
===================================================================
--- branches/soc-2008-mxcurioni/build_files/cmake/config/blender_lite.cmake 2012-08-18 14:27:48 UTC (rev 49986)
+++ branches/soc-2008-mxcurioni/build_files/cmake/config/blender_lite.cmake 2012-08-18 15:20:35 UTC (rev 49987)
@@ -18,6 +18,7 @@
set(WITH_GAMEENGINE OFF CACHE FORCE BOOL)
set(WITH_COMPOSITOR OFF CACHE FORCE BOOL)
set(WITH_GHOST_XDND OFF CACHE FORCE BOOL)
+set(WITH_IK_SOLVER 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)
Deleted: branches/soc-2008-mxcurioni/build_files/cmake/data_to_c.cmake
===================================================================
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list