[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [52692] branches/soc-2008-mxcurioni: Merged changes in the trunk up to revision 52690.
Tamito Kajiyama
rd6t-kjym at asahi-net.or.jp
Sat Dec 1 03:48:02 CET 2012
Revision: 52692
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=52692
Author: kjym3
Date: 2012-12-01 02:47:59 +0000 (Sat, 01 Dec 2012)
Log Message:
-----------
Merged changes in the trunk up to revision 52690.
Conflicts resolved:
release/datafiles/startup.blend
source/blender/blenlib/intern/bpath.c
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=52690
Modified Paths:
--------------
branches/soc-2008-mxcurioni/CMakeLists.txt
branches/soc-2008-mxcurioni/SConstruct
branches/soc-2008-mxcurioni/build_files/build_environment/install_deps.sh
branches/soc-2008-mxcurioni/build_files/buildbot/config/user-config-glibc211-i686.py
branches/soc-2008-mxcurioni/build_files/buildbot/config/user-config-glibc211-x86_64.py
branches/soc-2008-mxcurioni/build_files/buildbot/config/user-config-glibc27-i686.py
branches/soc-2008-mxcurioni/build_files/buildbot/config/user-config-glibc27-x86_64.py
branches/soc-2008-mxcurioni/build_files/buildbot/config/user-config-player-glibc211-i686.py
branches/soc-2008-mxcurioni/build_files/buildbot/config/user-config-player-glibc211-x86_64.py
branches/soc-2008-mxcurioni/build_files/buildbot/config/user-config-player-glibc27-i686.py
branches/soc-2008-mxcurioni/build_files/buildbot/config/user-config-player-glibc27-x86_64.py
branches/soc-2008-mxcurioni/build_files/cmake/cmake_consistency_check.py
branches/soc-2008-mxcurioni/build_files/cmake/cmake_netbeans_project.py
branches/soc-2008-mxcurioni/build_files/cmake/cmake_qtcreator_project.py
branches/soc-2008-mxcurioni/build_files/cmake/cmake_static_check_clang_array.py
branches/soc-2008-mxcurioni/build_files/cmake/cmake_static_check_cppcheck.py
branches/soc-2008-mxcurioni/build_files/cmake/cmake_static_check_smatch.py
branches/soc-2008-mxcurioni/build_files/cmake/cmake_static_check_sparse.py
branches/soc-2008-mxcurioni/build_files/cmake/cmake_static_check_splint.py
branches/soc-2008-mxcurioni/build_files/cmake/example_scripts/make_quicky.py
branches/soc-2008-mxcurioni/build_files/cmake/project_info.py
branches/soc-2008-mxcurioni/build_files/scons/config/freebsd7-config.py
branches/soc-2008-mxcurioni/build_files/scons/config/freebsd8-config.py
branches/soc-2008-mxcurioni/build_files/scons/config/freebsd9-config.py
branches/soc-2008-mxcurioni/build_files/scons/config/linuxcross-config.py
branches/soc-2008-mxcurioni/build_files/scons/config/win32-mingw-config.py
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/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/doc/blender_file_format/BlendFileDnaExporter_25.py
branches/soc-2008-mxcurioni/doc/blender_file_format/BlendFileReader.py
branches/soc-2008-mxcurioni/doc/python_api/rst/bge.logic.rst
branches/soc-2008-mxcurioni/doc/python_api/rst/bge.types.rst
branches/soc-2008-mxcurioni/doc/python_api/sphinx_doc_gen.py
branches/soc-2008-mxcurioni/extern/CMakeLists.txt
branches/soc-2008-mxcurioni/extern/SConscript
branches/soc-2008-mxcurioni/intern/cycles/CMakeLists.txt
branches/soc-2008-mxcurioni/intern/cycles/SConscript
branches/soc-2008-mxcurioni/intern/cycles/blender/blender_object.cpp
branches/soc-2008-mxcurioni/intern/cycles/kernel/closure/bsdf_phong_ramp.h
branches/soc-2008-mxcurioni/intern/cycles/kernel/kernel_camera.h
branches/soc-2008-mxcurioni/intern/cycles/kernel/kernel_light.h
branches/soc-2008-mxcurioni/intern/cycles/kernel/kernel_object.h
branches/soc-2008-mxcurioni/intern/cycles/kernel/kernel_types.h
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/osl_services.cpp
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/osl_shader.cpp
branches/soc-2008-mxcurioni/intern/cycles/kernel/shaders/node_convert_from_color.osl
branches/soc-2008-mxcurioni/intern/cycles/kernel/shaders/node_convert_from_float.osl
branches/soc-2008-mxcurioni/intern/cycles/kernel/shaders/node_convert_from_int.osl
branches/soc-2008-mxcurioni/intern/cycles/kernel/shaders/node_convert_from_normal.osl
branches/soc-2008-mxcurioni/intern/cycles/kernel/shaders/node_convert_from_point.osl
branches/soc-2008-mxcurioni/intern/cycles/kernel/shaders/node_convert_from_vector.osl
branches/soc-2008-mxcurioni/intern/cycles/kernel/svm/svm.h
branches/soc-2008-mxcurioni/intern/cycles/kernel/svm/svm_brick.h
branches/soc-2008-mxcurioni/intern/cycles/kernel/svm/svm_closure.h
branches/soc-2008-mxcurioni/intern/cycles/kernel/svm/svm_texture.h
branches/soc-2008-mxcurioni/intern/cycles/kernel/svm/svm_voronoi.h
branches/soc-2008-mxcurioni/intern/cycles/render/camera.cpp
branches/soc-2008-mxcurioni/intern/cycles/render/graph.cpp
branches/soc-2008-mxcurioni/intern/cycles/render/graph.h
branches/soc-2008-mxcurioni/intern/cycles/render/nodes.cpp
branches/soc-2008-mxcurioni/intern/cycles/render/nodes.h
branches/soc-2008-mxcurioni/intern/cycles/render/object.cpp
branches/soc-2008-mxcurioni/intern/cycles/render/osl.cpp
branches/soc-2008-mxcurioni/intern/cycles/render/session.cpp
branches/soc-2008-mxcurioni/intern/cycles/render/svm.cpp
branches/soc-2008-mxcurioni/intern/cycles/render/svm.h
branches/soc-2008-mxcurioni/intern/cycles/util/util_transform.cpp
branches/soc-2008-mxcurioni/intern/cycles/util/util_transform.h
branches/soc-2008-mxcurioni/intern/ghost/GHOST_C-api.h
branches/soc-2008-mxcurioni/intern/guardedalloc/intern/mallocn.c
branches/soc-2008-mxcurioni/intern/tools/bpy_introspect_ui.py
branches/soc-2008-mxcurioni/intern/tools/credits_svn_gen.py
branches/soc-2008-mxcurioni/intern/tools/dump_rna2xml.py
branches/soc-2008-mxcurioni/intern/utfconv/utfconv.h
branches/soc-2008-mxcurioni/release/datafiles/startup.blend
branches/soc-2008-mxcurioni/release/scripts/modules/bl_i18n_utils/spell_check_utils.py
branches/soc-2008-mxcurioni/release/scripts/modules/bl_i18n_utils/update_trunk.py
branches/soc-2008-mxcurioni/release/scripts/modules/bpy_extras/mesh_utils.py
branches/soc-2008-mxcurioni/release/scripts/modules/bpy_types.py
branches/soc-2008-mxcurioni/release/scripts/modules/rna_xml.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_operators/uvcalc_follow_active.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_operators/uvcalc_lightmap.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_operators/uvcalc_smart_project.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_particle.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/space_userpref.py
branches/soc-2008-mxcurioni/release/scripts/templates/script_stub.py
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_DerivedMesh.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_node.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/SConscript
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/blender.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/camera.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/cdderivedmesh.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/displist.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/editderivedmesh.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/image.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/mask.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/mask_rasterize.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/mesh.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/modifiers_bmesh.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/node.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/particle.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/pointcache.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/seqmodifier.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/sequencer.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/smoke.c
branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_array.h
branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_endian_switch.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_utildefines.h
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/bpath.c
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/scanfill.c
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/string.c
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/string_utf8.c
branches/soc-2008-mxcurioni/source/blender/bmesh/bmesh_class.h
branches/soc-2008-mxcurioni/source/blender/bmesh/intern/bmesh_construct.c
branches/soc-2008-mxcurioni/source/blender/bmesh/intern/bmesh_construct.h
branches/soc-2008-mxcurioni/source/blender/bmesh/intern/bmesh_core.c
branches/soc-2008-mxcurioni/source/blender/bmesh/intern/bmesh_core.h
branches/soc-2008-mxcurioni/source/blender/bmesh/intern/bmesh_mesh_conv.c
branches/soc-2008-mxcurioni/source/blender/bmesh/intern/bmesh_mods.c
branches/soc-2008-mxcurioni/source/blender/bmesh/intern/bmesh_opdefines.c
branches/soc-2008-mxcurioni/source/blender/bmesh/intern/bmesh_operator_api.h
branches/soc-2008-mxcurioni/source/blender/bmesh/intern/bmesh_operator_api_inline.h
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_operators_private.h
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/bmesh/operators/bmo_dupe.c
branches/soc-2008-mxcurioni/source/blender/bmesh/operators/bmo_extrude.c
branches/soc-2008-mxcurioni/source/blender/bmesh/operators/bmo_hull.c
branches/soc-2008-mxcurioni/source/blender/bmesh/operators/bmo_inset.c
branches/soc-2008-mxcurioni/source/blender/bmesh/operators/bmo_mirror.c
branches/soc-2008-mxcurioni/source/blender/bmesh/operators/bmo_primitive.c
branches/soc-2008-mxcurioni/source/blender/bmesh/operators/bmo_removedoubles.c
branches/soc-2008-mxcurioni/source/blender/bmesh/operators/bmo_slide.c
branches/soc-2008-mxcurioni/source/blender/bmesh/operators/bmo_smooth_laplacian.c
branches/soc-2008-mxcurioni/source/blender/bmesh/operators/bmo_subdivide.c
branches/soc-2008-mxcurioni/source/blender/bmesh/operators/bmo_subdivide.h
branches/soc-2008-mxcurioni/source/blender/bmesh/operators/bmo_symmetrize.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/operators/bmo_wireframe.c
branches/soc-2008-mxcurioni/source/blender/bmesh/tools/bmesh_bevel.c
branches/soc-2008-mxcurioni/source/blender/bmesh/tools/bmesh_decimate.h
branches/soc-2008-mxcurioni/source/blender/bmesh/tools/bmesh_decimate_collapse.c
branches/soc-2008-mxcurioni/source/blender/bmesh/tools/bmesh_decimate_dissolve.c
branches/soc-2008-mxcurioni/source/blender/collada/MaterialExporter.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_NodeOperation.h
branches/soc-2008-mxcurioni/source/blender/compositor/intern/COM_WorkPackage.h
branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_MapRangeOperation.cpp
branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_NormalizeOperation.cpp
branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_ViewerBaseOperation.cpp
branches/soc-2008-mxcurioni/source/blender/editors/animation/anim_markers.c
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/interface/interface.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/mesh/editmesh_add.c
branches/soc-2008-mxcurioni/source/blender/editors/mesh/editmesh_knife.c
branches/soc-2008-mxcurioni/source/blender/editors/mesh/editmesh_loopcut.c
branches/soc-2008-mxcurioni/source/blender/editors/mesh/editmesh_rip.c
branches/soc-2008-mxcurioni/source/blender/editors/mesh/editmesh_select.c
branches/soc-2008-mxcurioni/source/blender/editors/mesh/editmesh_slide.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_navmesh.c
branches/soc-2008-mxcurioni/source/blender/editors/object/object_add.c
branches/soc-2008-mxcurioni/source/blender/editors/object/object_relations.c
branches/soc-2008-mxcurioni/source/blender/editors/object/object_vgroup.c
branches/soc-2008-mxcurioni/source/blender/editors/physics/particle_edit.c
branches/soc-2008-mxcurioni/source/blender/editors/render/render_internal.c
branches/soc-2008-mxcurioni/source/blender/editors/render/render_shading.c
branches/soc-2008-mxcurioni/source/blender/editors/render/render_update.c
branches/soc-2008-mxcurioni/source/blender/editors/sculpt_paint/paint_image.c
branches/soc-2008-mxcurioni/source/blender/editors/sculpt_paint/paint_utils.c
branches/soc-2008-mxcurioni/source/blender/editors/sculpt_paint/sculpt.c
branches/soc-2008-mxcurioni/source/blender/editors/space_buttons/space_buttons.c
branches/soc-2008-mxcurioni/source/blender/editors/space_clip/tracking_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/space_node/node_edit.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_select.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_draw.c
branches/soc-2008-mxcurioni/source/blender/editors/space_sequencer/sequencer_edit.c
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/drawmesh.c
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/space_view3d.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_iterators.c
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/view3d_toolbar.c
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/view3d_view.c
branches/soc-2008-mxcurioni/source/blender/editors/transform/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/editors/transform/SConscript
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/util/numinput.c
branches/soc-2008-mxcurioni/source/blender/editors/uvedit/uvedit_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/uvedit/uvedit_smart_stitch.c
branches/soc-2008-mxcurioni/source/blender/editors/uvedit/uvedit_unwrap_ops.c
branches/soc-2008-mxcurioni/source/blender/gpu/GPU_draw.h
branches/soc-2008-mxcurioni/source/blender/gpu/intern/gpu_draw.c
branches/soc-2008-mxcurioni/source/blender/ikplugin/intern/ikplugin_api.c
branches/soc-2008-mxcurioni/source/blender/imbuf/intern/openexr/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_node_types.h
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_material.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_object.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_scene_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/rna_cleanup/rna_cleaner.py
branches/soc-2008-mxcurioni/source/blender/makesrna/rna_cleanup/rna_cleaner_merge.py
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_array.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_decimate.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_skin.c
branches/soc-2008-mxcurioni/source/blender/nodes/NOD_composite.h
branches/soc-2008-mxcurioni/source/blender/nodes/NOD_shader.h
branches/soc-2008-mxcurioni/source/blender/nodes/NOD_texture.h
branches/soc-2008-mxcurioni/source/blender/nodes/intern/node_socket.c
branches/soc-2008-mxcurioni/source/blender/python/bmesh/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/python/bmesh/bmesh_py_api.c
branches/soc-2008-mxcurioni/source/blender/python/bmesh/bmesh_py_ops.c
branches/soc-2008-mxcurioni/source/blender/python/bmesh/bmesh_py_types.c
branches/soc-2008-mxcurioni/source/blender/python/bmesh/bmesh_py_types.h
branches/soc-2008-mxcurioni/source/blender/python/bmesh/bmesh_py_types_customdata.c
branches/soc-2008-mxcurioni/source/blender/python/bmesh/bmesh_py_types_select.c
branches/soc-2008-mxcurioni/source/blender/python/bmesh/bmesh_py_utils.c
branches/soc-2008-mxcurioni/source/blender/render/intern/source/convertblender.c
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_event_system.c
branches/soc-2008-mxcurioni/source/blender/windowmanager/intern/wm_gesture.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/creator/CMakeLists.txt
branches/soc-2008-mxcurioni/source/creator/blender.map
branches/soc-2008-mxcurioni/source/creator/creator.c
branches/soc-2008-mxcurioni/source/gameengine/BlenderRoutines/KX_BlenderKeyboardDevice.cpp
branches/soc-2008-mxcurioni/source/gameengine/BlenderRoutines/KX_BlenderMouseDevice.cpp
branches/soc-2008-mxcurioni/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
branches/soc-2008-mxcurioni/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp
branches/soc-2008-mxcurioni/source/tests/bl_run_operators.py
branches/soc-2008-mxcurioni/source/tools/check_style_c.py
branches/soc-2008-mxcurioni/source/tools/spell_check_source.py
branches/soc-2008-mxcurioni/source/tools/tag_release.py
Added Paths:
-----------
branches/soc-2008-mxcurioni/doc/python_api/examples/bmesh.ops.1.py
branches/soc-2008-mxcurioni/doc/python_api/rst_from_bmesh_opdefines.py
branches/soc-2008-mxcurioni/intern/cycles/kernel/shaders/node_convert_from_string.osl
branches/soc-2008-mxcurioni/release/scripts/templates/bmesh_simple_editmode.py
branches/soc-2008-mxcurioni/source/blender/python/bmesh/bmesh_py_ops_call.c
branches/soc-2008-mxcurioni/source/blender/python/bmesh/bmesh_py_ops_call.h
branches/soc-2008-mxcurioni/source/creator/osx_locals.map
Removed Paths:
-------------
branches/soc-2008-mxcurioni/extern/eltopo/
Property Changed:
----------------
branches/soc-2008-mxcurioni/
branches/soc-2008-mxcurioni/release/scripts/startup/bl_operators/uvcalc_smart_project.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_particle.py
branches/soc-2008-mxcurioni/source/blender/editors/interface/interface.c
branches/soc-2008-mxcurioni/source/blender/editors/render/render_update.c
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,49894,50052,50126
/trunk/blender:34011-39896,39898-40096,40098-44221,44223-44419,44421-47664,47667-51853,51855-52546
+ /branches/ge_harmony:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/soc-2011-tomato:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801,43872,44130,44141,44147-44149,44151-44152,44229-44230,45623-45625,46037,48089,48092,48551-48552,48679,48790,48792-48793,49076,49087,49292,49294,49466,49894,50052,50126
/trunk/blender:34011-39896,39898-40096,40098-44221,44223-44419,44421-47664,47667-51853,51855-52690
Modified: branches/soc-2008-mxcurioni/CMakeLists.txt
===================================================================
--- branches/soc-2008-mxcurioni/CMakeLists.txt 2012-11-30 22:46:28 UTC (rev 52691)
+++ branches/soc-2008-mxcurioni/CMakeLists.txt 2012-12-01 02:47:59 UTC (rev 52692)
@@ -190,8 +190,8 @@
option(WITH_MOD_SMOKE "Enable Smoke Modifier (Smoke Simulation)" ON)
option(WITH_MOD_BOOLEAN "Enable Boolean Modifier" ON)
option(WITH_MOD_REMESH "Enable Remesh Modifier" ON)
-option(WITH_MOD_CLOTH_ELTOPO "Enable Experimental cloth solver" OFF)
-mark_as_advanced(WITH_MOD_CLOTH_ELTOPO)
+# option(WITH_MOD_CLOTH_ELTOPO "Enable Experimental cloth solver" OFF) # this is now only available in a branch
+# mark_as_advanced(WITH_MOD_CLOTH_ELTOPO)
option(WITH_MOD_OCEANSIM "Enable Ocean Modifier" OFF)
# Image format support
@@ -271,6 +271,9 @@
if(APPLE)
+ cmake_minimum_required(VERSION 2.8.8)
+ cmake_policy(VERSION 2.8.8)
+
if(NOT CMAKE_OSX_ARCHITECTURES)
set(CMAKE_OSX_ARCHITECTURES x86_64 CACHE STRING
"Choose the architecture you want to build Blender for: i386, x86_64 or ppc"
@@ -487,14 +490,14 @@
# For alternate Python locations the commandline can be used to override detected/default cache settings, e.g:
# On Unix:
# cmake ../blender \
-# -D PYTHON_VERSION=3.2 \
-# -D PYTHON_INCLUDE_DIR=/opt/py32/include/python3.2d \
-# -D PYTHON_LIBRARY=/opt/py32/lib/libpython3.2d.so
+# -D PYTHON_VERSION=3.3 \
+# -D PYTHON_INCLUDE_DIR=/opt/py33/include/python3.3d \
+# -D PYTHON_LIBRARY=/opt/py33/lib/libpython3.3d.so
#
# On Macs:
# cmake ../blender \
-# -D PYTHON_INCLUDE_DIR=/System/Library/Frameworks/Python.framework/Versions/3.2/include/python3.2 \
-# -D PYTHON_LIBPATH=/System/Library/Frameworks/Python.framework/Versions/3.2/lib/python3.2/config \
+# -D PYTHON_INCLUDE_DIR=/System/Library/Frameworks/Python.framework/Versions/3.3/include/python3.3 \
+# -D PYTHON_LIBPATH=/System/Library/Frameworks/Python.framework/Versions/3.3/lib/python3.3/config \
# -G Xcode
#
# When changing any of this remember to update the notes in doc/build_systems/cmake.txt
@@ -522,7 +525,7 @@
find_package_wrapper(Freetype REQUIRED)
if(WITH_PYTHON)
- # No way to set py32. remove for now.
+ # No way to set py33. remove for now.
# find_package(PythonLibs)
# Use our own instead, since wothout py is such a rare case,
@@ -755,7 +758,6 @@
OUTPUT_STRIP_TRAILING_WHITESPACE)
string(REPLACE " " ";" LLVM_LIBRARY ${LLVM_LIBRARY})
endif()
- message(STATUS "LLVM library = ${LLVM_LIBRARY}")
else()
message(FATAL_ERROR "LLVM not found.")
endif()
@@ -872,7 +874,7 @@
# Setup 64bit and 64bit windows systems
if(WITH_MINGW64)
- message("Set 64 bit compiler for MinGW.")
+ message("Compiling for 64 bit with MinGW-w64.")
set(LIBDIR ${CMAKE_SOURCE_DIR}/../lib/mingw64)
endif()
else()
@@ -928,8 +930,6 @@
if(WITH_CYCLES_OSL)
set(CYCLES_OSL ${LIBDIR}/osl CACHE PATH "Path to OpenShadingLanguage installation")
- message(STATUS "CYCLES_OSL = ${CYCLES_OSL}")
-
find_library(OSL_LIB_EXEC NAMES oslexec PATHS ${CYCLES_OSL}/lib)
find_library(OSL_LIB_COMP NAMES oslcomp PATHS ${CYCLES_OSL}/lib)
find_library(OSL_LIB_QUERY NAMES oslquery PATHS ${CYCLES_OSL}/lib)
@@ -939,9 +939,6 @@
if(OSL_INCLUDES AND OSL_LIBRARIES AND OSL_COMPILER)
set(OSL_FOUND TRUE)
- message(STATUS "OSL includes = ${OSL_INCLUDES}")
- message(STATUS "OSL library = ${OSL_LIBRARIES}")
- message(STATUS "OSL compiler = ${OSL_COMPILER}")
else()
message(STATUS "OSL not found")
endif()
@@ -1102,9 +1099,17 @@
if(WITH_PYTHON)
# normally cached but not since we include them with blender
- set(PYTHON_VERSION 3.2) # CACHE STRING)
+ if(MSVC10)
+ set(PYTHON_VERSION 3.2) # CACHE STRING)
+ else()
+ set(PYTHON_VERSION 3.3) # CACHE STRING)
+ endif()
+
set_lib_path(PYTHON "python")
- set(PYTHON_LIBRARY ${PYTHON}/lib/python32.lib) #CACHE FILEPATH
+ STRING(REPLACE "." "" _PYTHON_VERSION_NO_DOTS ${PYTHON_VERSION})
+ set(PYTHON_LIBRARY ${PYTHON}/lib/python${_PYTHON_VERSION_NO_DOTS}.lib) #CACHE FILEPATH
+ unset(_PYTHON_VERSION_NO_DOTS)
+
#Shared includes for both vc2008 and vc2010
set(PYTHON_INCLUDE_DIR ${LIBDIR}/python/include/python${PYTHON_VERSION})
@@ -1212,7 +1217,7 @@
#comes with own pthread library
if(NOT WITH_MINGW64)
set(PTHREADS ${LIBDIR}/pthreads)
- set(PTHREADS_INCLUDE_DIRS ${PTHREADS}/include)
+ #set(PTHREADS_INCLUDE_DIRS ${PTHREADS}/include)
set(PTHREADS_LIBPATH ${PTHREADS}/lib)
set(PTHREADS_LIBRARIES pthreadGC2)
endif()
@@ -1284,9 +1289,9 @@
if(WITH_PYTHON)
# normally cached but not since we include them with blender
- set(PYTHON_VERSION 3.2) # CACHE STRING)
+ set(PYTHON_VERSION 3.3) # CACHE STRING)
set(PYTHON_INCLUDE_DIR "${LIBDIR}/python/include/python${PYTHON_VERSION}") # CACHE PATH)
- set(PYTHON_LIBRARY "${LIBDIR}/python/lib/python32mw.lib") # CACHE FILEPATH)
+ set(PYTHON_LIBRARY "${LIBDIR}/python/lib/python33mw.lib") # CACHE FILEPATH)
# uncached vars
set(PYTHON_INCLUDE_DIRS "${PYTHON_INCLUDE_DIR}")
@@ -1605,9 +1610,6 @@
find_library(LLVM_LIBRARY
NAMES LLVMAnalysis # first of a whole bunch of libs to get
PATHS ${LLVM_LIB_DIR})
- message(STATUS "LLVM version = ${LLVM_VERSION}")
- message(STATUS "LLVM dir = ${LLVM_DIRECTORY}")
- message(STATUS "LLVM lib dir = ${LLVM_LIB_DIR}")
if(LLVM_LIBRARY AND LLVM_DIRECTORY AND LLVM_LIB_DIR)
if(LLVM_STATIC)
@@ -1619,7 +1621,6 @@
OUTPUT_STRIP_TRAILING_WHITESPACE)
string(REPLACE " " ";" LLVM_LIBRARY ${LLVM_LIBRARY})
endif()
- message(STATUS "LLVM library = ${LLVM_LIBRARY}")
else()
message(FATAL_ERROR "LLVM not found.")
endif()
@@ -1628,8 +1629,6 @@
if(WITH_CYCLES_OSL)
set(CYCLES_OSL ${LIBDIR}/osl CACHE PATH "Path to OpenShadingLanguage installation")
- message(STATUS "CYCLES_OSL = ${CYCLES_OSL}")
-
find_library(OSL_LIB_EXEC NAMES oslexec PATHS ${CYCLES_OSL}/lib)
find_library(OSL_LIB_COMP NAMES oslcomp PATHS ${CYCLES_OSL}/lib)
find_library(OSL_LIB_QUERY NAMES oslquery PATHS ${CYCLES_OSL}/lib)
@@ -1640,9 +1639,6 @@
if(OSL_INCLUDES AND OSL_LIBRARIES AND OSL_COMPILER)
set(OSL_FOUND TRUE)
- message(STATUS "OSL includes = ${OSL_INCLUDES}")
- message(STATUS "OSL library = ${OSL_LIBRARIES}")
- message(STATUS "OSL compiler = ${OSL_COMPILER}")
else()
message(STATUS "OSL not found")
endif()
Modified: branches/soc-2008-mxcurioni/SConstruct
===================================================================
--- branches/soc-2008-mxcurioni/SConstruct 2012-11-30 22:46:28 UTC (rev 52691)
+++ branches/soc-2008-mxcurioni/SConstruct 2012-12-01 02:47:59 UTC (rev 52692)
@@ -312,6 +312,9 @@
env.Append(LINKFLAGS=['-L'+OSX_OSL_LIBPATH,'-loslcomp','-force_load '+ OSX_OSL_LIBPATH +'/liboslexec.a','-loslquery'])
env.Append(BF_PROGRAM_LINKFLAGS=['-Xlinker','-force_load','-Xlinker',OSX_OSL_LIBPATH +'/liboslexec.a'])
+ # Trying to get rid of eventually clashes, we export some explicite as local symbols
+ env.Append(LINKFLAGS=['-Xlinker','-unexported_symbols_list','-Xlinker','./source/creator/osx_locals.map'])
+
if env['WITH_BF_OPENMP'] == 1:
if env['OURPLATFORM'] in ('win32-vc', 'win64-vc'):
env['CCFLAGS'].append('/openmp')
Modified: branches/soc-2008-mxcurioni/build_files/build_environment/install_deps.sh
===================================================================
--- branches/soc-2008-mxcurioni/build_files/build_environment/install_deps.sh 2012-11-30 22:46:28 UTC (rev 52691)
+++ branches/soc-2008-mxcurioni/build_files/build_environment/install_deps.sh 2012-12-01 02:47:59 UTC (rev 52692)
@@ -188,9 +188,14 @@
prepare_opt() {
INFO "Ensuring $INST exists and is writable by us"
- sudo mkdir -p $INST
- sudo chown $USER $INST
- sudo chmod 775 $INST
+ if [ ! -d $INST ]; then
+ sudo mkdir -p $INST
+ fi
+
+ if [ ! -w $INST ]; then
+ sudo chown $USER $INST
+ sudo chmod 775 $INST
+ fi
}
# Check whether the current package needs to be recompiled, based on a dummy file containing a magic number in its name...
@@ -407,6 +412,7 @@
prepare_opt
if [ ! -d $_src ]; then
+ mkdir -p $SRC
wget -c $OIIO_SOURCE -O "$_src.tar.gz"
INFO "Unpacking OpenImageIO-$OIIO_VERSION"
@@ -450,12 +456,16 @@
cmake_d="$cmake_d -D CMAKE_PREFIX_PATH=$_inst"
cmake_d="$cmake_d -D CMAKE_INSTALL_PREFIX=$_inst"
cmake_d="$cmake_d -D BUILDSTATIC=ON"
- cmake_d="$cmake_d -D LINKSTATIC=ON"
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list