[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [55060] branches/soc-2011-tomato: Merging r54848 through r55059 from trunk into soc-2011-tomato
Sergey Sharybin
sergey.vfx at gmail.com
Tue Mar 5 19:05:19 CET 2013
Revision: 55060
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=55060
Author: nazgul
Date: 2013-03-05 18:05:18 +0000 (Tue, 05 Mar 2013)
Log Message:
-----------
Merging r54848 through r55059 from trunk into soc-2011-tomato
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=54848
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=55059
Modified Paths:
--------------
branches/soc-2011-tomato/CMakeLists.txt
branches/soc-2011-tomato/SConstruct
branches/soc-2011-tomato/build_files/cmake/macros.cmake
branches/soc-2011-tomato/build_files/scons/tools/Blender.py
branches/soc-2011-tomato/doc/build_systems/cmake.txt
branches/soc-2011-tomato/doc/python_api/rst/bge.logic.rst
branches/soc-2011-tomato/extern/libmv/CMakeLists.txt
branches/soc-2011-tomato/extern/libmv/ChangeLog
branches/soc-2011-tomato/extern/libmv/SConscript
branches/soc-2011-tomato/extern/libmv/bundle.sh
branches/soc-2011-tomato/extern/libmv/files.txt
branches/soc-2011-tomato/extern/libmv/libmv/multiview/euclidean_resection.cc
branches/soc-2011-tomato/extern/libmv/libmv/simple_pipeline/bundle.cc
branches/soc-2011-tomato/extern/libmv/libmv/simple_pipeline/bundle.h
branches/soc-2011-tomato/extern/libmv/libmv/simple_pipeline/camera_intrinsics.cc
branches/soc-2011-tomato/extern/libmv/libmv/simple_pipeline/camera_intrinsics.h
branches/soc-2011-tomato/extern/libmv/libmv/simple_pipeline/intersect.cc
branches/soc-2011-tomato/extern/libmv/libmv/simple_pipeline/modal_solver.cc
branches/soc-2011-tomato/extern/libmv/libmv/simple_pipeline/pipeline.cc
branches/soc-2011-tomato/extern/libmv/libmv/tracking/track_region.cc
branches/soc-2011-tomato/extern/libmv/libmv-capi.cpp
branches/soc-2011-tomato/extern/libmv/libmv-capi.h
branches/soc-2011-tomato/extern/libmv/patches/series
branches/soc-2011-tomato/extern/libmv/third_party/ceres/CMakeLists.txt
branches/soc-2011-tomato/extern/libmv/third_party/ceres/ChangeLog
branches/soc-2011-tomato/extern/libmv/third_party/ceres/SConscript
branches/soc-2011-tomato/extern/libmv/third_party/ceres/bundle.sh
branches/soc-2011-tomato/extern/libmv/third_party/ceres/include/ceres/dynamic_autodiff_cost_function.h
branches/soc-2011-tomato/extern/libmv/third_party/ceres/include/ceres/internal/eigen.h
branches/soc-2011-tomato/extern/libmv/third_party/ceres/include/ceres/problem.h
branches/soc-2011-tomato/extern/libmv/third_party/ceres/include/ceres/solver.h
branches/soc-2011-tomato/extern/libmv/third_party/ceres/internal/ceres/block_random_access_dense_matrix.cc
branches/soc-2011-tomato/extern/libmv/third_party/ceres/internal/ceres/block_random_access_dense_matrix.h
branches/soc-2011-tomato/extern/libmv/third_party/ceres/internal/ceres/cxsparse.cc
branches/soc-2011-tomato/extern/libmv/third_party/ceres/internal/ceres/dense_normal_cholesky_solver.cc
branches/soc-2011-tomato/extern/libmv/third_party/ceres/internal/ceres/dense_sparse_matrix.cc
branches/soc-2011-tomato/extern/libmv/third_party/ceres/internal/ceres/dense_sparse_matrix.h
branches/soc-2011-tomato/extern/libmv/third_party/ceres/internal/ceres/evaluator.cc
branches/soc-2011-tomato/extern/libmv/third_party/ceres/internal/ceres/evaluator.h
branches/soc-2011-tomato/extern/libmv/third_party/ceres/internal/ceres/generate_eliminator_specialization.py
branches/soc-2011-tomato/extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_2_2_2.cc
branches/soc-2011-tomato/extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_2_2_3.cc
branches/soc-2011-tomato/extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_2_2_4.cc
branches/soc-2011-tomato/extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_2_2_d.cc
branches/soc-2011-tomato/extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_2_3_3.cc
branches/soc-2011-tomato/extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_2_3_4.cc
branches/soc-2011-tomato/extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_2_3_9.cc
branches/soc-2011-tomato/extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_2_3_d.cc
branches/soc-2011-tomato/extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_2_4_3.cc
branches/soc-2011-tomato/extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_2_4_4.cc
branches/soc-2011-tomato/extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_2_4_d.cc
branches/soc-2011-tomato/extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_4_4_2.cc
branches/soc-2011-tomato/extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_4_4_3.cc
branches/soc-2011-tomato/extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_4_4_4.cc
branches/soc-2011-tomato/extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_4_4_d.cc
branches/soc-2011-tomato/extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_d_d_d.cc
branches/soc-2011-tomato/extern/libmv/third_party/ceres/internal/ceres/line_search_direction.cc
branches/soc-2011-tomato/extern/libmv/third_party/ceres/internal/ceres/linear_solver.h
branches/soc-2011-tomato/extern/libmv/third_party/ceres/internal/ceres/mutex.h
branches/soc-2011-tomato/extern/libmv/third_party/ceres/internal/ceres/preconditioner.h
branches/soc-2011-tomato/extern/libmv/third_party/ceres/internal/ceres/problem_impl.cc
branches/soc-2011-tomato/extern/libmv/third_party/ceres/internal/ceres/program_evaluator.h
branches/soc-2011-tomato/extern/libmv/third_party/ceres/internal/ceres/residual_block.cc
branches/soc-2011-tomato/extern/libmv/third_party/ceres/internal/ceres/residual_block.h
branches/soc-2011-tomato/extern/libmv/third_party/ceres/internal/ceres/schur_eliminator.cc
branches/soc-2011-tomato/extern/libmv/third_party/ceres/internal/ceres/schur_eliminator.h
branches/soc-2011-tomato/extern/libmv/third_party/ceres/internal/ceres/solver.cc
branches/soc-2011-tomato/extern/libmv/third_party/ceres/internal/ceres/solver_impl.cc
branches/soc-2011-tomato/extern/libmv/third_party/ceres/internal/ceres/visibility.cc
branches/soc-2011-tomato/extern/libmv/third_party/ceres/internal/ceres/visibility_based_preconditioner.h
branches/soc-2011-tomato/intern/audaspace/FX/AUD_IDynamicIIRFilterCalculator.h
branches/soc-2011-tomato/intern/audaspace/ffmpeg/AUD_FFMPEGReader.cpp
branches/soc-2011-tomato/intern/audaspace/intern/AUD_Sequencer.h
branches/soc-2011-tomato/intern/cycles/blender/addon/properties.py
branches/soc-2011-tomato/intern/cycles/blender/addon/ui.py
branches/soc-2011-tomato/intern/cycles/blender/blender_object.cpp
branches/soc-2011-tomato/intern/cycles/render/object.cpp
branches/soc-2011-tomato/intern/elbeem/intern/ntl_geometrymodel.cpp
branches/soc-2011-tomato/intern/elbeem/intern/ntl_geometryobject.cpp
branches/soc-2011-tomato/intern/elbeem/intern/ntl_geometryobject.h
branches/soc-2011-tomato/intern/elbeem/intern/ntl_ray.cpp
branches/soc-2011-tomato/intern/elbeem/intern/ntl_ray.h
branches/soc-2011-tomato/intern/elbeem/intern/solver_main.cpp
branches/soc-2011-tomato/intern/elbeem/intern/solver_util.cpp
branches/soc-2011-tomato/intern/ffmpeg/ffmpeg_compat.h
branches/soc-2011-tomato/intern/ghost/intern/GHOST_SystemCocoa.mm
branches/soc-2011-tomato/intern/ghost/intern/GHOST_SystemWin32.cpp
branches/soc-2011-tomato/intern/ghost/intern/GHOST_WindowCocoa.mm
branches/soc-2011-tomato/intern/ghost/intern/GHOST_WindowWin32.cpp
branches/soc-2011-tomato/intern/iksolver/intern/IK_Solver.cpp
branches/soc-2011-tomato/intern/itasc/Armature.cpp
branches/soc-2011-tomato/intern/itasc/Armature.hpp
branches/soc-2011-tomato/intern/itasc/kdl/segment.cpp
branches/soc-2011-tomato/intern/locale/boost_locale_wrapper.cpp
branches/soc-2011-tomato/intern/locale/boost_locale_wrapper.h
branches/soc-2011-tomato/intern/smoke/intern/FLUID_3D.h
branches/soc-2011-tomato/intern/smoke/intern/FLUID_3D_STATIC.cpp
branches/soc-2011-tomato/intern/smoke/intern/WTURBULENCE.h
branches/soc-2011-tomato/release/datafiles/startup.blend
branches/soc-2011-tomato/release/scripts/modules/bl_i18n_utils/bl_extract_messages.py
branches/soc-2011-tomato/release/scripts/modules/bl_i18n_utils/settings.py
branches/soc-2011-tomato/release/scripts/modules/bl_i18n_utils/spell_check_utils.py
branches/soc-2011-tomato/release/scripts/modules/bl_i18n_utils/utils.py
branches/soc-2011-tomato/release/scripts/modules/bpy_extras/keyconfig_utils.py
branches/soc-2011-tomato/release/scripts/presets/operator/wm.collada_export/second_life_rigged.py
branches/soc-2011-tomato/release/scripts/presets/operator/wm.collada_export/second_life_static.py
branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_data_modifier.py
branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_object_constraint.py
branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_physics_fluid.py
branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_scene.py
branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_texture.py
branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_clip.py
branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_sequencer.py
branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_userpref_keymap.py
branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_view3d.py
branches/soc-2011-tomato/source/blender/blenfont/intern/blf_dir.c
branches/soc-2011-tomato/source/blender/blenfont/intern/blf_lang.c
branches/soc-2011-tomato/source/blender/blenfont/intern/blf_translation.c
branches/soc-2011-tomato/source/blender/blenkernel/BKE_blender.h
branches/soc-2011-tomato/source/blender/blenkernel/BKE_depsgraph.h
branches/soc-2011-tomato/source/blender/blenkernel/BKE_node.h
branches/soc-2011-tomato/source/blender/blenkernel/BKE_report.h
branches/soc-2011-tomato/source/blender/blenkernel/BKE_rigidbody.h
branches/soc-2011-tomato/source/blender/blenkernel/BKE_sequencer.h
branches/soc-2011-tomato/source/blender/blenkernel/BKE_tracking.h
branches/soc-2011-tomato/source/blender/blenkernel/depsgraph_private.h
branches/soc-2011-tomato/source/blender/blenkernel/intern/DerivedMesh.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/blender.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/cloth.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/collision.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/customdata.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/customdata_file.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/deform.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/depsgraph.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/dynamicpaint.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/fcurve.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/font.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/mask.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/mesh.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/mesh_validate.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/modifier.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/movieclip.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/nla.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/node.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/object.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/packedFile.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/pbvh.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/pbvh_bmesh.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/pointcache.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/rigidbody.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/scene.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/seqmodifier.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/sequencer.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/text.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/texture.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/tracking.c
branches/soc-2011-tomato/source/blender/blenlib/BLI_fileops.h
branches/soc-2011-tomato/source/blender/blenlib/BLI_fileops_types.h
branches/soc-2011-tomato/source/blender/blenlib/BLI_ghash.h
branches/soc-2011-tomato/source/blender/blenlib/BLI_math_geom.h
branches/soc-2011-tomato/source/blender/blenlib/BLI_path_util.h
branches/soc-2011-tomato/source/blender/blenlib/BLI_string.h
branches/soc-2011-tomato/source/blender/blenlib/BLI_utildefines.h
branches/soc-2011-tomato/source/blender/blenlib/BLI_winstuff.h
branches/soc-2011-tomato/source/blender/blenlib/intern/BLI_ghash.c
branches/soc-2011-tomato/source/blender/blenlib/intern/fileops.c
branches/soc-2011-tomato/source/blender/blenlib/intern/math_geom.c
branches/soc-2011-tomato/source/blender/blenlib/intern/path_util.c
branches/soc-2011-tomato/source/blender/blenlib/intern/storage.c
branches/soc-2011-tomato/source/blender/blenlib/intern/string.c
branches/soc-2011-tomato/source/blender/blenlib/intern/threads.c
branches/soc-2011-tomato/source/blender/blenlib/intern/winstuff.c
branches/soc-2011-tomato/source/blender/blenloader/intern/readfile.c
branches/soc-2011-tomato/source/blender/blenloader/intern/versioning_legacy.c
branches/soc-2011-tomato/source/blender/blenloader/intern/writefile.c
branches/soc-2011-tomato/source/blender/bmesh/intern/bmesh_iterators_inline.h
branches/soc-2011-tomato/source/blender/bmesh/intern/bmesh_log.c
branches/soc-2011-tomato/source/blender/bmesh/intern/bmesh_operator_api_inline.h
branches/soc-2011-tomato/source/blender/bmesh/operators/bmo_hull.c
branches/soc-2011-tomato/source/blender/collada/ArmatureImporter.cpp
branches/soc-2011-tomato/source/blender/collada/ArmatureImporter.h
branches/soc-2011-tomato/source/blender/collada/CMakeLists.txt
branches/soc-2011-tomato/source/blender/collada/ControllerExporter.cpp
branches/soc-2011-tomato/source/blender/collada/DocumentExporter.cpp
branches/soc-2011-tomato/source/blender/collada/DocumentImporter.cpp
branches/soc-2011-tomato/source/blender/collada/EffectExporter.cpp
branches/soc-2011-tomato/source/blender/collada/ExportSettings.h
branches/soc-2011-tomato/source/blender/collada/GeometryExporter.cpp
branches/soc-2011-tomato/source/blender/collada/GeometryExporter.h
branches/soc-2011-tomato/source/blender/collada/MeshImporter.cpp
branches/soc-2011-tomato/source/blender/collada/MeshImporter.h
branches/soc-2011-tomato/source/blender/collada/SConscript
branches/soc-2011-tomato/source/blender/collada/TransformReader.cpp
branches/soc-2011-tomato/source/blender/collada/collada.cpp
branches/soc-2011-tomato/source/blender/collada/collada.h
branches/soc-2011-tomato/source/blender/collada/collada_utils.cpp
branches/soc-2011-tomato/source/blender/collada/collada_utils.h
branches/soc-2011-tomato/source/blender/compositor/COM_compositor.h
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_ImageNode.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_TextureOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_TextureOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_TranslateOperation.h
branches/soc-2011-tomato/source/blender/editors/armature/CMakeLists.txt
branches/soc-2011-tomato/source/blender/editors/armature/armature_intern.h
branches/soc-2011-tomato/source/blender/editors/armature/armature_ops.c
branches/soc-2011-tomato/source/blender/editors/armature/editarmature_generate.c
branches/soc-2011-tomato/source/blender/editors/armature/editarmature_retarget.c
branches/soc-2011-tomato/source/blender/editors/armature/editarmature_sketch.c
branches/soc-2011-tomato/source/blender/editors/armature/meshlaplacian.c
branches/soc-2011-tomato/source/blender/editors/armature/reeb.c
branches/soc-2011-tomato/source/blender/editors/gpencil/gpencil_paint.c
branches/soc-2011-tomato/source/blender/editors/include/ED_armature.h
branches/soc-2011-tomato/source/blender/editors/include/ED_view3d.h
branches/soc-2011-tomato/source/blender/editors/include/UI_interface.h
branches/soc-2011-tomato/source/blender/editors/interface/interface.c
branches/soc-2011-tomato/source/blender/editors/interface/interface_draw.c
branches/soc-2011-tomato/source/blender/editors/interface/interface_handlers.c
branches/soc-2011-tomato/source/blender/editors/interface/interface_icons.c
branches/soc-2011-tomato/source/blender/editors/interface/interface_intern.h
branches/soc-2011-tomato/source/blender/editors/interface/interface_layout.c
branches/soc-2011-tomato/source/blender/editors/interface/interface_ops.c
branches/soc-2011-tomato/source/blender/editors/interface/interface_templates.c
branches/soc-2011-tomato/source/blender/editors/interface/interface_widgets.c
branches/soc-2011-tomato/source/blender/editors/interface/resources.c
branches/soc-2011-tomato/source/blender/editors/interface/view2d_ops.c
branches/soc-2011-tomato/source/blender/editors/io/io_collada.c
branches/soc-2011-tomato/source/blender/editors/mesh/editface.c
branches/soc-2011-tomato/source/blender/editors/mesh/editmesh_select.c
branches/soc-2011-tomato/source/blender/editors/mesh/editmesh_tools.c
branches/soc-2011-tomato/source/blender/editors/mesh/mesh_data.c
branches/soc-2011-tomato/source/blender/editors/mesh/meshtools.c
branches/soc-2011-tomato/source/blender/editors/object/object_add.c
branches/soc-2011-tomato/source/blender/editors/object/object_modifier.c
branches/soc-2011-tomato/source/blender/editors/object/object_transform.c
branches/soc-2011-tomato/source/blender/editors/object/object_vgroup.c
branches/soc-2011-tomato/source/blender/editors/physics/physics_fluid.c
branches/soc-2011-tomato/source/blender/editors/render/render_preview.c
branches/soc-2011-tomato/source/blender/editors/screen/screen_ops.c
branches/soc-2011-tomato/source/blender/editors/screen/screendump.c
branches/soc-2011-tomato/source/blender/editors/sculpt_paint/paint_cursor.c
branches/soc-2011-tomato/source/blender/editors/sculpt_paint/paint_image.c
branches/soc-2011-tomato/source/blender/editors/sculpt_paint/paint_intern.h
branches/soc-2011-tomato/source/blender/editors/sculpt_paint/paint_mask.c
branches/soc-2011-tomato/source/blender/editors/sculpt_paint/paint_ops.c
branches/soc-2011-tomato/source/blender/editors/sculpt_paint/paint_stroke.c
branches/soc-2011-tomato/source/blender/editors/sculpt_paint/paint_utils.c
branches/soc-2011-tomato/source/blender/editors/sculpt_paint/paint_vertex.c
branches/soc-2011-tomato/source/blender/editors/sculpt_paint/sculpt.c
branches/soc-2011-tomato/source/blender/editors/sculpt_paint/sculpt_undo.c
branches/soc-2011-tomato/source/blender/editors/sculpt_paint/sculpt_uv.c
branches/soc-2011-tomato/source/blender/editors/space_buttons/buttons_ops.c
branches/soc-2011-tomato/source/blender/editors/space_clip/clip_dopesheet_ops.c
branches/soc-2011-tomato/source/blender/editors/space_clip/clip_intern.h
branches/soc-2011-tomato/source/blender/editors/space_clip/clip_ops.c
branches/soc-2011-tomato/source/blender/editors/space_clip/space_clip.c
branches/soc-2011-tomato/source/blender/editors/space_clip/tracking_ops.c
branches/soc-2011-tomato/source/blender/editors/space_file/file_draw.c
branches/soc-2011-tomato/source/blender/editors/space_file/file_ops.c
branches/soc-2011-tomato/source/blender/editors/space_file/filelist.c
branches/soc-2011-tomato/source/blender/editors/space_file/filesel.c
branches/soc-2011-tomato/source/blender/editors/space_file/fsmenu.h
branches/soc-2011-tomato/source/blender/editors/space_file/space_file.c
branches/soc-2011-tomato/source/blender/editors/space_graph/graph_buttons.c
branches/soc-2011-tomato/source/blender/editors/space_image/image_buttons.c
branches/soc-2011-tomato/source/blender/editors/space_image/image_intern.h
branches/soc-2011-tomato/source/blender/editors/space_image/image_ops.c
branches/soc-2011-tomato/source/blender/editors/space_image/space_image.c
branches/soc-2011-tomato/source/blender/editors/space_node/drawnode.c
branches/soc-2011-tomato/source/blender/editors/space_node/node_add.c
branches/soc-2011-tomato/source/blender/editors/space_node/node_relationships.c
branches/soc-2011-tomato/source/blender/editors/space_outliner/outliner_tools.c
branches/soc-2011-tomato/source/blender/editors/space_sequencer/sequencer_add.c
branches/soc-2011-tomato/source/blender/editors/space_sequencer/sequencer_draw.c
branches/soc-2011-tomato/source/blender/editors/space_sequencer/space_sequencer.c
branches/soc-2011-tomato/source/blender/editors/space_text/text_format.c
branches/soc-2011-tomato/source/blender/editors/space_view3d/space_view3d.c
branches/soc-2011-tomato/source/blender/editors/space_view3d/view3d_draw.c
branches/soc-2011-tomato/source/blender/editors/space_view3d/view3d_edit.c
branches/soc-2011-tomato/source/blender/editors/space_view3d/view3d_header.c
branches/soc-2011-tomato/source/blender/editors/space_view3d/view3d_intern.h
branches/soc-2011-tomato/source/blender/editors/space_view3d/view3d_project.c
branches/soc-2011-tomato/source/blender/editors/space_view3d/view3d_select.c
branches/soc-2011-tomato/source/blender/editors/transform/transform.c
branches/soc-2011-tomato/source/blender/editors/transform/transform.h
branches/soc-2011-tomato/source/blender/editors/transform/transform_constraints.c
branches/soc-2011-tomato/source/blender/editors/transform/transform_conversions.c
branches/soc-2011-tomato/source/blender/editors/transform/transform_manipulator.c
branches/soc-2011-tomato/source/blender/editors/transform/transform_orientations.c
branches/soc-2011-tomato/source/blender/editors/util/ed_util.c
branches/soc-2011-tomato/source/blender/editors/util/undo.c
branches/soc-2011-tomato/source/blender/editors/uvedit/uvedit_ops.c
branches/soc-2011-tomato/source/blender/editors/uvedit/uvedit_smart_stitch.c
branches/soc-2011-tomato/source/blender/gpu/CMakeLists.txt
branches/soc-2011-tomato/source/blender/gpu/GPU_extensions.h
branches/soc-2011-tomato/source/blender/gpu/SConscript
branches/soc-2011-tomato/source/blender/gpu/intern/gpu_codegen.c
branches/soc-2011-tomato/source/blender/gpu/intern/gpu_extensions.c
branches/soc-2011-tomato/source/blender/gpu/intern/gpu_material.c
branches/soc-2011-tomato/source/blender/gpu/shaders/gpu_shader_vertex.glsl
branches/soc-2011-tomato/source/blender/ikplugin/intern/itasc_plugin.cpp
branches/soc-2011-tomato/source/blender/imbuf/IMB_imbuf_types.h
branches/soc-2011-tomato/source/blender/imbuf/intern/anim_movie.c
branches/soc-2011-tomato/source/blender/imbuf/intern/bmp.c
branches/soc-2011-tomato/source/blender/imbuf/intern/cineon/cineon_dpx.c
branches/soc-2011-tomato/source/blender/imbuf/intern/cineon/logImageCore.c
branches/soc-2011-tomato/source/blender/imbuf/intern/colormanagement.c
branches/soc-2011-tomato/source/blender/imbuf/intern/filetype.c
branches/soc-2011-tomato/source/blender/imbuf/intern/imageprocess.c
branches/soc-2011-tomato/source/blender/imbuf/intern/indexer.c
branches/soc-2011-tomato/source/blender/imbuf/intern/iris.c
branches/soc-2011-tomato/source/blender/imbuf/intern/jpeg.c
branches/soc-2011-tomato/source/blender/imbuf/intern/png.c
branches/soc-2011-tomato/source/blender/imbuf/intern/radiance_hdr.c
branches/soc-2011-tomato/source/blender/imbuf/intern/readimage.c
branches/soc-2011-tomato/source/blender/imbuf/intern/rectop.c
branches/soc-2011-tomato/source/blender/imbuf/intern/targa.c
branches/soc-2011-tomato/source/blender/imbuf/intern/thumbs.c
branches/soc-2011-tomato/source/blender/imbuf/intern/util.c
branches/soc-2011-tomato/source/blender/makesdna/DNA_action_types.h
branches/soc-2011-tomato/source/blender/makesdna/DNA_actuator_types.h
branches/soc-2011-tomato/source/blender/makesdna/DNA_anim_types.h
branches/soc-2011-tomato/source/blender/makesdna/DNA_controller_types.h
branches/soc-2011-tomato/source/blender/makesdna/DNA_customdata_types.h
branches/soc-2011-tomato/source/blender/makesdna/DNA_defs.h
branches/soc-2011-tomato/source/blender/makesdna/DNA_group_types.h
branches/soc-2011-tomato/source/blender/makesdna/DNA_image_types.h
branches/soc-2011-tomato/source/blender/makesdna/DNA_key_types.h
branches/soc-2011-tomato/source/blender/makesdna/DNA_mask_types.h
branches/soc-2011-tomato/source/blender/makesdna/DNA_node_types.h
branches/soc-2011-tomato/source/blender/makesdna/DNA_property_types.h
branches/soc-2011-tomato/source/blender/makesdna/DNA_rigidbody_types.h
branches/soc-2011-tomato/source/blender/makesdna/DNA_sensor_types.h
branches/soc-2011-tomato/source/blender/makesdna/DNA_sequence_types.h
branches/soc-2011-tomato/source/blender/makesdna/DNA_space_types.h
branches/soc-2011-tomato/source/blender/makesdna/DNA_text_types.h
branches/soc-2011-tomato/source/blender/makesdna/DNA_texture_types.h
branches/soc-2011-tomato/source/blender/makesdna/DNA_tracking_types.h
branches/soc-2011-tomato/source/blender/makesdna/DNA_vfont_types.h
branches/soc-2011-tomato/source/blender/makesrna/intern/CMakeLists.txt
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_access.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_fluidsim.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_image.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_main.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_main_api.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_modifier.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_nodetree.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_render.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_scene.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_scene_api.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_space.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_texture.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_texture_api.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_tracking.c
branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_cast.c
branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_meshcache.c
branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_solidify.c
branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_subsurf.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_outputFile.c
branches/soc-2011-tomato/source/blender/nodes/intern/node_exec.c
branches/soc-2011-tomato/source/blender/python/intern/bpy.c
branches/soc-2011-tomato/source/blender/python/intern/bpy_app.c
branches/soc-2011-tomato/source/blender/python/intern/bpy_app_translations.c
branches/soc-2011-tomato/source/blender/python/intern/bpy_interface.c
branches/soc-2011-tomato/source/blender/python/intern/bpy_rna.c
branches/soc-2011-tomato/source/blender/python/intern/bpy_rna_anim.c
branches/soc-2011-tomato/source/blender/python/intern/bpy_traceback.c
branches/soc-2011-tomato/source/blender/quicktime/apple/qtkit_import.m
branches/soc-2011-tomato/source/blender/render/CMakeLists.txt
branches/soc-2011-tomato/source/blender/render/intern/raytrace/reorganize.h
branches/soc-2011-tomato/source/blender/render/intern/source/bake.c
branches/soc-2011-tomato/source/blender/render/intern/source/convertblender.c
branches/soc-2011-tomato/source/blender/render/intern/source/imagetexture.c
branches/soc-2011-tomato/source/blender/render/intern/source/occlusion.c
branches/soc-2011-tomato/source/blender/render/intern/source/pipeline.c
branches/soc-2011-tomato/source/blender/render/intern/source/render_result.c
branches/soc-2011-tomato/source/blender/windowmanager/WM_api.h
branches/soc-2011-tomato/source/blender/windowmanager/intern/wm_draw.c
branches/soc-2011-tomato/source/blender/windowmanager/intern/wm_event_system.c
branches/soc-2011-tomato/source/blender/windowmanager/intern/wm_files.c
branches/soc-2011-tomato/source/blender/windowmanager/intern/wm_operators.c
branches/soc-2011-tomato/source/blender/windowmanager/intern/wm_playanim.c
branches/soc-2011-tomato/source/blender/windowmanager/wm_event_types.h
branches/soc-2011-tomato/source/creator/CMakeLists.txt
branches/soc-2011-tomato/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
branches/soc-2011-tomato/source/gameengine/Converter/BL_BlenderDataConversion.cpp
branches/soc-2011-tomato/source/gameengine/Expressions/Value.h
branches/soc-2011-tomato/source/gameengine/GameLogic/Joystick/SCA_Joystick.cpp
branches/soc-2011-tomato/source/gameengine/GameLogic/Joystick/SCA_JoystickDefines.h
branches/soc-2011-tomato/source/gameengine/GamePlayer/common/GPC_Canvas.h
branches/soc-2011-tomato/source/gameengine/Ketsji/BL_BlenderShader.cpp
branches/soc-2011-tomato/source/gameengine/Ketsji/CMakeLists.txt
branches/soc-2011-tomato/source/gameengine/Ketsji/KX_ConvertPhysicsObjects.cpp
branches/soc-2011-tomato/source/gameengine/Ketsji/KX_GameObject.cpp
branches/soc-2011-tomato/source/gameengine/Ketsji/KX_IpoConvert.cpp
branches/soc-2011-tomato/source/gameengine/Ketsji/KX_IpoConvert.h
branches/soc-2011-tomato/source/gameengine/Ketsji/KX_PythonInit.cpp
branches/soc-2011-tomato/source/gameengine/Network/NG_NetworkScene.h
branches/soc-2011-tomato/source/gameengine/Rasterizer/RAS_2DFilterManager.cpp
branches/soc-2011-tomato/source/gameengine/Rasterizer/RAS_IRasterizer.h
branches/soc-2011-tomato/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp
branches/soc-2011-tomato/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.h
branches/soc-2011-tomato/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_StorageIM.cpp
branches/soc-2011-tomato/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_StorageIM.h
branches/soc-2011-tomato/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_StorageVA.cpp
branches/soc-2011-tomato/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_StorageVA.h
branches/soc-2011-tomato/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_StorageVBO.cpp
branches/soc-2011-tomato/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_StorageVBO.h
branches/soc-2011-tomato/source/gameengine/Rasterizer/SConscript
branches/soc-2011-tomato/source/tests/CMakeLists.txt
branches/soc-2011-tomato/source/tools/check_style_c.py
Added Paths:
-----------
branches/soc-2011-tomato/extern/libmv/libmv/multiview/panography.h
branches/soc-2011-tomato/source/blender/editors/armature/armature_add.c
branches/soc-2011-tomato/source/blender/editors/armature/armature_edit.c
branches/soc-2011-tomato/source/blender/editors/armature/armature_naming.c
branches/soc-2011-tomato/source/blender/editors/armature/armature_relations.c
branches/soc-2011-tomato/source/blender/editors/armature/armature_select.c
branches/soc-2011-tomato/source/blender/editors/armature/armature_skinning.c
branches/soc-2011-tomato/source/blender/editors/armature/armature_utils.c
branches/soc-2011-tomato/source/blender/editors/armature/pose_edit.c
branches/soc-2011-tomato/source/blender/editors/armature/pose_group.c
branches/soc-2011-tomato/source/blender/editors/armature/pose_lib.c
branches/soc-2011-tomato/source/blender/editors/armature/pose_select.c
branches/soc-2011-tomato/source/blender/editors/armature/pose_slide.c
branches/soc-2011-tomato/source/blender/editors/armature/pose_transform.c
branches/soc-2011-tomato/source/blender/editors/armature/pose_utils.c
branches/soc-2011-tomato/source/blender/gpu/intern/gpu_fixed_material.c
branches/soc-2011-tomato/source/blender/gpu/shaders/gpu_shader_fixed_fragment.glsl
branches/soc-2011-tomato/source/blender/gpu/shaders/gpu_shader_fixed_vertex.glsl
branches/soc-2011-tomato/source/tests/bl_keymap_completeness.py
Removed Paths:
-------------
branches/soc-2011-tomato/extern/libmv/libmv/simple_pipeline/rigid_registration.cc
branches/soc-2011-tomato/extern/libmv/libmv/simple_pipeline/rigid_registration.h
branches/soc-2011-tomato/extern/libmv/patches/v3d_verbosity.patch
branches/soc-2011-tomato/extern/libmv/third_party/ldl/
branches/soc-2011-tomato/extern/libmv/third_party/ssba/
branches/soc-2011-tomato/source/blender/editors/armature/editarmature.c
branches/soc-2011-tomato/source/blender/editors/armature/poseSlide.c
branches/soc-2011-tomato/source/blender/editors/armature/poseUtils.c
branches/soc-2011-tomato/source/blender/editors/armature/poselib.c
branches/soc-2011-tomato/source/blender/editors/armature/poseobject.c
Property Changed:
----------------
branches/soc-2011-tomato/
branches/soc-2011-tomato/extern/libmv/third_party/ceres/include/ceres/cost_function_to_functor.h
branches/soc-2011-tomato/extern/libmv/third_party/ceres/include/ceres/dynamic_autodiff_cost_function.h
branches/soc-2011-tomato/extern/libmv/third_party/ceres/include/ceres/gradient_checker.h
branches/soc-2011-tomato/extern/libmv/third_party/ceres/include/ceres/internal/variadic_evaluate.h
branches/soc-2011-tomato/extern/libmv/third_party/ceres/include/ceres/numeric_diff_functor.h
branches/soc-2011-tomato/extern/libmv/third_party/ceres/include/ceres/ordered_groups.h
branches/soc-2011-tomato/extern/libmv/third_party/ceres/internal/ceres/coordinate_descent_minimizer.cc
branches/soc-2011-tomato/extern/libmv/third_party/ceres/internal/ceres/line_search.cc
branches/soc-2011-tomato/extern/libmv/third_party/ceres/internal/ceres/line_search.h
branches/soc-2011-tomato/extern/libmv/third_party/ceres/internal/ceres/line_search_direction.cc
branches/soc-2011-tomato/extern/libmv/third_party/ceres/internal/ceres/line_search_minimizer.cc
branches/soc-2011-tomato/extern/libmv/third_party/ceres/internal/ceres/low_rank_inverse_hessian.cc
branches/soc-2011-tomato/extern/libmv/third_party/ceres/internal/ceres/low_rank_inverse_hessian.h
branches/soc-2011-tomato/extern/libmv/third_party/ceres/internal/ceres/preconditioner.h
branches/soc-2011-tomato/extern/libmv/third_party/ceres/internal/ceres/schur_jacobi_preconditioner.cc
branches/soc-2011-tomato/extern/libmv/third_party/ceres/internal/ceres/schur_jacobi_preconditioner.h
branches/soc-2011-tomato/source/blender/editors/interface/interface.c
branches/soc-2011-tomato/source/blender/editors/space_outliner/
Property changes on: branches/soc-2011-tomato
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/ge_harmony:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/vgroup_modifiers:38694-39989
/trunk/blender:36831-54847
+ /branches/ge_harmony:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/vgroup_modifiers:38694-39989
/trunk/blender:36831-55059
Modified: branches/soc-2011-tomato/CMakeLists.txt
===================================================================
--- branches/soc-2011-tomato/CMakeLists.txt 2013-03-05 15:15:53 UTC (rev 55059)
+++ branches/soc-2011-tomato/CMakeLists.txt 2013-03-05 18:05:18 UTC (rev 55060)
@@ -1968,21 +1968,28 @@
# strange, clang complains these are not supported, but then yses them.
ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_ALL -Wall)
+ ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_ERROR_DECLARATION_AFTER_STATEMENT -Werror=declaration-after-statement)
+ ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_ERROR_IMPLICIT_FUNCTION_DECLARATION -Werror=implicit-function-declaration)
+ ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_ERROR_RETURN_TYPE -Werror=return-type)
ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_NO_AUTOLOGICAL_COMPARE -Wno-tautological-compare)
ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_NO_UNKNOWN_PRAGMAS -Wno-unknown-pragmas)
ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_NO_CHAR_SUBSCRIPTS -Wno-char-subscripts)
ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_STRICT_PROTOTYPES -Wstrict-prototypes)
ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_MISSING_PROTOTYPES -Wmissing-prototypes)
- ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_UNUSED_MACROS -Wunused-macros)
+ ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_UNUSED_PARAMETER -Wunused-parameter)
ADD_CHECK_CXX_COMPILER_FLAG(CXX_WARNINGS CXX_WARN_ALL -Wall)
ADD_CHECK_CXX_COMPILER_FLAG(CXX_WARNINGS CXX_WARN_NO_AUTOLOGICAL_COMPARE -Wno-tautological-compare)
ADD_CHECK_CXX_COMPILER_FLAG(CXX_WARNINGS CXX_WARN_NO_UNKNOWN_PRAGMAS -Wno-unknown-pragmas)
ADD_CHECK_CXX_COMPILER_FLAG(CXX_WARNINGS CXX_WARN_NO_CHAR_SUBSCRIPTS -Wno-char-subscripts)
ADD_CHECK_CXX_COMPILER_FLAG(CXX_WARNINGS CXX_WARN_NO_OVERLOADED_VIRTUAL -Wno-overloaded-virtual) # we get a lot of these, if its a problem a dev needs to look into it.
+ ADD_CHECK_CXX_COMPILER_FLAG(CXX_WARNINGS CXX_WARN_NO_SIGN_COMPARE -Wno-sign-compare)
ADD_CHECK_CXX_COMPILER_FLAG(CXX_WARNINGS CXX_WARN_NO_INVALID_OFFSETOF -Wno-invalid-offsetof)
- ADD_CHECK_CXX_COMPILER_FLAG(CXX_WARNINGS CXX_WARN_UNUSED_MACROS -Wunused-macros)
+ # gives too many unfixable warnings
+ # ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_UNUSED_MACROS -Wunused-macros)
+ # ADD_CHECK_CXX_COMPILER_FLAG(CXX_WARNINGS CXX_WARN_UNUSED_MACROS -Wunused-macros)
+
elseif(CMAKE_C_COMPILER_ID MATCHES "Intel")
ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_ALL -Wall)
Modified: branches/soc-2011-tomato/SConstruct
===================================================================
--- branches/soc-2011-tomato/SConstruct 2013-03-05 15:15:53 UTC (rev 55059)
+++ branches/soc-2011-tomato/SConstruct 2013-03-05 18:05:18 UTC (rev 55060)
@@ -527,11 +527,13 @@
data_to_c_simple("release/datafiles/preview_cycles.blend")
# --- glsl ---
+ data_to_c_simple("source/blender/gpu/shaders/gpu_shader_fixed_fragment.glsl")
+ data_to_c_simple("source/blender/gpu/shaders/gpu_shader_fixed_vertex.glsl")
data_to_c_simple("source/blender/gpu/shaders/gpu_shader_material.glsl")
- data_to_c_simple("source/blender/gpu/shaders/gpu_shader_vertex.glsl")
+ data_to_c_simple("source/blender/gpu/shaders/gpu_shader_material.glsl")
data_to_c_simple("source/blender/gpu/shaders/gpu_shader_sep_gaussian_blur_frag.glsl")
data_to_c_simple("source/blender/gpu/shaders/gpu_shader_sep_gaussian_blur_vert.glsl")
- data_to_c_simple("source/blender/gpu/shaders/gpu_shader_material.glsl")
+ data_to_c_simple("source/blender/gpu/shaders/gpu_shader_vertex.glsl")
data_to_c_simple("source/blender/gpu/shaders/gpu_shader_vsm_store_frag.glsl")
data_to_c_simple("source/blender/gpu/shaders/gpu_shader_vsm_store_vert.glsl")
Modified: branches/soc-2011-tomato/build_files/cmake/macros.cmake
===================================================================
--- branches/soc-2011-tomato/build_files/cmake/macros.cmake 2013-03-05 15:15:53 UTC (rev 55059)
+++ branches/soc-2011-tomato/build_files/cmake/macros.cmake 2013-03-05 18:05:18 UTC (rev 55060)
@@ -143,7 +143,9 @@
foreach(_SRC ${sources})
get_filename_component(_SRC_EXT ${_SRC} EXT)
- if((${_SRC_EXT} MATCHES ".h") OR (${_SRC_EXT} MATCHES ".hpp"))
+ if((${_SRC_EXT} MATCHES ".h") OR
+ (${_SRC_EXT} MATCHES ".hpp") OR
+ (${_SRC_EXT} MATCHES ".hh"))
source_group("Header Files" FILES ${_SRC})
else()
source_group("Source Files" FILES ${_SRC})
@@ -499,6 +501,7 @@
if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
remove_cc_flag("-Wunused-parameter")
remove_cc_flag("-Wunused-variable")
+ remove_cc_flag("-Werror=[^ ]+")
remove_cc_flag("-Werror")
endif()
Modified: branches/soc-2011-tomato/build_files/scons/tools/Blender.py
===================================================================
--- branches/soc-2011-tomato/build_files/scons/tools/Blender.py 2013-03-05 15:15:53 UTC (rev 55059)
+++ branches/soc-2011-tomato/build_files/scons/tools/Blender.py 2013-03-05 18:05:18 UTC (rev 55060)
@@ -455,22 +455,22 @@
def my_compile_print(target, source, env):
a = '%s' % (source[0])
d, f = os.path.split(a)
- return bc.OKBLUE+"Compiling"+bc.ENDC +" ==> '"+bc.OKGREEN+"%s" % (f) + "'"+bc.ENDC
+ return bc.OKBLUE + "Compiling" + bc.ENDC + " ==> '" + bc.OKGREEN + ("%s" % f) + bc.ENDC + "'"
def my_moc_print(target, source, env):
a = '%s' % (source[0])
d, f = os.path.split(a)
- return bc.OKBLUE+"Creating MOC"+bc.ENDC+ " ==> '"+bc.OKGREEN+"%s" %(f) + "'"+bc.ENDC
+ return bc.OKBLUE + "Creating MOC" + bc.ENDC + " ==> '" + bc.OKGREEN + ("%s" % f) + bc.ENDC + "'"
def my_linking_print(target, source, env):
t = '%s' % (target[0])
d, f = os.path.split(t)
- return bc.OKBLUE+"Linking library"+bc.ENDC +" ==> '"+bc.OKGREEN+"%s" % (f) + "'"+bc.ENDC
+ return bc.OKBLUE + "Linking library" + bc.ENDC + " ==> '" + bc.OKGREEN + ("%s" % f) + bc.ENDC + "'"
def my_program_print(target, source, env):
t = '%s' % (target[0])
d, f = os.path.split(t)
- return bc.OKBLUE+"Linking program"+bc.ENDC +" ==> '"+bc.OKGREEN+"%s" % (f) + "'"+bc.ENDC
+ return bc.OKBLUE + "Linking program" + bc.ENDC + " ==> '" + bc.OKGREEN + ("%s" % f) + bc.ENDC + "'"
def msvc_hack(env):
static_lib = SCons.Tool.createStaticLibBuilder(env)
Modified: branches/soc-2011-tomato/doc/build_systems/cmake.txt
===================================================================
--- branches/soc-2011-tomato/doc/build_systems/cmake.txt 2013-03-05 15:15:53 UTC (rev 55059)
+++ branches/soc-2011-tomato/doc/build_systems/cmake.txt 2013-03-05 18:05:18 UTC (rev 55060)
@@ -7,13 +7,10 @@
1. Introduction
2. Obtaining CMake
- 3. Obtaining Dependencies
- 4. Deciding on a Build Environment
- 5. Configuring the build for the first time
- 6. Configuring the build after SVN updates
- 7. Specify alternate Python library versions and locations
+ 3. Building Blender
+ 4. Generic Setup
+ 5. Configuring the build after SVN updates
-
1. Introduction
---------------
@@ -28,37 +25,18 @@
The website also contains some documentation on CMake usage but I found
the man page alone pretty helpful.
- 3. Obtaining Dependencies
- -------------------------
+ 3. Building Blender
+ -------------------
- Check from the page
- http://www.blender.org/cms/Getting_Dependencies.135.0.html that you
- have all dependencies needed for building Blender. Note that for
- windows many of these dependencies already come in the lib/windows
- module from SVN.
+ Building Blender requires obtaining a compiler, library dependencies,
+ and correct setup depending on the system. For details on how to set
+ up a build on various operating systems, see the wiki documentation:
- 4. Deciding on a Build Environment
- ----------------------------------
+ http://wiki.blender.org/index.php/Dev:Doc/Building_Blender
- To build Blender with the CMake scripts you first need to decide which
- build environment you feel comfortable with. This decision will also be
- influenced by the platform you are developing on. The current implementation
- have been successfully used to generate build files for the following
- environments:
+ 4. Generic Setup
+ ----------------
- 1. Microsoft Visual Studio 2008. There is a free version available
- at http://http://www.microsoft.com/visualstudio/en-us/products/2008-editions/express
-
- 2. Xcode on Mac OSX
-
- 3. Unix Makefiles (On Linux and Mac OSX): CMake actually creates make
- files which generates nicely color coded output and a percentage
- progress indicator.
-
-
- 5. Configuring the build for the first time
- -------------------------------------------
-
CMake allows one to generate the build project files and binary objects
outside the source tree which can be pretty handy in working and experimenting
with different Blender configurations (Audio/NoAudio, GameEngine/NoGameEngine etc.)
@@ -113,42 +91,14 @@
It is also possible to use the commandline of 'cmake' to override certain
of these settings.
- 6. Configuring the build after SVN updates
+ 5. Configuring the build after SVN updates
------------------------------------------
The $BLENDERBUILD directory maintains a file called CMakeCache.txt which
remembers the initial run's settings for subsequent generation runs. After
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list