Revision: 37218 http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=37218 Author: nicks Date: 2011-06-05 18:51:00 +0000 (Sun, 05 Jun 2011) Log Message: ----------- synched with trunk at revision 37212
Revision Links: -------------- http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=37212 Modified Paths: -------------- branches/soc-2010-nicks/CMakeLists.txt branches/soc-2010-nicks/build_files/buildbot/config/user-config-i686.py branches/soc-2010-nicks/build_files/buildbot/config/user-config-player-i686.py branches/soc-2010-nicks/build_files/buildbot/config/user-config-player-x86_64.py branches/soc-2010-nicks/build_files/buildbot/config/user-config-x86_64.py branches/soc-2010-nicks/build_files/buildbot/master.cfg branches/soc-2010-nicks/build_files/buildbot/master_unpack.py branches/soc-2010-nicks/build_files/buildbot/slave_compile.py branches/soc-2010-nicks/build_files/buildbot/slave_pack.py branches/soc-2010-nicks/build_files/cmake/cmake_qtcreator_project.py branches/soc-2010-nicks/build_files/cmake/macros.cmake branches/soc-2010-nicks/build_files/cmake/packaging.cmake branches/soc-2010-nicks/build_files/package_spec/rpm/blender.spec.in branches/soc-2010-nicks/build_files/scons/config/linux2-config.py branches/soc-2010-nicks/build_files/scons/config/win32-vc-config.py branches/soc-2010-nicks/build_files/scons/config/win64-vc-config.py branches/soc-2010-nicks/build_files/scons/tools/Blender.py branches/soc-2010-nicks/build_files/scons/tools/btools.py branches/soc-2010-nicks/doc/doxygen/doxygen.source branches/soc-2010-nicks/extern/binreloc/CMakeLists.txt branches/soc-2010-nicks/extern/bullet2/CMakeLists.txt branches/soc-2010-nicks/extern/bullet2/src/BulletCollision/BroadphaseCollision/btAxisSweep3.h branches/soc-2010-nicks/extern/bullet2/src/BulletCollision/CollisionDispatch/btConvexConvexAlgorithm.cpp branches/soc-2010-nicks/extern/eltopo/CMakeLists.txt branches/soc-2010-nicks/extern/glew/CMakeLists.txt branches/soc-2010-nicks/extern/glew/include/GL/glew.h branches/soc-2010-nicks/extern/glew/include/GL/glxew.h branches/soc-2010-nicks/extern/glew/include/GL/wglew.h branches/soc-2010-nicks/extern/glew/src/glew.c branches/soc-2010-nicks/extern/libopenjpeg/CMakeLists.txt branches/soc-2010-nicks/extern/libredcode/CMakeLists.txt branches/soc-2010-nicks/extern/lzma/CMakeLists.txt branches/soc-2010-nicks/extern/lzo/CMakeLists.txt branches/soc-2010-nicks/extern/recastnavigation/CMakeLists.txt branches/soc-2010-nicks/intern/audaspace/CMakeLists.txt branches/soc-2010-nicks/intern/audaspace/SConscript branches/soc-2010-nicks/intern/audaspace/ffmpeg/AUD_FFMPEGReader.cpp branches/soc-2010-nicks/intern/boolop/CMakeLists.txt branches/soc-2010-nicks/intern/bsp/CMakeLists.txt branches/soc-2010-nicks/intern/bsp/SConscript branches/soc-2010-nicks/intern/bsp/test/BSP_GhostTest/BSP_GhostTest.dsp branches/soc-2010-nicks/intern/bsp/test/BSP_GhostTest/BSP_GhostTest.dsw branches/soc-2010-nicks/intern/container/CMakeLists.txt branches/soc-2010-nicks/intern/container/CTR_TaggedIndex.h branches/soc-2010-nicks/intern/decimation/CMakeLists.txt branches/soc-2010-nicks/intern/decimation/SConscript branches/soc-2010-nicks/intern/elbeem/CMakeLists.txt branches/soc-2010-nicks/intern/ghost/CMakeLists.txt branches/soc-2010-nicks/intern/ghost/intern/GHOST_ISystem.cpp branches/soc-2010-nicks/intern/ghost/intern/GHOST_NDOFManager.cpp branches/soc-2010-nicks/intern/ghost/intern/GHOST_SystemWin32.cpp branches/soc-2010-nicks/intern/ghost/intern/GHOST_SystemWin32.h branches/soc-2010-nicks/intern/ghost/intern/GHOST_SystemX11.cpp branches/soc-2010-nicks/intern/ghost/intern/GHOST_WindowCocoa.mm branches/soc-2010-nicks/intern/ghost/intern/GHOST_WindowX11.cpp branches/soc-2010-nicks/intern/ghost/intern/GHOST_WindowX11.h branches/soc-2010-nicks/intern/guardedalloc/CMakeLists.txt branches/soc-2010-nicks/intern/iksolver/CMakeLists.txt branches/soc-2010-nicks/intern/iksolver/intern/IK_QSegment.cpp branches/soc-2010-nicks/intern/itasc/CMakeLists.txt branches/soc-2010-nicks/intern/memutil/CMakeLists.txt branches/soc-2010-nicks/intern/mikktspace/CMakeLists.txt branches/soc-2010-nicks/intern/moto/CMakeLists.txt branches/soc-2010-nicks/intern/opennl/CMakeLists.txt branches/soc-2010-nicks/intern/smoke/CMakeLists.txt branches/soc-2010-nicks/intern/string/CMakeLists.txt branches/soc-2010-nicks/release/scripts/modules/bpy/path.py branches/soc-2010-nicks/release/scripts/modules/bpy/utils.py branches/soc-2010-nicks/release/scripts/modules/bpy_types.py branches/soc-2010-nicks/release/scripts/startup/bl_operators/add_mesh_torus.py branches/soc-2010-nicks/release/scripts/startup/bl_operators/mesh.py branches/soc-2010-nicks/release/scripts/startup/bl_operators/uvcalc_follow_active.py branches/soc-2010-nicks/release/scripts/startup/bl_operators/wm.py branches/soc-2010-nicks/release/scripts/startup/bl_ui/__init__.py branches/soc-2010-nicks/release/scripts/startup/bl_ui/properties_data_camera.py branches/soc-2010-nicks/release/scripts/startup/bl_ui/properties_data_curve.py branches/soc-2010-nicks/release/scripts/startup/bl_ui/properties_data_empty.py branches/soc-2010-nicks/release/scripts/startup/bl_ui/properties_data_mesh.py branches/soc-2010-nicks/release/scripts/startup/bl_ui/properties_data_metaball.py branches/soc-2010-nicks/release/scripts/startup/bl_ui/properties_data_modifier.py branches/soc-2010-nicks/release/scripts/startup/bl_ui/properties_object_constraint.py branches/soc-2010-nicks/release/scripts/startup/bl_ui/properties_particle.py branches/soc-2010-nicks/release/scripts/startup/bl_ui/space_image.py branches/soc-2010-nicks/release/scripts/startup/bl_ui/space_sequencer.py branches/soc-2010-nicks/release/scripts/startup/bl_ui/space_userpref.py branches/soc-2010-nicks/release/scripts/startup/bl_ui/space_userpref_keymap.py branches/soc-2010-nicks/release/scripts/startup/bl_ui/space_view3d.py branches/soc-2010-nicks/release/scripts/startup/bl_ui/space_view3d_toolbar.py branches/soc-2010-nicks/release/scripts/templates/operator_export.py branches/soc-2010-nicks/release/scripts/templates/operator_mesh_add.py branches/soc-2010-nicks/release/windows/installer/00.sconsblender.nsi branches/soc-2010-nicks/scons/scons-local-1.2.0.d20090223/SCons/Tool/MSCommon/vs.py branches/soc-2010-nicks/source/blender/CMakeLists.txt branches/soc-2010-nicks/source/blender/SConscript branches/soc-2010-nicks/source/blender/avi/CMakeLists.txt branches/soc-2010-nicks/source/blender/blenfont/CMakeLists.txt branches/soc-2010-nicks/source/blender/blenfont/intern/blf_dir.c branches/soc-2010-nicks/source/blender/blenfont/intern/blf_internal.h branches/soc-2010-nicks/source/blender/blenkernel/BKE_blender.h branches/soc-2010-nicks/source/blender/blenkernel/BKE_brush.h branches/soc-2010-nicks/source/blender/blenkernel/BKE_colortools.h branches/soc-2010-nicks/source/blender/blenkernel/BKE_global.h branches/soc-2010-nicks/source/blender/blenkernel/BKE_icons.h branches/soc-2010-nicks/source/blender/blenkernel/BKE_object.h branches/soc-2010-nicks/source/blender/blenkernel/BKE_screen.h branches/soc-2010-nicks/source/blender/blenkernel/BKE_sequencer.h branches/soc-2010-nicks/source/blender/blenkernel/BKE_sketch.h branches/soc-2010-nicks/source/blender/blenkernel/BKE_subsurf.h branches/soc-2010-nicks/source/blender/blenkernel/BKE_text.h branches/soc-2010-nicks/source/blender/blenkernel/BKE_texture.h branches/soc-2010-nicks/source/blender/blenkernel/BKE_world.h branches/soc-2010-nicks/source/blender/blenkernel/CMakeLists.txt branches/soc-2010-nicks/source/blender/blenkernel/SConscript branches/soc-2010-nicks/source/blender/blenkernel/intern/action.c branches/soc-2010-nicks/source/blender/blenkernel/intern/anim.c branches/soc-2010-nicks/source/blender/blenkernel/intern/anim_sys.c branches/soc-2010-nicks/source/blender/blenkernel/intern/blender.c branches/soc-2010-nicks/source/blender/blenkernel/intern/brush.c branches/soc-2010-nicks/source/blender/blenkernel/intern/colortools.c branches/soc-2010-nicks/source/blender/blenkernel/intern/curve.c branches/soc-2010-nicks/source/blender/blenkernel/intern/depsgraph.c branches/soc-2010-nicks/source/blender/blenkernel/intern/displist.c branches/soc-2010-nicks/source/blender/blenkernel/intern/fcurve.c branches/soc-2010-nicks/source/blender/blenkernel/intern/icons.c branches/soc-2010-nicks/source/blender/blenkernel/intern/image.c branches/soc-2010-nicks/source/blender/blenkernel/intern/lattice.c branches/soc-2010-nicks/source/blender/blenkernel/intern/material.c branches/soc-2010-nicks/source/blender/blenkernel/intern/multires.c branches/soc-2010-nicks/source/blender/blenkernel/intern/node.c branches/soc-2010-nicks/source/blender/blenkernel/intern/object.c branches/soc-2010-nicks/source/blender/blenkernel/intern/particle.c branches/soc-2010-nicks/source/blender/blenkernel/intern/particle_system.c branches/soc-2010-nicks/source/blender/blenkernel/intern/scene.c branches/soc-2010-nicks/source/blender/blenkernel/intern/screen.c branches/soc-2010-nicks/source/blender/blenkernel/intern/seqeffects.c branches/soc-2010-nicks/source/blender/blenkernel/intern/sequencer.c branches/soc-2010-nicks/source/blender/blenkernel/intern/shrinkwrap.c branches/soc-2010-nicks/source/blender/blenkernel/intern/sketch.c branches/soc-2010-nicks/source/blender/blenkernel/intern/softbody.c branches/soc-2010-nicks/source/blender/blenkernel/intern/subsurf_ccg.c branches/soc-2010-nicks/source/blender/blenkernel/intern/text.c branches/soc-2010-nicks/source/blender/blenkernel/intern/texture.c branches/soc-2010-nicks/source/blender/blenkernel/intern/world.c branches/soc-2010-nicks/source/blender/blenkernel/intern/writeffmpeg.c branches/soc-2010-nicks/source/blender/blenlib/BLI_math_geom.h branches/soc-2010-nicks/source/blender/blenlib/BLI_math_matrix.h branches/soc-2010-nicks/source/blender/blenlib/BLI_path_util.h branches/soc-2010-nicks/source/blender/blenlib/BLI_scanfill.h branches/soc-2010-nicks/source/blender/blenlib/BLI_string.h branches/soc-2010-nicks/source/blender/blenlib/CMakeLists.txt branches/soc-2010-nicks/source/blender/blenlib/intern/BLI_kdopbvh.c branches/soc-2010-nicks/source/blender/blenlib/intern/bpath.c branches/soc-2010-nicks/source/blender/blenlib/intern/edgehash.c branches/soc-2010-nicks/source/blender/blenlib/intern/math_base.c branches/soc-2010-nicks/source/blender/blenlib/intern/math_color.c branches/soc-2010-nicks/source/blender/blenlib/intern/math_geom.c branches/soc-2010-nicks/source/blender/blenlib/intern/math_matrix.c branches/soc-2010-nicks/source/blender/blenlib/intern/path_util.c branches/soc-2010-nicks/source/blender/blenlib/intern/pbvh.c branches/soc-2010-nicks/source/blender/blenlib/intern/rand.c branches/soc-2010-nicks/source/blender/blenlib/intern/rct.c branches/soc-2010-nicks/source/blender/blenlib/intern/scanfill.c branches/soc-2010-nicks/source/blender/blenlib/intern/string.c branches/soc-2010-nicks/source/blender/blenloader/BLO_readfile.h branches/soc-2010-nicks/source/blender/blenloader/BLO_writefile.h branches/soc-2010-nicks/source/blender/blenloader/CMakeLists.txt branches/soc-2010-nicks/source/blender/blenloader/SConscript branches/soc-2010-nicks/source/blender/blenloader/intern/readblenentry.c branches/soc-2010-nicks/source/blender/blenloader/intern/readfile.c branches/soc-2010-nicks/source/blender/blenloader/intern/readfile.h branches/soc-2010-nicks/source/blender/blenloader/intern/writefile.c branches/soc-2010-nicks/source/blender/blenpluginapi/CMakeLists.txt branches/soc-2010-nicks/source/blender/collada/CMakeLists.txt branches/soc-2010-nicks/source/blender/editors/animation/CMakeLists.txt branches/soc-2010-nicks/source/blender/editors/animation/anim_channels_edit.c branches/soc-2010-nicks/source/blender/editors/animation/anim_ops.c branches/soc-2010-nicks/source/blender/editors/animation/keyframes_draw.c branches/soc-2010-nicks/source/blender/editors/animation/keyframing.c branches/soc-2010-nicks/source/blender/editors/animation/keyingsets.c branches/soc-2010-nicks/source/blender/editors/armature/CMakeLists.txt branches/soc-2010-nicks/source/blender/editors/armature/armature_intern.h branches/soc-2010-nicks/source/blender/editors/armature/editarmature.c branches/soc-2010-nicks/source/blender/editors/armature/editarmature_sketch.c branches/soc-2010-nicks/source/blender/editors/armature/poselib.c branches/soc-2010-nicks/source/blender/editors/armature/poseobject.c branches/soc-2010-nicks/source/blender/editors/curve/CMakeLists.txt branches/soc-2010-nicks/source/blender/editors/curve/editcurve.c branches/soc-2010-nicks/source/blender/editors/datafiles/CMakeLists.txt branches/soc-2010-nicks/source/blender/editors/datafiles/startup.blend.c branches/soc-2010-nicks/source/blender/editors/gpencil/CMakeLists.txt branches/soc-2010-nicks/source/blender/editors/gpencil/drawgpencil.c branches/soc-2010-nicks/source/blender/editors/gpencil/gpencil_edit.c branches/soc-2010-nicks/source/blender/editors/gpencil/gpencil_paint.c branches/soc-2010-nicks/source/blender/editors/include/ED_armature.h branches/soc-2010-nicks/source/blender/editors/include/ED_curve.h branches/soc-2010-nicks/source/blender/editors/include/ED_gpencil.h branches/soc-2010-nicks/source/blender/editors/include/ED_image.h branches/soc-2010-nicks/source/blender/editors/include/ED_keyframing.h branches/soc-2010-nicks/source/blender/editors/include/ED_mball.h branches/soc-2010-nicks/source/blender/editors/include/ED_mesh.h branches/soc-2010-nicks/source/blender/editors/include/ED_object.h branches/soc-2010-nicks/source/blender/editors/include/ED_particle.h branches/soc-2010-nicks/source/blender/editors/include/ED_screen.h branches/soc-2010-nicks/source/blender/editors/include/ED_types.h branches/soc-2010-nicks/source/blender/editors/include/ED_util.h branches/soc-2010-nicks/source/blender/editors/include/ED_view3d.h branches/soc-2010-nicks/source/blender/editors/include/UI_interface.h branches/soc-2010-nicks/source/blender/editors/include/UI_interface_icons.h branches/soc-2010-nicks/source/blender/editors/interface/CMakeLists.txt branches/soc-2010-nicks/source/blender/editors/interface/interface.c branches/soc-2010-nicks/source/blender/editors/interface/interface_draw.c branches/soc-2010-nicks/source/blender/editors/interface/interface_handlers.c branches/soc-2010-nicks/source/blender/editors/interface/interface_icons.c branches/soc-2010-nicks/source/blender/editors/interface/interface_intern.h branches/soc-2010-nicks/source/blender/editors/interface/interface_layout.c branches/soc-2010-nicks/source/blender/editors/interface/interface_ops.c branches/soc-2010-nicks/source/blender/editors/interface/interface_panel.c branches/soc-2010-nicks/source/blender/editors/interface/interface_regions.c branches/soc-2010-nicks/source/blender/editors/interface/interface_templates.c branches/soc-2010-nicks/source/blender/editors/interface/interface_widgets.c branches/soc-2010-nicks/source/blender/editors/interface/resources.c branches/soc-2010-nicks/source/blender/editors/interface/view2d.c branches/soc-2010-nicks/source/blender/editors/interface/view2d_ops.c branches/soc-2010-nicks/source/blender/editors/mesh/CMakeLists.txt branches/soc-2010-nicks/source/blender/editors/mesh/editface.c branches/soc-2010-nicks/source/blender/editors/mesh/editmesh_loop.c branches/soc-2010-nicks/source/blender/editors/mesh/editmesh_mods.c branches/soc-2010-nicks/source/blender/editors/mesh/editmesh_tools.c branches/soc-2010-nicks/source/blender/editors/metaball/CMakeLists.txt branches/soc-2010-nicks/source/blender/editors/metaball/mball_edit.c branches/soc-2010-nicks/source/blender/editors/object/CMakeLists.txt branches/soc-2010-nicks/source/blender/editors/object/object_add.c branches/soc-2010-nicks/source/blender/editors/object/object_edit.c branches/soc-2010-nicks/source/blender/editors/object/object_hook.c branches/soc-2010-nicks/source/blender/editors/object/object_lattice.c branches/soc-2010-nicks/source/blender/editors/object/object_modifier.c branches/soc-2010-nicks/source/blender/editors/object/object_relations.c branches/soc-2010-nicks/source/blender/editors/object/object_transform.c branches/soc-2010-nicks/source/blender/editors/object/object_vgroup.c branches/soc-2010-nicks/source/blender/editors/physics/CMakeLists.txt branches/soc-2010-nicks/source/blender/editors/physics/particle_edit.c branches/soc-2010-nicks/source/blender/editors/physics/physics_intern.h branches/soc-2010-nicks/source/blender/editors/physics/physics_ops.c branches/soc-2010-nicks/source/blender/editors/physics/physics_pointcache.c branches/soc-2010-nicks/source/blender/editors/render/CMakeLists.txt branches/soc-2010-nicks/source/blender/editors/render/render_intern.h branches/soc-2010-nicks/source/blender/editors/render/render_internal.c branches/soc-2010-nicks/source/blender/editors/render/render_opengl.c branches/soc-2010-nicks/source/blender/editors/render/render_preview.c branches/soc-2010-nicks/source/blender/editors/render/render_shading.c branches/soc-2010-nicks/source/blender/editors/screen/CMakeLists.txt branches/soc-2010-nicks/source/blender/editors/screen/area.c branches/soc-2010-nicks/source/blender/editors/screen/screen_edit.c branches/soc-2010-nicks/source/blender/editors/screen/screen_ops.c branches/soc-2010-nicks/source/blender/editors/screen/screendump.c branches/soc-2010-nicks/source/blender/editors/sculpt_paint/CMakeLists.txt branches/soc-2010-nicks/source/blender/editors/sculpt_paint/paint_image.c branches/soc-2010-nicks/source/blender/editors/sculpt_paint/paint_intern.h branches/soc-2010-nicks/source/blender/editors/sculpt_paint/paint_ops.c branches/soc-2010-nicks/source/blender/editors/sculpt_paint/paint_stroke.c branches/soc-2010-nicks/source/blender/editors/sculpt_paint/paint_utils.c branches/soc-2010-nicks/source/blender/editors/sculpt_paint/paint_vertex.c branches/soc-2010-nicks/source/blender/editors/sculpt_paint/sculpt.c branches/soc-2010-nicks/source/blender/editors/sound/CMakeLists.txt branches/soc-2010-nicks/source/blender/editors/space_action/CMakeLists.txt branches/soc-2010-nicks/source/blender/editors/space_action/action_select.c branches/soc-2010-nicks/source/blender/editors/space_action/space_action.c branches/soc-2010-nicks/source/blender/editors/space_api/CMakeLists.txt branches/soc-2010-nicks/source/blender/editors/space_api/spacetypes.c branches/soc-2010-nicks/source/blender/editors/space_buttons/CMakeLists.txt branches/soc-2010-nicks/source/blender/editors/space_buttons/buttons_header.c branches/soc-2010-nicks/source/blender/editors/space_buttons/buttons_intern.h branches/soc-2010-nicks/source/blender/editors/space_buttons/buttons_ops.c branches/soc-2010-nicks/source/blender/editors/space_buttons/space_buttons.c branches/soc-2010-nicks/source/blender/editors/space_console/CMakeLists.txt branches/soc-2010-nicks/source/blender/editors/space_file/CMakeLists.txt branches/soc-2010-nicks/source/blender/editors/space_file/file_draw.c branches/soc-2010-nicks/source/blender/editors/space_file/file_intern.h branches/soc-2010-nicks/source/blender/editors/space_file/file_ops.c branches/soc-2010-nicks/source/blender/editors/space_file/filelist.c branches/soc-2010-nicks/source/blender/editors/space_file/filesel.c branches/soc-2010-nicks/source/blender/editors/space_file/space_file.c branches/soc-2010-nicks/source/blender/editors/space_graph/CMakeLists.txt branches/soc-2010-nicks/source/blender/editors/space_graph/graph_draw.c branches/soc-2010-nicks/source/blender/editors/space_graph/graph_ops.c branches/soc-2010-nicks/source/blender/editors/space_graph/graph_select.c branches/soc-2010-nicks/source/blender/editors/space_graph/space_graph.c branches/soc-2010-nicks/source/blender/editors/space_image/CMakeLists.txt branches/soc-2010-nicks/source/blender/editors/space_image/SConscript branches/soc-2010-nicks/source/blender/editors/space_image/image_buttons.c branches/soc-2010-nicks/source/blender/editors/space_image/image_draw.c branches/soc-2010-nicks/source/blender/editors/space_image/image_ops.c branches/soc-2010-nicks/source/blender/editors/space_image/space_image.c branches/soc-2010-nicks/source/blender/editors/space_info/CMakeLists.txt branches/soc-2010-nicks/source/blender/editors/space_info/info_report.c branches/soc-2010-nicks/source/blender/editors/space_logic/CMakeLists.txt branches/soc-2010-nicks/source/blender/editors/space_logic/space_logic.c branches/soc-2010-nicks/source/blender/editors/space_nla/CMakeLists.txt branches/soc-2010-nicks/source/blender/editors/space_nla/nla_channels.c branches/soc-2010-nicks/source/blender/editors/space_nla/nla_select.c branches/soc-2010-nicks/source/blender/editors/space_nla/space_nla.c branches/soc-2010-nicks/source/blender/editors/space_node/CMakeLists.txt branches/soc-2010-nicks/source/blender/editors/space_node/drawnode.c branches/soc-2010-nicks/source/blender/editors/space_node/node_edit.c branches/soc-2010-nicks/source/blender/editors/space_node/node_select.c branches/soc-2010-nicks/source/blender/editors/space_node/node_state.c branches/soc-2010-nicks/source/blender/editors/space_node/space_node.c branches/soc-2010-nicks/source/blender/editors/space_outliner/CMakeLists.txt branches/soc-2010-nicks/source/blender/editors/space_outliner/outliner.c branches/soc-2010-nicks/source/blender/editors/space_script/CMakeLists.txt branches/soc-2010-nicks/source/blender/editors/space_script/script_header.c branches/soc-2010-nicks/source/blender/editors/space_sequencer/CMakeLists.txt branches/soc-2010-nicks/source/blender/editors/space_sequencer/sequencer_add.c branches/soc-2010-nicks/source/blender/editors/space_sequencer/sequencer_draw.c branches/soc-2010-nicks/source/blender/editors/space_sequencer/sequencer_edit.c branches/soc-2010-nicks/source/blender/editors/space_sequencer/sequencer_intern.h branches/soc-2010-nicks/source/blender/editors/space_sequencer/sequencer_select.c branches/soc-2010-nicks/source/blender/editors/space_sequencer/space_sequencer.c branches/soc-2010-nicks/source/blender/editors/space_sound/CMakeLists.txt branches/soc-2010-nicks/source/blender/editors/space_sound/sound_header.c branches/soc-2010-nicks/source/blender/editors/space_text/CMakeLists.txt branches/soc-2010-nicks/source/blender/editors/space_text/text_header.c branches/soc-2010-nicks/source/blender/editors/space_text/text_ops.c branches/soc-2010-nicks/source/blender/editors/space_text/text_python.c branches/soc-2010-nicks/source/blender/editors/space_time/CMakeLists.txt branches/soc-2010-nicks/source/blender/editors/space_time/space_time.c branches/soc-2010-nicks/source/blender/editors/space_userpref/CMakeLists.txt branches/soc-2010-nicks/source/blender/editors/space_view3d/CMakeLists.txt branches/soc-2010-nicks/source/blender/editors/space_view3d/drawmesh.c branches/soc-2010-nicks/source/blender/editors/space_view3d/drawobject.c branches/soc-2010-nicks/source/blender/editors/space_view3d/space_view3d.c branches/soc-2010-nicks/source/blender/editors/space_view3d/view3d_draw.c branches/soc-2010-nicks/source/blender/editors/space_view3d/view3d_edit.c branches/soc-2010-nicks/source/blender/editors/space_view3d/view3d_fly.c branches/soc-2010-nicks/source/blender/editors/space_view3d/view3d_header.c branches/soc-2010-nicks/source/blender/editors/space_view3d/view3d_intern.h branches/soc-2010-nicks/source/blender/editors/space_view3d/view3d_ops.c branches/soc-2010-nicks/source/blender/editors/space_view3d/view3d_select.c branches/soc-2010-nicks/source/blender/editors/space_view3d/view3d_snap.c branches/soc-2010-nicks/source/blender/editors/space_view3d/view3d_toolbar.c branches/soc-2010-nicks/source/blender/editors/space_view3d/view3d_view.c branches/soc-2010-nicks/source/blender/editors/transform/CMakeLists.txt branches/soc-2010-nicks/source/blender/editors/transform/transform.c branches/soc-2010-nicks/source/blender/editors/transform/transform.h branches/soc-2010-nicks/source/blender/editors/transform/transform_constraints.c branches/soc-2010-nicks/source/blender/editors/transform/transform_conversions.c branches/soc-2010-nicks/source/blender/editors/transform/transform_generics.c branches/soc-2010-nicks/source/blender/editors/transform/transform_input.c branches/soc-2010-nicks/source/blender/editors/transform/transform_manipulator.c branches/soc-2010-nicks/source/blender/editors/transform/transform_ops.c branches/soc-2010-nicks/source/blender/editors/transform/transform_snap.c branches/soc-2010-nicks/source/blender/editors/util/CMakeLists.txt branches/soc-2010-nicks/source/blender/editors/util/editmode_undo.c branches/soc-2010-nicks/source/blender/editors/util/undo.c branches/soc-2010-nicks/source/blender/editors/util/util_intern.h branches/soc-2010-nicks/source/blender/editors/uvedit/CMakeLists.txt branches/soc-2010-nicks/source/blender/editors/uvedit/uvedit_ops.c branches/soc-2010-nicks/source/blender/editors/uvedit/uvedit_parametrizer.c branches/soc-2010-nicks/source/blender/editors/uvedit/uvedit_unwrap_ops.c branches/soc-2010-nicks/source/blender/gpu/CMakeLists.txt branches/soc-2010-nicks/source/blender/gpu/intern/gpu_draw.c branches/soc-2010-nicks/source/blender/gpu/intern/gpu_material.c branches/soc-2010-nicks/source/blender/ikplugin/CMakeLists.txt branches/soc-2010-nicks/source/blender/imbuf/CMakeLists.txt branches/soc-2010-nicks/source/blender/imbuf/IMB_imbuf_types.h branches/soc-2010-nicks/source/blender/imbuf/SConscript branches/soc-2010-nicks/source/blender/imbuf/intern/IMB_anim.h branches/soc-2010-nicks/source/blender/imbuf/intern/allocimbuf.c branches/soc-2010-nicks/source/blender/imbuf/intern/anim_movie.c branches/soc-2010-nicks/source/blender/imbuf/intern/cineon/CMakeLists.txt branches/soc-2010-nicks/source/blender/imbuf/intern/cineon/cineon_dpx.c branches/soc-2010-nicks/source/blender/imbuf/intern/cineon/cineonfile.h branches/soc-2010-nicks/source/blender/imbuf/intern/cineon/cineonlib.c branches/soc-2010-nicks/source/blender/imbuf/intern/cineon/logmemfile.c branches/soc-2010-nicks/source/blender/imbuf/intern/dds/CMakeLists.txt branches/soc-2010-nicks/source/blender/imbuf/intern/imageprocess.c branches/soc-2010-nicks/source/blender/imbuf/intern/md5.h branches/soc-2010-nicks/source/blender/imbuf/intern/openexr/CMakeLists.txt branches/soc-2010-nicks/source/blender/imbuf/intern/png.c branches/soc-2010-nicks/source/blender/imbuf/intern/scaling.c branches/soc-2010-nicks/source/blender/imbuf/intern/targa.c branches/soc-2010-nicks/source/blender/imbuf/intern/tiff.c branches/soc-2010-nicks/source/blender/imbuf/intern/util.c branches/soc-2010-nicks/source/blender/makesdna/DNA_ID.h branches/soc-2010-nicks/source/blender/makesdna/DNA_camera_types.h branches/soc-2010-nicks/source/blender/makesdna/DNA_object_fluidsim.h branches/soc-2010-nicks/source/blender/makesdna/DNA_object_types.h branches/soc-2010-nicks/source/blender/makesdna/DNA_screen_types.h branches/soc-2010-nicks/source/blender/makesdna/DNA_sequence_types.h branches/soc-2010-nicks/source/blender/makesdna/DNA_userdef_types.h branches/soc-2010-nicks/source/blender/makesdna/DNA_view3d_types.h branches/soc-2010-nicks/source/blender/makesdna/DNA_windowmanager_types.h branches/soc-2010-nicks/source/blender/makesdna/intern/CMakeLists.txt branches/soc-2010-nicks/source/blender/makesdna/intern/makesdna.c branches/soc-2010-nicks/source/blender/makesrna/RNA_access.h branches/soc-2010-nicks/source/blender/makesrna/RNA_define.h branches/soc-2010-nicks/source/blender/makesrna/RNA_enum_types.h branches/soc-2010-nicks/source/blender/makesrna/RNA_types.h branches/soc-2010-nicks/source/blender/makesrna/SConscript branches/soc-2010-nicks/source/blender/makesrna/intern/CMakeLists.txt branches/soc-2010-nicks/source/blender/makesrna/intern/SConscript branches/soc-2010-nicks/source/blender/makesrna/intern/makesrna.c branches/soc-2010-nicks/source/blender/makesrna/intern/rna_ID.c branches/soc-2010-nicks/source/blender/makesrna/intern/rna_access.c branches/soc-2010-nicks/source/blender/makesrna/intern/rna_actuator.c branches/soc-2010-nicks/source/blender/makesrna/intern/rna_animation.c branches/soc-2010-nicks/source/blender/makesrna/intern/rna_armature.c branches/soc-2010-nicks/source/blender/makesrna/intern/rna_brush.c branches/soc-2010-nicks/source/blender/makesrna/intern/rna_camera.c branches/soc-2010-nicks/source/blender/makesrna/intern/rna_cloth.c branches/soc-2010-nicks/source/blender/makesrna/intern/rna_color.c branches/soc-2010-nicks/source/blender/makesrna/intern/rna_constraint.c branches/soc-2010-nicks/source/blender/makesrna/intern/rna_curve.c branches/soc-2010-nicks/source/blender/makesrna/intern/rna_define.c branches/soc-2010-nicks/source/blender/makesrna/intern/rna_fcurve.c branches/soc-2010-nicks/source/blender/makesrna/intern/rna_fluidsim.c branches/soc-2010-nicks/source/blender/makesrna/intern/rna_image.c branches/soc-2010-nicks/source/blender/makesrna/intern/rna_internal.h branches/soc-2010-nicks/source/blender/makesrna/intern/rna_internal_types.h branches/soc-2010-nicks/source/blender/makesrna/intern/rna_key.c branches/soc-2010-nicks/source/blender/makesrna/intern/rna_lamp.c branches/soc-2010-nicks/source/blender/makesrna/intern/rna_lattice.c branches/soc-2010-nicks/source/blender/makesrna/intern/rna_main.c branches/soc-2010-nicks/source/blender/makesrna/intern/rna_main_api.c branches/soc-2010-nicks/source/blender/makesrna/intern/rna_material.c branches/soc-2010-nicks/source/blender/makesrna/intern/rna_mesh.c branches/soc-2010-nicks/source/blender/makesrna/intern/rna_modifier.c branches/soc-2010-nicks/source/blender/makesrna/intern/rna_nla.c branches/soc-2010-nicks/source/blender/makesrna/intern/rna_nodetree.c branches/soc-2010-nicks/source/blender/makesrna/intern/rna_object.c branches/soc-2010-nicks/source/blender/makesrna/intern/rna_object_force.c branches/soc-2010-nicks/source/blender/makesrna/intern/rna_particle.c branches/soc-2010-nicks/source/blender/makesrna/intern/rna_pose.c branches/soc-2010-nicks/source/blender/makesrna/intern/rna_property.c branches/soc-2010-nicks/source/blender/makesrna/intern/rna_render.c branches/soc-2010-nicks/source/blender/makesrna/intern/rna_rna.c branches/soc-2010-nicks/source/blender/makesrna/intern/rna_scene.c branches/soc-2010-nicks/source/blender/makesrna/intern/rna_screen.c branches/soc-2010-nicks/source/blender/makesrna/intern/rna_sculpt_paint.c branches/soc-2010-nicks/source/blender/makesrna/intern/rna_sensor.c branches/soc-2010-nicks/source/blender/makesrna/intern/rna_sequencer.c branches/soc-2010-nicks/source/blender/makesrna/intern/rna_sequencer_api.c branches/soc-2010-nicks/source/blender/makesrna/intern/rna_smoke.c branches/soc-2010-nicks/source/blender/makesrna/intern/rna_space.c branches/soc-2010-nicks/source/blender/makesrna/intern/rna_texture.c branches/soc-2010-nicks/source/blender/makesrna/intern/rna_ui.c branches/soc-2010-nicks/source/blender/makesrna/intern/rna_ui_api.c branches/soc-2010-nicks/source/blender/makesrna/intern/rna_userdef.c branches/soc-2010-nicks/source/blender/makesrna/intern/rna_wm.c branches/soc-2010-nicks/source/blender/makesrna/intern/rna_world.c branches/soc-2010-nicks/source/blender/modifiers/CMakeLists.txt branches/soc-2010-nicks/source/blender/modifiers/intern/MOD_armature.c branches/soc-2010-nicks/source/blender/modifiers/intern/MOD_boolean.c branches/soc-2010-nicks/source/blender/modifiers/intern/MOD_displace.c branches/soc-2010-nicks/source/blender/modifiers/intern/MOD_fluidsim_util.c branches/soc-2010-nicks/source/blender/modifiers/intern/MOD_none.c branches/soc-2010-nicks/source/blender/modifiers/intern/MOD_subsurf.c branches/soc-2010-nicks/source/blender/modifiers/intern/MOD_uvproject.c branches/soc-2010-nicks/source/blender/nodes/CMakeLists.txt branches/soc-2010-nicks/source/blender/nodes/intern/CMP_nodes/CMP_colorMatte.c branches/soc-2010-nicks/source/blender/nodes/intern/CMP_nodes/CMP_rgb.c branches/soc-2010-nicks/source/blender/nodes/intern/SHD_nodes/SHD_material.c branches/soc-2010-nicks/source/blender/nodes/intern/SHD_util.h branches/soc-2010-nicks/source/blender/python/BPY_extern.h branches/soc-2010-nicks/source/blender/python/generic/CMakeLists.txt branches/soc-2010-nicks/source/blender/python/generic/IDProp.c branches/soc-2010-nicks/source/blender/python/generic/bgl.c branches/soc-2010-nicks/source/blender/python/generic/bgl.h branches/soc-2010-nicks/source/blender/python/generic/blf_py_api.c branches/soc-2010-nicks/source/blender/python/generic/bpy_internal_import.c branches/soc-2010-nicks/source/blender/python/generic/bpy_internal_import.h branches/soc-2010-nicks/source/blender/python/generic/mathutils.c branches/soc-2010-nicks/source/blender/python/generic/mathutils_Color.c branches/soc-2010-nicks/source/blender/python/generic/mathutils_Euler.c branches/soc-2010-nicks/source/blender/python/generic/mathutils_Matrix.c branches/soc-2010-nicks/source/blender/python/generic/mathutils_Quaternion.c branches/soc-2010-nicks/source/blender/python/generic/mathutils_Vector.c branches/soc-2010-nicks/source/blender/python/generic/mathutils_geometry.c branches/soc-2010-nicks/source/blender/python/generic/noise_py_api.c branches/soc-2010-nicks/source/blender/python/intern/CMakeLists.txt branches/soc-2010-nicks/source/blender/python/intern/bpy.c branches/soc-2010-nicks/source/blender/python/intern/bpy.h branches/soc-2010-nicks/source/blender/python/intern/bpy_app.h branches/soc-2010-nicks/source/blender/python/intern/bpy_driver.c branches/soc-2010-nicks/source/blender/python/intern/bpy_interface.c branches/soc-2010-nicks/source/blender/python/intern/bpy_library.c branches/soc-2010-nicks/source/blender/python/intern/bpy_operator.c branches/soc-2010-nicks/source/blender/python/intern/bpy_operator_wrap.c branches/soc-2010-nicks/source/blender/python/intern/bpy_props.c branches/soc-2010-nicks/source/blender/python/intern/bpy_props.h branches/soc-2010-nicks/source/blender/python/intern/bpy_rna.c branches/soc-2010-nicks/source/blender/python/intern/bpy_rna.h branches/soc-2010-nicks/source/blender/quicktime/CMakeLists.txt branches/soc-2010-nicks/source/blender/render/CMakeLists.txt branches/soc-2010-nicks/source/blender/render/extern/include/RE_pipeline.h branches/soc-2010-nicks/source/blender/render/intern/include/shading.h branches/soc-2010-nicks/source/blender/render/intern/source/convertblender.c branches/soc-2010-nicks/source/blender/render/intern/source/pointdensity.c branches/soc-2010-nicks/source/blender/render/intern/source/rayshade.c branches/soc-2010-nicks/source/blender/render/intern/source/rendercore.c branches/soc-2010-nicks/source/blender/render/intern/source/renderdatabase.c branches/soc-2010-nicks/source/blender/render/intern/source/shadeinput.c branches/soc-2010-nicks/source/blender/render/intern/source/strand.c branches/soc-2010-nicks/source/blender/render/intern/source/sunsky.c branches/soc-2010-nicks/source/blender/render/intern/source/volume_precache.c branches/soc-2010-nicks/source/blender/render/intern/source/volumetric.c branches/soc-2010-nicks/source/blender/windowmanager/CMakeLists.txt branches/soc-2010-nicks/source/blender/windowmanager/SConscript branches/soc-2010-nicks/source/blender/windowmanager/WM_api.h branches/soc-2010-nicks/source/blender/windowmanager/WM_types.h branches/soc-2010-nicks/source/blender/windowmanager/intern/wm.c branches/soc-2010-nicks/source/blender/windowmanager/intern/wm_apple.c branches/soc-2010-nicks/source/blender/windowmanager/intern/wm_event_system.c branches/soc-2010-nicks/source/blender/windowmanager/intern/wm_files.c branches/soc-2010-nicks/source/blender/windowmanager/intern/wm_init_exit.c branches/soc-2010-nicks/source/blender/windowmanager/intern/wm_keymap.c branches/soc-2010-nicks/source/blender/windowmanager/intern/wm_operators.c branches/soc-2010-nicks/source/blender/windowmanager/intern/wm_window.c branches/soc-2010-nicks/source/blender/windowmanager/wm.h branches/soc-2010-nicks/source/blenderplayer/CMakeLists.txt branches/soc-2010-nicks/source/blenderplayer/bad_level_call_stubs/CMakeLists.txt branches/soc-2010-nicks/source/blenderplayer/bad_level_call_stubs/stubs.c branches/soc-2010-nicks/source/creator/CMakeLists.txt branches/soc-2010-nicks/source/creator/creator.c branches/soc-2010-nicks/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp branches/soc-2010-nicks/source/gameengine/BlenderRoutines/CMakeLists.txt branches/soc-2010-nicks/source/gameengine/Converter/BL_BlenderDataConversion.cpp branches/soc-2010-nicks/source/gameengine/Converter/CMakeLists.txt branches/soc-2010-nicks/source/gameengine/Converter/KX_BlenderSceneConverter.cpp branches/soc-2010-nicks/source/gameengine/Expressions/CMakeLists.txt branches/soc-2010-nicks/source/gameengine/Expressions/PyObjectPlus.cpp branches/soc-2010-nicks/source/gameengine/GameLogic/CMakeLists.txt branches/soc-2010-nicks/source/gameengine/GameLogic/SCA_PythonController.cpp branches/soc-2010-nicks/source/gameengine/GamePlayer/common/CMakeLists.txt branches/soc-2010-nicks/source/gameengine/GamePlayer/ghost/CMakeLists.txt branches/soc-2010-nicks/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp branches/soc-2010-nicks/source/gameengine/GamePlayer/ghost/SConscript branches/soc-2010-nicks/source/gameengine/Ketsji/BL_Material.h branches/soc-2010-nicks/source/gameengine/Ketsji/CMakeLists.txt branches/soc-2010-nicks/source/gameengine/Ketsji/KXNetwork/CMakeLists.txt branches/soc-2010-nicks/source/gameengine/Ketsji/KX_PyConstraintBinding.cpp branches/soc-2010-nicks/source/gameengine/Ketsji/KX_PythonInit.cpp branches/soc-2010-nicks/source/gameengine/Network/CMakeLists.txt branches/soc-2010-nicks/source/gameengine/Network/LoopBackNetwork/CMakeLists.txt branches/soc-2010-nicks/source/gameengine/Physics/Bullet/CMakeLists.txt branches/soc-2010-nicks/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp branches/soc-2010-nicks/source/gameengine/Physics/Dummy/CMakeLists.txt branches/soc-2010-nicks/source/gameengine/Physics/common/CMakeLists.txt branches/soc-2010-nicks/source/gameengine/Rasterizer/CMakeLists.txt branches/soc-2010-nicks/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/CMakeLists.txt branches/soc-2010-nicks/source/gameengine/SceneGraph/CMakeLists.txt branches/soc-2010-nicks/source/gameengine/VideoTexture/CMakeLists.txt branches/soc-2010-nicks/source/gameengine/VideoTexture/SConscript branches/soc-2010-nicks/source/gameengine/VideoTexture/VideoFFmpeg.cpp branches/soc-2010-nicks/source/gameengine/VideoTexture/VideoFFmpeg.h Added Paths: ----------- branches/soc-2010-nicks/build_files/cmake/cmake_netbeans_project.py branches/soc-2010-nicks/build_files/cmake/project_info.py branches/soc-2010-nicks/intern/ffmpeg/ branches/soc-2010-nicks/intern/ffmpeg/ffmpeg_compat.h branches/soc-2010-nicks/intern/ghost/intern/GHOST_DisplayManagerNULL.h branches/soc-2010-nicks/intern/ghost/intern/GHOST_SystemNULL.h branches/soc-2010-nicks/intern/ghost/intern/GHOST_WindowNULL.h branches/soc-2010-nicks/intern/smoke/intern/main.cpp_disabled branches/soc-2010-nicks/intern/tools/ui_snapshot.py branches/soc-2010-nicks/release/scripts/modules/bpy_extras/ branches/soc-2010-nicks/release/scripts/modules/bpy_extras/__init__.py branches/soc-2010-nicks/release/scripts/modules/bpy_extras/image_utils.py branches/soc-2010-nicks/release/scripts/modules/bpy_extras/io_utils.py branches/soc-2010-nicks/release/scripts/modules/bpy_extras/mesh_utils.py branches/soc-2010-nicks/release/scripts/modules/bpy_extras/object_utils.py branches/soc-2010-nicks/release/scripts/modules/bpy_extras/view3d_utils.py branches/soc-2010-nicks/source/blender/blenloader/BLO_runtime.h branches/soc-2010-nicks/source/blender/blenloader/intern/runtime.c branches/soc-2010-nicks/source/blender/editors/render/render_update.c branches/soc-2010-nicks/source/blender/editors/render/render_view.c Removed Paths: ------------- branches/soc-2010-nicks/intern/ffmpeg/ffmpeg_compat.h branches/soc-2010-nicks/intern/smoke/intern/main.cpp.back branches/soc-2010-nicks/release/release_todo.txt branches/soc-2010-nicks/release/scripts/modules/add_object_utils.py branches/soc-2010-nicks/release/scripts/modules/bpy_extras/__init__.py branches/soc-2010-nicks/release/scripts/modules/bpy_extras/image_utils.py branches/soc-2010-nicks/release/scripts/modules/bpy_extras/io_utils.py branches/soc-2010-nicks/release/scripts/modules/bpy_extras/mesh_utils.py branches/soc-2010-nicks/release/scripts/modules/bpy_extras/object_utils.py branches/soc-2010-nicks/release/scripts/modules/bpy_extras/view3d_utils.py branches/soc-2010-nicks/release/scripts/modules/image_utils.py branches/soc-2010-nicks/release/scripts/modules/io_utils.py branches/soc-2010-nicks/release/scripts/modules/mesh_utils.py branches/soc-2010-nicks/source/blender/readblenfile/ branches/soc-2010-nicks/source/tools/darwin/ Property Changed: ---------------- branches/soc-2010-nicks/ branches/soc-2010-nicks/build_files/cmake/cmake_consistency_check.py branches/soc-2010-nicks/build_files/cmake/cmake_qtcreator_project.py branches/soc-2010-nicks/intern/bsp/test/BSP_GhostTest/BSP_GhostTest.dsp branches/soc-2010-nicks/intern/bsp/test/BSP_GhostTest/BSP_GhostTest.dsw branches/soc-2010-nicks/release/scripts/startup/bl_operators/add_mesh_torus.py branches/soc-2010-nicks/release/scripts/startup/bl_operators/uvcalc_smart_project.py branches/soc-2010-nicks/release/scripts/startup/bl_operators/vertexpaint_dirt.py branches/soc-2010-nicks/release/scripts/startup/bl_ui/properties_data_armature.py branches/soc-2010-nicks/release/scripts/startup/bl_ui/properties_data_bone.py branches/soc-2010-nicks/release/scripts/startup/bl_ui/properties_data_camera.py branches/soc-2010-nicks/release/scripts/startup/bl_ui/properties_data_empty.py branches/soc-2010-nicks/release/scripts/startup/bl_ui/properties_data_lamp.py branches/soc-2010-nicks/release/scripts/startup/bl_ui/properties_data_lattice.py branches/soc-2010-nicks/release/scripts/startup/bl_ui/properties_data_mesh.py branches/soc-2010-nicks/release/scripts/startup/bl_ui/properties_data_metaball.py branches/soc-2010-nicks/release/scripts/startup/bl_ui/properties_data_modifier.py branches/soc-2010-nicks/release/scripts/startup/bl_ui/properties_game.py branches/soc-2010-nicks/release/scripts/startup/bl_ui/properties_material.py branches/soc-2010-nicks/release/scripts/startup/bl_ui/properties_particle.py branches/soc-2010-nicks/release/scripts/startup/bl_ui/properties_physics_field.py branches/soc-2010-nicks/release/scripts/startup/bl_ui/properties_physics_fluid.py branches/soc-2010-nicks/release/scripts/startup/bl_ui/properties_physics_smoke.py branches/soc-2010-nicks/release/scripts/startup/bl_ui/properties_texture.py branches/soc-2010-nicks/release/scripts/startup/bl_ui/properties_world.py branches/soc-2010-nicks/release/scripts/startup/bl_ui/space_node.py branches/soc-2010-nicks/source/blender/editors/uvedit/uvedit_buttons.c branches/soc-2010-nicks/source/blender/python/generic/ branches/soc-2010-nicks/source/gameengine/GamePlayer/xembed/CMakeLists.txt branches/soc-2010-nicks/source/gameengine/VideoTexture/CMakeLists.txt Property changes on: branches/soc-2010-nicks ___________________________________________________________________ Modified: svn:mergeinfo - /trunk/blender:34794-36569 + /trunk/blender:34794-37212 Modified: branches/soc-2010-nicks/CMakeLists.txt =================================================================== --- branches/soc-2010-nicks/CMakeLists.txt 2011-06-05 18:35:18 UTC (rev 37217) +++ branches/soc-2010-nicks/CMakeLists.txt 2011-06-05 18:51:00 UTC (rev 37218) @@ -55,33 +55,19 @@ # quiet output for Makefiles, 'make -s' helps too # set_property(GLOBAL PROPERTY RULE_MESSAGES OFF) -# ignore system set flag, use our own -# must be before project(...) -# if the user wants to add their own its ok after first run. -if(DEFINED CMAKE_C_STANDARD_LIBRARIES) - set(_reset_standard_libraries OFF) -else() - set(_reset_standard_libraries ON) -endif() +#----------------------------------------------------------------------------- +# Load some macros. +include(build_files/cmake/macros.cmake) -project(Blender) +#----------------------------------------------------------------------------- +# Initialize project. +blender_project_hack_pre() -if (_reset_standard_libraries) - # Must come after project(...) - # - # MINGW workaround for -ladvapi32 being included which surprisingly causes - # string formatting of floats, eg: printf("%.*f", 3, value). to crash blender - # with a meaningless stack trace. by overriding this flag we ensure we only - # have libs we define and that cmake & scons builds match. - set(CMAKE_C_STANDARD_LIBRARIES "" CACHE STRING "" FORCE) - set(CMAKE_CXX_STANDARD_LIBRARIES "" CACHE STRING "" FORCE) - mark_as_advanced(CMAKE_C_STANDARD_LIBRARIES) - mark_as_advanced(CMAKE_CXX_STANDARD_LIBRARIES) -endif() -unset(_reset_standard_libraries) +project(Blender) +blender_project_hack_post() enable_testing() @@ -92,10 +78,6 @@ set(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/lib CACHE INTERNAL "" FORCE ) #----------------------------------------------------------------------------- -# Load some macros. -include(build_files/cmake/macros.cmake) - -#----------------------------------------------------------------------------- # Set default config options get_blender_version() @@ -106,7 +88,7 @@ option(WITH_PYTHON "Enable Embedded Python API (only disable for development)" ON) option(WITH_PYTHON_SECURITY "Disables execution of scripts within blend files by default (recommend to leave off)" OFF) mark_as_advanced(WITH_PYTHON) # dont want people disabling this unless they really know what they are doing. -mark_as_advanced(WITH_PYTHON_SECURITY) # some distrobutions see this as a security issue, rather then have them patch it, make a build option. +mark_as_advanced(WITH_PYTHON_SECURITY) # some distrobutions see this as a security issue, rather than have them patch it, make a build option. option(WITH_PYTHON_SAFETY "Enable internal API error checking to track invalid data to prevent crash on access (at the expense of some effeciency, only enable for development)." OFF) option(WITH_PYTHON_MODULE "Enable building as a python module (experemental, only enable for development)" OFF) @@ -116,6 +98,10 @@ option(WITH_BULLET "Enable Bullet (Physics Engine)" ON) option(WITH_GAMEENGINE "Enable Game Engine" ON) option(WITH_PLAYER "Build Player" OFF) + +option(WITH_HEADLESS "Build without graphical support (renderfarm, server mode only)" OFF) +mark_as_advanced(WITH_HEADLESS) + # (unix defaults to OpenMP On) if(UNIX AND NOT APPLE) option(WITH_OPENMP "Enable OpenMP (has to be supported by the compiler)" ON) @@ -175,6 +161,10 @@ endif() option(WITH_PYTHON_INSTALL "Copy system python into the blender install folder" ON) +# disable for now, but plan to support on all platforms eventually +option(WITH_MEM_JEMALLOC "Enable malloc replacement (http://www.canonware.com/jemalloc)" OFF) +mark_as_advanced(WITH_MEM_JEMALLOC) + # Debug option(WITH_CXX_GUARDEDALLOC "Enable GuardedAlloc for C++ memory allocation tracking (only enable for development)" OFF) mark_as_advanced(WITH_CXX_GUARDEDALLOC) @@ -198,9 +188,6 @@ option(WITH_LIBS10.5 "Use 10.5 libs (needed for 64bit builds)" OFF) endif() -# only for developers who want to make this functional -# option(WITH_LCMS "Enable color correction with lcms" OFF) - if(NOT WITH_GAMEENGINE AND WITH_PLAYER) message(FATAL_ERROR "WITH_PLAYER requires WITH_GAMEENGINE") endif() @@ -222,6 +209,11 @@ message(FATAL_ERROR "WITH_PYTHON_MODULE requires WITH_PYTHON_INSTALL to be OFF") endif() +# may as well build python module without a UI +if(WITH_PYTHON_MODULE) + set(WITH_HEADLESS ON) +endif() + # remove old vars unset(WITH_INSTALL CACHE) @@ -375,13 +367,6 @@ find_package(ZLIB REQUIRED) - if(WITH_LCMS) - set(LCMS /usr CACHE FILEPATH "LCMS directory") - set(LCMS_INCLUDE_DIR ${LCMS}/include) - set(LCMS_LIBRARY lcms) - set(LCMS_LIBPATH ${LCMS}/lib) - endif() - if(WITH_CODEC_FFMPEG) set(FFMPEG /usr CACHE FILEPATH "FFMPEG Directory") mark_as_advanced(FFMPEG) @@ -424,15 +409,28 @@ set(EXPAT_LIB expat) endif() - find_package(X11 REQUIRED) - find_path(X11_XF86keysym_INCLUDE_PATH X11/XF86keysym.h ${X11_INC_SEARCH_PATH}) - mark_as_advanced(X11_XF86keysym_INCLUDE_PATH) + if(WITH_MEM_JEMALLOC) + set(JEMALLOC /usr) + set(JEMALLOC_LIBRARY jemalloc CACHE STRING "JeMalloc library") + set(JEMALLOC_LIBPATH ${JEMALLOC}/lib CACHE FILEPATH "JeMalloc library path") + # no use for this yet. + # set(JEMALLOC_INCLUDE_DIR ${JEMALLOC}/include CACHE FILEPATH "JeMalloc include path") + unset(JEMALLOC) + endif() # OpenSuse needs lutil, ArchLinux not, for now keep, can avoid by using --as-needed - set(LLIBS "-lutil -lc -lm -lpthread -lstdc++ ${X11_X11_LIB}") + set(LLIBS "-lutil -lc -lm -lpthread -lstdc++") - if(WITH_X11_XINPUT) - list(APPEND LLIBS ${X11_Xinput_LIB}) + if(NOT WITH_HEADLESS) + find_package(X11 REQUIRED) + find_path(X11_XF86keysym_INCLUDE_PATH X11/XF86keysym.h ${X11_INC_SEARCH_PATH}) + mark_as_advanced(X11_XF86keysym_INCLUDE_PATH) + + list(APPEND LLIBS ${X11_X11_LIB}) + + if(WITH_X11_XINPUT) + list(APPEND LLIBS ${X11_Xinput_LIB}) + endif() endif() if(CMAKE_SYSTEM_NAME MATCHES "Linux") @@ -627,14 +625,7 @@ set(OPENCOLLADA_LIB OpenCOLLADASaxFrameworkLoader OpenCOLLADAFramework OpenCOLLADABaseUtils OpenCOLLADAStreamWriter MathMLSolver GeneratedSaxParser xml2 buffer ftoa UTF) set(PCRE_LIB pcre) endif() - - if(WITH_LCMS) - set(LCMS ${LIBDIR}/lcms) - set(LCMS_INCLUDE_DIR ${LCMS}/include) - set(LCMS_LIBPATH ${LCMS}/lib) - set(LCMS_LIB lcms) - endif() - + if(WITH_CODEC_FFMPEG) set(FFMPEG ${LIBDIR}/ffmpeg) set(FFMPEG_INC ${FFMPEG}/include ${FFMPEG}/include/msvc) @@ -870,7 +861,7 @@ set(GETTEXT_LIB intl iconv) set(GETTEXT_LIBPATH ${GETTEXT}/lib) endif() - + if(WITH_FFTW3) set(FFTW3 ${LIBDIR}/fftw3) set(FFTW3_INC ${FFTW3}/include) @@ -897,13 +888,6 @@ set(OPENEXR_LIBPATH ${OPENEXR}/lib) endif() - if(WITH_LCMS) - set(LCMS ${LIBDIR}/lcms) - set(LCMS_INCLUDE_DIR ${LCMS}/include) - set(LCMS_LIBRARY lcms) - set(LCMS_LIBPATH ${LCMS}/lib) - endif() - if(WITH_CODEC_FFMPEG) set(FFMPEG ${LIBDIR}/ffmpeg) set(FFMPEG_INC ${FFMPEG}/include) @@ -995,6 +979,12 @@ #----------------------------------------------------------------------------- # Common. +if(APPLE OR WIN32) + if(NOT IS_DIRECTORY "${LIBDIR}") + message(FATAL_ERROR "Apple and Windows require pre-compiled libs at: '${LIBDIR}'") + endif() +endif() + if(WITH_RAYOPTIMIZATION) if(CMAKE_COMPILER_IS_GNUCC) if(SUPPORT_SSE_BUILD) @@ -1155,9 +1145,9 @@ #------------------------------------------------------------------------------- # Global Defines -# better not define flags here but this is a debugging option thats off by default. +# better not set includes here but this debugging option is off by default. if(WITH_CXX_GUARDEDALLOC) - set(CMAKE_CXX_FLAGS " -DWITH_CXX_GUARDEDALLOC -I${CMAKE_SOURCE_DIR}/intern/guardedalloc ${CMAKE_CXX_FLAGS}") + include_directories(${CMAKE_SOURCE_DIR}/intern/guardedalloc) endif() if(WITH_ASSERT_ABORT) Modified: branches/soc-2010-nicks/build_files/buildbot/config/user-config-i686.py =================================================================== --- branches/soc-2010-nicks/build_files/buildbot/config/user-config-i686.py 2011-06-05 18:35:18 UTC (rev 37217) +++ branches/soc-2010-nicks/build_files/buildbot/config/user-config-i686.py 2011-06-05 18:51:00 UTC (rev 37218) @@ -29,7 +29,8 @@ '${BF_FFMPEG_LIBPATH}/libxvidcore.a ${BF_FFMPEG_LIBPATH}/libx264.a ${BF_FFMPEG_LIBPATH}/libmp3lame.a ' + \ '${BF_FFMPEG_LIBPATH}/libvpx.a ${BF_FFMPEG_LIBPATH}/libvorbis.a ${BF_FFMPEG_LIBPATH}/libogg.a ' + \ '${BF_FFMPEG_LIBPATH}/libvorbisenc.a ${BF_FFMPEG_LIBPATH}/libtheora.a ' + \ - '${BF_FFMPEG_LIBPATH}/libschroedinger-1.0.a ${BF_FFMPEG_LIBPATH}/liborc-0.4.a ${BF_FFMPEG_LIBPATH}/libdirac_encoder.a' + '${BF_FFMPEG_LIBPATH}/libschroedinger-1.0.a ${BF_FFMPEG_LIBPATH}/liborc-0.4.a ${BF_FFMPEG_LIBPATH}/libdirac_encoder.a ' + \ + '${BF_FFMPEG_LIBPATH}/libfaad.a' # Don't depend on system's libstdc++ WITH_BF_STATICCXX = True @@ -74,6 +75,12 @@ # Blender player (would be enabled in it's own config) WITH_BF_PLAYER = False +# Use jemalloc memory manager +WITH_BF_JEMALLOC = True +WITH_BF_STATICJEMALLOC = True +BF_JEMALLOC = '/home/sources/staticlibs/jemalloc' +BF_JEMALLOC_LIBPATH = '${BF_JEMALLOC}/lib32' + # Compilation and optimization BF_DEBUG = False REL_CFLAGS = ['-O2'] Modified: branches/soc-2010-nicks/build_files/buildbot/config/user-config-player-i686.py =================================================================== --- branches/soc-2010-nicks/build_files/buildbot/config/user-config-player-i686.py 2011-06-05 18:35:18 UTC (rev 37217) +++ branches/soc-2010-nicks/build_files/buildbot/config/user-config-player-i686.py 2011-06-05 18:51:00 UTC (rev 37218) @@ -59,6 +59,12 @@ WITH_BF_NOBLENDER = True WITH_BF_PLAYER = True +# Use jemalloc memory manager +WITH_BF_JEMALLOC = True +WITH_BF_STATICJEMALLOC = True +BF_JEMALLOC = '/home/sources/staticlibs/jemalloc' +BF_JEMALLOC_LIBPATH = '${BF_JEMALLOC}/lib32' + # Compilation and optimization BF_DEBUG = False REL_CFLAGS = ['-O2'] Modified: branches/soc-2010-nicks/build_files/buildbot/config/user-config-player-x86_64.py =================================================================== @@ Diff output truncated at 10240 characters. @@ _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org http://lists.blender.org/mailman/listinfo/bf-blender-cvs