[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [40494] branches/soc-2011-tomato: Merging r40265 through r40492 from trunk into soc-2011-tomato

Sergey Sharybin g.ulairi at gmail.com
Fri Sep 23 15:20:22 CEST 2011


Revision: 40494
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=40494
Author:   nazgul
Date:     2011-09-23 13:20:21 +0000 (Fri, 23 Sep 2011)
Log Message:
-----------
Merging r40265 through r40492 from trunk into soc-2011-tomato

Revision Links:
--------------
    http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=40265
    http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=40492

Modified Paths:
--------------
    branches/soc-2011-tomato/CMakeLists.txt
    branches/soc-2011-tomato/GNUmakefile
    branches/soc-2011-tomato/SConstruct
    branches/soc-2011-tomato/build_files/buildbot/config/user-config-i686.py
    branches/soc-2011-tomato/build_files/buildbot/config/user-config-player-i686.py
    branches/soc-2011-tomato/build_files/buildbot/config/user-config-player-x86_64.py
    branches/soc-2011-tomato/build_files/buildbot/config/user-config-x86_64.py
    branches/soc-2011-tomato/build_files/buildbot/master_unpack.py
    branches/soc-2011-tomato/build_files/cmake/cmake_static_check_cppcheck.py
    branches/soc-2011-tomato/build_files/cmake/cmake_static_check_sparse.py
    branches/soc-2011-tomato/build_files/cmake/cmake_static_check_splint.py
    branches/soc-2011-tomato/build_files/cmake/project_source_info.py
    branches/soc-2011-tomato/build_files/scons/config/irix6-config.py
    branches/soc-2011-tomato/build_files/scons/config/win64-vc-config.py
    branches/soc-2011-tomato/build_files/scons/tools/Blender.py
    branches/soc-2011-tomato/build_files/scons/tools/btools.py
    branches/soc-2011-tomato/doc/manpage/blender.1
    branches/soc-2011-tomato/doc/python_api/sphinx_doc_gen.py
    branches/soc-2011-tomato/extern/glew/include/GL/glew.h
    branches/soc-2011-tomato/extern/glew/include/GL/glxew.h
    branches/soc-2011-tomato/extern/glew/include/GL/wglew.h
    branches/soc-2011-tomato/extern/glew/src/glew.c
    branches/soc-2011-tomato/extern/recastnavigation/CMakeLists.txt
    branches/soc-2011-tomato/extern/recastnavigation/SConscript
    branches/soc-2011-tomato/intern/audaspace/CMakeLists.txt
    branches/soc-2011-tomato/intern/audaspace/intern/AUD_ConverterReader.cpp
    branches/soc-2011-tomato/intern/audaspace/intern/AUD_Mixer.cpp
    branches/soc-2011-tomato/intern/elbeem/intern/loop_tools.h
    branches/soc-2011-tomato/intern/ghost/SConscript
    branches/soc-2011-tomato/intern/ghost/intern/GHOST_SystemX11.cpp
    branches/soc-2011-tomato/intern/guardedalloc/MEM_sys_types.h
    branches/soc-2011-tomato/intern/guardedalloc/intern/mallocn.c
    branches/soc-2011-tomato/intern/itasc/kdl/frames.hpp
    branches/soc-2011-tomato/intern/opennl/superlu/superlu_sys_types.h
    branches/soc-2011-tomato/intern/smoke/CMakeLists.txt
    branches/soc-2011-tomato/intern/string/intern/STR_String.cpp
    branches/soc-2011-tomato/po/ar.po
    branches/soc-2011-tomato/po/bg.po
    branches/soc-2011-tomato/po/ca.po
    branches/soc-2011-tomato/po/cs.po
    branches/soc-2011-tomato/po/de.po
    branches/soc-2011-tomato/po/el.po
    branches/soc-2011-tomato/po/es.po
    branches/soc-2011-tomato/po/fi.po
    branches/soc-2011-tomato/po/fr.po
    branches/soc-2011-tomato/po/hr.po
    branches/soc-2011-tomato/po/it.po
    branches/soc-2011-tomato/po/ja.po
    branches/soc-2011-tomato/po/ko.po
    branches/soc-2011-tomato/po/nl.po
    branches/soc-2011-tomato/po/pl.po
    branches/soc-2011-tomato/po/pt_BR.po
    branches/soc-2011-tomato/po/ro.po
    branches/soc-2011-tomato/po/ru.po
    branches/soc-2011-tomato/po/sr.po
    branches/soc-2011-tomato/po/sr at Latn.po
    branches/soc-2011-tomato/po/sv.po
    branches/soc-2011-tomato/po/uk.po
    branches/soc-2011-tomato/po/zh_CN.po
    branches/soc-2011-tomato/release/bin/.blender/.Blanguages
    branches/soc-2011-tomato/release/bin/.blender/locale/ar/LC_MESSAGES/blender.mo
    branches/soc-2011-tomato/release/bin/.blender/locale/bg/LC_MESSAGES/blender.mo
    branches/soc-2011-tomato/release/bin/.blender/locale/ca/LC_MESSAGES/blender.mo
    branches/soc-2011-tomato/release/bin/.blender/locale/cs/LC_MESSAGES/blender.mo
    branches/soc-2011-tomato/release/bin/.blender/locale/de/LC_MESSAGES/blender.mo
    branches/soc-2011-tomato/release/bin/.blender/locale/el/LC_MESSAGES/blender.mo
    branches/soc-2011-tomato/release/bin/.blender/locale/es/LC_MESSAGES/blender.mo
    branches/soc-2011-tomato/release/bin/.blender/locale/fi/LC_MESSAGES/blender.mo
    branches/soc-2011-tomato/release/bin/.blender/locale/fr/LC_MESSAGES/blender.mo
    branches/soc-2011-tomato/release/bin/.blender/locale/hr/LC_MESSAGES/blender.mo
    branches/soc-2011-tomato/release/bin/.blender/locale/it/LC_MESSAGES/blender.mo
    branches/soc-2011-tomato/release/bin/.blender/locale/ja/LC_MESSAGES/blender.mo
    branches/soc-2011-tomato/release/bin/.blender/locale/ko/LC_MESSAGES/blender.mo
    branches/soc-2011-tomato/release/bin/.blender/locale/nl/LC_MESSAGES/blender.mo
    branches/soc-2011-tomato/release/bin/.blender/locale/pl/LC_MESSAGES/blender.mo
    branches/soc-2011-tomato/release/bin/.blender/locale/pt_BR/LC_MESSAGES/blender.mo
    branches/soc-2011-tomato/release/bin/.blender/locale/ro/LC_MESSAGES/blender.mo
    branches/soc-2011-tomato/release/bin/.blender/locale/ru/LC_MESSAGES/blender.mo
    branches/soc-2011-tomato/release/bin/.blender/locale/sr/LC_MESSAGES/blender.mo
    branches/soc-2011-tomato/release/bin/.blender/locale/sr at Latn/LC_MESSAGES/blender.mo
    branches/soc-2011-tomato/release/bin/.blender/locale/sv/LC_MESSAGES/blender.mo
    branches/soc-2011-tomato/release/bin/.blender/locale/uk/LC_MESSAGES/blender.mo
    branches/soc-2011-tomato/release/bin/.blender/locale/zh_CN/LC_MESSAGES/blender.mo
    branches/soc-2011-tomato/release/scripts/modules/bpy/utils.py
    branches/soc-2011-tomato/release/scripts/modules/bpy_extras/__init__.py
    branches/soc-2011-tomato/release/scripts/modules/bpy_extras/io_utils.py
    branches/soc-2011-tomato/release/scripts/modules/bpy_types.py
    branches/soc-2011-tomato/release/scripts/modules/console_python.py
    branches/soc-2011-tomato/release/scripts/startup/bl_operators/__init__.py
    branches/soc-2011-tomato/release/scripts/startup/bl_operators/image.py
    branches/soc-2011-tomato/release/scripts/startup/bl_operators/mesh.py
    branches/soc-2011-tomato/release/scripts/startup/bl_operators/object.py
    branches/soc-2011-tomato/release/scripts/startup/bl_operators/object_quick_effects.py
    branches/soc-2011-tomato/release/scripts/startup/bl_operators/screen_play_rendered_anim.py
    branches/soc-2011-tomato/release/scripts/startup/bl_operators/sequencer.py
    branches/soc-2011-tomato/release/scripts/startup/bl_operators/uvcalc_follow_active.py
    branches/soc-2011-tomato/release/scripts/startup/bl_operators/uvcalc_lightmap.py
    branches/soc-2011-tomato/release/scripts/startup/bl_operators/uvcalc_smart_project.py
    branches/soc-2011-tomato/release/scripts/startup/bl_operators/wm.py
    branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_data_curve.py
    branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_data_mesh.py
    branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_data_modifier.py
    branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_material.py
    branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_particle.py
    branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_physics_cloth.py
    branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_physics_field.py
    branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_physics_fluid.py
    branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_physics_smoke.py
    branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_physics_softbody.py
    branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_render.py
    branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_scene.py
    branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_console.py
    branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_image.py
    branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_info.py
    branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_sequencer.py
    branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_text.py
    branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_userpref.py
    branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_userpref_keymap.py
    branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_view3d.py
    branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_view3d_toolbar.py
    branches/soc-2011-tomato/release/scripts/templates/operator_export.py
    branches/soc-2011-tomato/source/blender/avi/intern/avirgb.c
    branches/soc-2011-tomato/source/blender/avi/intern/endian.c
    branches/soc-2011-tomato/source/blender/blenfont/BLF_api.h
    branches/soc-2011-tomato/source/blender/blenfont/CMakeLists.txt
    branches/soc-2011-tomato/source/blender/blenfont/SConscript
    branches/soc-2011-tomato/source/blender/blenfont/intern/blf.c
    branches/soc-2011-tomato/source/blender/blenfont/intern/blf_dir.c
    branches/soc-2011-tomato/source/blender/blenfont/intern/blf_font.c
    branches/soc-2011-tomato/source/blender/blenfont/intern/blf_glyph.c
    branches/soc-2011-tomato/source/blender/blenfont/intern/blf_internal_types.h
    branches/soc-2011-tomato/source/blender/blenfont/intern/blf_lang.c
    branches/soc-2011-tomato/source/blender/blenfont/intern/blf_util.c
    branches/soc-2011-tomato/source/blender/blenkernel/BKE_armature.h
    branches/soc-2011-tomato/source/blender/blenkernel/BKE_blender.h
    branches/soc-2011-tomato/source/blender/blenkernel/BKE_colortools.h
    branches/soc-2011-tomato/source/blender/blenkernel/BKE_global.h
    branches/soc-2011-tomato/source/blender/blenkernel/BKE_image.h
    branches/soc-2011-tomato/source/blender/blenkernel/BKE_material.h
    branches/soc-2011-tomato/source/blender/blenkernel/BKE_mesh.h
    branches/soc-2011-tomato/source/blender/blenkernel/BKE_navmesh_conversion.h
    branches/soc-2011-tomato/source/blender/blenkernel/BKE_paint.h
    branches/soc-2011-tomato/source/blender/blenkernel/BKE_utildefines.h
    branches/soc-2011-tomato/source/blender/blenkernel/CMakeLists.txt
    branches/soc-2011-tomato/source/blender/blenkernel/SConscript
    branches/soc-2011-tomato/source/blender/blenkernel/intern/DerivedMesh.c
    branches/soc-2011-tomato/source/blender/blenkernel/intern/anim_sys.c
    branches/soc-2011-tomato/source/blender/blenkernel/intern/armature.c
    branches/soc-2011-tomato/source/blender/blenkernel/intern/blender.c
    branches/soc-2011-tomato/source/blender/blenkernel/intern/cdderivedmesh.c
    branches/soc-2011-tomato/source/blender/blenkernel/intern/constraint.c
    branches/soc-2011-tomato/source/blender/blenkernel/intern/curve.c
    branches/soc-2011-tomato/source/blender/blenkernel/intern/customdata.c
    branches/soc-2011-tomato/source/blender/blenkernel/intern/effect.c
    branches/soc-2011-tomato/source/blender/blenkernel/intern/image.c
    branches/soc-2011-tomato/source/blender/blenkernel/intern/key.c
    branches/soc-2011-tomato/source/blender/blenkernel/intern/material.c
    branches/soc-2011-tomato/source/blender/blenkernel/intern/mesh.c
    branches/soc-2011-tomato/source/blender/blenkernel/intern/multires.c
    branches/soc-2011-tomato/source/blender/blenkernel/intern/node.c
    branches/soc-2011-tomato/source/blender/blenkernel/intern/object.c
    branches/soc-2011-tomato/source/blender/blenkernel/intern/paint.c
    branches/soc-2011-tomato/source/blender/blenkernel/intern/particle.c
    branches/soc-2011-tomato/source/blender/blenkernel/intern/screen.c
    branches/soc-2011-tomato/source/blender/blenkernel/intern/seqeffects.c
    branches/soc-2011-tomato/source/blender/blenkernel/intern/sound.c
    branches/soc-2011-tomato/source/blender/blenkernel/intern/subsurf_ccg.c
    branches/soc-2011-tomato/source/blender/blenlib/BLI_fileops.h
    branches/soc-2011-tomato/source/blender/blenlib/BLI_math_rotation.h
    branches/soc-2011-tomato/source/blender/blenlib/BLI_utildefines.h
    branches/soc-2011-tomato/source/blender/blenlib/BLI_voxel.h
    branches/soc-2011-tomato/source/blender/blenlib/intern/fileops.c
    branches/soc-2011-tomato/source/blender/blenlib/intern/math_rotation.c
    branches/soc-2011-tomato/source/blender/blenlib/intern/path_util.c
    branches/soc-2011-tomato/source/blender/blenlib/intern/storage.c
    branches/soc-2011-tomato/source/blender/blenlib/intern/threads.c
    branches/soc-2011-tomato/source/blender/blenlib/intern/voxel.c
    branches/soc-2011-tomato/source/blender/blenloader/BLO_sys_types.h
    branches/soc-2011-tomato/source/blender/blenloader/intern/readfile.c
    branches/soc-2011-tomato/source/blender/blenloader/intern/writefile.c
    branches/soc-2011-tomato/source/blender/collada/AnimationExporter.cpp
    branches/soc-2011-tomato/source/blender/collada/AnimationImporter.cpp
    branches/soc-2011-tomato/source/blender/collada/CameraExporter.cpp
    branches/soc-2011-tomato/source/blender/collada/DocumentImporter.cpp
    branches/soc-2011-tomato/source/blender/collada/GeometryExporter.cpp
    branches/soc-2011-tomato/source/blender/collada/GeometryExporter.h
    branches/soc-2011-tomato/source/blender/collada/MeshImporter.cpp
    branches/soc-2011-tomato/source/blender/collada/MeshImporter.h
    branches/soc-2011-tomato/source/blender/collada/TransformReader.cpp
    branches/soc-2011-tomato/source/blender/collada/TransformWriter.cpp
    branches/soc-2011-tomato/source/blender/editors/animation/anim_channels_defines.c
    branches/soc-2011-tomato/source/blender/editors/animation/anim_draw.c
    branches/soc-2011-tomato/source/blender/editors/animation/drivers.c
    branches/soc-2011-tomato/source/blender/editors/animation/fmodifier_ui.c
    branches/soc-2011-tomato/source/blender/editors/animation/keyframes_general.c
    branches/soc-2011-tomato/source/blender/editors/animation/keyframing.c
    branches/soc-2011-tomato/source/blender/editors/animation/keyingsets.c
    branches/soc-2011-tomato/source/blender/editors/armature/CMakeLists.txt
    branches/soc-2011-tomato/source/blender/editors/armature/SConscript
    branches/soc-2011-tomato/source/blender/editors/armature/armature_ops.c
    branches/soc-2011-tomato/source/blender/editors/armature/editarmature.c
    branches/soc-2011-tomato/source/blender/editors/armature/meshlaplacian.c
    branches/soc-2011-tomato/source/blender/editors/armature/poseSlide.c
    branches/soc-2011-tomato/source/blender/editors/armature/poselib.c
    branches/soc-2011-tomato/source/blender/editors/armature/poseobject.c
    branches/soc-2011-tomato/source/blender/editors/curve/editcurve.c
    branches/soc-2011-tomato/source/blender/editors/curve/editfont.c
    branches/soc-2011-tomato/source/blender/editors/gpencil/gpencil_edit.c
    branches/soc-2011-tomato/source/blender/editors/gpencil/gpencil_paint.c
    branches/soc-2011-tomato/source/blender/editors/include/ED_mesh.h
    branches/soc-2011-tomato/source/blender/editors/include/ED_view3d.h
    branches/soc-2011-tomato/source/blender/editors/include/UI_interface.h
    branches/soc-2011-tomato/source/blender/editors/interface/interface.c
    branches/soc-2011-tomato/source/blender/editors/interface/interface_draw.c
    branches/soc-2011-tomato/source/blender/editors/interface/interface_handlers.c
    branches/soc-2011-tomato/source/blender/editors/interface/interface_intern.h
    branches/soc-2011-tomato/source/blender/editors/interface/interface_layout.c
    branches/soc-2011-tomato/source/blender/editors/interface/interface_ops.c
    branches/soc-2011-tomato/source/blender/editors/interface/interface_panel.c
    branches/soc-2011-tomato/source/blender/editors/interface/interface_regions.c
    branches/soc-2011-tomato/source/blender/editors/interface/interface_style.c
    branches/soc-2011-tomato/source/blender/editors/interface/interface_templates.c
    branches/soc-2011-tomato/source/blender/editors/interface/interface_utils.c
    branches/soc-2011-tomato/source/blender/editors/interface/view2d.c
    branches/soc-2011-tomato/source/blender/editors/interface/view2d_ops.c
    branches/soc-2011-tomato/source/blender/editors/mesh/editmesh.c
    branches/soc-2011-tomato/source/blender/editors/mesh/editmesh_mods.c
    branches/soc-2011-tomato/source/blender/editors/mesh/editmesh_tools.c
    branches/soc-2011-tomato/source/blender/editors/mesh/mesh_data.c
    branches/soc-2011-tomato/source/blender/editors/mesh/meshtools.c
    branches/soc-2011-tomato/source/blender/editors/metaball/mball_edit.c
    branches/soc-2011-tomato/source/blender/editors/object/object_constraint.c
    branches/soc-2011-tomato/source/blender/editors/object/object_edit.c
    branches/soc-2011-tomato/source/blender/editors/object/object_hook.c
    branches/soc-2011-tomato/source/blender/editors/object/object_intern.h
    branches/soc-2011-tomato/source/blender/editors/object/object_modifier.c
    branches/soc-2011-tomato/source/blender/editors/object/object_ops.c
    branches/soc-2011-tomato/source/blender/editors/object/object_relations.c
    branches/soc-2011-tomato/source/blender/editors/object/object_select.c
    branches/soc-2011-tomato/source/blender/editors/object/object_shapekey.c
    branches/soc-2011-tomato/source/blender/editors/object/object_transform.c
    branches/soc-2011-tomato/source/blender/editors/object/object_vgroup.c
    branches/soc-2011-tomato/source/blender/editors/physics/particle_edit.c
    branches/soc-2011-tomato/source/blender/editors/physics/physics_fluid.c
    branches/soc-2011-tomato/source/blender/editors/render/render_internal.c
    branches/soc-2011-tomato/source/blender/editors/render/render_opengl.c
    branches/soc-2011-tomato/source/blender/editors/render/render_shading.c
    branches/soc-2011-tomato/source/blender/editors/screen/area.c
    branches/soc-2011-tomato/source/blender/editors/screen/glutil.c
    branches/soc-2011-tomato/source/blender/editors/screen/screen_ops.c
    branches/soc-2011-tomato/source/blender/editors/sculpt_paint/paint_image.c
    branches/soc-2011-tomato/source/blender/editors/sculpt_paint/paint_intern.h
    branches/soc-2011-tomato/source/blender/editors/sculpt_paint/paint_ops.c
    branches/soc-2011-tomato/source/blender/editors/sculpt_paint/paint_stroke.c
    branches/soc-2011-tomato/source/blender/editors/sculpt_paint/paint_utils.c
    branches/soc-2011-tomato/source/blender/editors/sculpt_paint/paint_vertex.c
    branches/soc-2011-tomato/source/blender/editors/sculpt_paint/sculpt.c
    branches/soc-2011-tomato/source/blender/editors/sound/sound_ops.c
    branches/soc-2011-tomato/source/blender/editors/space_action/action_draw.c
    branches/soc-2011-tomato/source/blender/editors/space_action/action_edit.c
    branches/soc-2011-tomato/source/blender/editors/space_action/action_ops.c
    branches/soc-2011-tomato/source/blender/editors/space_action/action_select.c
    branches/soc-2011-tomato/source/blender/editors/space_buttons/CMakeLists.txt
    branches/soc-2011-tomato/source/blender/editors/space_buttons/SConscript
    branches/soc-2011-tomato/source/blender/editors/space_buttons/buttons_header.c
    branches/soc-2011-tomato/source/blender/editors/space_console/console_ops.c
    branches/soc-2011-tomato/source/blender/editors/space_console/space_console.c
    branches/soc-2011-tomato/source/blender/editors/space_file/file_draw.c
    branches/soc-2011-tomato/source/blender/editors/space_file/file_ops.c
    branches/soc-2011-tomato/source/blender/editors/space_file/file_panels.c
    branches/soc-2011-tomato/source/blender/editors/space_file/filesel.c
    branches/soc-2011-tomato/source/blender/editors/space_graph/CMakeLists.txt
    branches/soc-2011-tomato/source/blender/editors/space_graph/SConscript
    branches/soc-2011-tomato/source/blender/editors/space_graph/graph_buttons.c
    branches/soc-2011-tomato/source/blender/editors/space_graph/graph_edit.c
    branches/soc-2011-tomato/source/blender/editors/space_graph/graph_ops.c
    branches/soc-2011-tomato/source/blender/editors/space_graph/graph_select.c
    branches/soc-2011-tomato/source/blender/editors/space_image/image_buttons.c
    branches/soc-2011-tomato/source/blender/editors/space_image/image_ops.c
    branches/soc-2011-tomato/source/blender/editors/space_image/space_image.c
    branches/soc-2011-tomato/source/blender/editors/space_info/info_ops.c
    branches/soc-2011-tomato/source/blender/editors/space_info/info_report.c
    branches/soc-2011-tomato/source/blender/editors/space_info/space_info.c
    branches/soc-2011-tomato/source/blender/editors/space_logic/CMakeLists.txt
    branches/soc-2011-tomato/source/blender/editors/space_logic/logic_ops.c
    branches/soc-2011-tomato/source/blender/editors/space_logic/logic_window.c
    branches/soc-2011-tomato/source/blender/editors/space_nla/CMakeLists.txt
    branches/soc-2011-tomato/source/blender/editors/space_nla/SConscript
    branches/soc-2011-tomato/source/blender/editors/space_nla/nla_buttons.c
    branches/soc-2011-tomato/source/blender/editors/space_nla/nla_channels.c
    branches/soc-2011-tomato/source/blender/editors/space_nla/nla_edit.c
    branches/soc-2011-tomato/source/blender/editors/space_nla/nla_select.c
    branches/soc-2011-tomato/source/blender/editors/space_node/drawnode.c
    branches/soc-2011-tomato/source/blender/editors/space_node/node_draw.c
    branches/soc-2011-tomato/source/blender/editors/space_node/node_edit.c
    branches/soc-2011-tomato/source/blender/editors/space_node/node_header.c
    branches/soc-2011-tomato/source/blender/editors/space_node/node_ops.c
    branches/soc-2011-tomato/source/blender/editors/space_node/node_select.c
    branches/soc-2011-tomato/source/blender/editors/space_node/node_state.c
    branches/soc-2011-tomato/source/blender/editors/space_node/space_node.c
    branches/soc-2011-tomato/source/blender/editors/space_outliner/outliner_draw.c
    branches/soc-2011-tomato/source/blender/editors/space_outliner/outliner_edit.c
    branches/soc-2011-tomato/source/blender/editors/space_outliner/outliner_select.c
    branches/soc-2011-tomato/source/blender/editors/space_outliner/outliner_tools.c
    branches/soc-2011-tomato/source/blender/editors/space_outliner/outliner_tree.c
    branches/soc-2011-tomato/source/blender/editors/space_sequencer/sequencer_add.c
    branches/soc-2011-tomato/source/blender/editors/space_sequencer/sequencer_edit.c
    branches/soc-2011-tomato/source/blender/editors/space_sequencer/sequencer_select.c
    branches/soc-2011-tomato/source/blender/editors/space_sequencer/space_sequencer.c
    branches/soc-2011-tomato/source/blender/editors/space_text/text_draw.c
    branches/soc-2011-tomato/source/blender/editors/space_text/text_ops.c
    branches/soc-2011-tomato/source/blender/editors/space_view3d/drawmesh.c
    branches/soc-2011-tomato/source/blender/editors/space_view3d/drawobject.c
    branches/soc-2011-tomato/source/blender/editors/space_view3d/drawvolume.c
    branches/soc-2011-tomato/source/blender/editors/space_view3d/space_view3d.c
    branches/soc-2011-tomato/source/blender/editors/space_view3d/view3d_buttons.c
    branches/soc-2011-tomato/source/blender/editors/space_view3d/view3d_edit.c
    branches/soc-2011-tomato/source/blender/editors/space_view3d/view3d_header.c
    branches/soc-2011-tomato/source/blender/editors/space_view3d/view3d_select.c
    branches/soc-2011-tomato/source/blender/editors/space_view3d/view3d_toolbar.c
    branches/soc-2011-tomato/source/blender/editors/space_view3d/view3d_view.c
    branches/soc-2011-tomato/source/blender/editors/transform/CMakeLists.txt
    branches/soc-2011-tomato/source/blender/editors/transform/SConscript
    branches/soc-2011-tomato/source/blender/editors/transform/transform.c
    branches/soc-2011-tomato/source/blender/editors/transform/transform_conversions.c
    branches/soc-2011-tomato/source/blender/editors/transform/transform_manipulator.c
    branches/soc-2011-tomato/source/blender/editors/transform/transform_ops.c
    branches/soc-2011-tomato/source/blender/editors/transform/transform_orientations.c
    branches/soc-2011-tomato/source/blender/editors/uvedit/uvedit_draw.c
    branches/soc-2011-tomato/source/blender/editors/uvedit/uvedit_ops.c
    branches/soc-2011-tomato/source/blender/editors/uvedit/uvedit_parametrizer.c
    branches/soc-2011-tomato/source/blender/editors/uvedit/uvedit_unwrap_ops.c
    branches/soc-2011-tomato/source/blender/gpu/GPU_draw.h
    branches/soc-2011-tomato/source/blender/gpu/GPU_material.h
    branches/soc-2011-tomato/source/blender/gpu/intern/gpu_draw.c
    branches/soc-2011-tomato/source/blender/gpu/intern/gpu_material.c
    branches/soc-2011-tomato/source/blender/imbuf/CMakeLists.txt
    branches/soc-2011-tomato/source/blender/imbuf/SConscript
    branches/soc-2011-tomato/source/blender/imbuf/intern/IMB_anim.h
    branches/soc-2011-tomato/source/blender/imbuf/intern/IMB_indexer.h
    branches/soc-2011-tomato/source/blender/imbuf/intern/anim_movie.c
    branches/soc-2011-tomato/source/blender/imbuf/intern/imbuf.h
    branches/soc-2011-tomato/source/blender/imbuf/intern/jp2.c
    branches/soc-2011-tomato/source/blender/imbuf/intern/jpeg.c
    branches/soc-2011-tomato/source/blender/imbuf/intern/md5.c
    branches/soc-2011-tomato/source/blender/imbuf/intern/radiance_hdr.c
    branches/soc-2011-tomato/source/blender/imbuf/intern/tiff.c
    branches/soc-2011-tomato/source/blender/makesdna/DNA_ID.h
    branches/soc-2011-tomato/source/blender/makesdna/DNA_material_types.h
    branches/soc-2011-tomato/source/blender/makesdna/DNA_mesh_types.h
    branches/soc-2011-tomato/source/blender/makesdna/DNA_meshdata_types.h
    branches/soc-2011-tomato/source/blender/makesdna/DNA_modifier_types.h
    branches/soc-2011-tomato/source/blender/makesdna/DNA_node_types.h
    branches/soc-2011-tomato/source/blender/makesdna/DNA_object_types.h
    branches/soc-2011-tomato/source/blender/makesdna/DNA_scene_types.h
    branches/soc-2011-tomato/source/blender/makesdna/DNA_userdef_types.h
    branches/soc-2011-tomato/source/blender/makesrna/RNA_access.h
    branches/soc-2011-tomato/source/blender/makesrna/RNA_define.h
    branches/soc-2011-tomato/source/blender/makesrna/RNA_types.h
    branches/soc-2011-tomato/source/blender/makesrna/SConscript
    branches/soc-2011-tomato/source/blender/makesrna/intern/CMakeLists.txt
    branches/soc-2011-tomato/source/blender/makesrna/intern/SConscript
    branches/soc-2011-tomato/source/blender/makesrna/intern/makesrna.c
    branches/soc-2011-tomato/source/blender/makesrna/intern/rna_ID.c
    branches/soc-2011-tomato/source/blender/makesrna/intern/rna_access.c
    branches/soc-2011-tomato/source/blender/makesrna/intern/rna_action.c
    branches/soc-2011-tomato/source/blender/makesrna/intern/rna_actuator.c
    branches/soc-2011-tomato/source/blender/makesrna/intern/rna_actuator_api.c
    branches/soc-2011-tomato/source/blender/makesrna/intern/rna_animation.c
    branches/soc-2011-tomato/source/blender/makesrna/intern/rna_armature.c
    branches/soc-2011-tomato/source/blender/makesrna/intern/rna_armature_api.c
    branches/soc-2011-tomato/source/blender/makesrna/intern/rna_color.c
    branches/soc-2011-tomato/source/blender/makesrna/intern/rna_controller_api.c
    branches/soc-2011-tomato/source/blender/makesrna/intern/rna_curve.c
    branches/soc-2011-tomato/source/blender/makesrna/intern/rna_define.c
    branches/soc-2011-tomato/source/blender/makesrna/intern/rna_fcurve.c
    branches/soc-2011-tomato/source/blender/makesrna/intern/rna_gpencil.c
    branches/soc-2011-tomato/source/blender/makesrna/intern/rna_group.c
    branches/soc-2011-tomato/source/blender/makesrna/intern/rna_image_api.c
    branches/soc-2011-tomato/source/blender/makesrna/intern/rna_main.c
    branches/soc-2011-tomato/source/blender/makesrna/intern/rna_main_api.c
    branches/soc-2011-tomato/source/blender/makesrna/intern/rna_material.c
    branches/soc-2011-tomato/source/blender/makesrna/intern/rna_mesh.c
    branches/soc-2011-tomato/source/blender/makesrna/intern/rna_mesh_api.c
    branches/soc-2011-tomato/source/blender/makesrna/intern/rna_meta.c
    branches/soc-2011-tomato/source/blender/makesrna/intern/rna_modifier.c
    branches/soc-2011-tomato/source/blender/makesrna/intern/rna_nla.c
    branches/soc-2011-tomato/source/blender/makesrna/intern/rna_nodetree.c
    branches/soc-2011-tomato/source/blender/makesrna/intern/rna_object.c
    branches/soc-2011-tomato/source/blender/makesrna/intern/rna_object_api.c
    branches/soc-2011-tomato/source/blender/makesrna/intern/rna_object_force.c
    branches/soc-2011-tomato/source/blender/makesrna/intern/rna_pose.c
    branches/soc-2011-tomato/source/blender/makesrna/intern/rna_pose_api.c
    branches/soc-2011-tomato/source/blender/makesrna/intern/rna_render.c
    branches/soc-2011-tomato/source/blender/makesrna/intern/rna_rna.c
    branches/soc-2011-tomato/source/blender/makesrna/intern/rna_scene.c
    branches/soc-2011-tomato/source/blender/makesrna/intern/rna_scene_api.c
    branches/soc-2011-tomato/source/blender/makesrna/intern/rna_screen.c
    branches/soc-2011-tomato/source/blender/makesrna/intern/rna_sensor_api.c
    branches/soc-2011-tomato/source/blender/makesrna/intern/rna_sequencer.c
    branches/soc-2011-tomato/source/blender/makesrna/intern/rna_sequencer_api.c
    branches/soc-2011-tomato/source/blender/makesrna/intern/rna_smoke.c
    branches/soc-2011-tomato/source/blender/makesrna/intern/rna_sound.c
    branches/soc-2011-tomato/source/blender/makesrna/intern/rna_space.c
    branches/soc-2011-tomato/source/blender/makesrna/intern/rna_speaker.c
    branches/soc-2011-tomato/source/blender/makesrna/intern/rna_text_api.c
    branches/soc-2011-tomato/source/blender/makesrna/intern/rna_texture.c
    branches/soc-2011-tomato/source/blender/makesrna/intern/rna_texture_api.c
    branches/soc-2011-tomato/source/blender/makesrna/intern/rna_ui.c
    branches/soc-2011-tomato/source/blender/makesrna/intern/rna_ui_api.c
    branches/soc-2011-tomato/source/blender/makesrna/intern/rna_userdef.c
    branches/soc-2011-tomato/source/blender/makesrna/intern/rna_wm.c
    branches/soc-2011-tomato/source/blender/makesrna/intern/rna_wm_api.c
    branches/soc-2011-tomato/source/blender/modifiers/CMakeLists.txt
    branches/soc-2011-tomato/source/blender/modifiers/SConscript
    branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_solidify.c
    branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_uvproject.c
    branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_warp.c
    branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_weightvg_util.c
    branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_weightvg_util.h
    branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_weightvgedit.c
    branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_weightvgmix.c
    branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_weightvgproximity.c
    branches/soc-2011-tomato/source/blender/nodes/composite/node_composite_util.h
    branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_colorSpill.c
    branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_diffMatte.c
    branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_lummaMatte.c
    branches/soc-2011-tomato/source/blender/nodes/intern/node_common.c
    branches/soc-2011-tomato/source/blender/nodes/intern/node_util.h
    branches/soc-2011-tomato/source/blender/python/SConscript
    branches/soc-2011-tomato/source/blender/python/generic/CMakeLists.txt
    branches/soc-2011-tomato/source/blender/python/generic/bgl.c
    branches/soc-2011-tomato/source/blender/python/generic/blf_py_api.c
    branches/soc-2011-tomato/source/blender/python/intern/CMakeLists.txt
    branches/soc-2011-tomato/source/blender/python/intern/bpy.h
    branches/soc-2011-tomato/source/blender/python/intern/bpy_interface.c
    branches/soc-2011-tomato/source/blender/python/intern/bpy_props.c
    branches/soc-2011-tomato/source/blender/python/intern/bpy_rna.c
    branches/soc-2011-tomato/source/blender/python/mathutils/mathutils_Euler.c
    branches/soc-2011-tomato/source/blender/python/mathutils/mathutils_Matrix.c
    branches/soc-2011-tomato/source/blender/python/mathutils/mathutils_Quaternion.c
    branches/soc-2011-tomato/source/blender/python/mathutils/mathutils_Vector.c
    branches/soc-2011-tomato/source/blender/render/intern/include/voxeldata.h
    branches/soc-2011-tomato/source/blender/render/intern/source/convertblender.c
    branches/soc-2011-tomato/source/blender/render/intern/source/pixelshading.c
    branches/soc-2011-tomato/source/blender/render/intern/source/pointdensity.c
    branches/soc-2011-tomato/source/blender/render/intern/source/render_texture.c
    branches/soc-2011-tomato/source/blender/render/intern/source/rendercore.c
    branches/soc-2011-tomato/source/blender/render/intern/source/shadbuf.c
    branches/soc-2011-tomato/source/blender/render/intern/source/shadeinput.c
    branches/soc-2011-tomato/source/blender/render/intern/source/shadeoutput.c
    branches/soc-2011-tomato/source/blender/render/intern/source/volumetric.c
    branches/soc-2011-tomato/source/blender/render/intern/source/voxeldata.c
    branches/soc-2011-tomato/source/blender/render/intern/source/zbuf.c
    branches/soc-2011-tomato/source/blender/windowmanager/SConscript
    branches/soc-2011-tomato/source/blender/windowmanager/WM_api.h
    branches/soc-2011-tomato/source/blender/windowmanager/intern/wm_event_system.c
    branches/soc-2011-tomato/source/blender/windowmanager/intern/wm_files.c
    branches/soc-2011-tomato/source/blender/windowmanager/intern/wm_gesture.c
    branches/soc-2011-tomato/source/blender/windowmanager/intern/wm_init_exit.c
    branches/soc-2011-tomato/source/blender/windowmanager/intern/wm_operators.c
    branches/soc-2011-tomato/source/blender/windowmanager/intern/wm_window.c
    branches/soc-2011-tomato/source/blenderplayer/bad_level_call_stubs/stubs.c
    branches/soc-2011-tomato/source/creator/CMakeLists.txt
    branches/soc-2011-tomato/source/creator/creator.c
    branches/soc-2011-tomato/source/gameengine/Converter/BL_BlenderDataConversion.cpp
    branches/soc-2011-tomato/source/gameengine/Converter/BL_ShapeActionActuator.cpp
    branches/soc-2011-tomato/source/gameengine/GamePlayer/ghost/CMakeLists.txt
    branches/soc-2011-tomato/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
    branches/soc-2011-tomato/source/gameengine/GamePlayer/ghost/SConscript
    branches/soc-2011-tomato/source/gameengine/Ketsji/BL_BlenderShader.cpp
    branches/soc-2011-tomato/source/gameengine/Ketsji/BL_BlenderShader.h
    branches/soc-2011-tomato/source/gameengine/Ketsji/BL_Material.cpp
    branches/soc-2011-tomato/source/gameengine/Ketsji/BL_Material.h
    branches/soc-2011-tomato/source/gameengine/Ketsji/KX_BlenderMaterial.cpp
    branches/soc-2011-tomato/source/gameengine/Ketsji/KX_BlenderMaterial.h
    branches/soc-2011-tomato/source/gameengine/Ketsji/KX_Dome.cpp
    branches/soc-2011-tomato/source/gameengine/Ketsji/KX_GameObject.cpp
    branches/soc-2011-tomato/source/gameengine/Ketsji/KX_IpoActuator.cpp
    branches/soc-2011-tomato/source/gameengine/Ketsji/KX_KetsjiEngine.cpp
    branches/soc-2011-tomato/source/gameengine/Ketsji/KX_NavMeshObject.cpp
    branches/soc-2011-tomato/source/gameengine/Ketsji/KX_PolygonMaterial.cpp
    branches/soc-2011-tomato/source/gameengine/Ketsji/KX_PolygonMaterial.h
    branches/soc-2011-tomato/source/gameengine/Ketsji/KX_Scene.cpp
    branches/soc-2011-tomato/source/gameengine/Rasterizer/RAS_IPolygonMaterial.cpp
    branches/soc-2011-tomato/source/gameengine/Rasterizer/RAS_IPolygonMaterial.h
    branches/soc-2011-tomato/source/gameengine/Rasterizer/RAS_IRasterizer.h
    branches/soc-2011-tomato/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp
    branches/soc-2011-tomato/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.h
    branches/soc-2011-tomato/source/tests/bl_load_py_modules.py

Added Paths:
-----------
    branches/soc-2011-tomato/extern/recastnavigation/recast-capi.cpp
    branches/soc-2011-tomato/extern/recastnavigation/recast-capi.h
    branches/soc-2011-tomato/po/POTFILES.in
    branches/soc-2011-tomato/po/blender.pot
    branches/soc-2011-tomato/po/messages.txt
    branches/soc-2011-tomato/po/ne.po
    branches/soc-2011-tomato/po/update_mo.py
    branches/soc-2011-tomato/po/update_msg.py
    branches/soc-2011-tomato/po/update_po.py
    branches/soc-2011-tomato/po/update_pot.py
    branches/soc-2011-tomato/po/zh_TW.po
    branches/soc-2011-tomato/release/bin/.blender/fonts/
    branches/soc-2011-tomato/release/bin/.blender/fonts/droidsans.ttf.gz
    branches/soc-2011-tomato/release/bin/.blender/locale/ne/
    branches/soc-2011-tomato/release/bin/.blender/locale/ne/LC_MESSAGES/
    branches/soc-2011-tomato/release/bin/.blender/locale/ne/LC_MESSAGES/blender.mo
    branches/soc-2011-tomato/release/bin/.blender/locale/zh_TW/
    branches/soc-2011-tomato/release/bin/.blender/locale/zh_TW/LC_MESSAGES/
    branches/soc-2011-tomato/release/bin/.blender/locale/zh_TW/LC_MESSAGES/blender.mo
    branches/soc-2011-tomato/release/scripts/modules/bpy_extras/anim_utils.py
    branches/soc-2011-tomato/release/scripts/startup/bl_operators/anim.py
    branches/soc-2011-tomato/release/scripts/startup/bl_operators/console.py
    branches/soc-2011-tomato/release/scripts/startup/bl_operators/view3d.py
    branches/soc-2011-tomato/source/blender/blenfont/BLF_translation.h
    branches/soc-2011-tomato/source/blender/blenfont/intern/blf_translation.c
    branches/soc-2011-tomato/source/blender/blenkernel/intern/navmesh_conversion.c
    branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_navmesh.c
    branches/soc-2011-tomato/source/blender/python/intern/bpy_interface_atexit.c

Removed Paths:
-------------
    branches/soc-2011-tomato/extern/glew/ChangeLog
    branches/soc-2011-tomato/extern/glew/README.txt
    branches/soc-2011-tomato/extern/glew/doc/
    branches/soc-2011-tomato/release/bin/.blender/fonts/droidsans.ttf.gz
    branches/soc-2011-tomato/release/bin/.blender/locale/ne/LC_MESSAGES/
    branches/soc-2011-tomato/release/bin/.blender/locale/ne/LC_MESSAGES/blender.mo
    branches/soc-2011-tomato/release/bin/.blender/locale/zh_TW/LC_MESSAGES/
    branches/soc-2011-tomato/release/bin/.blender/locale/zh_TW/LC_MESSAGES/blender.mo
    branches/soc-2011-tomato/release/irix-6.2-mips/
    branches/soc-2011-tomato/release/scripts/startup/bl_operators/nla.py
    branches/soc-2011-tomato/source/blender/blenkernel/BKE_endian.h
    branches/soc-2011-tomato/source/blender/blenkernel/intern/navmesh_conversion.cpp
    branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_navmesh.cpp

Property Changed:
----------------
    branches/soc-2011-tomato/
    branches/soc-2011-tomato/build_files/cmake/cmake_static_check_cppcheck.py
    branches/soc-2011-tomato/build_files/cmake/cmake_static_check_sparse.py
    branches/soc-2011-tomato/build_files/cmake/cmake_static_check_splint.py
    branches/soc-2011-tomato/build_files/cmake/project_source_info.py
    branches/soc-2011-tomato/source/blender/editors/space_outliner/


Property changes on: branches/soc-2011-tomato
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/vgroup_modifiers:38694-39989
/trunk/blender:36831-40264
   + /branches/vgroup_modifiers:38694-39989
/trunk/blender:36831-40492

Modified: branches/soc-2011-tomato/CMakeLists.txt
===================================================================
--- branches/soc-2011-tomato/CMakeLists.txt	2011-09-23 13:04:01 UTC (rev 40493)
+++ branches/soc-2011-tomato/CMakeLists.txt	2011-09-23 13:20:21 UTC (rev 40494)
@@ -105,6 +105,7 @@
 
 get_blender_version()
 
+
 # Blender internal features
 option(WITH_BLENDER "Build blender (disable to build only the blender player)" ON)
 mark_as_advanced(WITH_BLENDER)
@@ -1153,6 +1154,18 @@
 	unset(_sse2)
 endif()
 
+
+# set the endian define
+include(TestBigEndian)
+test_big_endian(_SYSTEM_BIG_ENDIAN)
+if(_SYSTEM_BIG_ENDIAN)
+	add_definitions(-D__BIG_ENDIAN__)
+else()
+	add_definitions(-D__LITTLE_ENDIAN__)
+endif()
+unset(_SYSTEM_BIG_ENDIAN)
+
+
 if(WITH_IMAGE_OPENJPEG)
 	if(UNIX AND NOT APPLE)
 		# dealt with above

Modified: branches/soc-2011-tomato/GNUmakefile
===================================================================
--- branches/soc-2011-tomato/GNUmakefile	2011-09-23 13:04:01 UTC (rev 40493)
+++ branches/soc-2011-tomato/GNUmakefile	2011-09-23 13:20:21 UTC (rev 40494)
@@ -36,7 +36,7 @@
 BLENDER_DIR:=$(shell pwd -P)
 BUILD_DIR:=$(shell dirname $(BLENDER_DIR))/build/$(OS_NCASE)
 BUILD_TYPE:=Release
-BUILD_CMAKE_ARGS:=""
+BUILD_CMAKE_ARGS:=
 
 
 # -----------------------------------------------------------------------------
@@ -77,14 +77,24 @@
 	NPROCS:=$(shell sysctl -a | grep "hw.ncpu " | cut -d" " -f3 )
 endif
 
+
 # -----------------------------------------------------------------------------
+# Macro for configuring cmake
+
+CMAKE_CONFIG = cmake $(BUILD_CMAKE_ARGS) \
+                     -H$(BLENDER_DIR) \
+                     -B$(BUILD_DIR) \
+                     -DCMAKE_BUILD_TYPE:STRING=$(BUILD_TYPE)
+
+
+# -----------------------------------------------------------------------------
 # Build Blender
 all:
 	@echo
 	@echo Configuring Blender ...
 
 	if test ! -f $(BUILD_DIR)/CMakeCache.txt ; then \
-		cmake $(BUILD_CMAKE_ARGS) -H$(BLENDER_DIR) -B$(BUILD_DIR) -DCMAKE_BUILD_TYPE:STRING=$(BUILD_TYPE); \
+		$(CMAKE_CONFIG); \
 	fi
 
 	@echo
@@ -120,6 +130,10 @@
 	@echo "  * package_pacman  - build an arch linux pacmanpackage"
 	@echo "  * package_archive - build an archive package"
 	@echo ""
+	@echo "Other Targets"
+	@echo "  * translations  - update blenders translation files in po/"
+	# TODO, doxygen and sphinx docs
+	@echo ""
 	@echo "Testing Targets (not assosiated with building blender)"
 	@echo "  * test            - run ctest, currently tests import/export, operator execution and that python modules load"
 	@echo "  * test_cmake      - runs our own cmake file checker which detects errors in the cmake file list definitions"
@@ -147,6 +161,16 @@
 
 
 # -----------------------------------------------------------------------------
+# Other Targets
+#
+translations:
+	$(BUILD_DIR)/bin/blender --background --python po/update_msg.py
+	python3 po/update_pot.py
+	python3 po/update_po.py
+	python3 po/update_mo.py
+
+
+# -----------------------------------------------------------------------------
 # Tests
 #
 test:
@@ -186,12 +210,15 @@
 #
 
 check_cppcheck:
+	$(CMAKE_CONFIG)
 	cd $(BUILD_DIR) ; python3 $(BLENDER_DIR)/build_files/cmake/cmake_static_check_cppcheck.py
 
 check_splint:
+	$(CMAKE_CONFIG)
 	cd $(BUILD_DIR) ; python3 $(BLENDER_DIR)/build_files/cmake/cmake_static_check_splint.py
 
 check_sparse:
+	$(CMAKE_CONFIG)
 	cd $(BUILD_DIR) ; python3 $(BLENDER_DIR)/build_files/cmake/cmake_static_check_sparse.py
 
 

Modified: branches/soc-2011-tomato/SConstruct
===================================================================
--- branches/soc-2011-tomato/SConstruct	2011-09-23 13:04:01 UTC (rev 40493)
+++ branches/soc-2011-tomato/SConstruct	2011-09-23 13:20:21 UTC (rev 40494)
@@ -337,6 +337,17 @@
     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')
@@ -501,31 +512,35 @@
 dottargetlist = []
 scriptinstall = []
 
-if  env['OURPLATFORM']!='darwin':
-        for dp, dn, df in os.walk('bin/.blender'):
+if env['OURPLATFORM']!='darwin':
+        for dp, dn, df in os.walk('release/bin/.blender'):
+            dp = os.path.normpath(dp)
+
             if '.svn' in dn:
                 dn.remove('.svn')
             if '_svn' in dn:
                 dn.remove('_svn')
             
             for f in df:
+                # This files aren't used anymore
+                if f in ['.Blanguages', '.bfont.ttf']:
+                    continue
+
                 if not env['WITH_BF_INTERNATIONAL']:
                     if 'locale' in dp:
                         continue
-                    if f == '.Blanguages':
-                        continue
                 if not env['WITH_BF_FREETYPE']:
                     if f.endswith('.ttf'):
                         continue
                 
-                if 'locale' in dp:
+                if 'locale' in dp or 'fonts' in dp:
                     datafileslist.append(os.path.join(dp,f))
-                    dir= os.path.join(*([env['BF_INSTALLDIR']] + [VERSION] + ['datafiles'] + dp.split(os.sep)[1:]))    # skip bin
+                    dir= os.path.join(*([env['BF_INSTALLDIR']] + [VERSION] + ['datafiles'] + dp.split(os.sep)[3:]))    # skip bin
                     datafilestargetlist.append(dir + os.sep + f)
 
                 else:
                     dotblendlist.append(os.path.join(dp, f))
-                    dir= os.path.join(*([env['BF_INSTALLDIR']] + [VERSION] + ['config'] + dp.split(os.sep)[1:]))    # skip bin
+                    dir= os.path.join(*([env['BF_INSTALLDIR']] + [VERSION] + ['config'] + dp.split(os.sep)[3:]))    # skip bin
                     dottargetlist.append(dir + os.sep + f)
                     
         dotblenderinstall = []

Modified: branches/soc-2011-tomato/build_files/buildbot/config/user-config-i686.py
===================================================================
--- branches/soc-2011-tomato/build_files/buildbot/config/user-config-i686.py	2011-09-23 13:04:01 UTC (rev 40493)
+++ branches/soc-2011-tomato/build_files/buildbot/config/user-config-i686.py	2011-09-23 13:20:21 UTC (rev 40494)
@@ -5,7 +5,7 @@
 # Python configuration
 BF_PYTHON_VERSION = '3.2'
 BF_PYTHON_ABI_FLAGS = 'mu'
-BF_PYTHON = '/opt/python3.2'
+BF_PYTHON = '/opt/python3'
 
 WITH_BF_STATICPYTHON = True
 

Modified: branches/soc-2011-tomato/build_files/buildbot/config/user-config-player-i686.py
===================================================================
--- branches/soc-2011-tomato/build_files/buildbot/config/user-config-player-i686.py	2011-09-23 13:04:01 UTC (rev 40493)
+++ branches/soc-2011-tomato/build_files/buildbot/config/user-config-player-i686.py	2011-09-23 13:20:21 UTC (rev 40494)
@@ -5,7 +5,7 @@
 # Python configuration
 BF_PYTHON_VERSION = '3.2'
 BF_PYTHON_ABI_FLAGS = 'mu'
-BF_PYTHON = '/opt/python3.2'
+BF_PYTHON = '/opt/python3'
 
 WITH_BF_STATICPYTHON = True
 

Modified: branches/soc-2011-tomato/build_files/buildbot/config/user-config-player-x86_64.py
===================================================================
--- branches/soc-2011-tomato/build_files/buildbot/config/user-config-player-x86_64.py	2011-09-23 13:04:01 UTC (rev 40493)
+++ branches/soc-2011-tomato/build_files/buildbot/config/user-config-player-x86_64.py	2011-09-23 13:20:21 UTC (rev 40494)
@@ -5,7 +5,7 @@
 # Python configuration
 BF_PYTHON_VERSION = '3.2'
 BF_PYTHON_ABI_FLAGS = 'mu'
-BF_PYTHON = '/opt/python3.2'
+BF_PYTHON = '/opt/python3'
 
 WITH_BF_STATICPYTHON = True
 

Modified: branches/soc-2011-tomato/build_files/buildbot/config/user-config-x86_64.py
===================================================================
--- branches/soc-2011-tomato/build_files/buildbot/config/user-config-x86_64.py	2011-09-23 13:04:01 UTC (rev 40493)
+++ branches/soc-2011-tomato/build_files/buildbot/config/user-config-x86_64.py	2011-09-23 13:20:21 UTC (rev 40494)
@@ -5,7 +5,7 @@
 # Python configuration
 BF_PYTHON_VERSION = '3.2'
 BF_PYTHON_ABI_FLAGS = 'mu'
-BF_PYTHON = '/opt/python3.2'
+BF_PYTHON = '/opt/python3'
 
 WITH_BF_STATICPYTHON = True
 

Modified: branches/soc-2011-tomato/build_files/buildbot/master_unpack.py
===================================================================
--- branches/soc-2011-tomato/build_files/buildbot/master_unpack.py	2011-09-23 13:04:01 UTC (rev 40493)
+++ branches/soc-2011-tomato/build_files/buildbot/master_unpack.py	2011-09-23 13:20:21 UTC (rev 40494)
@@ -48,11 +48,11 @@
     tokens = filename.split("-")
     platforms = ('osx', 'mac', 'bsd',
                  'win', 'linux', 'source',
-                 'irix', 'solaris')
+                 'solaris')
     platform_tokens = []
     found = False
 
-    for i, token in enumerate(tokens):
+    for token in tokens:
         if not found:
             for platform in platforms:
                 if platform in token.lower():

Modified: branches/soc-2011-tomato/build_files/cmake/cmake_static_check_cppcheck.py
===================================================================
--- branches/soc-2011-tomato/build_files/cmake/cmake_static_check_cppcheck.py	2011-09-23 13:04:01 UTC (rev 40493)
+++ branches/soc-2011-tomato/build_files/cmake/cmake_static_check_cppcheck.py	2011-09-23 13:20:21 UTC (rev 40494)
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 
-# $Id:
+# $Id$
 # ***** BEGIN GPL LICENSE BLOCK *****
 #
 # This program is free software; you can redistribute it and/or
@@ -37,12 +37,13 @@
 
 CHECKER_ARGS = [
     # not sure why this is needed, but it is.
-    "-I" + os.path.join(project_source_info.SOURCE_DIR, "extern/glew/include"),
+    "-I" + os.path.join(project_source_info.SOURCE_DIR, "extern", "glew", "include"),
 
     #  "--check-config", # when includes are missing
     #  "--enable=all",  # if you want sixty hundred pedantic suggestions
     ]
 
+
 def main():

@@ Diff output truncated at 10240 characters. @@



More information about the Bf-blender-cvs mailing list