[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [40411] branches/soc-2011-carrot: Merge with trunk r40409

Miika Hamalainen miika.hamalainen at kolumbus.fi
Tue Sep 20 19:51:05 CEST 2011


Revision: 40411
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=40411
Author:   miikah
Date:     2011-09-20 17:51:04 +0000 (Tue, 20 Sep 2011)
Log Message:
-----------
Merge with trunk r40409

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

Modified Paths:
--------------
    branches/soc-2011-carrot/CMakeLists.txt
    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-x86_64.py
    branches/soc-2011-carrot/build_files/cmake/Modules/FindOpenCOLLADA.cmake
    branches/soc-2011-carrot/build_files/cmake/macros.cmake
    branches/soc-2011-carrot/build_files/scons/config/darwin-config.py
    branches/soc-2011-carrot/build_files/scons/config/linuxcross-config.py
    branches/soc-2011-carrot/build_files/scons/config/win32-mingw-config.py
    branches/soc-2011-carrot/build_files/scons/config/win64-vc-config.py
    branches/soc-2011-carrot/build_files/scons/tools/Blender.py
    branches/soc-2011-carrot/build_files/scons/tools/btools.py
    branches/soc-2011-carrot/doc/python_api/examples/bge.texture.1.py
    branches/soc-2011-carrot/doc/python_api/examples/bpy.types.ID.user_clear.1.py
    branches/soc-2011-carrot/doc/python_api/examples/bpy.types.Operator.py
    branches/soc-2011-carrot/doc/python_api/rst/bgl.rst
    branches/soc-2011-carrot/doc/python_api/rst/info_gotcha.rst
    branches/soc-2011-carrot/doc/python_api/rst/info_quickstart.rst
    branches/soc-2011-carrot/doc/python_api/rst/info_tips_and_tricks.rst
    branches/soc-2011-carrot/doc/python_api/sphinx_doc_gen.py
    branches/soc-2011-carrot/doc/python_api/sphinx_doc_gen.sh
    branches/soc-2011-carrot/extern/CMakeLists.txt
    branches/soc-2011-carrot/extern/SConscript
    branches/soc-2011-carrot/extern/eltopo/common/bfstream.h
    branches/soc-2011-carrot/extern/glew/include/GL/glew.h
    branches/soc-2011-carrot/extern/glew/include/GL/glxew.h
    branches/soc-2011-carrot/extern/glew/include/GL/wglew.h
    branches/soc-2011-carrot/extern/glew/src/glew.c
    branches/soc-2011-carrot/intern/audaspace/intern/AUD_ConverterReader.cpp
    branches/soc-2011-carrot/intern/audaspace/intern/AUD_JOSResampleReader.cpp
    branches/soc-2011-carrot/intern/audaspace/intern/AUD_Mixer.cpp
    branches/soc-2011-carrot/intern/audaspace/intern/AUD_SequencerHandle.cpp
    branches/soc-2011-carrot/intern/audaspace/intern/AUD_SequencerHandle.h
    branches/soc-2011-carrot/intern/audaspace/intern/AUD_SequencerReader.cpp
    branches/soc-2011-carrot/intern/elbeem/CMakeLists.txt
    branches/soc-2011-carrot/intern/ghost/intern/GHOST_NDOFManager.cpp
    branches/soc-2011-carrot/intern/guardedalloc/MEM_sys_types.h
    branches/soc-2011-carrot/intern/guardedalloc/intern/mallocn.c
    branches/soc-2011-carrot/intern/itasc/kdl/frames.hpp
    branches/soc-2011-carrot/intern/opennl/CMakeLists.txt
    branches/soc-2011-carrot/intern/smoke/CMakeLists.txt
    branches/soc-2011-carrot/intern/smoke/SConscript
    branches/soc-2011-carrot/intern/smoke/intern/FFT_NOISE.h
    branches/soc-2011-carrot/intern/smoke/intern/WTURBULENCE.cpp
    branches/soc-2011-carrot/intern/string/intern/STR_String.cpp
    branches/soc-2011-carrot/intern/tools/credits_svn_gen.py
    branches/soc-2011-carrot/intern/tools/pydna.py
    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/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/zh_CN.po
    branches/soc-2011-carrot/release/bin/.blender/.Blanguages
    branches/soc-2011-carrot/release/bin/.blender/locale/ar/LC_MESSAGES/blender.mo
    branches/soc-2011-carrot/release/bin/.blender/locale/bg/LC_MESSAGES/blender.mo
    branches/soc-2011-carrot/release/bin/.blender/locale/ca/LC_MESSAGES/blender.mo
    branches/soc-2011-carrot/release/bin/.blender/locale/cs/LC_MESSAGES/blender.mo
    branches/soc-2011-carrot/release/bin/.blender/locale/de/LC_MESSAGES/blender.mo
    branches/soc-2011-carrot/release/bin/.blender/locale/el/LC_MESSAGES/blender.mo
    branches/soc-2011-carrot/release/bin/.blender/locale/es/LC_MESSAGES/blender.mo
    branches/soc-2011-carrot/release/bin/.blender/locale/fi/LC_MESSAGES/blender.mo
    branches/soc-2011-carrot/release/bin/.blender/locale/fr/LC_MESSAGES/blender.mo
    branches/soc-2011-carrot/release/bin/.blender/locale/hr/LC_MESSAGES/blender.mo
    branches/soc-2011-carrot/release/bin/.blender/locale/it/LC_MESSAGES/blender.mo
    branches/soc-2011-carrot/release/bin/.blender/locale/ja/LC_MESSAGES/blender.mo
    branches/soc-2011-carrot/release/bin/.blender/locale/ko/LC_MESSAGES/blender.mo
    branches/soc-2011-carrot/release/bin/.blender/locale/nl/LC_MESSAGES/blender.mo
    branches/soc-2011-carrot/release/bin/.blender/locale/pl/LC_MESSAGES/blender.mo
    branches/soc-2011-carrot/release/bin/.blender/locale/pt_BR/LC_MESSAGES/blender.mo
    branches/soc-2011-carrot/release/bin/.blender/locale/ro/LC_MESSAGES/blender.mo
    branches/soc-2011-carrot/release/bin/.blender/locale/ru/LC_MESSAGES/blender.mo
    branches/soc-2011-carrot/release/bin/.blender/locale/sr/LC_MESSAGES/blender.mo
    branches/soc-2011-carrot/release/bin/.blender/locale/sr at Latn/LC_MESSAGES/blender.mo
    branches/soc-2011-carrot/release/bin/.blender/locale/sv/LC_MESSAGES/blender.mo
    branches/soc-2011-carrot/release/bin/.blender/locale/uk/LC_MESSAGES/blender.mo
    branches/soc-2011-carrot/release/bin/.blender/locale/zh_CN/LC_MESSAGES/blender.mo
    branches/soc-2011-carrot/release/datafiles/blenderbuttons
    branches/soc-2011-carrot/release/scripts/modules/bpy/utils.py
    branches/soc-2011-carrot/release/scripts/modules/bpy_extras/io_utils.py
    branches/soc-2011-carrot/release/scripts/modules/bpy_types.py
    branches/soc-2011-carrot/release/scripts/modules/console_python.py
    branches/soc-2011-carrot/release/scripts/modules/rna_info.py
    branches/soc-2011-carrot/release/scripts/startup/bl_operators/animsys_update.py
    branches/soc-2011-carrot/release/scripts/startup/bl_operators/image.py
    branches/soc-2011-carrot/release/scripts/startup/bl_operators/nla.py
    branches/soc-2011-carrot/release/scripts/startup/bl_operators/object.py
    branches/soc-2011-carrot/release/scripts/startup/bl_operators/object_quick_effects.py
    branches/soc-2011-carrot/release/scripts/startup/bl_operators/sequencer.py
    branches/soc-2011-carrot/release/scripts/startup/bl_operators/uvcalc_follow_active.py
    branches/soc-2011-carrot/release/scripts/startup/bl_operators/uvcalc_lightmap.py
    branches/soc-2011-carrot/release/scripts/startup/bl_operators/uvcalc_smart_project.py
    branches/soc-2011-carrot/release/scripts/startup/bl_operators/wm.py
    branches/soc-2011-carrot/release/scripts/startup/bl_ui/properties_animviz.py
    branches/soc-2011-carrot/release/scripts/startup/bl_ui/properties_data_armature.py
    branches/soc-2011-carrot/release/scripts/startup/bl_ui/properties_data_bone.py
    branches/soc-2011-carrot/release/scripts/startup/bl_ui/properties_data_camera.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_empty.py
    branches/soc-2011-carrot/release/scripts/startup/bl_ui/properties_data_lamp.py
    branches/soc-2011-carrot/release/scripts/startup/bl_ui/properties_data_mesh.py
    branches/soc-2011-carrot/release/scripts/startup/bl_ui/properties_data_metaball.py
    branches/soc-2011-carrot/release/scripts/startup/bl_ui/properties_data_modifier.py
    branches/soc-2011-carrot/release/scripts/startup/bl_ui/properties_data_speaker.py
    branches/soc-2011-carrot/release/scripts/startup/bl_ui/properties_game.py
    branches/soc-2011-carrot/release/scripts/startup/bl_ui/properties_material.py
    branches/soc-2011-carrot/release/scripts/startup/bl_ui/properties_object.py
    branches/soc-2011-carrot/release/scripts/startup/bl_ui/properties_object_constraint.py
    branches/soc-2011-carrot/release/scripts/startup/bl_ui/properties_particle.py
    branches/soc-2011-carrot/release/scripts/startup/bl_ui/properties_physics_cloth.py
    branches/soc-2011-carrot/release/scripts/startup/bl_ui/properties_physics_common.py
    branches/soc-2011-carrot/release/scripts/startup/bl_ui/properties_physics_field.py
    branches/soc-2011-carrot/release/scripts/startup/bl_ui/properties_physics_fluid.py
    branches/soc-2011-carrot/release/scripts/startup/bl_ui/properties_physics_smoke.py
    branches/soc-2011-carrot/release/scripts/startup/bl_ui/properties_physics_softbody.py
    branches/soc-2011-carrot/release/scripts/startup/bl_ui/properties_render.py
    branches/soc-2011-carrot/release/scripts/startup/bl_ui/properties_scene.py
    branches/soc-2011-carrot/release/scripts/startup/bl_ui/properties_texture.py
    branches/soc-2011-carrot/release/scripts/startup/bl_ui/properties_world.py
    branches/soc-2011-carrot/release/scripts/startup/bl_ui/space_console.py
    branches/soc-2011-carrot/release/scripts/startup/bl_ui/space_dopesheet.py
    branches/soc-2011-carrot/release/scripts/startup/bl_ui/space_graph.py
    branches/soc-2011-carrot/release/scripts/startup/bl_ui/space_image.py
    branches/soc-2011-carrot/release/scripts/startup/bl_ui/space_info.py
    branches/soc-2011-carrot/release/scripts/startup/bl_ui/space_logic.py
    branches/soc-2011-carrot/release/scripts/startup/bl_ui/space_nla.py
    branches/soc-2011-carrot/release/scripts/startup/bl_ui/space_node.py
    branches/soc-2011-carrot/release/scripts/startup/bl_ui/space_sequencer.py
    branches/soc-2011-carrot/release/scripts/startup/bl_ui/space_text.py
    branches/soc-2011-carrot/release/scripts/startup/bl_ui/space_time.py
    branches/soc-2011-carrot/release/scripts/startup/bl_ui/space_userpref.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/templates/operator_export.py
    branches/soc-2011-carrot/source/blender/avi/intern/avirgb.c
    branches/soc-2011-carrot/source/blender/avi/intern/endian.c
    branches/soc-2011-carrot/source/blender/blenfont/BLF_api.h
    branches/soc-2011-carrot/source/blender/blenfont/CMakeLists.txt
    branches/soc-2011-carrot/source/blender/blenfont/SConscript
    branches/soc-2011-carrot/source/blender/blenfont/intern/blf.c
    branches/soc-2011-carrot/source/blender/blenfont/intern/blf_dir.c
    branches/soc-2011-carrot/source/blender/blenfont/intern/blf_font.c
    branches/soc-2011-carrot/source/blender/blenfont/intern/blf_glyph.c
    branches/soc-2011-carrot/source/blender/blenfont/intern/blf_internal.h
    branches/soc-2011-carrot/source/blender/blenfont/intern/blf_internal_types.h
    branches/soc-2011-carrot/source/blender/blenfont/intern/blf_lang.c
    branches/soc-2011-carrot/source/blender/blenfont/intern/blf_util.c
    branches/soc-2011-carrot/source/blender/blenkernel/BKE_armature.h
    branches/soc-2011-carrot/source/blender/blenkernel/BKE_blender.h
    branches/soc-2011-carrot/source/blender/blenkernel/BKE_colortools.h
    branches/soc-2011-carrot/source/blender/blenkernel/BKE_curve.h
    branches/soc-2011-carrot/source/blender/blenkernel/BKE_global.h
    branches/soc-2011-carrot/source/blender/blenkernel/BKE_image.h
    branches/soc-2011-carrot/source/blender/blenkernel/BKE_material.h
    branches/soc-2011-carrot/source/blender/blenkernel/BKE_mesh.h
    branches/soc-2011-carrot/source/blender/blenkernel/BKE_node.h
    branches/soc-2011-carrot/source/blender/blenkernel/BKE_object.h
    branches/soc-2011-carrot/source/blender/blenkernel/BKE_paint.h
    branches/soc-2011-carrot/source/blender/blenkernel/BKE_sequencer.h
    branches/soc-2011-carrot/source/blender/blenkernel/BKE_sound.h
    branches/soc-2011-carrot/source/blender/blenkernel/BKE_utildefines.h
    branches/soc-2011-carrot/source/blender/blenkernel/CMakeLists.txt
    branches/soc-2011-carrot/source/blender/blenkernel/SConscript
    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/boids.c
    branches/soc-2011-carrot/source/blender/blenkernel/intern/brush.c
    branches/soc-2011-carrot/source/blender/blenkernel/intern/cdderivedmesh.c
    branches/soc-2011-carrot/source/blender/blenkernel/intern/collision.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/displist.c
    branches/soc-2011-carrot/source/blender/blenkernel/intern/dynamicpaint.c
    branches/soc-2011-carrot/source/blender/blenkernel/intern/effect.c
    branches/soc-2011-carrot/source/blender/blenkernel/intern/image.c
    branches/soc-2011-carrot/source/blender/blenkernel/intern/ipo.c
    branches/soc-2011-carrot/source/blender/blenkernel/intern/material.c
    branches/soc-2011-carrot/source/blender/blenkernel/intern/mesh.c
    branches/soc-2011-carrot/source/blender/blenkernel/intern/mesh_validate.c
    branches/soc-2011-carrot/source/blender/blenkernel/intern/node.c
    branches/soc-2011-carrot/source/blender/blenkernel/intern/object.c
    branches/soc-2011-carrot/source/blender/blenkernel/intern/paint.c
    branches/soc-2011-carrot/source/blender/blenkernel/intern/particle.c
    branches/soc-2011-carrot/source/blender/blenkernel/intern/sca.c
    branches/soc-2011-carrot/source/blender/blenkernel/intern/scene.c
    branches/soc-2011-carrot/source/blender/blenkernel/intern/screen.c
    branches/soc-2011-carrot/source/blender/blenkernel/intern/seqeffects.c
    branches/soc-2011-carrot/source/blender/blenkernel/intern/sequencer.c
    branches/soc-2011-carrot/source/blender/blenkernel/intern/shrinkwrap.c
    branches/soc-2011-carrot/source/blender/blenkernel/intern/sketch.c
    branches/soc-2011-carrot/source/blender/blenkernel/intern/sound.c
    branches/soc-2011-carrot/source/blender/blenkernel/intern/subsurf_ccg.c
    branches/soc-2011-carrot/source/blender/blenkernel/intern/texture.c
    branches/soc-2011-carrot/source/blender/blenkernel/intern/unit.c
    branches/soc-2011-carrot/source/blender/blenlib/BLI_fileops.h
    branches/soc-2011-carrot/source/blender/blenlib/BLI_math_inline.h
    branches/soc-2011-carrot/source/blender/blenlib/BLI_math_matrix.h
    branches/soc-2011-carrot/source/blender/blenlib/BLI_math_rotation.h
    branches/soc-2011-carrot/source/blender/blenlib/BLI_math_vector.h
    branches/soc-2011-carrot/source/blender/blenlib/BLI_string.h
    branches/soc-2011-carrot/source/blender/blenlib/BLI_utildefines.h
    branches/soc-2011-carrot/source/blender/blenlib/BLI_voxel.h
    branches/soc-2011-carrot/source/blender/blenlib/CMakeLists.txt
    branches/soc-2011-carrot/source/blender/blenlib/intern/BLI_kdopbvh.c
    branches/soc-2011-carrot/source/blender/blenlib/intern/fileops.c
    branches/soc-2011-carrot/source/blender/blenlib/intern/graph.c
    branches/soc-2011-carrot/source/blender/blenlib/intern/math_matrix.c
    branches/soc-2011-carrot/source/blender/blenlib/intern/math_rotation.c
    branches/soc-2011-carrot/source/blender/blenlib/intern/math_vector.c
    branches/soc-2011-carrot/source/blender/blenlib/intern/math_vector_inline.c
    branches/soc-2011-carrot/source/blender/blenlib/intern/noise.c
    branches/soc-2011-carrot/source/blender/blenlib/intern/string.c
    branches/soc-2011-carrot/source/blender/blenlib/intern/voxel.c
    branches/soc-2011-carrot/source/blender/blenloader/BLO_sys_types.h
    branches/soc-2011-carrot/source/blender/blenloader/CMakeLists.txt
    branches/soc-2011-carrot/source/blender/blenloader/SConscript
    branches/soc-2011-carrot/source/blender/blenloader/intern/readfile.c
    branches/soc-2011-carrot/source/blender/blenloader/intern/writefile.c
    branches/soc-2011-carrot/source/blender/collada/AnimationExporter.cpp
    branches/soc-2011-carrot/source/blender/collada/AnimationImporter.cpp
    branches/soc-2011-carrot/source/blender/collada/AnimationImporter.h
    branches/soc-2011-carrot/source/blender/collada/ArmatureExporter.cpp
    branches/soc-2011-carrot/source/blender/collada/ArmatureExporter.h
    branches/soc-2011-carrot/source/blender/collada/ArmatureImporter.cpp
    branches/soc-2011-carrot/source/blender/collada/CMakeLists.txt
    branches/soc-2011-carrot/source/blender/collada/CameraExporter.cpp
    branches/soc-2011-carrot/source/blender/collada/CameraExporter.h
    branches/soc-2011-carrot/source/blender/collada/DocumentExporter.cpp
    branches/soc-2011-carrot/source/blender/collada/DocumentExporter.h
    branches/soc-2011-carrot/source/blender/collada/DocumentImporter.cpp
    branches/soc-2011-carrot/source/blender/collada/EffectExporter.cpp
    branches/soc-2011-carrot/source/blender/collada/EffectExporter.h
    branches/soc-2011-carrot/source/blender/collada/GeometryExporter.cpp
    branches/soc-2011-carrot/source/blender/collada/GeometryExporter.h
    branches/soc-2011-carrot/source/blender/collada/ImageExporter.cpp
    branches/soc-2011-carrot/source/blender/collada/ImageExporter.h
    branches/soc-2011-carrot/source/blender/collada/LightExporter.cpp
    branches/soc-2011-carrot/source/blender/collada/LightExporter.h
    branches/soc-2011-carrot/source/blender/collada/MaterialExporter.cpp
    branches/soc-2011-carrot/source/blender/collada/MaterialExporter.h
    branches/soc-2011-carrot/source/blender/collada/MeshImporter.cpp
    branches/soc-2011-carrot/source/blender/collada/MeshImporter.h
    branches/soc-2011-carrot/source/blender/collada/TransformReader.cpp
    branches/soc-2011-carrot/source/blender/collada/TransformWriter.cpp
    branches/soc-2011-carrot/source/blender/collada/collada.cpp
    branches/soc-2011-carrot/source/blender/editors/animation/anim_channels_defines.c
    branches/soc-2011-carrot/source/blender/editors/animation/anim_draw.c
    branches/soc-2011-carrot/source/blender/editors/animation/anim_filter.c
    branches/soc-2011-carrot/source/blender/editors/animation/anim_ops.c
    branches/soc-2011-carrot/source/blender/editors/animation/drivers.c
    branches/soc-2011-carrot/source/blender/editors/animation/fmodifier_ui.c
    branches/soc-2011-carrot/source/blender/editors/animation/keyframes_edit.c
    branches/soc-2011-carrot/source/blender/editors/animation/keyframes_general.c
    branches/soc-2011-carrot/source/blender/editors/animation/keyframing.c
    branches/soc-2011-carrot/source/blender/editors/animation/keyingsets.c
    branches/soc-2011-carrot/source/blender/editors/armature/CMakeLists.txt
    branches/soc-2011-carrot/source/blender/editors/armature/SConscript
    branches/soc-2011-carrot/source/blender/editors/armature/editarmature.c
    branches/soc-2011-carrot/source/blender/editors/armature/editarmature_sketch.c
    branches/soc-2011-carrot/source/blender/editors/armature/meshlaplacian.c
    branches/soc-2011-carrot/source/blender/editors/armature/poseSlide.c
    branches/soc-2011-carrot/source/blender/editors/armature/poselib.c
    branches/soc-2011-carrot/source/blender/editors/armature/poseobject.c
    branches/soc-2011-carrot/source/blender/editors/curve/curve_ops.c
    branches/soc-2011-carrot/source/blender/editors/curve/editcurve.c
    branches/soc-2011-carrot/source/blender/editors/curve/editfont.c
    branches/soc-2011-carrot/source/blender/editors/datafiles/blenderbuttons.c
    branches/soc-2011-carrot/source/blender/editors/gpencil/CMakeLists.txt
    branches/soc-2011-carrot/source/blender/editors/gpencil/drawgpencil.c
    branches/soc-2011-carrot/source/blender/editors/gpencil/gpencil_edit.c
    branches/soc-2011-carrot/source/blender/editors/gpencil/gpencil_intern.h
    branches/soc-2011-carrot/source/blender/editors/gpencil/gpencil_ops.c
    branches/soc-2011-carrot/source/blender/editors/gpencil/gpencil_paint.c
    branches/soc-2011-carrot/source/blender/editors/include/ED_armature.h
    branches/soc-2011-carrot/source/blender/editors/include/ED_curve.h
    branches/soc-2011-carrot/source/blender/editors/include/ED_gpencil.h
    branches/soc-2011-carrot/source/blender/editors/include/ED_mesh.h
    branches/soc-2011-carrot/source/blender/editors/include/ED_node.h
    branches/soc-2011-carrot/source/blender/editors/include/ED_object.h
    branches/soc-2011-carrot/source/blender/editors/include/ED_sculpt.h
    branches/soc-2011-carrot/source/blender/editors/include/ED_sequencer.h
    branches/soc-2011-carrot/source/blender/editors/include/ED_view3d.h
    branches/soc-2011-carrot/source/blender/editors/include/UI_icons.h
    branches/soc-2011-carrot/source/blender/editors/include/UI_interface.h
    branches/soc-2011-carrot/source/blender/editors/include/UI_resources.h
    branches/soc-2011-carrot/source/blender/editors/interface/interface.c
    branches/soc-2011-carrot/source/blender/editors/interface/interface_draw.c
    branches/soc-2011-carrot/source/blender/editors/interface/interface_handlers.c
    branches/soc-2011-carrot/source/blender/editors/interface/interface_intern.h
    branches/soc-2011-carrot/source/blender/editors/interface/interface_layout.c
    branches/soc-2011-carrot/source/blender/editors/interface/interface_ops.c
    branches/soc-2011-carrot/source/blender/editors/interface/interface_panel.c
    branches/soc-2011-carrot/source/blender/editors/interface/interface_regions.c
    branches/soc-2011-carrot/source/blender/editors/interface/interface_style.c
    branches/soc-2011-carrot/source/blender/editors/interface/interface_templates.c
    branches/soc-2011-carrot/source/blender/editors/interface/interface_utils.c
    branches/soc-2011-carrot/source/blender/editors/interface/interface_widgets.c
    branches/soc-2011-carrot/source/blender/editors/interface/resources.c
    branches/soc-2011-carrot/source/blender/editors/interface/view2d.c
    branches/soc-2011-carrot/source/blender/editors/interface/view2d_ops.c
    branches/soc-2011-carrot/source/blender/editors/mesh/editmesh.c
    branches/soc-2011-carrot/source/blender/editors/mesh/editmesh_add.c
    branches/soc-2011-carrot/source/blender/editors/mesh/editmesh_lib.c
    branches/soc-2011-carrot/source/blender/editors/mesh/editmesh_mods.c
    branches/soc-2011-carrot/source/blender/editors/mesh/editmesh_tools.c
    branches/soc-2011-carrot/source/blender/editors/mesh/mesh_data.c
    branches/soc-2011-carrot/source/blender/editors/mesh/meshtools.c
    branches/soc-2011-carrot/source/blender/editors/metaball/mball_edit.c
    branches/soc-2011-carrot/source/blender/editors/object/CMakeLists.txt
    branches/soc-2011-carrot/source/blender/editors/object/SConscript
    branches/soc-2011-carrot/source/blender/editors/object/object_add.c
    branches/soc-2011-carrot/source/blender/editors/object/object_constraint.c
    branches/soc-2011-carrot/source/blender/editors/object/object_edit.c
    branches/soc-2011-carrot/source/blender/editors/object/object_hook.c
    branches/soc-2011-carrot/source/blender/editors/object/object_intern.h
    branches/soc-2011-carrot/source/blender/editors/object/object_modifier.c
    branches/soc-2011-carrot/source/blender/editors/object/object_ops.c
    branches/soc-2011-carrot/source/blender/editors/object/object_relations.c
    branches/soc-2011-carrot/source/blender/editors/object/object_select.c
    branches/soc-2011-carrot/source/blender/editors/object/object_shapekey.c
    branches/soc-2011-carrot/source/blender/editors/object/object_transform.c
    branches/soc-2011-carrot/source/blender/editors/object/object_vgroup.c
    branches/soc-2011-carrot/source/blender/editors/physics/particle_edit.c
    branches/soc-2011-carrot/source/blender/editors/physics/physics_fluid.c
    branches/soc-2011-carrot/source/blender/editors/render/render_internal.c
    branches/soc-2011-carrot/source/blender/editors/render/render_opengl.c
    branches/soc-2011-carrot/source/blender/editors/render/render_shading.c
    branches/soc-2011-carrot/source/blender/editors/screen/area.c
    branches/soc-2011-carrot/source/blender/editors/screen/screen_context.c
    branches/soc-2011-carrot/source/blender/editors/screen/screen_ops.c
    branches/soc-2011-carrot/source/blender/editors/sculpt_paint/paint_image.c
    branches/soc-2011-carrot/source/blender/editors/sculpt_paint/paint_intern.h
    branches/soc-2011-carrot/source/blender/editors/sculpt_paint/paint_ops.c
    branches/soc-2011-carrot/source/blender/editors/sculpt_paint/paint_stroke.c
    branches/soc-2011-carrot/source/blender/editors/sculpt_paint/paint_utils.c
    branches/soc-2011-carrot/source/blender/editors/sculpt_paint/paint_vertex.c
    branches/soc-2011-carrot/source/blender/editors/sculpt_paint/sculpt.c
    branches/soc-2011-carrot/source/blender/editors/sculpt_paint/sculpt_intern.h
    branches/soc-2011-carrot/source/blender/editors/sculpt_paint/sculpt_undo.c
    branches/soc-2011-carrot/source/blender/editors/sound/sound_intern.h
    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_action/action_select.c
    branches/soc-2011-carrot/source/blender/editors/space_buttons/CMakeLists.txt
    branches/soc-2011-carrot/source/blender/editors/space_buttons/SConscript
    branches/soc-2011-carrot/source/blender/editors/space_buttons/buttons_header.c
    branches/soc-2011-carrot/source/blender/editors/space_console/console_ops.c
    branches/soc-2011-carrot/source/blender/editors/space_console/space_console.c
    branches/soc-2011-carrot/source/blender/editors/space_file/file_draw.c
    branches/soc-2011-carrot/source/blender/editors/space_file/file_ops.c
    branches/soc-2011-carrot/source/blender/editors/space_file/file_panels.c
    branches/soc-2011-carrot/source/blender/editors/space_file/filelist.c
    branches/soc-2011-carrot/source/blender/editors/space_file/filesel.c
    branches/soc-2011-carrot/source/blender/editors/space_graph/CMakeLists.txt
    branches/soc-2011-carrot/source/blender/editors/space_graph/SConscript
    branches/soc-2011-carrot/source/blender/editors/space_graph/graph_buttons.c
    branches/soc-2011-carrot/source/blender/editors/space_graph/graph_edit.c
    branches/soc-2011-carrot/source/blender/editors/space_graph/graph_ops.c
    branches/soc-2011-carrot/source/blender/editors/space_graph/graph_select.c
    branches/soc-2011-carrot/source/blender/editors/space_image/image_buttons.c
    branches/soc-2011-carrot/source/blender/editors/space_image/image_ops.c
    branches/soc-2011-carrot/source/blender/editors/space_image/space_image.c
    branches/soc-2011-carrot/source/blender/editors/space_info/info_ops.c
    branches/soc-2011-carrot/source/blender/editors/space_info/info_report.c
    branches/soc-2011-carrot/source/blender/editors/space_info/info_stats.c
    branches/soc-2011-carrot/source/blender/editors/space_info/space_info.c
    branches/soc-2011-carrot/source/blender/editors/space_logic/CMakeLists.txt
    branches/soc-2011-carrot/source/blender/editors/space_logic/logic_ops.c
    branches/soc-2011-carrot/source/blender/editors/space_logic/logic_window.c
    branches/soc-2011-carrot/source/blender/editors/space_nla/CMakeLists.txt
    branches/soc-2011-carrot/source/blender/editors/space_nla/SConscript
    branches/soc-2011-carrot/source/blender/editors/space_nla/nla_buttons.c
    branches/soc-2011-carrot/source/blender/editors/space_nla/nla_channels.c
    branches/soc-2011-carrot/source/blender/editors/space_nla/nla_draw.c
    branches/soc-2011-carrot/source/blender/editors/space_nla/nla_edit.c
    branches/soc-2011-carrot/source/blender/editors/space_nla/nla_select.c
    branches/soc-2011-carrot/source/blender/editors/space_node/drawnode.c
    branches/soc-2011-carrot/source/blender/editors/space_node/node_buttons.c
    branches/soc-2011-carrot/source/blender/editors/space_node/node_draw.c
    branches/soc-2011-carrot/source/blender/editors/space_node/node_edit.c
    branches/soc-2011-carrot/source/blender/editors/space_node/node_header.c
    branches/soc-2011-carrot/source/blender/editors/space_node/node_intern.h
    branches/soc-2011-carrot/source/blender/editors/space_node/node_ops.c
    branches/soc-2011-carrot/source/blender/editors/space_node/node_select.c
    branches/soc-2011-carrot/source/blender/editors/space_node/node_state.c
    branches/soc-2011-carrot/source/blender/editors/space_node/space_node.c
    branches/soc-2011-carrot/source/blender/editors/space_outliner/outliner_draw.c
    branches/soc-2011-carrot/source/blender/editors/space_outliner/outliner_edit.c
    branches/soc-2011-carrot/source/blender/editors/space_outliner/outliner_intern.h
    branches/soc-2011-carrot/source/blender/editors/space_outliner/outliner_select.c
    branches/soc-2011-carrot/source/blender/editors/space_outliner/outliner_tools.c
    branches/soc-2011-carrot/source/blender/editors/space_outliner/outliner_tree.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_sequencer/space_sequencer.c
    branches/soc-2011-carrot/source/blender/editors/space_text/text_draw.c
    branches/soc-2011-carrot/source/blender/editors/space_text/text_ops.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/drawvolume.c
    branches/soc-2011-carrot/source/blender/editors/space_view3d/space_view3d.c
    branches/soc-2011-carrot/source/blender/editors/space_view3d/view3d_buttons.c
    branches/soc-2011-carrot/source/blender/editors/space_view3d/view3d_draw.c
    branches/soc-2011-carrot/source/blender/editors/space_view3d/view3d_edit.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/space_view3d/view3d_toolbar.c
    branches/soc-2011-carrot/source/blender/editors/space_view3d/view3d_view.c
    branches/soc-2011-carrot/source/blender/editors/transform/CMakeLists.txt
    branches/soc-2011-carrot/source/blender/editors/transform/SConscript
    branches/soc-2011-carrot/source/blender/editors/transform/transform.c
    branches/soc-2011-carrot/source/blender/editors/transform/transform_constraints.c
    branches/soc-2011-carrot/source/blender/editors/transform/transform_conversions.c
    branches/soc-2011-carrot/source/blender/editors/transform/transform_generics.c
    branches/soc-2011-carrot/source/blender/editors/transform/transform_manipulator.c
    branches/soc-2011-carrot/source/blender/editors/transform/transform_ops.c
    branches/soc-2011-carrot/source/blender/editors/transform/transform_orientations.c
    branches/soc-2011-carrot/source/blender/editors/transform/transform_snap.c
    branches/soc-2011-carrot/source/blender/editors/util/SConscript
    branches/soc-2011-carrot/source/blender/editors/util/undo.c
    branches/soc-2011-carrot/source/blender/editors/uvedit/uvedit_draw.c
    branches/soc-2011-carrot/source/blender/editors/uvedit/uvedit_ops.c
    branches/soc-2011-carrot/source/blender/editors/uvedit/uvedit_parametrizer.c
    branches/soc-2011-carrot/source/blender/editors/uvedit/uvedit_unwrap_ops.c
    branches/soc-2011-carrot/source/blender/gpu/GPU_draw.h
    branches/soc-2011-carrot/source/blender/gpu/GPU_extensions.h
    branches/soc-2011-carrot/source/blender/gpu/GPU_material.h
    branches/soc-2011-carrot/source/blender/gpu/SConscript
    branches/soc-2011-carrot/source/blender/gpu/intern/gpu_buffers.c
    branches/soc-2011-carrot/source/blender/gpu/intern/gpu_codegen.c
    branches/soc-2011-carrot/source/blender/gpu/intern/gpu_codegen.h
    branches/soc-2011-carrot/source/blender/gpu/intern/gpu_draw.c
    branches/soc-2011-carrot/source/blender/gpu/intern/gpu_extensions.c
    branches/soc-2011-carrot/source/blender/gpu/intern/gpu_material.c
    branches/soc-2011-carrot/source/blender/gpu/intern/gpu_shader_material.glsl
    branches/soc-2011-carrot/source/blender/gpu/intern/gpu_shader_material.glsl.c
    branches/soc-2011-carrot/source/blender/imbuf/CMakeLists.txt
    branches/soc-2011-carrot/source/blender/imbuf/SConscript
    branches/soc-2011-carrot/source/blender/imbuf/intern/IMB_anim.h
    branches/soc-2011-carrot/source/blender/imbuf/intern/IMB_indexer.h
    branches/soc-2011-carrot/source/blender/imbuf/intern/cineon/cineonlib.c
    branches/soc-2011-carrot/source/blender/imbuf/intern/cineon/logImageCore.h
    branches/soc-2011-carrot/source/blender/imbuf/intern/filter.c
    branches/soc-2011-carrot/source/blender/imbuf/intern/imbuf.h
    branches/soc-2011-carrot/source/blender/imbuf/intern/indexer.c
    branches/soc-2011-carrot/source/blender/imbuf/intern/iris.c
    branches/soc-2011-carrot/source/blender/imbuf/intern/jp2.c
    branches/soc-2011-carrot/source/blender/imbuf/intern/md5.c
    branches/soc-2011-carrot/source/blender/imbuf/intern/radiance_hdr.c
    branches/soc-2011-carrot/source/blender/imbuf/intern/tiff.c
    branches/soc-2011-carrot/source/blender/makesdna/DNA_ID.h
    branches/soc-2011-carrot/source/blender/makesdna/DNA_action_types.h
    branches/soc-2011-carrot/source/blender/makesdna/DNA_actuator_types.h
    branches/soc-2011-carrot/source/blender/makesdna/DNA_customdata_types.h
    branches/soc-2011-carrot/source/blender/makesdna/DNA_material_types.h
    branches/soc-2011-carrot/source/blender/makesdna/DNA_mesh_types.h
    branches/soc-2011-carrot/source/blender/makesdna/DNA_meshdata_types.h
    branches/soc-2011-carrot/source/blender/makesdna/DNA_modifier_types.h
    branches/soc-2011-carrot/source/blender/makesdna/DNA_node_types.h
    branches/soc-2011-carrot/source/blender/makesdna/DNA_object_types.h
    branches/soc-2011-carrot/source/blender/makesdna/DNA_outliner_types.h
    branches/soc-2011-carrot/source/blender/makesdna/DNA_scene_types.h
    branches/soc-2011-carrot/source/blender/makesdna/DNA_sequence_types.h
    branches/soc-2011-carrot/source/blender/makesdna/DNA_space_types.h
    branches/soc-2011-carrot/source/blender/makesdna/DNA_userdef_types.h
    branches/soc-2011-carrot/source/blender/makesrna/RNA_access.h
    branches/soc-2011-carrot/source/blender/makesrna/RNA_enum_types.h
    branches/soc-2011-carrot/source/blender/makesrna/RNA_types.h
    branches/soc-2011-carrot/source/blender/makesrna/SConscript
    branches/soc-2011-carrot/source/blender/makesrna/intern/CMakeLists.txt
    branches/soc-2011-carrot/source/blender/makesrna/intern/SConscript
    branches/soc-2011-carrot/source/blender/makesrna/intern/makesrna.c
    branches/soc-2011-carrot/source/blender/makesrna/intern/rna_ID.c
    branches/soc-2011-carrot/source/blender/makesrna/intern/rna_access.c
    branches/soc-2011-carrot/source/blender/makesrna/intern/rna_action.c
    branches/soc-2011-carrot/source/blender/makesrna/intern/rna_actuator.c
    branches/soc-2011-carrot/source/blender/makesrna/intern/rna_actuator_api.c
    branches/soc-2011-carrot/source/blender/makesrna/intern/rna_animation.c
    branches/soc-2011-carrot/source/blender/makesrna/intern/rna_armature.c
    branches/soc-2011-carrot/source/blender/makesrna/intern/rna_armature_api.c
    branches/soc-2011-carrot/source/blender/makesrna/intern/rna_color.c
    branches/soc-2011-carrot/source/blender/makesrna/intern/rna_constraint.c
    branches/soc-2011-carrot/source/blender/makesrna/intern/rna_controller_api.c
    branches/soc-2011-carrot/source/blender/makesrna/intern/rna_curve.c
    branches/soc-2011-carrot/source/blender/makesrna/intern/rna_dynamicpaint.c
    branches/soc-2011-carrot/source/blender/makesrna/intern/rna_fcurve.c
    branches/soc-2011-carrot/source/blender/makesrna/intern/rna_gpencil.c
    branches/soc-2011-carrot/source/blender/makesrna/intern/rna_group.c
    branches/soc-2011-carrot/source/blender/makesrna/intern/rna_image_api.c
    branches/soc-2011-carrot/source/blender/makesrna/intern/rna_internal.h
    branches/soc-2011-carrot/source/blender/makesrna/intern/rna_key.c
    branches/soc-2011-carrot/source/blender/makesrna/intern/rna_main.c
    branches/soc-2011-carrot/source/blender/makesrna/intern/rna_main_api.c
    branches/soc-2011-carrot/source/blender/makesrna/intern/rna_material.c
    branches/soc-2011-carrot/source/blender/makesrna/intern/rna_mesh.c
    branches/soc-2011-carrot/source/blender/makesrna/intern/rna_mesh_api.c
    branches/soc-2011-carrot/source/blender/makesrna/intern/rna_meta.c
    branches/soc-2011-carrot/source/blender/makesrna/intern/rna_modifier.c
    branches/soc-2011-carrot/source/blender/makesrna/intern/rna_nla.c
    branches/soc-2011-carrot/source/blender/makesrna/intern/rna_nodetree.c
    branches/soc-2011-carrot/source/blender/makesrna/intern/rna_nodetree_types.h
    branches/soc-2011-carrot/source/blender/makesrna/intern/rna_object.c
    branches/soc-2011-carrot/source/blender/makesrna/intern/rna_object_api.c
    branches/soc-2011-carrot/source/blender/makesrna/intern/rna_object_force.c
    branches/soc-2011-carrot/source/blender/makesrna/intern/rna_particle.c
    branches/soc-2011-carrot/source/blender/makesrna/intern/rna_pose.c
    branches/soc-2011-carrot/source/blender/makesrna/intern/rna_pose_api.c
    branches/soc-2011-carrot/source/blender/makesrna/intern/rna_property.c
    branches/soc-2011-carrot/source/blender/makesrna/intern/rna_render.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_scene_api.c
    branches/soc-2011-carrot/source/blender/makesrna/intern/rna_screen.c
    branches/soc-2011-carrot/source/blender/makesrna/intern/rna_sensor_api.c
    branches/soc-2011-carrot/source/blender/makesrna/intern/rna_sequencer.c
    branches/soc-2011-carrot/source/blender/makesrna/intern/rna_sequencer_api.c
    branches/soc-2011-carrot/source/blender/makesrna/intern/rna_smoke.c
    branches/soc-2011-carrot/source/blender/makesrna/intern/rna_sound.c
    branches/soc-2011-carrot/source/blender/makesrna/intern/rna_space.c
    branches/soc-2011-carrot/source/blender/makesrna/intern/rna_speaker.c
    branches/soc-2011-carrot/source/blender/makesrna/intern/rna_text.c
    branches/soc-2011-carrot/source/blender/makesrna/intern/rna_text_api.c
    branches/soc-2011-carrot/source/blender/makesrna/intern/rna_texture.c
    branches/soc-2011-carrot/source/blender/makesrna/intern/rna_texture_api.c
    branches/soc-2011-carrot/source/blender/makesrna/intern/rna_ui.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/makesrna/intern/rna_wm_api.c
    branches/soc-2011-carrot/source/blender/makesrna/intern/rna_world.c
    branches/soc-2011-carrot/source/blender/modifiers/CMakeLists.txt
    branches/soc-2011-carrot/source/blender/modifiers/MOD_modifiertypes.h
    branches/soc-2011-carrot/source/blender/modifiers/SConscript
    branches/soc-2011-carrot/source/blender/modifiers/intern/MOD_util.c
    branches/soc-2011-carrot/source/blender/modifiers/intern/MOD_uvproject.c
    branches/soc-2011-carrot/source/blender/modifiers/intern/MOD_warp.c
    branches/soc-2011-carrot/source/blender/nodes/CMakeLists.txt
    branches/soc-2011-carrot/source/blender/nodes/SConscript
    branches/soc-2011-carrot/source/blender/nodes/intern/node_util.c
    branches/soc-2011-carrot/source/blender/nodes/intern/node_util.h
    branches/soc-2011-carrot/source/blender/python/SConscript
    branches/soc-2011-carrot/source/blender/python/generic/CMakeLists.txt
    branches/soc-2011-carrot/source/blender/python/generic/bgl.c
    branches/soc-2011-carrot/source/blender/python/generic/blf_py_api.c
    branches/soc-2011-carrot/source/blender/python/generic/bpy_internal_import.c
    branches/soc-2011-carrot/source/blender/python/generic/py_capi_utils.c
    branches/soc-2011-carrot/source/blender/python/generic/py_capi_utils.h
    branches/soc-2011-carrot/source/blender/python/intern/CMakeLists.txt
    branches/soc-2011-carrot/source/blender/python/intern/bpy.h
    branches/soc-2011-carrot/source/blender/python/intern/bpy_app_handlers.c
    branches/soc-2011-carrot/source/blender/python/intern/bpy_interface.c
    branches/soc-2011-carrot/source/blender/python/intern/bpy_rna.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/render/extern/include/RE_render_ext.h
    branches/soc-2011-carrot/source/blender/render/intern/include/pixelshading.h
    branches/soc-2011-carrot/source/blender/render/intern/include/render_types.h
    branches/soc-2011-carrot/source/blender/render/intern/include/rendercore.h
    branches/soc-2011-carrot/source/blender/render/intern/include/renderdatabase.h
    branches/soc-2011-carrot/source/blender/render/intern/include/shadbuf.h
    branches/soc-2011-carrot/source/blender/render/intern/include/shading.h
    branches/soc-2011-carrot/source/blender/render/intern/include/texture.h
    branches/soc-2011-carrot/source/blender/render/intern/include/volumetric.h
    branches/soc-2011-carrot/source/blender/render/intern/include/voxeldata.h
    branches/soc-2011-carrot/source/blender/render/intern/include/zbuf.h
    branches/soc-2011-carrot/source/blender/render/intern/raytrace/rayobject_octree.cpp
    branches/soc-2011-carrot/source/blender/render/intern/source/convertblender.c
    branches/soc-2011-carrot/source/blender/render/intern/source/envmap.c
    branches/soc-2011-carrot/source/blender/render/intern/source/imagetexture.c
    branches/soc-2011-carrot/source/blender/render/intern/source/occlusion.c
    branches/soc-2011-carrot/source/blender/render/intern/source/pipeline.c
    branches/soc-2011-carrot/source/blender/render/intern/source/pixelshading.c
    branches/soc-2011-carrot/source/blender/render/intern/source/pointdensity.c
    branches/soc-2011-carrot/source/blender/render/intern/source/render_texture.c
    branches/soc-2011-carrot/source/blender/render/intern/source/rendercore.c
    branches/soc-2011-carrot/source/blender/render/intern/source/renderdatabase.c
    branches/soc-2011-carrot/source/blender/render/intern/source/shadbuf.c
    branches/soc-2011-carrot/source/blender/render/intern/source/shadeinput.c
    branches/soc-2011-carrot/source/blender/render/intern/source/shadeoutput.c
    branches/soc-2011-carrot/source/blender/render/intern/source/sss.c
    branches/soc-2011-carrot/source/blender/render/intern/source/volume_precache.c
    branches/soc-2011-carrot/source/blender/render/intern/source/volumetric.c
    branches/soc-2011-carrot/source/blender/render/intern/source/voxeldata.c
    branches/soc-2011-carrot/source/blender/render/intern/source/zbuf.c
    branches/soc-2011-carrot/source/blender/windowmanager/SConscript
    branches/soc-2011-carrot/source/blender/windowmanager/WM_api.h
    branches/soc-2011-carrot/source/blender/windowmanager/intern/wm_dragdrop.c
    branches/soc-2011-carrot/source/blender/windowmanager/intern/wm_event_system.c
    branches/soc-2011-carrot/source/blender/windowmanager/intern/wm_files.c
    branches/soc-2011-carrot/source/blender/windowmanager/intern/wm_gesture.c
    branches/soc-2011-carrot/source/blender/windowmanager/intern/wm_init_exit.c
    branches/soc-2011-carrot/source/blender/windowmanager/intern/wm_keymap.c
    branches/soc-2011-carrot/source/blender/windowmanager/intern/wm_operators.c
    branches/soc-2011-carrot/source/blender/windowmanager/intern/wm_window.c
    branches/soc-2011-carrot/source/blenderplayer/CMakeLists.txt
    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/creator/creator.c
    branches/soc-2011-carrot/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
    branches/soc-2011-carrot/source/gameengine/Converter/BL_ArmatureObject.cpp
    branches/soc-2011-carrot/source/gameengine/Converter/BL_BlenderDataConversion.cpp
    branches/soc-2011-carrot/source/gameengine/Converter/BL_SkinDeformer.cpp
    branches/soc-2011-carrot/source/gameengine/Converter/CMakeLists.txt
    branches/soc-2011-carrot/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
    branches/soc-2011-carrot/source/gameengine/Converter/KX_ConvertActuators.cpp
    branches/soc-2011-carrot/source/gameengine/Converter/SConscript
    branches/soc-2011-carrot/source/gameengine/Expressions/IfExpr.h
    branches/soc-2011-carrot/source/gameengine/Expressions/ListValue.cpp
    branches/soc-2011-carrot/source/gameengine/Expressions/Value.cpp
    branches/soc-2011-carrot/source/gameengine/GameLogic/SCA_IActuator.h
    branches/soc-2011-carrot/source/gameengine/GamePlayer/ghost/CMakeLists.txt
    branches/soc-2011-carrot/source/gameengine/GamePlayer/ghost/GPG_Application.cpp
    branches/soc-2011-carrot/source/gameengine/GamePlayer/ghost/GPG_Application.h
    branches/soc-2011-carrot/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
    branches/soc-2011-carrot/source/gameengine/GamePlayer/ghost/SConscript
    branches/soc-2011-carrot/source/gameengine/Ketsji/BL_BlenderShader.cpp
    branches/soc-2011-carrot/source/gameengine/Ketsji/BL_BlenderShader.h
    branches/soc-2011-carrot/source/gameengine/Ketsji/BL_Material.cpp
    branches/soc-2011-carrot/source/gameengine/Ketsji/BL_Material.h
    branches/soc-2011-carrot/source/gameengine/Ketsji/CMakeLists.txt
    branches/soc-2011-carrot/source/gameengine/Ketsji/KX_BlenderMaterial.cpp
    branches/soc-2011-carrot/source/gameengine/Ketsji/KX_BlenderMaterial.h
    branches/soc-2011-carrot/source/gameengine/Ketsji/KX_Dome.cpp
    branches/soc-2011-carrot/source/gameengine/Ketsji/KX_GameObject.cpp
    branches/soc-2011-carrot/source/gameengine/Ketsji/KX_GameObject.h
    branches/soc-2011-carrot/source/gameengine/Ketsji/KX_KetsjiEngine.cpp
    branches/soc-2011-carrot/source/gameengine/Ketsji/KX_KetsjiEngine.h
    branches/soc-2011-carrot/source/gameengine/Ketsji/KX_PolygonMaterial.cpp
    branches/soc-2011-carrot/source/gameengine/Ketsji/KX_PolygonMaterial.h
    branches/soc-2011-carrot/source/gameengine/Ketsji/KX_PythonInit.cpp
    branches/soc-2011-carrot/source/gameengine/Ketsji/KX_PythonInit.h
    branches/soc-2011-carrot/source/gameengine/Ketsji/KX_PythonInitTypes.cpp
    branches/soc-2011-carrot/source/gameengine/Ketsji/KX_Scene.cpp
    branches/soc-2011-carrot/source/gameengine/Ketsji/KX_Scene.h
    branches/soc-2011-carrot/source/gameengine/Ketsji/KX_SoundActuator.cpp
    branches/soc-2011-carrot/source/gameengine/Ketsji/SConscript
    branches/soc-2011-carrot/source/gameengine/Rasterizer/RAS_IPolygonMaterial.cpp
    branches/soc-2011-carrot/source/gameengine/Rasterizer/RAS_IPolygonMaterial.h
    branches/soc-2011-carrot/source/gameengine/Rasterizer/RAS_IRasterizer.h
    branches/soc-2011-carrot/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp
    branches/soc-2011-carrot/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.h
    branches/soc-2011-carrot/source/gameengine/VideoTexture/CMakeLists.txt
    branches/soc-2011-carrot/source/gameengine/VideoTexture/blendVideoTex.cpp

Added Paths:
-----------
    branches/soc-2011-carrot/build_files/cmake/Modules/FindPCRE.cmake
    branches/soc-2011-carrot/build_files/cmake/Modules/FindXML2.cmake
    branches/soc-2011-carrot/build_files/cmake/cmake_static_check_cppcheck.py
    branches/soc-2011-carrot/build_files/cmake/cmake_static_check_sparse.py
    branches/soc-2011-carrot/build_files/cmake/cmake_static_check_splint.py
    branches/soc-2011-carrot/build_files/cmake/project_source_info.py
    branches/soc-2011-carrot/doc/python_api/rst/gpu.rst
    branches/soc-2011-carrot/doc/python_api/rst/info_best_practice.rst
    branches/soc-2011-carrot/extern/recastnavigation/
    branches/soc-2011-carrot/extern/recastnavigation/CMakeLists.txt
    branches/soc-2011-carrot/extern/recastnavigation/Detour/
    branches/soc-2011-carrot/extern/recastnavigation/Detour/Include/
    branches/soc-2011-carrot/extern/recastnavigation/Detour/Include/DetourCommon.h
    branches/soc-2011-carrot/extern/recastnavigation/Detour/Include/DetourNode.h
    branches/soc-2011-carrot/extern/recastnavigation/Detour/Include/DetourStatNavMesh.h
    branches/soc-2011-carrot/extern/recastnavigation/Detour/Include/DetourStatNavMeshBuilder.h
    branches/soc-2011-carrot/extern/recastnavigation/Detour/Include/DetourTileNavMesh.h
    branches/soc-2011-carrot/extern/recastnavigation/Detour/Include/DetourTileNavMeshBuilder.h
    branches/soc-2011-carrot/extern/recastnavigation/Detour/Source/
    branches/soc-2011-carrot/extern/recastnavigation/Detour/Source/DetourCommon.cpp
    branches/soc-2011-carrot/extern/recastnavigation/Detour/Source/DetourNode.cpp
    branches/soc-2011-carrot/extern/recastnavigation/Detour/Source/DetourStatNavMesh.cpp
    branches/soc-2011-carrot/extern/recastnavigation/Detour/Source/DetourStatNavMeshBuilder.cpp
    branches/soc-2011-carrot/extern/recastnavigation/Detour/Source/DetourTileNavMesh.cpp
    branches/soc-2011-carrot/extern/recastnavigation/Detour/Source/DetourTileNavMeshBuilder.cpp
    branches/soc-2011-carrot/extern/recastnavigation/License.txt
    branches/soc-2011-carrot/extern/recastnavigation/Readme.txt
    branches/soc-2011-carrot/extern/recastnavigation/Recast/
    branches/soc-2011-carrot/extern/recastnavigation/Recast/Include/
    branches/soc-2011-carrot/extern/recastnavigation/Recast/Include/Recast.h
    branches/soc-2011-carrot/extern/recastnavigation/Recast/Include/RecastLog.h
    branches/soc-2011-carrot/extern/recastnavigation/Recast/Include/RecastTimer.h
    branches/soc-2011-carrot/extern/recastnavigation/Recast/Source/
    branches/soc-2011-carrot/extern/recastnavigation/Recast/Source/Recast.cpp
    branches/soc-2011-carrot/extern/recastnavigation/Recast/Source/RecastContour.cpp
    branches/soc-2011-carrot/extern/recastnavigation/Recast/Source/RecastFilter.cpp
    branches/soc-2011-carrot/extern/recastnavigation/Recast/Source/RecastLog.cpp
    branches/soc-2011-carrot/extern/recastnavigation/Recast/Source/RecastMesh.cpp
    branches/soc-2011-carrot/extern/recastnavigation/Recast/Source/RecastMeshDetail.cpp
    branches/soc-2011-carrot/extern/recastnavigation/Recast/Source/RecastRasterization.cpp
    branches/soc-2011-carrot/extern/recastnavigation/Recast/Source/RecastRegion.cpp
    branches/soc-2011-carrot/extern/recastnavigation/Recast/Source/RecastTimer.cpp
    branches/soc-2011-carrot/extern/recastnavigation/SConscript
    branches/soc-2011-carrot/extern/recastnavigation/recast-capi.cpp
    branches/soc-2011-carrot/extern/recastnavigation/recast-capi.h
    branches/soc-2011-carrot/po/POTFILES.in
    branches/soc-2011-carrot/po/blender.pot
    branches/soc-2011-carrot/po/messages.txt
    branches/soc-2011-carrot/po/ne.po
    branches/soc-2011-carrot/po/update_mo.py
    branches/soc-2011-carrot/po/update_po.py
    branches/soc-2011-carrot/po/update_pot.py
    branches/soc-2011-carrot/po/zh_TW.po
    branches/soc-2011-carrot/release/bin/.blender/fonts/
    branches/soc-2011-carrot/release/bin/.blender/fonts/droidsans.ttf.gz
    branches/soc-2011-carrot/release/bin/.blender/locale/ne/
    branches/soc-2011-carrot/release/bin/.blender/locale/ne/LC_MESSAGES/
    branches/soc-2011-carrot/release/bin/.blender/locale/ne/LC_MESSAGES/blender.mo
    branches/soc-2011-carrot/release/bin/.blender/locale/zh_TW/
    branches/soc-2011-carrot/release/bin/.blender/locale/zh_TW/LC_MESSAGES/
    branches/soc-2011-carrot/release/bin/.blender/locale/zh_TW/LC_MESSAGES/blender.mo
    branches/soc-2011-carrot/source/blender/blenfont/BLF_translation.h
    branches/soc-2011-carrot/source/blender/blenfont/intern/blf_translation.c
    branches/soc-2011-carrot/source/blender/blenkernel/BKE_navmesh_conversion.h
    branches/soc-2011-carrot/source/blender/blenkernel/intern/navmesh_conversion.c
    branches/soc-2011-carrot/source/blender/blenlib/intern/string_utf8.c
    branches/soc-2011-carrot/source/blender/collada/ErrorHandler.cpp
    branches/soc-2011-carrot/source/blender/collada/ErrorHandler.h
    branches/soc-2011-carrot/source/blender/collada/ExportSettings.cpp
    branches/soc-2011-carrot/source/blender/collada/ExportSettings.h
    branches/soc-2011-carrot/source/blender/collada/SceneExporter.cpp
    branches/soc-2011-carrot/source/blender/collada/SceneExporter.h
    branches/soc-2011-carrot/source/blender/editors/gpencil/gpencil_undo.c
    branches/soc-2011-carrot/source/blender/editors/object/object_navmesh.cpp
    branches/soc-2011-carrot/source/blender/modifiers/intern/MOD_navmesh.c
    branches/soc-2011-carrot/source/blender/modifiers/intern/MOD_weightvg_util.c
    branches/soc-2011-carrot/source/blender/modifiers/intern/MOD_weightvg_util.h
    branches/soc-2011-carrot/source/blender/modifiers/intern/MOD_weightvgedit.c
    branches/soc-2011-carrot/source/blender/modifiers/intern/MOD_weightvgmix.c
    branches/soc-2011-carrot/source/blender/modifiers/intern/MOD_weightvgproximity.c
    branches/soc-2011-carrot/source/blender/nodes/NOD_composite.h
    branches/soc-2011-carrot/source/blender/nodes/NOD_shader.h
    branches/soc-2011-carrot/source/blender/nodes/NOD_socket.h
    branches/soc-2011-carrot/source/blender/nodes/NOD_texture.h
    branches/soc-2011-carrot/source/blender/nodes/composite/
    branches/soc-2011-carrot/source/blender/nodes/composite/node_composite_tree.c
    branches/soc-2011-carrot/source/blender/nodes/composite/node_composite_util.c
    branches/soc-2011-carrot/source/blender/nodes/composite/node_composite_util.h
    branches/soc-2011-carrot/source/blender/nodes/composite/nodes/
    branches/soc-2011-carrot/source/blender/nodes/composite/nodes/node_composite_alphaOver.c
    branches/soc-2011-carrot/source/blender/nodes/composite/nodes/node_composite_bilateralblur.c
    branches/soc-2011-carrot/source/blender/nodes/composite/nodes/node_composite_blur.c
    branches/soc-2011-carrot/source/blender/nodes/composite/nodes/node_composite_brightness.c
    branches/soc-2011-carrot/source/blender/nodes/composite/nodes/node_composite_channelMatte.c
    branches/soc-2011-carrot/source/blender/nodes/composite/nodes/node_composite_chromaMatte.c
    branches/soc-2011-carrot/source/blender/nodes/composite/nodes/node_composite_colorMatte.c
    branches/soc-2011-carrot/source/blender/nodes/composite/nodes/node_composite_colorSpill.c
    branches/soc-2011-carrot/source/blender/nodes/composite/nodes/node_composite_colorbalance.c
    branches/soc-2011-carrot/source/blender/nodes/composite/nodes/node_composite_common.c
    branches/soc-2011-carrot/source/blender/nodes/composite/nodes/node_composite_composite.c
    branches/soc-2011-carrot/source/blender/nodes/composite/nodes/node_composite_crop.c
    branches/soc-2011-carrot/source/blender/nodes/composite/nodes/node_composite_curves.c
    branches/soc-2011-carrot/source/blender/nodes/composite/nodes/node_composite_defocus.c
    branches/soc-2011-carrot/source/blender/nodes/composite/nodes/node_composite_diffMatte.c
    branches/soc-2011-carrot/source/blender/nodes/composite/nodes/node_composite_dilate.c
    branches/soc-2011-carrot/source/blender/nodes/composite/nodes/node_composite_directionalblur.c
    branches/soc-2011-carrot/source/blender/nodes/composite/nodes/node_composite_displace.c
    branches/soc-2011-carrot/source/blender/nodes/composite/nodes/node_composite_distanceMatte.c
    branches/soc-2011-carrot/source/blender/nodes/composite/nodes/node_composite_filter.c
    branches/soc-2011-carrot/source/blender/nodes/composite/nodes/node_composite_flip.c
    branches/soc-2011-carrot/source/blender/nodes/composite/nodes/node_composite_gamma.c
    branches/soc-2011-carrot/source/blender/nodes/composite/nodes/node_composite_glare.c
    branches/soc-2011-carrot/source/blender/nodes/composite/nodes/node_composite_hueSatVal.c
    branches/soc-2011-carrot/source/blender/nodes/composite/nodes/node_composite_huecorrect.c
    branches/soc-2011-carrot/source/blender/nodes/composite/nodes/node_composite_idMask.c
    branches/soc-2011-carrot/source/blender/nodes/composite/nodes/node_composite_image.c
    branches/soc-2011-carrot/source/blender/nodes/composite/nodes/node_composite_invert.c
    branches/soc-2011-carrot/source/blender/nodes/composite/nodes/node_composite_lensdist.c
    branches/soc-2011-carrot/source/blender/nodes/composite/nodes/node_composite_levels.c
    branches/soc-2011-carrot/source/blender/nodes/composite/nodes/node_composite_lummaMatte.c
    branches/soc-2011-carrot/source/blender/nodes/composite/nodes/node_composite_mapUV.c
    branches/soc-2011-carrot/source/blender/nodes/composite/nodes/node_composite_mapValue.c
    branches/soc-2011-carrot/source/blender/nodes/composite/nodes/node_composite_math.c
    branches/soc-2011-carrot/source/blender/nodes/composite/nodes/node_composite_mixrgb.c
    branches/soc-2011-carrot/source/blender/nodes/composite/nodes/node_composite_normal.c
    branches/soc-2011-carrot/source/blender/nodes/composite/nodes/node_composite_normalize.c
    branches/soc-2011-carrot/source/blender/nodes/composite/nodes/node_composite_outputFile.c
    branches/soc-2011-carrot/source/blender/nodes/composite/nodes/node_composite_premulkey.c
    branches/soc-2011-carrot/source/blender/nodes/composite/nodes/node_composite_rgb.c
    branches/soc-2011-carrot/source/blender/nodes/composite/nodes/node_composite_rotate.c
    branches/soc-2011-carrot/source/blender/nodes/composite/nodes/node_composite_scale.c
    branches/soc-2011-carrot/source/blender/nodes/composite/nodes/node_composite_sepcombHSVA.c
    branches/soc-2011-carrot/source/blender/nodes/composite/nodes/node_composite_sepcombRGBA.c
    branches/soc-2011-carrot/source/blender/nodes/composite/nodes/node_composite_sepcombYCCA.c
    branches/soc-2011-carrot/source/blender/nodes/composite/nodes/node_composite_sepcombYUVA.c
    branches/soc-2011-carrot/source/blender/nodes/composite/nodes/node_composite_setalpha.c
    branches/soc-2011-carrot/source/blender/nodes/composite/nodes/node_composite_splitViewer.c
    branches/soc-2011-carrot/source/blender/nodes/composite/nodes/node_composite_texture.c
    branches/soc-2011-carrot/source/blender/nodes/composite/nodes/node_composite_tonemap.c
    branches/soc-2011-carrot/source/blender/nodes/composite/nodes/node_composite_translate.c
    branches/soc-2011-carrot/source/blender/nodes/composite/nodes/node_composite_valToRgb.c
    branches/soc-2011-carrot/source/blender/nodes/composite/nodes/node_composite_value.c
    branches/soc-2011-carrot/source/blender/nodes/composite/nodes/node_composite_vecBlur.c
    branches/soc-2011-carrot/source/blender/nodes/composite/nodes/node_composite_viewer.c
    branches/soc-2011-carrot/source/blender/nodes/composite/nodes/node_composite_zcombine.c
    branches/soc-2011-carrot/source/blender/nodes/intern/node_common.c
    branches/soc-2011-carrot/source/blender/nodes/intern/node_common.h
    branches/soc-2011-carrot/source/blender/nodes/intern/node_exec.c
    branches/soc-2011-carrot/source/blender/nodes/intern/node_exec.h
    branches/soc-2011-carrot/source/blender/nodes/intern/node_socket.c
    branches/soc-2011-carrot/source/blender/nodes/shader/
    branches/soc-2011-carrot/source/blender/nodes/shader/node_shader_tree.c
    branches/soc-2011-carrot/source/blender/nodes/shader/node_shader_util.c
    branches/soc-2011-carrot/source/blender/nodes/shader/node_shader_util.h
    branches/soc-2011-carrot/source/blender/nodes/shader/nodes/
    branches/soc-2011-carrot/source/blender/nodes/shader/nodes/node_shader_camera.c
    branches/soc-2011-carrot/source/blender/nodes/shader/nodes/node_shader_common.c
    branches/soc-2011-carrot/source/blender/nodes/shader/nodes/node_shader_curves.c
    branches/soc-2011-carrot/source/blender/nodes/shader/nodes/node_shader_dynamic.c
    branches/soc-2011-carrot/source/blender/nodes/shader/nodes/node_shader_geom.c
    branches/soc-2011-carrot/source/blender/nodes/shader/nodes/node_shader_hueSatVal.c
    branches/soc-2011-carrot/source/blender/nodes/shader/nodes/node_shader_invert.c
    branches/soc-2011-carrot/source/blender/nodes/shader/nodes/node_shader_mapping.c
    branches/soc-2011-carrot/source/blender/nodes/shader/nodes/node_shader_material.c
    branches/soc-2011-carrot/source/blender/nodes/shader/nodes/node_shader_math.c
    branches/soc-2011-carrot/source/blender/nodes/shader/nodes/node_shader_mixRgb.c
    branches/soc-2011-carrot/source/blender/nodes/shader/nodes/node_shader_normal.c
    branches/soc-2011-carrot/source/blender/nodes/shader/nodes/node_shader_output.c
    branches/soc-2011-carrot/source/blender/nodes/shader/nodes/node_shader_rgb.c
    branches/soc-2011-carrot/source/blender/nodes/shader/nodes/node_shader_sepcombRGB.c
    branches/soc-2011-carrot/source/blender/nodes/shader/nodes/node_shader_squeeze.c
    branches/soc-2011-carrot/source/blender/nodes/shader/nodes/node_shader_texture.c
    branches/soc-2011-carrot/source/blender/nodes/shader/nodes/node_shader_valToRgb.c
    branches/soc-2011-carrot/source/blender/nodes/shader/nodes/node_shader_value.c
    branches/soc-2011-carrot/source/blender/nodes/shader/nodes/node_shader_vectMath.c
    branches/soc-2011-carrot/source/blender/nodes/texture/
    branches/soc-2011-carrot/source/blender/nodes/texture/node_texture_tree.c
    branches/soc-2011-carrot/source/blender/nodes/texture/node_texture_util.c
    branches/soc-2011-carrot/source/blender/nodes/texture/node_texture_util.h
    branches/soc-2011-carrot/source/blender/nodes/texture/nodes/
    branches/soc-2011-carrot/source/blender/nodes/texture/nodes/node_texture_at.c
    branches/soc-2011-carrot/source/blender/nodes/texture/nodes/node_texture_bricks.c
    branches/soc-2011-carrot/source/blender/nodes/texture/nodes/node_texture_checker.c
    branches/soc-2011-carrot/source/blender/nodes/texture/nodes/node_texture_common.c
    branches/soc-2011-carrot/source/blender/nodes/texture/nodes/node_texture_compose.c
    branches/soc-2011-carrot/source/blender/nodes/texture/nodes/node_texture_coord.c
    branches/soc-2011-carrot/source/blender/nodes/texture/nodes/node_texture_curves.c
    branches/soc-2011-carrot/source/blender/nodes/texture/nodes/node_texture_decompose.c
    branches/soc-2011-carrot/source/blender/nodes/texture/nodes/node_texture_distance.c
    branches/soc-2011-carrot/source/blender/nodes/texture/nodes/node_texture_hueSatVal.c
    branches/soc-2011-carrot/source/blender/nodes/texture/nodes/node_texture_image.c
    branches/soc-2011-carrot/source/blender/nodes/texture/nodes/node_texture_invert.c
    branches/soc-2011-carrot/source/blender/nodes/texture/nodes/node_texture_math.c
    branches/soc-2011-carrot/source/blender/nodes/texture/nodes/node_texture_mixRgb.c
    branches/soc-2011-carrot/source/blender/nodes/texture/nodes/node_texture_output.c
    branches/soc-2011-carrot/source/blender/nodes/texture/nodes/node_texture_proc.c
    branches/soc-2011-carrot/source/blender/nodes/texture/nodes/node_texture_rotate.c
    branches/soc-2011-carrot/source/blender/nodes/texture/nodes/node_texture_scale.c
    branches/soc-2011-carrot/source/blender/nodes/texture/nodes/node_texture_texture.c
    branches/soc-2011-carrot/source/blender/nodes/texture/nodes/node_texture_translate.c
    branches/soc-2011-carrot/source/blender/nodes/texture/nodes/node_texture_valToNor.c
    branches/soc-2011-carrot/source/blender/nodes/texture/nodes/node_texture_valToRgb.c
    branches/soc-2011-carrot/source/blender/nodes/texture/nodes/node_texture_viewer.c
    branches/soc-2011-carrot/source/blender/python/intern/bpy_interface_atexit.c
    branches/soc-2011-carrot/source/blender/python/intern/gpu.c
    branches/soc-2011-carrot/source/blender/python/intern/gpu.h
    branches/soc-2011-carrot/source/gameengine/Ketsji/KX_NavMeshObject.cpp
    branches/soc-2011-carrot/source/gameengine/Ketsji/KX_NavMeshObject.h
    branches/soc-2011-carrot/source/gameengine/Ketsji/KX_ObstacleSimulation.cpp
    branches/soc-2011-carrot/source/gameengine/Ketsji/KX_ObstacleSimulation.h
    branches/soc-2011-carrot/source/gameengine/Ketsji/KX_SteeringActuator.cpp
    branches/soc-2011-carrot/source/gameengine/Ketsji/KX_SteeringActuator.h

Removed Paths:
-------------
    branches/soc-2011-carrot/extern/glew/ChangeLog
    branches/soc-2011-carrot/extern/glew/README.txt
    branches/soc-2011-carrot/extern/glew/doc/
    branches/soc-2011-carrot/extern/recastnavigation/CMakeLists.txt
    branches/soc-2011-carrot/extern/recastnavigation/Detour/
    branches/soc-2011-carrot/extern/recastnavigation/Detour/Include/
    branches/soc-2011-carrot/extern/recastnavigation/Detour/Include/DetourCommon.h
    branches/soc-2011-carrot/extern/recastnavigation/Detour/Include/DetourNode.h
    branches/soc-2011-carrot/extern/recastnavigation/Detour/Include/DetourStatNavMesh.h
    branches/soc-2011-carrot/extern/recastnavigation/Detour/Include/DetourStatNavMeshBuilder.h
    branches/soc-2011-carrot/extern/recastnavigation/Detour/Include/DetourTileNavMesh.h
    branches/soc-2011-carrot/extern/recastnavigation/Detour/Include/DetourTileNavMeshBuilder.h
    branches/soc-2011-carrot/extern/recastnavigation/Detour/Source/
    branches/soc-2011-carrot/extern/recastnavigation/Detour/Source/DetourCommon.cpp
    branches/soc-2011-carrot/extern/recastnavigation/Detour/Source/DetourNode.cpp
    branches/soc-2011-carrot/extern/recastnavigation/Detour/Source/DetourStatNavMesh.cpp
    branches/soc-2011-carrot/extern/recastnavigation/Detour/Source/DetourStatNavMeshBuilder.cpp
    branches/soc-2011-carrot/extern/recastnavigation/Detour/Source/DetourTileNavMesh.cpp
    branches/soc-2011-carrot/extern/recastnavigation/Detour/Source/DetourTileNavMeshBuilder.cpp
    branches/soc-2011-carrot/extern/recastnavigation/License.txt
    branches/soc-2011-carrot/extern/recastnavigation/Readme.txt
    branches/soc-2011-carrot/extern/recastnavigation/Recast/
    branches/soc-2011-carrot/extern/recastnavigation/Recast/Include/
    branches/soc-2011-carrot/extern/recastnavigation/Recast/Include/Recast.h
    branches/soc-2011-carrot/extern/recastnavigation/Recast/Include/RecastLog.h
    branches/soc-2011-carrot/extern/recastnavigation/Recast/Include/RecastTimer.h
    branches/soc-2011-carrot/extern/recastnavigation/Recast/Source/
    branches/soc-2011-carrot/extern/recastnavigation/Recast/Source/Recast.cpp
    branches/soc-2011-carrot/extern/recastnavigation/Recast/Source/RecastContour.cpp
    branches/soc-2011-carrot/extern/recastnavigation/Recast/Source/RecastFilter.cpp
    branches/soc-2011-carrot/extern/recastnavigation/Recast/Source/RecastLog.cpp
    branches/soc-2011-carrot/extern/recastnavigation/Recast/Source/RecastMesh.cpp
    branches/soc-2011-carrot/extern/recastnavigation/Recast/Source/RecastMeshDetail.cpp
    branches/soc-2011-carrot/extern/recastnavigation/Recast/Source/RecastRasterization.cpp
    branches/soc-2011-carrot/extern/recastnavigation/Recast/Source/RecastRegion.cpp
    branches/soc-2011-carrot/extern/recastnavigation/Recast/Source/RecastTimer.cpp
    branches/soc-2011-carrot/extern/recastnavigation/SConscript
    branches/soc-2011-carrot/release/bin/.blender/fonts/droidsans.ttf.gz
    branches/soc-2011-carrot/release/bin/.blender/locale/ne/LC_MESSAGES/
    branches/soc-2011-carrot/release/bin/.blender/locale/ne/LC_MESSAGES/blender.mo
    branches/soc-2011-carrot/release/bin/.blender/locale/zh_TW/LC_MESSAGES/
    branches/soc-2011-carrot/release/bin/.blender/locale/zh_TW/LC_MESSAGES/blender.mo
    branches/soc-2011-carrot/source/blender/blenkernel/BKE_endian.h
    branches/soc-2011-carrot/source/blender/nodes/CMP_node.h
    branches/soc-2011-carrot/source/blender/nodes/SHD_node.h
    branches/soc-2011-carrot/source/blender/nodes/TEX_node.h
    branches/soc-2011-carrot/source/blender/nodes/composite/node_composite_tree.c
    branches/soc-2011-carrot/source/blender/nodes/composite/node_composite_util.c
    branches/soc-2011-carrot/source/blender/nodes/composite/node_composite_util.h
    branches/soc-2011-carrot/source/blender/nodes/composite/nodes/
    branches/soc-2011-carrot/source/blender/nodes/composite/nodes/node_composite_alphaOver.c
    branches/soc-2011-carrot/source/blender/nodes/composite/nodes/node_composite_bilateralblur.c
    branches/soc-2011-carrot/source/blender/nodes/composite/nodes/node_composite_blur.c
    branches/soc-2011-carrot/source/blender/nodes/composite/nodes/node_composite_brightness.c
    branches/soc-2011-carrot/source/blender/nodes/composite/nodes/node_composite_channelMatte.c
    branches/soc-2011-carrot/source/blender/nodes/composite/nodes/node_composite_chromaMatte.c
    branches/soc-2011-carrot/source/blender/nodes/composite/nodes/node_composite_colorMatte.c
    branches/soc-2011-carrot/source/blender/nodes/composite/nodes/node_composite_colorSpill.c
    branches/soc-2011-carrot/source/blender/nodes/composite/nodes/node_composite_colorbalance.c
    branches/soc-2011-carrot/source/blender/nodes/composite/nodes/node_composite_common.c
    branches/soc-2011-carrot/source/blender/nodes/composite/nodes/node_composite_composite.c
    branches/soc-2011-carrot/source/blender/nodes/composite/nodes/node_composite_crop.c
    branches/soc-2011-carrot/source/blender/nodes/composite/nodes/node_composite_curves.c
    branches/soc-2011-carrot/source/blender/nodes/composite/nodes/node_composite_defocus.c
    branches/soc-2011-carrot/source/blender/nodes/composite/nodes/node_composite_diffMatte.c
    branches/soc-2011-carrot/source/blender/nodes/composite/nodes/node_composite_dilate.c
    branches/soc-2011-carrot/source/blender/nodes/composite/nodes/node_composite_directionalblur.c
    branches/soc-2011-carrot/source/blender/nodes/composite/nodes/node_composite_displace.c
    branches/soc-2011-carrot/source/blender/nodes/composite/nodes/node_composite_distanceMatte.c
    branches/soc-2011-carrot/source/blender/nodes/composite/nodes/node_composite_filter.c
    branches/soc-2011-carrot/source/blender/nodes/composite/nodes/node_composite_flip.c
    branches/soc-2011-carrot/source/blender/nodes/composite/nodes/node_composite_gamma.c
    branches/soc-2011-carrot/source/blender/nodes/composite/nodes/node_composite_glare.c
    branches/soc-2011-carrot/source/blender/nodes/composite/nodes/node_composite_hueSatVal.c
    branches/soc-2011-carrot/source/blender/nodes/composite/nodes/node_composite_huecorrect.c
    branches/soc-2011-carrot/source/blender/nodes/composite/nodes/node_composite_idMask.c
    branches/soc-2011-carrot/source/blender/nodes/composite/nodes/node_composite_image.c
    branches/soc-2011-carrot/source/blender/nodes/composite/nodes/node_composite_invert.c
    branches/soc-2011-carrot/source/blender/nodes/composite/nodes/node_composite_lensdist.c
    branches/soc-2011-carrot/source/blender/nodes/composite/nodes/node_composite_levels.c
    branches/soc-2011-carrot/source/blender/nodes/composite/nodes/node_composite_lummaMatte.c
    branches/soc-2011-carrot/source/blender/nodes/composite/nodes/node_composite_mapUV.c
    branches/soc-2011-carrot/source/blender/nodes/composite/nodes/node_composite_mapValue.c
    branches/soc-2011-carrot/source/blender/nodes/composite/nodes/node_composite_math.c
    branches/soc-2011-carrot/source/blender/nodes/composite/nodes/node_composite_mixrgb.c
    branches/soc-2011-carrot/source/blender/nodes/composite/nodes/node_composite_normal.c
    branches/soc-2011-carrot/source/blender/nodes/composite/nodes/node_composite_normalize.c
    branches/soc-2011-carrot/source/blender/nodes/composite/nodes/node_composite_outputFile.c
    branches/soc-2011-carrot/source/blender/nodes/composite/nodes/node_composite_premulkey.c
    branches/soc-2011-carrot/source/blender/nodes/composite/nodes/node_composite_rgb.c
    branches/soc-2011-carrot/source/blender/nodes/composite/nodes/node_composite_rotate.c
    branches/soc-2011-carrot/source/blender/nodes/composite/nodes/node_composite_scale.c
    branches/soc-2011-carrot/source/blender/nodes/composite/nodes/node_composite_sepcombHSVA.c
    branches/soc-2011-carrot/source/blender/nodes/composite/nodes/node_composite_sepcombRGBA.c
    branches/soc-2011-carrot/source/blender/nodes/composite/nodes/node_composite_sepcombYCCA.c
    branches/soc-2011-carrot/source/blender/nodes/composite/nodes/node_composite_sepcombYUVA.c
    branches/soc-2011-carrot/source/blender/nodes/composite/nodes/node_composite_setalpha.c
    branches/soc-2011-carrot/source/blender/nodes/composite/nodes/node_composite_splitViewer.c
    branches/soc-2011-carrot/source/blender/nodes/composite/nodes/node_composite_texture.c
    branches/soc-2011-carrot/source/blender/nodes/composite/nodes/node_composite_tonemap.c
    branches/soc-2011-carrot/source/blender/nodes/composite/nodes/node_composite_translate.c
    branches/soc-2011-carrot/source/blender/nodes/composite/nodes/node_composite_valToRgb.c
    branches/soc-2011-carrot/source/blender/nodes/composite/nodes/node_composite_value.c
    branches/soc-2011-carrot/source/blender/nodes/composite/nodes/node_composite_vecBlur.c
    branches/soc-2011-carrot/source/blender/nodes/composite/nodes/node_composite_viewer.c
    branches/soc-2011-carrot/source/blender/nodes/composite/nodes/node_composite_zcombine.c
    branches/soc-2011-carrot/source/blender/nodes/intern/CMP_nodes/
    branches/soc-2011-carrot/source/blender/nodes/intern/CMP_util.c
    branches/soc-2011-carrot/source/blender/nodes/intern/CMP_util.h
    branches/soc-2011-carrot/source/blender/nodes/intern/SHD_nodes/
    branches/soc-2011-carrot/source/blender/nodes/intern/SHD_util.c
    branches/soc-2011-carrot/source/blender/nodes/intern/SHD_util.h
    branches/soc-2011-carrot/source/blender/nodes/intern/TEX_nodes/
    branches/soc-2011-carrot/source/blender/nodes/intern/TEX_util.c
    branches/soc-2011-carrot/source/blender/nodes/intern/TEX_util.h
    branches/soc-2011-carrot/source/blender/nodes/shader/node_shader_tree.c
    branches/soc-2011-carrot/source/blender/nodes/shader/node_shader_util.c
    branches/soc-2011-carrot/source/blender/nodes/shader/node_shader_util.h
    branches/soc-2011-carrot/source/blender/nodes/shader/nodes/
    branches/soc-2011-carrot/source/blender/nodes/shader/nodes/node_shader_camera.c
    branches/soc-2011-carrot/source/blender/nodes/shader/nodes/node_shader_common.c
    branches/soc-2011-carrot/source/blender/nodes/shader/nodes/node_shader_curves.c
    branches/soc-2011-carrot/source/blender/nodes/shader/nodes/node_shader_dynamic.c
    branches/soc-2011-carrot/source/blender/nodes/shader/nodes/node_shader_geom.c
    branches/soc-2011-carrot/source/blender/nodes/shader/nodes/node_shader_hueSatVal.c
    branches/soc-2011-carrot/source/blender/nodes/shader/nodes/node_shader_invert.c
    branches/soc-2011-carrot/source/blender/nodes/shader/nodes/node_shader_mapping.c
    branches/soc-2011-carrot/source/blender/nodes/shader/nodes/node_shader_material.c
    branches/soc-2011-carrot/source/blender/nodes/shader/nodes/node_shader_math.c
    branches/soc-2011-carrot/source/blender/nodes/shader/nodes/node_shader_mixRgb.c
    branches/soc-2011-carrot/source/blender/nodes/shader/nodes/node_shader_normal.c
    branches/soc-2011-carrot/source/blender/nodes/shader/nodes/node_shader_output.c
    branches/soc-2011-carrot/source/blender/nodes/shader/nodes/node_shader_rgb.c
    branches/soc-2011-carrot/source/blender/nodes/shader/nodes/node_shader_sepcombRGB.c
    branches/soc-2011-carrot/source/blender/nodes/shader/nodes/node_shader_squeeze.c
    branches/soc-2011-carrot/source/blender/nodes/shader/nodes/node_shader_texture.c
    branches/soc-2011-carrot/source/blender/nodes/shader/nodes/node_shader_valToRgb.c
    branches/soc-2011-carrot/source/blender/nodes/shader/nodes/node_shader_value.c
    branches/soc-2011-carrot/source/blender/nodes/shader/nodes/node_shader_vectMath.c
    branches/soc-2011-carrot/source/blender/nodes/texture/node_texture_tree.c
    branches/soc-2011-carrot/source/blender/nodes/texture/node_texture_util.c
    branches/soc-2011-carrot/source/blender/nodes/texture/node_texture_util.h
    branches/soc-2011-carrot/source/blender/nodes/texture/nodes/
    branches/soc-2011-carrot/source/blender/nodes/texture/nodes/node_texture_at.c
    branches/soc-2011-carrot/source/blender/nodes/texture/nodes/node_texture_bricks.c
    branches/soc-2011-carrot/source/blender/nodes/texture/nodes/node_texture_checker.c
    branches/soc-2011-carrot/source/blender/nodes/texture/nodes/node_texture_common.c
    branches/soc-2011-carrot/source/blender/nodes/texture/nodes/node_texture_compose.c
    branches/soc-2011-carrot/source/blender/nodes/texture/nodes/node_texture_coord.c
    branches/soc-2011-carrot/source/blender/nodes/texture/nodes/node_texture_curves.c
    branches/soc-2011-carrot/source/blender/nodes/texture/nodes/node_texture_decompose.c
    branches/soc-2011-carrot/source/blender/nodes/texture/nodes/node_texture_distance.c
    branches/soc-2011-carrot/source/blender/nodes/texture/nodes/node_texture_hueSatVal.c
    branches/soc-2011-carrot/source/blender/nodes/texture/nodes/node_texture_image.c
    branches/soc-2011-carrot/source/blender/nodes/texture/nodes/node_texture_invert.c
    branches/soc-2011-carrot/source/blender/nodes/texture/nodes/node_texture_math.c
    branches/soc-2011-carrot/source/blender/nodes/texture/nodes/node_texture_mixRgb.c
    branches/soc-2011-carrot/source/blender/nodes/texture/nodes/node_texture_output.c
    branches/soc-2011-carrot/source/blender/nodes/texture/nodes/node_texture_proc.c
    branches/soc-2011-carrot/source/blender/nodes/texture/nodes/node_texture_rotate.c
    branches/soc-2011-carrot/source/blender/nodes/texture/nodes/node_texture_scale.c
    branches/soc-2011-carrot/source/blender/nodes/texture/nodes/node_texture_texture.c
    branches/soc-2011-carrot/source/blender/nodes/texture/nodes/node_texture_translate.c
    branches/soc-2011-carrot/source/blender/nodes/texture/nodes/node_texture_valToNor.c
    branches/soc-2011-carrot/source/blender/nodes/texture/nodes/node_texture_valToRgb.c
    branches/soc-2011-carrot/source/blender/nodes/texture/nodes/node_texture_viewer.c

Property Changed:
----------------
    branches/soc-2011-carrot/
    branches/soc-2011-carrot/intern/audaspace/OpenAL/
    branches/soc-2011-carrot/source/blender/editors/space_outliner/


Property changes on: branches/soc-2011-carrot
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/blender:36828-39928
   + /trunk/blender:36828-40409

Modified: branches/soc-2011-carrot/CMakeLists.txt
===================================================================
--- branches/soc-2011-carrot/CMakeLists.txt	2011-09-20 17:44:45 UTC (rev 40410)
+++ branches/soc-2011-carrot/CMakeLists.txt	2011-09-20 17:51:04 UTC (rev 40411)
@@ -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)
@@ -452,15 +453,8 @@
 	if(WITH_OPENCOLLADA)
 		find_package(OpenCOLLADA)
 		if(OPENCOLLADA_FOUND)
-			set(PCRE /usr CACHE PATH "PCRE Directory")
-			mark_as_advanced(PCRE)
-			set(PCRE_LIBPATH ${PCRE}/lib)
-			set(PCRE_LIB pcre)
-
-			set(EXPAT /usr CACHE PATH "Expat Directory")
-			mark_as_advanced(EXPAT)
-			set(EXPAT_LIBPATH ${EXPAT}/lib)
-			set(EXPAT_LIB expat)
+			find_package(XML2)
+			find_package(PCRE)
 		else()
 			set(WITH_OPENCOLLADA OFF)
 		endif()
@@ -649,11 +643,7 @@
 			set(GETTEXT ${LIBDIR}/gettext)
 			set(GETTEXT_INC ${GETTEXT}/include)
 			set(GETTEXT_LIBPATH ${GETTEXT}/lib)
-			if(CMAKE_CL_64)
-				set(GETTEXT_LIB gettext)
-			else()
-				set(GETTEXT_LIB gnu_gettext)
-			endif()
+			set(GETTEXT_LIB gnu_gettext)
 		endif()
 
 		if(CMAKE_CL_64)
@@ -709,7 +699,7 @@
 				${LIBDIR}/opencollada/lib/ftoa.lib
 				${LIBDIR}/opencollada/lib/UTF.lib
 			)
-			set(PCRE_LIB
+			set(PCRE_LIBRARIES
 				${LIBDIR}/opencollada/lib/pcre.lib
 			)
 		endif()
@@ -797,7 +787,7 @@
 	else()
 		# keep GCC spesific stuff here
 		if(CMAKE_COMPILER_IS_GNUCC)
-			set(PLATFORM_LINKLIBS "-lshell32 -lshfolder -lgdi32 -lmsvcrt -lwinmm -lmingw32 -lm -lws2_32 -lz -lstdc++ -lole32 -luuid")
+			set(PLATFORM_LINKLIBS "-lshell32 -lshfolder -lgdi32 -lmsvcrt -lwinmm -lmingw32 -lm -lws2_32 -lz -lstdc++ -lole32 -luuid -lwsock32")
 			set(PLATFORM_CFLAGS "-pipe -funsigned-char -fno-strict-aliasing")
 
 			add_definitions(-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE)
@@ -851,7 +841,7 @@
 			)
 			set(OPENCOLLADA_LIBPATH ${OPENCOLLADA}/lib ${OPENCOLLADA}/lib)
 			set(OPENCOLLADA_LIBRARIES OpenCOLLADAStreamWriter OpenCOLLADASaxFrameworkLoader OpenCOLLADAFramework OpenCOLLADABaseUtils GeneratedSaxParser UTF MathMLSolver expat pcre buffer ftoa)
-			set(PCRE_LIB pcre)
+			set(PCRE_LIBRARIES pcre)
 		endif()
 		
 		if(WITH_CODEC_FFMPEG)
@@ -1073,7 +1063,7 @@
 		#pcre is bundled with openCollada
 		#set(PCRE ${LIBDIR}/pcre)
 		#set(PCRE_LIBPATH ${PCRE}/lib)
-		set(PCRE_LIB pcre)
+		set(PCRE_LIBRARIES pcre)
 		#libxml2 is used
 		#set(EXPAT ${LIBDIR}/expat)
 		#set(EXPAT_LIBPATH ${EXPAT}/lib)
@@ -1161,6 +1151,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
@@ -1267,6 +1269,7 @@
 	ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_POINTER_ARITH -Wpointer-arith)
 	ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_UNUSED_PARAMETER -Wunused-parameter)
 	ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_WRITE_STRINGS -Wwrite-strings)
+	ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_UNDEFINED -Wundef)
 	# disable because it gives warnings for printf() & friends.
 	# ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_DOUBLE_PROMOTION -Wdouble-promotion -Wno-error=double-promotion)
 	ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_NO_ERROR_UNUSED_BUT_SET_VARIABLE -Wno-error=unused-but-set-variable)
@@ -1274,6 +1277,7 @@
 	ADD_CHECK_CXX_COMPILER_FLAG(CXX_WARNINGS CXX_WARN_ALL -Wall)
 	ADD_CHECK_CXX_COMPILER_FLAG(CXX_WARNINGS CXX_WARN_NO_INVALID_OFFSETOF -Wno-invalid-offsetof)
 	ADD_CHECK_CXX_COMPILER_FLAG(CXX_WARNINGS CXX_WARN_NO_SIGN_COMPARE -Wno-sign-compare)
+	ADD_CHECK_CXX_COMPILER_FLAG(CXX_WARNINGS CXX_WARN_UNDEFINED -Wundef)
 
 elseif(CMAKE_C_COMPILER_ID MATCHES "Intel")
 

Modified: branches/soc-2011-carrot/GNUmakefile
===================================================================
--- branches/soc-2011-carrot/GNUmakefile	2011-09-20 17:44:45 UTC (rev 40410)
+++ branches/soc-2011-carrot/GNUmakefile	2011-09-20 17:51:04 UTC (rev 40411)
@@ -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,12 +130,21 @@
 	@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"
 	@echo "  * test_pep8       - checks all python script are pep8 which are tagged to use the stricter formatting"
 	@echo "  * test_deprecated - checks for deprecation tags in our code which may need to be removed"
 	@echo ""
+	@echo "Static Source Code Checking (not assosiated with building blender)"
+	@echo "  * check_cppcheck  - run blender source through cppcheck (C & C++)"
+	@echo "  * check_splint    - run blenders source through splint (C only)"
+	@echo "  * check_sparse    - run blenders source through sparse (C only)"
+	@echo ""
 
 # -----------------------------------------------------------------------------
 # Packages
@@ -142,6 +161,15 @@
 
 
 # -----------------------------------------------------------------------------
+# Other Targets
+#
+translations:
+	python3 po/update_pot.py
+	python3 po/update_po.py
+	python3 po/update_mo.py
+
+
+# -----------------------------------------------------------------------------
 # Tests
 #
 test:
@@ -176,6 +204,23 @@
 	cmake -G"Eclipse CDT4 - Unix Makefiles" -H$(BLENDER_DIR) -B$(BUILD_DIR)
 
 
+# -----------------------------------------------------------------------------
+# Static Checking
+#
+
+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
+
+
 clean:
 	$(MAKE) -C $(BUILD_DIR) clean
 

Modified: branches/soc-2011-carrot/SConstruct
===================================================================
--- branches/soc-2011-carrot/SConstruct	2011-09-20 17:44:45 UTC (rev 40410)
+++ branches/soc-2011-carrot/SConstruct	2011-09-20 17:51:04 UTC (rev 40411)
@@ -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 = []
@@ -645,7 +660,7 @@
 if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'win64-vc', 'linuxcross'):
     dllsources = []
 
-    if not env['OURPLATFORM'] in ('win32-mingw', 'win64-vc', 'linuxcross'):

@@ Diff output truncated at 10240 characters. @@



More information about the Bf-blender-cvs mailing list