[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [40993] branches/soc-2011-carrot: Merge with trunk r40991
Miika Hamalainen
miika.hamalainen at kolumbus.fi
Thu Oct 13 23:43:04 CEST 2011
Revision: 40993
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=40993
Author: miikah
Date: 2011-10-13 21:43:02 +0000 (Thu, 13 Oct 2011)
Log Message:
-----------
Merge with trunk r40991
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=40991
Modified Paths:
--------------
branches/soc-2011-carrot/GNUmakefile
branches/soc-2011-carrot/SConstruct
branches/soc-2011-carrot/build_files/buildbot/config/user-config-i686.py
branches/soc-2011-carrot/build_files/buildbot/config/user-config-player-i686.py
branches/soc-2011-carrot/build_files/buildbot/config/user-config-player-x86_64.py
branches/soc-2011-carrot/build_files/buildbot/config/user-config-x86_64.py
branches/soc-2011-carrot/build_files/cmake/Modules/FindOpenCOLLADA.cmake
branches/soc-2011-carrot/build_files/package_spec/pacman/PKGBUILD
branches/soc-2011-carrot/doc/build_systems/cmake.txt
branches/soc-2011-carrot/doc/build_systems/scons-dev.txt
branches/soc-2011-carrot/doc/python_api/rst/change_log.rst
branches/soc-2011-carrot/doc/python_api/rst/gpu.rst
branches/soc-2011-carrot/doc/python_api/sphinx_doc_gen.py
branches/soc-2011-carrot/intern/audaspace/intern/AUD_C-API.cpp
branches/soc-2011-carrot/intern/container/CTR_List.h
branches/soc-2011-carrot/intern/container/CTR_Map.h
branches/soc-2011-carrot/intern/ghost/GHOST_Types.h
branches/soc-2011-carrot/intern/ghost/SConscript
branches/soc-2011-carrot/intern/ghost/intern/GHOST_Buttons.h
branches/soc-2011-carrot/intern/ghost/intern/GHOST_ModifierKeys.h
branches/soc-2011-carrot/intern/ghost/intern/GHOST_SystemCarbon.h
branches/soc-2011-carrot/intern/ghost/intern/GHOST_SystemCocoa.h
branches/soc-2011-carrot/intern/ghost/intern/GHOST_SystemPathsCarbon.h
branches/soc-2011-carrot/intern/ghost/intern/GHOST_SystemPathsCocoa.h
branches/soc-2011-carrot/intern/ghost/intern/GHOST_TaskbarWin32.h
branches/soc-2011-carrot/intern/ghost/intern/GHOST_Window.h
branches/soc-2011-carrot/intern/ghost/intern/GHOST_WindowCarbon.h
branches/soc-2011-carrot/intern/ghost/test/gears/GHOST_C-Test.c
branches/soc-2011-carrot/intern/mikktspace/mikktspace.c
branches/soc-2011-carrot/intern/string/STR_String.h
branches/soc-2011-carrot/po/POTFILES.in
branches/soc-2011-carrot/po/README.txt
branches/soc-2011-carrot/po/ar.po
branches/soc-2011-carrot/po/bg.po
branches/soc-2011-carrot/po/ca.po
branches/soc-2011-carrot/po/cs.po
branches/soc-2011-carrot/po/de.po
branches/soc-2011-carrot/po/el.po
branches/soc-2011-carrot/po/es.po
branches/soc-2011-carrot/po/fi.po
branches/soc-2011-carrot/po/fr.po
branches/soc-2011-carrot/po/hr.po
branches/soc-2011-carrot/po/it.po
branches/soc-2011-carrot/po/ja.po
branches/soc-2011-carrot/po/ko.po
branches/soc-2011-carrot/po/ne.po
branches/soc-2011-carrot/po/nl.po
branches/soc-2011-carrot/po/pl.po
branches/soc-2011-carrot/po/pt_BR.po
branches/soc-2011-carrot/po/ro.po
branches/soc-2011-carrot/po/ru.po
branches/soc-2011-carrot/po/sr.po
branches/soc-2011-carrot/po/sr at Latn.po
branches/soc-2011-carrot/po/sv.po
branches/soc-2011-carrot/po/uk.po
branches/soc-2011-carrot/po/update_msg.py
branches/soc-2011-carrot/po/zh_CN.po
branches/soc-2011-carrot/po/zh_TW.po
branches/soc-2011-carrot/release/bin/.blender/locale/ar/LC_MESSAGES/blender.mo
branches/soc-2011-carrot/release/bin/.blender/locale/fr/LC_MESSAGES/blender.mo
branches/soc-2011-carrot/release/scripts/modules/bpy/ops.py
branches/soc-2011-carrot/release/scripts/modules/bpy/path.py
branches/soc-2011-carrot/release/scripts/modules/bpy_extras/io_utils.py
branches/soc-2011-carrot/release/scripts/startup/bl_operators/image.py
branches/soc-2011-carrot/release/scripts/startup/bl_operators/object_align.py
branches/soc-2011-carrot/release/scripts/startup/bl_operators/object_quick_effects.py
branches/soc-2011-carrot/release/scripts/startup/bl_ui/properties_data_curve.py
branches/soc-2011-carrot/release/scripts/startup/bl_ui/properties_data_modifier.py
branches/soc-2011-carrot/release/scripts/startup/bl_ui/properties_game.py
branches/soc-2011-carrot/release/scripts/startup/bl_ui/space_sequencer.py
branches/soc-2011-carrot/release/scripts/startup/bl_ui/space_userpref_keymap.py
branches/soc-2011-carrot/release/scripts/startup/bl_ui/space_view3d.py
branches/soc-2011-carrot/release/scripts/startup/bl_ui/space_view3d_toolbar.py
branches/soc-2011-carrot/release/scripts/startup/keyingsets_builtins.py
branches/soc-2011-carrot/source/blender/blenfont/intern/blf_lang.c
branches/soc-2011-carrot/source/blender/blenkernel/BKE_action.h
branches/soc-2011-carrot/source/blender/blenkernel/BKE_anim.h
branches/soc-2011-carrot/source/blender/blenkernel/BKE_animsys.h
branches/soc-2011-carrot/source/blender/blenkernel/BKE_armature.h
branches/soc-2011-carrot/source/blender/blenkernel/BKE_bullet.h
branches/soc-2011-carrot/source/blender/blenkernel/BKE_cdderivedmesh.h
branches/soc-2011-carrot/source/blender/blenkernel/BKE_customdata.h
branches/soc-2011-carrot/source/blender/blenkernel/BKE_displist.h
branches/soc-2011-carrot/source/blender/blenkernel/BKE_font.h
branches/soc-2011-carrot/source/blender/blenkernel/BKE_icons.h
branches/soc-2011-carrot/source/blender/blenkernel/BKE_mesh.h
branches/soc-2011-carrot/source/blender/blenkernel/BKE_navmesh_conversion.h
branches/soc-2011-carrot/source/blender/blenkernel/BKE_nla.h
branches/soc-2011-carrot/source/blender/blenkernel/BKE_packedFile.h
branches/soc-2011-carrot/source/blender/blenkernel/BKE_paint.h
branches/soc-2011-carrot/source/blender/blenkernel/BKE_pointcache.h
branches/soc-2011-carrot/source/blender/blenkernel/BKE_shrinkwrap.h
branches/soc-2011-carrot/source/blender/blenkernel/BKE_subsurf.h
branches/soc-2011-carrot/source/blender/blenkernel/BKE_suggestions.h
branches/soc-2011-carrot/source/blender/blenkernel/BKE_unit.h
branches/soc-2011-carrot/source/blender/blenkernel/BKE_writeffmpeg.h
branches/soc-2011-carrot/source/blender/blenkernel/BKE_writeframeserver.h
branches/soc-2011-carrot/source/blender/blenkernel/CMakeLists.txt
branches/soc-2011-carrot/source/blender/blenkernel/intern/CCGSubSurf.c
branches/soc-2011-carrot/source/blender/blenkernel/intern/CCGSubSurf.h
branches/soc-2011-carrot/source/blender/blenkernel/intern/DerivedMesh.c
branches/soc-2011-carrot/source/blender/blenkernel/intern/action.c
branches/soc-2011-carrot/source/blender/blenkernel/intern/anim.c
branches/soc-2011-carrot/source/blender/blenkernel/intern/anim_sys.c
branches/soc-2011-carrot/source/blender/blenkernel/intern/armature.c
branches/soc-2011-carrot/source/blender/blenkernel/intern/blender.c
branches/soc-2011-carrot/source/blender/blenkernel/intern/bmfont.c
branches/soc-2011-carrot/source/blender/blenkernel/intern/boids.c
branches/soc-2011-carrot/source/blender/blenkernel/intern/bullet.c
branches/soc-2011-carrot/source/blender/blenkernel/intern/bvhutils.c
branches/soc-2011-carrot/source/blender/blenkernel/intern/cdderivedmesh.c
branches/soc-2011-carrot/source/blender/blenkernel/intern/colortools.c
branches/soc-2011-carrot/source/blender/blenkernel/intern/constraint.c
branches/soc-2011-carrot/source/blender/blenkernel/intern/curve.c
branches/soc-2011-carrot/source/blender/blenkernel/intern/customdata.c
branches/soc-2011-carrot/source/blender/blenkernel/intern/deform.c
branches/soc-2011-carrot/source/blender/blenkernel/intern/displist.c
branches/soc-2011-carrot/source/blender/blenkernel/intern/effect.c
branches/soc-2011-carrot/source/blender/blenkernel/intern/fcurve.c
branches/soc-2011-carrot/source/blender/blenkernel/intern/fmodifier.c
branches/soc-2011-carrot/source/blender/blenkernel/intern/font.c
branches/soc-2011-carrot/source/blender/blenkernel/intern/gpencil.c
branches/soc-2011-carrot/source/blender/blenkernel/intern/icons.c
branches/soc-2011-carrot/source/blender/blenkernel/intern/image.c
branches/soc-2011-carrot/source/blender/blenkernel/intern/image_gen.c
branches/soc-2011-carrot/source/blender/blenkernel/intern/ipo.c
branches/soc-2011-carrot/source/blender/blenkernel/intern/key.c
branches/soc-2011-carrot/source/blender/blenkernel/intern/lattice.c
branches/soc-2011-carrot/source/blender/blenkernel/intern/library.c
branches/soc-2011-carrot/source/blender/blenkernel/intern/material.c
branches/soc-2011-carrot/source/blender/blenkernel/intern/mball.c
branches/soc-2011-carrot/source/blender/blenkernel/intern/mesh.c
branches/soc-2011-carrot/source/blender/blenkernel/intern/modifier.c
branches/soc-2011-carrot/source/blender/blenkernel/intern/navmesh_conversion.c
branches/soc-2011-carrot/source/blender/blenkernel/intern/nla.c
branches/soc-2011-carrot/source/blender/blenkernel/intern/object.c
branches/soc-2011-carrot/source/blender/blenkernel/intern/packedFile.c
branches/soc-2011-carrot/source/blender/blenkernel/intern/particle.c
branches/soc-2011-carrot/source/blender/blenkernel/intern/particle_system.c
branches/soc-2011-carrot/source/blender/blenkernel/intern/property.c
branches/soc-2011-carrot/source/blender/blenkernel/intern/scene.c
branches/soc-2011-carrot/source/blender/blenkernel/intern/script.c
branches/soc-2011-carrot/source/blender/blenkernel/intern/seqcache.c
branches/soc-2011-carrot/source/blender/blenkernel/intern/sequencer.c
branches/soc-2011-carrot/source/blender/blenkernel/intern/sketch.c
branches/soc-2011-carrot/source/blender/blenkernel/intern/smoke.c
branches/soc-2011-carrot/source/blender/blenkernel/intern/softbody.c
branches/soc-2011-carrot/source/blender/blenkernel/intern/sound.c
branches/soc-2011-carrot/source/blender/blenkernel/intern/speaker.c
branches/soc-2011-carrot/source/blender/blenkernel/intern/text.c
branches/soc-2011-carrot/source/blender/blenkernel/intern/texture.c
branches/soc-2011-carrot/source/blender/blenkernel/intern/world.c
branches/soc-2011-carrot/source/blender/blenkernel/intern/writeavi.c
branches/soc-2011-carrot/source/blender/blenkernel/intern/writeffmpeg.c
branches/soc-2011-carrot/source/blender/blenkernel/intern/writeframeserver.c
branches/soc-2011-carrot/source/blender/blenlib/intern/path_util.c
branches/soc-2011-carrot/source/blender/blenlib/intern/winstuff.c
branches/soc-2011-carrot/source/blender/blenloader/intern/readfile.c
branches/soc-2011-carrot/source/blender/editors/animation/anim_draw.c
branches/soc-2011-carrot/source/blender/editors/animation/anim_ipo_utils.c
branches/soc-2011-carrot/source/blender/editors/animation/keyframing.c
branches/soc-2011-carrot/source/blender/editors/armature/poseobject.c
branches/soc-2011-carrot/source/blender/editors/curve/editfont.c
branches/soc-2011-carrot/source/blender/editors/gpencil/drawgpencil.c
branches/soc-2011-carrot/source/blender/editors/include/ED_keyframing.h
branches/soc-2011-carrot/source/blender/editors/include/UI_interface.h
branches/soc-2011-carrot/source/blender/editors/interface/interface.c
branches/soc-2011-carrot/source/blender/editors/interface/interface_handlers.c
branches/soc-2011-carrot/source/blender/editors/interface/interface_layout.c
branches/soc-2011-carrot/source/blender/editors/interface/interface_templates.c
branches/soc-2011-carrot/source/blender/editors/mesh/mesh_intern.h
branches/soc-2011-carrot/source/blender/editors/mesh/mesh_navmesh.c
branches/soc-2011-carrot/source/blender/editors/mesh/mesh_ops.c
branches/soc-2011-carrot/source/blender/editors/object/object_add.c
branches/soc-2011-carrot/source/blender/editors/object/object_edit.c
branches/soc-2011-carrot/source/blender/editors/object/object_modifier.c
branches/soc-2011-carrot/source/blender/editors/object/object_transform.c
branches/soc-2011-carrot/source/blender/editors/render/render_shading.c
branches/soc-2011-carrot/source/blender/editors/sculpt_paint/paint_vertex.c
branches/soc-2011-carrot/source/blender/editors/sound/sound_ops.c
branches/soc-2011-carrot/source/blender/editors/space_action/action_edit.c
branches/soc-2011-carrot/source/blender/editors/space_buttons/buttons_ops.c
branches/soc-2011-carrot/source/blender/editors/space_file/file_ops.c
branches/soc-2011-carrot/source/blender/editors/space_file/filesel.c
branches/soc-2011-carrot/source/blender/editors/space_file/space_file.c
branches/soc-2011-carrot/source/blender/editors/space_image/image_ops.c
branches/soc-2011-carrot/source/blender/editors/space_info/space_info.c
branches/soc-2011-carrot/source/blender/editors/space_node/drawnode.c
branches/soc-2011-carrot/source/blender/editors/space_sequencer/sequencer_add.c
branches/soc-2011-carrot/source/blender/editors/space_sequencer/sequencer_draw.c
branches/soc-2011-carrot/source/blender/editors/space_sequencer/sequencer_edit.c
branches/soc-2011-carrot/source/blender/editors/space_sequencer/sequencer_select.c
branches/soc-2011-carrot/source/blender/editors/space_view3d/drawarmature.c
branches/soc-2011-carrot/source/blender/editors/space_view3d/drawmesh.c
branches/soc-2011-carrot/source/blender/editors/space_view3d/drawobject.c
branches/soc-2011-carrot/source/blender/editors/space_view3d/view3d_header.c
branches/soc-2011-carrot/source/blender/editors/space_view3d/view3d_select.c
branches/soc-2011-carrot/source/blender/editors/space_view3d/view3d_snap.c
branches/soc-2011-carrot/source/blender/editors/transform/transform_generics.c
branches/soc-2011-carrot/source/blender/editors/transform/transform_input.c
branches/soc-2011-carrot/source/blender/editors/util/ed_util.c
branches/soc-2011-carrot/source/blender/gpu/intern/gpu_draw.c
branches/soc-2011-carrot/source/blender/imbuf/intern/anim_movie.c
branches/soc-2011-carrot/source/blender/imbuf/intern/indexer.c
branches/soc-2011-carrot/source/blender/imbuf/intern/openexr/openexr_api.cpp
branches/soc-2011-carrot/source/blender/makesdna/DNA_ID.h
branches/soc-2011-carrot/source/blender/makesdna/DNA_gpencil_types.h
branches/soc-2011-carrot/source/blender/makesdna/DNA_modifier_types.h
branches/soc-2011-carrot/source/blender/makesdna/DNA_scene_types.h
branches/soc-2011-carrot/source/blender/makesrna/RNA_access.h
branches/soc-2011-carrot/source/blender/makesrna/intern/rna_ID.c
branches/soc-2011-carrot/source/blender/makesrna/intern/rna_fluidsim.c
branches/soc-2011-carrot/source/blender/makesrna/intern/rna_gpencil.c
branches/soc-2011-carrot/source/blender/makesrna/intern/rna_image_api.c
branches/soc-2011-carrot/source/blender/makesrna/intern/rna_main_api.c
branches/soc-2011-carrot/source/blender/makesrna/intern/rna_modifier.c
branches/soc-2011-carrot/source/blender/makesrna/intern/rna_object.c
branches/soc-2011-carrot/source/blender/makesrna/intern/rna_particle.c
branches/soc-2011-carrot/source/blender/makesrna/intern/rna_rna.c
branches/soc-2011-carrot/source/blender/makesrna/intern/rna_scene.c
branches/soc-2011-carrot/source/blender/makesrna/intern/rna_sculpt_paint.c
branches/soc-2011-carrot/source/blender/makesrna/intern/rna_space.c
branches/soc-2011-carrot/source/blender/makesrna/intern/rna_ui_api.c
branches/soc-2011-carrot/source/blender/makesrna/intern/rna_userdef.c
branches/soc-2011-carrot/source/blender/makesrna/intern/rna_wm.c
branches/soc-2011-carrot/source/blender/modifiers/CMakeLists.txt
branches/soc-2011-carrot/source/blender/modifiers/intern/MOD_util.c
branches/soc-2011-carrot/source/blender/nodes/composite/nodes/node_composite_image.c
branches/soc-2011-carrot/source/blender/nodes/intern/node_common.c
branches/soc-2011-carrot/source/blender/nodes/intern/node_exec.c
branches/soc-2011-carrot/source/blender/python/generic/IDProp.c
branches/soc-2011-carrot/source/blender/python/generic/bgl.c
branches/soc-2011-carrot/source/blender/python/generic/bpy_internal_import.c
branches/soc-2011-carrot/source/blender/python/generic/noise_py_api.c
branches/soc-2011-carrot/source/blender/python/generic/py_capi_utils.c
branches/soc-2011-carrot/source/blender/python/intern/bpy.c
branches/soc-2011-carrot/source/blender/python/intern/bpy_app.c
branches/soc-2011-carrot/source/blender/python/intern/bpy_app_handlers.c
branches/soc-2011-carrot/source/blender/python/intern/bpy_driver.c
branches/soc-2011-carrot/source/blender/python/intern/bpy_interface.c
branches/soc-2011-carrot/source/blender/python/intern/bpy_interface_atexit.c
branches/soc-2011-carrot/source/blender/python/intern/bpy_library.c
branches/soc-2011-carrot/source/blender/python/intern/bpy_operator.c
branches/soc-2011-carrot/source/blender/python/intern/bpy_operator_wrap.c
branches/soc-2011-carrot/source/blender/python/intern/bpy_props.c
branches/soc-2011-carrot/source/blender/python/intern/bpy_rna.c
branches/soc-2011-carrot/source/blender/python/intern/bpy_rna_anim.c
branches/soc-2011-carrot/source/blender/python/intern/bpy_rna_array.c
branches/soc-2011-carrot/source/blender/python/intern/bpy_traceback.c
branches/soc-2011-carrot/source/blender/python/intern/bpy_util.c
branches/soc-2011-carrot/source/blender/python/intern/gpu.c
branches/soc-2011-carrot/source/blender/python/mathutils/mathutils.c
branches/soc-2011-carrot/source/blender/python/mathutils/mathutils_Color.c
branches/soc-2011-carrot/source/blender/python/mathutils/mathutils_Euler.c
branches/soc-2011-carrot/source/blender/python/mathutils/mathutils_Matrix.c
branches/soc-2011-carrot/source/blender/python/mathutils/mathutils_Quaternion.c
branches/soc-2011-carrot/source/blender/python/mathutils/mathutils_Vector.c
branches/soc-2011-carrot/source/blender/python/mathutils/mathutils_geometry.c
branches/soc-2011-carrot/source/blender/quicktime/SConscript
branches/soc-2011-carrot/source/blender/windowmanager/intern/wm_operators.c
branches/soc-2011-carrot/source/blenderplayer/bad_level_call_stubs/stubs.c
branches/soc-2011-carrot/source/creator/CMakeLists.txt
branches/soc-2011-carrot/source/gameengine/Converter/BlenderWorldInfo.h
branches/soc-2011-carrot/source/gameengine/Converter/KX_IpoConvert.cpp
branches/soc-2011-carrot/source/gameengine/Expressions/PyObjectPlus.h
branches/soc-2011-carrot/source/gameengine/GameLogic/SCA_2DFilterActuator.cpp
branches/soc-2011-carrot/source/gameengine/GameLogic/SCA_2DFilterActuator.h
branches/soc-2011-carrot/source/gameengine/Ketsji/KX_Dome.h
branches/soc-2011-carrot/source/gameengine/Ketsji/KX_GameObject.cpp
branches/soc-2011-carrot/source/gameengine/Ketsji/KX_ObstacleSimulation.cpp
branches/soc-2011-carrot/source/gameengine/Ketsji/KX_OrientationInterpolator.h
branches/soc-2011-carrot/source/gameengine/Ketsji/KX_SteeringActuator.cpp
branches/soc-2011-carrot/source/gameengine/Ketsji/KX_SteeringActuator.h
branches/soc-2011-carrot/source/gameengine/Ketsji/KX_VertexProxy.cpp
branches/soc-2011-carrot/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.h
branches/soc-2011-carrot/source/gameengine/Rasterizer/RAS_IRasterizer.h
branches/soc-2011-carrot/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_GrayScale2DFilter.h
branches/soc-2011-carrot/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_Invert2DFilter.h
branches/soc-2011-carrot/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.h
branches/soc-2011-carrot/source/gameengine/SceneGraph/SG_DList.h
branches/soc-2011-carrot/source/gameengine/VideoTexture/ImageRender.h
branches/soc-2011-carrot/source/gameengine/VideoTexture/ImageViewport.h
branches/soc-2011-carrot/source/tests/CMakeLists.txt
Added Paths:
-----------
branches/soc-2011-carrot/po/fa.po
branches/soc-2011-carrot/release/bin/.blender/locale/fa/
branches/soc-2011-carrot/release/bin/.blender/locale/fa/LC_MESSAGES/
branches/soc-2011-carrot/release/bin/.blender/locale/fa/LC_MESSAGES/blender.mo
branches/soc-2011-carrot/source/tools/compile_scripts.py
Removed Paths:
-------------
branches/soc-2011-carrot/release/bin/.blender/locale/fa/LC_MESSAGES/
branches/soc-2011-carrot/release/bin/.blender/locale/fa/LC_MESSAGES/blender.mo
branches/soc-2011-carrot/source/blender/modifiers/intern/MOD_navmesh.c
Property Changed:
----------------
branches/soc-2011-carrot/
branches/soc-2011-carrot/intern/audaspace/OpenAL/
branches/soc-2011-carrot/po/el.po
branches/soc-2011-carrot/po/ko.po
branches/soc-2011-carrot/po/ne.po
branches/soc-2011-carrot/po/zh_TW.po
branches/soc-2011-carrot/source/blender/editors/space_outliner/
Property changes on: branches/soc-2011-carrot
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/blender:36828-40782
+ /trunk/blender:36828-40991
Modified: branches/soc-2011-carrot/GNUmakefile
===================================================================
--- branches/soc-2011-carrot/GNUmakefile 2011-10-13 20:00:22 UTC (rev 40992)
+++ branches/soc-2011-carrot/GNUmakefile 2011-10-13 21:43:02 UTC (rev 40993)
@@ -145,6 +145,9 @@
@echo " * check_splint - run blenders source through splint (C only)"
@echo " * check_sparse - run blenders source through sparse (C only)"
@echo ""
+ @echo "Documentation Targets"
+ @echo " * doc_py - generate sphinx python api docs"
+ @echo ""
# -----------------------------------------------------------------------------
# Packages
@@ -222,6 +225,17 @@
cd $(BUILD_DIR) ; python3 $(BLENDER_DIR)/build_files/cmake/cmake_static_check_sparse.py
+# -----------------------------------------------------------------------------
+# Documentation
+#
+
+# Simple version of ./doc/python_api/sphinx_doc_gen.sh with no PDF generation.
+doc_py:
+ $(BUILD_DIR)/bin/blender --background --factory-startup --python doc/python_api/sphinx_doc_gen.py
+ cd doc/python_api ; sphinx-build -n -b html sphinx-in sphinx-out
+ @echo "docs written into: 'doc/python_api/sphinx-out/index.html'"
+
+
clean:
$(MAKE) -C $(BUILD_DIR) clean
Modified: branches/soc-2011-carrot/SConstruct
===================================================================
--- branches/soc-2011-carrot/SConstruct 2011-10-13 20:00:22 UTC (rev 40992)
+++ branches/soc-2011-carrot/SConstruct 2011-10-13 21:43:02 UTC (rev 40993)
@@ -30,6 +30,7 @@
# Then read all SConscripts and build
#
# TODO: fix /FORCE:MULTIPLE on windows to get proper debug builds.
+# TODO: cleanup CCFLAGS / CPPFLAGS use, often both are set when we only need one.
import platform as pltfrm
@@ -283,26 +284,21 @@
if env['OURPLATFORM'] in ('win32-vc', 'win64-vc'):
env['CCFLAGS'].append('/openmp')
env['CPPFLAGS'].append('/openmp')
- env['CXXFLAGS'].append('/openmp')
else:
if env['CC'].endswith('icc'): # to be able to handle CC=/opt/bla/icc case
env.Append(LINKFLAGS=['-openmp', '-static-intel'])
env['CCFLAGS'].append('-openmp')
env['CPPFLAGS'].append('-openmp')
- env['CXXFLAGS'].append('-openmp')
else:
env.Append(CCFLAGS=['-fopenmp'])
env.Append(CPPFLAGS=['-fopenmp'])
- env.Append(CXXFLAGS=['-fopenmp'])
if env['WITH_GHOST_COCOA'] == True:
env.Append(CFLAGS=['-DGHOST_COCOA'])
- env.Append(CXXFLAGS=['-DGHOST_COCOA'])
env.Append(CPPFLAGS=['-DGHOST_COCOA'])
if env['USE_QTKIT'] == True:
- env.Append(CFLAGS=['-DUSE_QTKIT'])
- env.Append(CXXFLAGS=['-DUSE_QTKIT'])
+ env.Append(CFLAGS=['-DUSE_QTKIT'])
env.Append(CPPFLAGS=['-DUSE_QTKIT'])
#check for additional debug libnames
@@ -334,23 +330,19 @@
# disable elbeem (fluidsim) compilation?
if env['BF_NO_ELBEEM'] == 1:
env['CPPFLAGS'].append('-DDISABLE_ELBEEM')
- env['CXXFLAGS'].append('-DDISABLE_ELBEEM')
env['CCFLAGS'].append('-DDISABLE_ELBEEM')
if btools.ENDIAN == "big":
env['CPPFLAGS'].append('-D__BIG_ENDIAN__')
- env['CXXFLAGS'].append('-D__BIG_ENDIAN__')
env['CCFLAGS'].append('-D__BIG_ENDIAN__')
else:
env['CPPFLAGS'].append('-D__LITTLE_ENDIAN__')
- env['CXXFLAGS'].append('-D__LITTLE_ENDIAN__')
env['CCFLAGS'].append('-D__LITTLE_ENDIAN__')
# TODO, make optional
env['CPPFLAGS'].append('-DWITH_AUDASPACE')
-env['CXXFLAGS'].append('-DWITH_AUDASPACE')
env['CCFLAGS'].append('-DWITH_AUDASPACE')
# lastly we check for root_build_dir ( we should not do before, otherwise we might do wrong builddir
Modified: branches/soc-2011-carrot/build_files/buildbot/config/user-config-i686.py
===================================================================
--- branches/soc-2011-carrot/build_files/buildbot/config/user-config-i686.py 2011-10-13 20:00:22 UTC (rev 40992)
+++ branches/soc-2011-carrot/build_files/buildbot/config/user-config-i686.py 2011-10-13 21:43:02 UTC (rev 40993)
@@ -89,6 +89,9 @@
WITH_BF_FFTW3 = True
WITH_BF_STATICFFTW3 = True
+# JACK
+WITH_BF_JACK = True
+
# Compilation and optimization
BF_DEBUG = False
REL_CFLAGS = ['-O2']
Modified: branches/soc-2011-carrot/build_files/buildbot/config/user-config-player-i686.py
===================================================================
--- branches/soc-2011-carrot/build_files/buildbot/config/user-config-player-i686.py 2011-10-13 20:00:22 UTC (rev 40992)
+++ branches/soc-2011-carrot/build_files/buildbot/config/user-config-player-i686.py 2011-10-13 21:43:02 UTC (rev 40993)
@@ -80,6 +80,9 @@
BF_3DMOUSE = '/home/sources/staticlibs/spnav'
BF_3DMOUSE_LIBPATH = '${BF_3DMOUSE}/lib32'
+# JACK
+WITH_BF_JACK = True
+
# Compilation and optimization
BF_DEBUG = False
REL_CFLAGS = ['-O2']
Modified: branches/soc-2011-carrot/build_files/buildbot/config/user-config-player-x86_64.py
===================================================================
--- branches/soc-2011-carrot/build_files/buildbot/config/user-config-player-x86_64.py 2011-10-13 20:00:22 UTC (rev 40992)
+++ branches/soc-2011-carrot/build_files/buildbot/config/user-config-player-x86_64.py 2011-10-13 21:43:02 UTC (rev 40993)
@@ -80,6 +80,9 @@
BF_3DMOUSE = '/home/sources/staticlibs/spnav'
BF_3DMOUSE_LIBPATH = '${BF_3DMOUSE}/lib64'
+# JACK
+WITH_BF_JACK = True
+
# Compilation and optimization
BF_DEBUG = False
REL_CFLAGS = ['-O2']
Modified: branches/soc-2011-carrot/build_files/buildbot/config/user-config-x86_64.py
===================================================================
--- branches/soc-2011-carrot/build_files/buildbot/config/user-config-x86_64.py 2011-10-13 20:00:22 UTC (rev 40992)
+++ branches/soc-2011-carrot/build_files/buildbot/config/user-config-x86_64.py 2011-10-13 21:43:02 UTC (rev 40993)
@@ -89,6 +89,9 @@
WITH_BF_FFTW3 = True
WITH_BF_STATICFFTW3 = True
+# JACK
+WITH_BF_JACK = True
+
# Compilation and optimization
BF_DEBUG = False
REL_CFLAGS = ['-O2']
Modified: branches/soc-2011-carrot/build_files/cmake/Modules/FindOpenCOLLADA.cmake
===================================================================
--- branches/soc-2011-carrot/build_files/cmake/Modules/FindOpenCOLLADA.cmake 2011-10-13 20:00:22 UTC (rev 40992)
+++ branches/soc-2011-carrot/build_files/cmake/Modules/FindOpenCOLLADA.cmake 2011-10-13 21:43:02 UTC (rev 40993)
@@ -53,10 +53,11 @@
)
# Fedora openCOLLADA package links these statically
+# note that order is important here ot it wont link
SET(_opencollada_FIND_STATIC_COMPONENTS
+ buffer
+ ftoa
UTF
- ftoa
- buffer
)
SET(_opencollada_SEARCH_DIRS
Modified: branches/soc-2011-carrot/build_files/package_spec/pacman/PKGBUILD
===================================================================
--- branches/soc-2011-carrot/build_files/package_spec/pacman/PKGBUILD 2011-10-13 20:00:22 UTC (rev 40992)
+++ branches/soc-2011-carrot/build_files/package_spec/pacman/PKGBUILD 2011-10-13 21:43:02 UTC (rev 40993)
@@ -12,10 +12,12 @@
# map the version a -> 1
# not to be confused with blender's internal subversions
if [ "$blender_version_char" ]; then
- blender_version=${blender_version}.$(expr index abcdefghijklmnopqrstuvwxyz $blender_version_char)
+ blender_version_full=${blender_version}.$(expr index abcdefghijklmnopqrstuvwxyz $blender_version_char)
+else
+ blender_version_full=${blender_version}
fi
-blender_ver_string=$blender_version+svn$blender_revision
+blender_ver_string=$blender_version+svn$blender_version_full
pkgname=blender-snapshot
pkgver=$blender_ver_string
@@ -61,5 +63,8 @@
package() {
cd $srcdir/build
make DESTDIR="$pkgdir" install
- python -m compileall $pkgdir/usr/share/blender
+ python -m compileall \
+ $pkgdir/usr/share/blender/$blender_version/scripts/startup \
+ $pkgdir/usr/share/blender/$blender_version/scripts/modules \
+ $pkgdir/usr/share/blender/$blender_version/scripts/addons
}
Modified: branches/soc-2011-carrot/doc/build_systems/cmake.txt
===================================================================
--- branches/soc-2011-carrot/doc/build_systems/cmake.txt 2011-10-13 20:00:22 UTC (rev 40992)
+++ branches/soc-2011-carrot/doc/build_systems/cmake.txt 2011-10-13 21:43:02 UTC (rev 40993)
@@ -11,7 +11,7 @@
3. Obtaining Dependencies
4. Deciding on a Build Environment
5. Configuring the build for the first time
- 6. Configuring the build after CVS updates
+ 6. Configuring the build after SVN updates
7. Specify alternate Python library versions and locations
@@ -36,7 +36,7 @@
http://www.blender.org/cms/Getting_Dependencies.135.0.html that you
have all dependencies needed for building Blender. Note that for
windows many of these dependencies already come in the lib/windows
- module from CVS.
+ module from SVN.
4. Deciding on a Build Environment
----------------------------------
@@ -47,8 +47,8 @@
have been successfully used to generate build files for the following
environments:
- 1. Microsoft Visual Studio 2005. There is a free version available
- at http://msdn.microsoft.com/vstudio/express/visualc/.
+ 1. Microsoft Visual Studio 2008. There is a free version available
+ at http://http://www.microsoft.com/visualstudio/en-us/products/2008-editions/express
2. Xcode on Mac OSX
@@ -65,7 +65,7 @@
with different Blender configurations (Audio/NoAudio, GameEngine/NoGameEngine etc.)
while maintaining a clean source tree. It also makes it possible to generate files
for different build systems on the same source tree. This also has benefits for
- general CVS management for the developer as patches and submit logs are much cleaner.
+ general SVN management for the developer as patches and submit logs are much cleaner.
Create a directory outside the blender source tree where you would like to build
Blender (from now on called $BLENDERBUILD). On the commandline you can then run
@@ -78,27 +78,27 @@
% cd $BLENDERBUILD
% cmake
- ...
- ...
- --version [file] = Show program name/version banner and exit.
+ ...
+ ...
+ --version [file] = Show program name/version banner and exit.
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list