[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [36255] branches/particles-2010: svn merge -r35899:36253 https://svn.blender.org/svnroot/bf-blender/trunk/ blender

Lukas Toenne lukas.toenne at googlemail.com
Wed Apr 20 23:30:02 CEST 2011


Revision: 36255
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=36255
Author:   lukastoenne
Date:     2011-04-20 21:30:02 +0000 (Wed, 20 Apr 2011)
Log Message:
-----------
svn merge -r35899:36253 https://svn.blender.org/svnroot/bf-blender/trunk/blender

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

Modified Paths:
--------------
    branches/particles-2010/CMakeLists.txt
    branches/particles-2010/GNUmakefile
    branches/particles-2010/build_files/buildbot/master_unpack.py
    branches/particles-2010/build_files/buildbot/slave_compile.py
    branches/particles-2010/build_files/buildbot/slave_pack.py
    branches/particles-2010/build_files/cmake/cmake_qtcreator_project.py
    branches/particles-2010/build_files/cmake/example_scripts/make_quicky.py
    branches/particles-2010/build_files/cmake/macros.cmake
    branches/particles-2010/build_files/package_spec/debian/control
    branches/particles-2010/build_files/package_spec/debian/rules
    branches/particles-2010/build_files/package_spec/pacman/PKGBUILD
    branches/particles-2010/build_files/scons/config/win32-mingw-config.py
    branches/particles-2010/build_files/scons/config/win32-vc-config.py
    branches/particles-2010/build_files/scons/config/win64-vc-config.py
    branches/particles-2010/build_files/scons/tools/btools.py
    branches/particles-2010/doc/doxygen/Doxyfile
    branches/particles-2010/doc/manpage/blender.1
    branches/particles-2010/doc/python_api/examples/bpy.props.2.py
    branches/particles-2010/doc/python_api/examples/mathutils.py
    branches/particles-2010/doc/python_api/rst/bge.logic.rst
    branches/particles-2010/doc/python_api/sphinx_doc_gen.py
    branches/particles-2010/doc/python_api/sphinx_doc_gen.sh
    branches/particles-2010/extern/CMakeLists.txt
    branches/particles-2010/intern/audaspace/Python/AUD_PyAPI.cpp
    branches/particles-2010/intern/audaspace/ffmpeg/AUD_FFMPEGReader.cpp
    branches/particles-2010/intern/audaspace/ffmpeg/AUD_FFMPEGReader.h
    branches/particles-2010/intern/audaspace/intern/AUD_C-API.cpp
    branches/particles-2010/intern/audaspace/intern/AUD_C-API.h
    branches/particles-2010/intern/audaspace/intern/AUD_SequencerFactory.cpp
    branches/particles-2010/intern/audaspace/intern/AUD_SequencerFactory.h
    branches/particles-2010/intern/audaspace/intern/AUD_SequencerReader.cpp
    branches/particles-2010/intern/ghost/CMakeLists.txt
    branches/particles-2010/intern/ghost/GHOST_IEvent.h
    branches/particles-2010/intern/ghost/intern/GHOST_DisplayManagerWin32.cpp
    branches/particles-2010/intern/ghost/intern/GHOST_System.cpp
    branches/particles-2010/intern/ghost/intern/GHOST_WindowWin32.cpp
    branches/particles-2010/intern/memutil/MEM_Allocator.h
    branches/particles-2010/release/datafiles/splash.png
    branches/particles-2010/release/release_todo.txt
    branches/particles-2010/release/scripts/modules/addon_utils.py
    branches/particles-2010/release/scripts/modules/bpy/__init__.py
    branches/particles-2010/release/scripts/modules/bpy/utils.py
    branches/particles-2010/release/scripts/modules/bpyml_ui.py
    branches/particles-2010/release/scripts/modules/io_utils.py
    branches/particles-2010/release/scripts/modules/keyingsets_utils.py
    branches/particles-2010/release/scripts/modules/mesh_utils.py
    branches/particles-2010/release/scripts/templates/background_job.py
    branches/particles-2010/release/scripts/templates/operator_modal_timer.py
    branches/particles-2010/release/text/readme.html
    branches/particles-2010/release/windows/installer/00.sconsblender.nsi
    branches/particles-2010/source/blender/blenfont/CMakeLists.txt
    branches/particles-2010/source/blender/blenfont/intern/blf_dir.c
    branches/particles-2010/source/blender/blenkernel/BKE_blender.h
    branches/particles-2010/source/blender/blenkernel/BKE_font.h
    branches/particles-2010/source/blender/blenkernel/BKE_idprop.h
    branches/particles-2010/source/blender/blenkernel/BKE_object.h
    branches/particles-2010/source/blender/blenkernel/BKE_scene.h
    branches/particles-2010/source/blender/blenkernel/BKE_sequencer.h
    branches/particles-2010/source/blender/blenkernel/BKE_sound.h
    branches/particles-2010/source/blender/blenkernel/BKE_text.h
    branches/particles-2010/source/blender/blenkernel/CMakeLists.txt
    branches/particles-2010/source/blender/blenkernel/intern/DerivedMesh.c
    branches/particles-2010/source/blender/blenkernel/intern/anim_sys.c
    branches/particles-2010/source/blender/blenkernel/intern/boids.c
    branches/particles-2010/source/blender/blenkernel/intern/brush.c
    branches/particles-2010/source/blender/blenkernel/intern/context.c
    branches/particles-2010/source/blender/blenkernel/intern/effect.c
    branches/particles-2010/source/blender/blenkernel/intern/fmodifier.c
    branches/particles-2010/source/blender/blenkernel/intern/font.c
    branches/particles-2010/source/blender/blenkernel/intern/idprop.c
    branches/particles-2010/source/blender/blenkernel/intern/ipo.c
    branches/particles-2010/source/blender/blenkernel/intern/library.c
    branches/particles-2010/source/blender/blenkernel/intern/material.c
    branches/particles-2010/source/blender/blenkernel/intern/mesh.c
    branches/particles-2010/source/blender/blenkernel/intern/node.c
    branches/particles-2010/source/blender/blenkernel/intern/object.c
    branches/particles-2010/source/blender/blenkernel/intern/particle.c
    branches/particles-2010/source/blender/blenkernel/intern/particle_system.c
    branches/particles-2010/source/blender/blenkernel/intern/pointcache.c
    branches/particles-2010/source/blender/blenkernel/intern/seqcache.c
    branches/particles-2010/source/blender/blenkernel/intern/seqeffects.c
    branches/particles-2010/source/blender/blenkernel/intern/sequencer.c
    branches/particles-2010/source/blender/blenkernel/intern/sound.c
    branches/particles-2010/source/blender/blenkernel/intern/text.c
    branches/particles-2010/source/blender/blenkernel/intern/texture.c
    branches/particles-2010/source/blender/blenkernel/intern/unit.c
    branches/particles-2010/source/blender/blenlib/BLI_math_geom.h
    branches/particles-2010/source/blender/blenlib/BLI_math_rotation.h
    branches/particles-2010/source/blender/blenlib/BLI_path_util.h
    branches/particles-2010/source/blender/blenlib/BLI_utildefines.h
    branches/particles-2010/source/blender/blenlib/BLI_winstuff.h
    branches/particles-2010/source/blender/blenlib/intern/fileops.c
    branches/particles-2010/source/blender/blenlib/intern/freetypefont.c
    branches/particles-2010/source/blender/blenlib/intern/math_geom.c
    branches/particles-2010/source/blender/blenlib/intern/math_geom_inline.c
    branches/particles-2010/source/blender/blenlib/intern/math_rotation.c
    branches/particles-2010/source/blender/blenlib/intern/path_util.c
    branches/particles-2010/source/blender/blenlib/intern/winstuff.c
    branches/particles-2010/source/blender/blenloader/intern/readfile.c
    branches/particles-2010/source/blender/blenloader/intern/writefile.c
    branches/particles-2010/source/blender/editors/animation/CMakeLists.txt
    branches/particles-2010/source/blender/editors/animation/anim_filter.c
    branches/particles-2010/source/blender/editors/animation/anim_ops.c
    branches/particles-2010/source/blender/editors/animation/fmodifier_ui.c
    branches/particles-2010/source/blender/editors/animation/keyframing.c
    branches/particles-2010/source/blender/editors/armature/CMakeLists.txt
    branches/particles-2010/source/blender/editors/armature/editarmature.c
    branches/particles-2010/source/blender/editors/armature/poseSlide.c
    branches/particles-2010/source/blender/editors/armature/poseUtils.c
    branches/particles-2010/source/blender/editors/armature/poseobject.c
    branches/particles-2010/source/blender/editors/curve/editcurve.c
    branches/particles-2010/source/blender/editors/curve/editfont.c
    branches/particles-2010/source/blender/editors/datafiles/splash.png.c
    branches/particles-2010/source/blender/editors/datafiles/startup.blend.c
    branches/particles-2010/source/blender/editors/gpencil/CMakeLists.txt
    branches/particles-2010/source/blender/editors/gpencil/drawgpencil.c
    branches/particles-2010/source/blender/editors/gpencil/gpencil_buttons.c
    branches/particles-2010/source/blender/editors/gpencil/gpencil_edit.c
    branches/particles-2010/source/blender/editors/gpencil/gpencil_paint.c
    branches/particles-2010/source/blender/editors/include/BIF_gl.h
    branches/particles-2010/source/blender/editors/include/ED_view3d.h
    branches/particles-2010/source/blender/editors/interface/CMakeLists.txt
    branches/particles-2010/source/blender/editors/interface/interface.c
    branches/particles-2010/source/blender/editors/interface/interface_handlers.c
    branches/particles-2010/source/blender/editors/interface/interface_icons.c
    branches/particles-2010/source/blender/editors/interface/interface_panel.c
    branches/particles-2010/source/blender/editors/interface/interface_regions.c
    branches/particles-2010/source/blender/editors/interface/interface_style.c
    branches/particles-2010/source/blender/editors/interface/interface_templates.c
    branches/particles-2010/source/blender/editors/interface/interface_utils.c
    branches/particles-2010/source/blender/editors/interface/interface_widgets.c
    branches/particles-2010/source/blender/editors/interface/resources.c
    branches/particles-2010/source/blender/editors/interface/view2d_ops.c
    branches/particles-2010/source/blender/editors/mesh/CMakeLists.txt
    branches/particles-2010/source/blender/editors/mesh/editmesh.c
    branches/particles-2010/source/blender/editors/mesh/editmesh_add.c
    branches/particles-2010/source/blender/editors/mesh/editmesh_lib.c
    branches/particles-2010/source/blender/editors/mesh/editmesh_loop.c
    branches/particles-2010/source/blender/editors/mesh/editmesh_mods.c
    branches/particles-2010/source/blender/editors/mesh/editmesh_tools.c
    branches/particles-2010/source/blender/editors/metaball/mball_edit.c
    branches/particles-2010/source/blender/editors/object/object_add.c
    branches/particles-2010/source/blender/editors/object/object_ops.c
    branches/particles-2010/source/blender/editors/object/object_relations.c
    branches/particles-2010/source/blender/editors/object/object_transform.c
    branches/particles-2010/source/blender/editors/physics/CMakeLists.txt
    branches/particles-2010/source/blender/editors/physics/physics_fluid.c
    branches/particles-2010/source/blender/editors/render/CMakeLists.txt
    branches/particles-2010/source/blender/editors/render/render_internal.c
    branches/particles-2010/source/blender/editors/render/render_preview.c
    branches/particles-2010/source/blender/editors/render/render_shading.c
    branches/particles-2010/source/blender/editors/screen/CMakeLists.txt
    branches/particles-2010/source/blender/editors/screen/area.c
    branches/particles-2010/source/blender/editors/screen/screen_context.c
    branches/particles-2010/source/blender/editors/screen/screen_edit.c
    branches/particles-2010/source/blender/editors/screen/screen_ops.c
    branches/particles-2010/source/blender/editors/sculpt_paint/CMakeLists.txt
    branches/particles-2010/source/blender/editors/sculpt_paint/paint_image.c
    branches/particles-2010/source/blender/editors/sculpt_paint/paint_ops.c
    branches/particles-2010/source/blender/editors/sculpt_paint/paint_vertex.c
    branches/particles-2010/source/blender/editors/sculpt_paint/sculpt.c
    branches/particles-2010/source/blender/editors/sound/sound_ops.c
    branches/particles-2010/source/blender/editors/space_action/CMakeLists.txt
    branches/particles-2010/source/blender/editors/space_action/action_edit.c
    branches/particles-2010/source/blender/editors/space_action/action_ops.c
    branches/particles-2010/source/blender/editors/space_action/action_select.c
    branches/particles-2010/source/blender/editors/space_action/space_action.c
    branches/particles-2010/source/blender/editors/space_buttons/CMakeLists.txt
    branches/particles-2010/source/blender/editors/space_console/CMakeLists.txt
    branches/particles-2010/source/blender/editors/space_file/CMakeLists.txt
    branches/particles-2010/source/blender/editors/space_file/file_draw.c
    branches/particles-2010/source/blender/editors/space_file/file_ops.c
    branches/particles-2010/source/blender/editors/space_file/file_panels.c
    branches/particles-2010/source/blender/editors/space_file/filelist.c
    branches/particles-2010/source/blender/editors/space_file/filesel.c
    branches/particles-2010/source/blender/editors/space_file/fsmenu.c
    branches/particles-2010/source/blender/editors/space_graph/CMakeLists.txt
    branches/particles-2010/source/blender/editors/space_graph/graph_edit.c
    branches/particles-2010/source/blender/editors/space_graph/graph_ops.c
    branches/particles-2010/source/blender/editors/space_graph/graph_select.c
    branches/particles-2010/source/blender/editors/space_image/CMakeLists.txt
    branches/particles-2010/source/blender/editors/space_image/image_buttons.c
    branches/particles-2010/source/blender/editors/space_image/image_draw.c
    branches/particles-2010/source/blender/editors/space_image/image_ops.c
    branches/particles-2010/source/blender/editors/space_info/CMakeLists.txt
    branches/particles-2010/source/blender/editors/space_logic/CMakeLists.txt
    branches/particles-2010/source/blender/editors/space_logic/logic_ops.c
    branches/particles-2010/source/blender/editors/space_nla/CMakeLists.txt
    branches/particles-2010/source/blender/editors/space_nla/nla_edit.c
    branches/particles-2010/source/blender/editors/space_node/CMakeLists.txt
    branches/particles-2010/source/blender/editors/space_node/drawnode.c
    branches/particles-2010/source/blender/editors/space_node/node_edit.c
    branches/particles-2010/source/blender/editors/space_outliner/CMakeLists.txt
    branches/particles-2010/source/blender/editors/space_outliner/outliner.c
    branches/particles-2010/source/blender/editors/space_script/CMakeLists.txt
    branches/particles-2010/source/blender/editors/space_sequencer/CMakeLists.txt
    branches/particles-2010/source/blender/editors/space_sequencer/sequencer_edit.c
    branches/particles-2010/source/blender/editors/space_sequencer/sequencer_scopes.c
    branches/particles-2010/source/blender/editors/space_sound/CMakeLists.txt
    branches/particles-2010/source/blender/editors/space_text/CMakeLists.txt
    branches/particles-2010/source/blender/editors/space_text/text_ops.c
    branches/particles-2010/source/blender/editors/space_time/CMakeLists.txt
    branches/particles-2010/source/blender/editors/space_view3d/CMakeLists.txt
    branches/particles-2010/source/blender/editors/space_view3d/drawobject.c
    branches/particles-2010/source/blender/editors/space_view3d/space_view3d.c
    branches/particles-2010/source/blender/editors/space_view3d/view3d_draw.c
    branches/particles-2010/source/blender/editors/space_view3d/view3d_edit.c
    branches/particles-2010/source/blender/editors/space_view3d/view3d_header.c
    branches/particles-2010/source/blender/editors/space_view3d/view3d_snap.c
    branches/particles-2010/source/blender/editors/space_view3d/view3d_view.c
    branches/particles-2010/source/blender/editors/transform/CMakeLists.txt
    branches/particles-2010/source/blender/editors/transform/transform.c
    branches/particles-2010/source/blender/editors/transform/transform_constraints.c
    branches/particles-2010/source/blender/editors/transform/transform_conversions.c
    branches/particles-2010/source/blender/editors/transform/transform_generics.c
    branches/particles-2010/source/blender/editors/transform/transform_ops.c
    branches/particles-2010/source/blender/editors/uvedit/CMakeLists.txt
    branches/particles-2010/source/blender/editors/uvedit/uvedit_ops.c
    branches/particles-2010/source/blender/editors/uvedit/uvedit_unwrap_ops.c
    branches/particles-2010/source/blender/gpu/CMakeLists.txt
    branches/particles-2010/source/blender/gpu/intern/gpu_draw.c
    branches/particles-2010/source/blender/gpu/intern/gpu_material.c
    branches/particles-2010/source/blender/imbuf/CMakeLists.txt
    branches/particles-2010/source/blender/imbuf/intern/jpeg.c
    branches/particles-2010/source/blender/imbuf/intern/scaling.c
    branches/particles-2010/source/blender/imbuf/intern/thumbs.c
    branches/particles-2010/source/blender/makesdna/DNA_action_types.h
    branches/particles-2010/source/blender/makesdna/DNA_gpencil_types.h
    branches/particles-2010/source/blender/makesdna/DNA_mesh_types.h
    branches/particles-2010/source/blender/makesdna/intern/dna_genfile.c
    branches/particles-2010/source/blender/makesrna/RNA_enum_types.h
    branches/particles-2010/source/blender/makesrna/RNA_types.h
    branches/particles-2010/source/blender/makesrna/SConscript
    branches/particles-2010/source/blender/makesrna/intern/CMakeLists.txt
    branches/particles-2010/source/blender/makesrna/intern/SConscript
    branches/particles-2010/source/blender/makesrna/intern/makesrna.c
    branches/particles-2010/source/blender/makesrna/intern/rna_ID.c
    branches/particles-2010/source/blender/makesrna/intern/rna_access.c
    branches/particles-2010/source/blender/makesrna/intern/rna_action.c
    branches/particles-2010/source/blender/makesrna/intern/rna_actuator.c
    branches/particles-2010/source/blender/makesrna/intern/rna_animation.c
    branches/particles-2010/source/blender/makesrna/intern/rna_armature.c
    branches/particles-2010/source/blender/makesrna/intern/rna_boid.c
    branches/particles-2010/source/blender/makesrna/intern/rna_brush.c
    branches/particles-2010/source/blender/makesrna/intern/rna_color.c
    branches/particles-2010/source/blender/makesrna/intern/rna_constraint.c
    branches/particles-2010/source/blender/makesrna/intern/rna_curve.c
    branches/particles-2010/source/blender/makesrna/intern/rna_define.c
    branches/particles-2010/source/blender/makesrna/intern/rna_fcurve.c
    branches/particles-2010/source/blender/makesrna/intern/rna_gpencil.c
    branches/particles-2010/source/blender/makesrna/intern/rna_image.c
    branches/particles-2010/source/blender/makesrna/intern/rna_internal.h
    branches/particles-2010/source/blender/makesrna/intern/rna_key.c
    branches/particles-2010/source/blender/makesrna/intern/rna_lamp.c
    branches/particles-2010/source/blender/makesrna/intern/rna_main.c
    branches/particles-2010/source/blender/makesrna/intern/rna_material.c
    branches/particles-2010/source/blender/makesrna/intern/rna_meta.c
    branches/particles-2010/source/blender/makesrna/intern/rna_modifier.c
    branches/particles-2010/source/blender/makesrna/intern/rna_nla.c
    branches/particles-2010/source/blender/makesrna/intern/rna_nodetree.c
    branches/particles-2010/source/blender/makesrna/intern/rna_object.c
    branches/particles-2010/source/blender/makesrna/intern/rna_object_force.c
    branches/particles-2010/source/blender/makesrna/intern/rna_particle.c
    branches/particles-2010/source/blender/makesrna/intern/rna_pose.c
    branches/particles-2010/source/blender/makesrna/intern/rna_render.c
    branches/particles-2010/source/blender/makesrna/intern/rna_rna.c
    branches/particles-2010/source/blender/makesrna/intern/rna_scene.c
    branches/particles-2010/source/blender/makesrna/intern/rna_sculpt_paint.c
    branches/particles-2010/source/blender/makesrna/intern/rna_sequencer.c
    branches/particles-2010/source/blender/makesrna/intern/rna_space.c
    branches/particles-2010/source/blender/makesrna/intern/rna_texture.c
    branches/particles-2010/source/blender/makesrna/intern/rna_userdef.c
    branches/particles-2010/source/blender/makesrna/intern/rna_wm.c
    branches/particles-2010/source/blender/makesrna/intern/rna_wm_api.c
    branches/particles-2010/source/blender/makesrna/intern/rna_world.c
    branches/particles-2010/source/blender/modifiers/intern/MOD_explode.c
    branches/particles-2010/source/blender/modifiers/intern/MOD_smoke.c
    branches/particles-2010/source/blender/modifiers/intern/MOD_solidify.c
    branches/particles-2010/source/blender/nodes/CMakeLists.txt
    branches/particles-2010/source/blender/nodes/intern/CMP_nodes/CMP_displace.c
    branches/particles-2010/source/blender/nodes/intern/CMP_nodes/CMP_huecorrect.c
    branches/particles-2010/source/blender/nodes/intern/CMP_nodes/CMP_lensdist.c
    branches/particles-2010/source/blender/nodes/intern/TEX_nodes/TEX_at.c
    branches/particles-2010/source/blender/nodes/intern/TEX_nodes/TEX_bricks.c
    branches/particles-2010/source/blender/nodes/intern/TEX_nodes/TEX_checker.c
    branches/particles-2010/source/blender/nodes/intern/TEX_nodes/TEX_compose.c
    branches/particles-2010/source/blender/nodes/intern/TEX_nodes/TEX_coord.c
    branches/particles-2010/source/blender/nodes/intern/TEX_nodes/TEX_curves.c
    branches/particles-2010/source/blender/nodes/intern/TEX_nodes/TEX_decompose.c
    branches/particles-2010/source/blender/nodes/intern/TEX_nodes/TEX_distance.c
    branches/particles-2010/source/blender/nodes/intern/TEX_nodes/TEX_hueSatVal.c
    branches/particles-2010/source/blender/nodes/intern/TEX_nodes/TEX_image.c
    branches/particles-2010/source/blender/nodes/intern/TEX_nodes/TEX_invert.c
    branches/particles-2010/source/blender/nodes/intern/TEX_nodes/TEX_math.c
    branches/particles-2010/source/blender/nodes/intern/TEX_nodes/TEX_mixRgb.c
    branches/particles-2010/source/blender/nodes/intern/TEX_nodes/TEX_output.c
    branches/particles-2010/source/blender/nodes/intern/TEX_nodes/TEX_proc.c
    branches/particles-2010/source/blender/nodes/intern/TEX_nodes/TEX_rotate.c
    branches/particles-2010/source/blender/nodes/intern/TEX_nodes/TEX_texture.c
    branches/particles-2010/source/blender/nodes/intern/TEX_nodes/TEX_translate.c
    branches/particles-2010/source/blender/nodes/intern/TEX_nodes/TEX_valToNor.c
    branches/particles-2010/source/blender/nodes/intern/TEX_nodes/TEX_valToRgb.c
    branches/particles-2010/source/blender/nodes/intern/TEX_nodes/TEX_viewer.c
    branches/particles-2010/source/blender/python/BPY_extern.h
    branches/particles-2010/source/blender/python/SConscript
    branches/particles-2010/source/blender/python/generic/CMakeLists.txt
    branches/particles-2010/source/blender/python/generic/bpy_internal_import.c
    branches/particles-2010/source/blender/python/generic/mathutils_Matrix.c
    branches/particles-2010/source/blender/python/generic/mathutils_Quaternion.c
    branches/particles-2010/source/blender/python/generic/mathutils_Vector.c
    branches/particles-2010/source/blender/python/generic/mathutils_geometry.c
    branches/particles-2010/source/blender/python/generic/py_capi_utils.c
    branches/particles-2010/source/blender/python/generic/py_capi_utils.h
    branches/particles-2010/source/blender/python/intern/bpy.c
    branches/particles-2010/source/blender/python/intern/bpy_app.c
    branches/particles-2010/source/blender/python/intern/bpy_interface.c
    branches/particles-2010/source/blender/python/intern/bpy_rna.c
    branches/particles-2010/source/blender/python/intern/bpy_rna.h
    branches/particles-2010/source/blender/python/intern/bpy_rna_anim.c
    branches/particles-2010/source/blender/quicktime/apple/quicktime_import.c
    branches/particles-2010/source/blender/render/intern/include/texture.h
    branches/particles-2010/source/blender/render/intern/raytrace/reorganize.h
    branches/particles-2010/source/blender/render/intern/source/convertblender.c
    branches/particles-2010/source/blender/render/intern/source/imagetexture.c
    branches/particles-2010/source/blender/render/intern/source/initrender.c
    branches/particles-2010/source/blender/render/intern/source/occlusion.c
    branches/particles-2010/source/blender/render/intern/source/pipeline.c
    branches/particles-2010/source/blender/render/intern/source/rayshade.c
    branches/particles-2010/source/blender/render/intern/source/rendercore.c
    branches/particles-2010/source/blender/windowmanager/CMakeLists.txt
    branches/particles-2010/source/blender/windowmanager/WM_api.h
    branches/particles-2010/source/blender/windowmanager/intern/wm_event_system.c
    branches/particles-2010/source/blender/windowmanager/intern/wm_files.c
    branches/particles-2010/source/blender/windowmanager/intern/wm_gesture.c
    branches/particles-2010/source/blender/windowmanager/intern/wm_init_exit.c
    branches/particles-2010/source/blender/windowmanager/intern/wm_keymap.c
    branches/particles-2010/source/blender/windowmanager/intern/wm_operators.c
    branches/particles-2010/source/blender/windowmanager/wm_event_system.h
    branches/particles-2010/source/blenderplayer/CMakeLists.txt
    branches/particles-2010/source/blenderplayer/bad_level_call_stubs/stubs.c
    branches/particles-2010/source/creator/CMakeLists.txt
    branches/particles-2010/source/creator/creator.c
    branches/particles-2010/source/gameengine/BlenderRoutines/CMakeLists.txt
    branches/particles-2010/source/gameengine/BlenderRoutines/KX_BlenderGL.cpp
    branches/particles-2010/source/gameengine/Converter/BL_ArmatureChannel.cpp
    branches/particles-2010/source/gameengine/Converter/BL_BlenderDataConversion.cpp
    branches/particles-2010/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
    branches/particles-2010/source/gameengine/Converter/KX_ConvertActuators.cpp
    branches/particles-2010/source/gameengine/Converter/KX_ConvertSensors.cpp
    branches/particles-2010/source/gameengine/Expressions/PyObjectPlus.h
    branches/particles-2010/source/gameengine/GamePlayer/common/CMakeLists.txt
    branches/particles-2010/source/gameengine/GamePlayer/ghost/CMakeLists.txt
    branches/particles-2010/source/gameengine/Ketsji/CMakeLists.txt
    branches/particles-2010/source/gameengine/Ketsji/KX_Camera.cpp
    branches/particles-2010/source/gameengine/Ketsji/KX_GameObject.cpp
    branches/particles-2010/source/gameengine/Ketsji/KX_PythonInit.cpp
    branches/particles-2010/source/gameengine/Physics/Bullet/CMakeLists.txt
    branches/particles-2010/source/gameengine/Physics/Bullet/CcdPhysicsController.h
    branches/particles-2010/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp
    branches/particles-2010/source/gameengine/Rasterizer/CMakeLists.txt
    branches/particles-2010/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/CMakeLists.txt
    branches/particles-2010/source/gameengine/VideoTexture/CMakeLists.txt
    branches/particles-2010/source/tests/CMakeLists.txt
    branches/particles-2010/source/tests/bl_run_operators.py
    branches/particles-2010/source/tests/bl_test.py
    branches/particles-2010/source/tests/pep8.py

Added Paths:
-----------
    branches/particles-2010/build_files/buildbot/config/
    branches/particles-2010/build_files/buildbot/config/user-config-i686.py
    branches/particles-2010/build_files/buildbot/config/user-config-player-i686.py
    branches/particles-2010/build_files/buildbot/config/user-config-player-x86_64.py
    branches/particles-2010/build_files/buildbot/config/user-config-x86_64.py
    branches/particles-2010/build_files/cmake/Modules/
    branches/particles-2010/build_files/cmake/Modules/FindGLEW.cmake
    branches/particles-2010/doc/python_api/examples/bpy.types.bpy_struct.keyframe_insert.1.py
    branches/particles-2010/doc/python_api/examples/bpy.types.bpy_struct.keyframe_insert.py
    branches/particles-2010/doc/python_api/rst/change_log.rst
    branches/particles-2010/doc/python_api/sphinx_changelog_gen.py

Removed Paths:
-------------
    branches/particles-2010/build_files/buildbot/config/user-config-i686.py
    branches/particles-2010/build_files/buildbot/config/user-config-player-i686.py
    branches/particles-2010/build_files/buildbot/config/user-config-player-x86_64.py
    branches/particles-2010/build_files/buildbot/config/user-config-x86_64.py
    branches/particles-2010/build_files/cmake/Modules/FindGLEW.cmake

Property Changed:
----------------
    branches/particles-2010/


Property changes on: branches/particles-2010
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/blender:33741-35899
   + /trunk/blender:33741-36253

Modified: branches/particles-2010/CMakeLists.txt
===================================================================
--- branches/particles-2010/CMakeLists.txt	2011-04-20 20:56:55 UTC (rev 36254)
+++ branches/particles-2010/CMakeLists.txt	2011-04-20 21:30:02 UTC (rev 36255)
@@ -44,11 +44,40 @@
 
 cmake_minimum_required(VERSION 2.8)
 
+# this starts out unset
+set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/build_files/cmake/Modules/")
+
 # 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()
+
+
 project(Blender)
 
+
+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)
+
+
 enable_testing()
 
 #-----------------------------------------------------------------------------
@@ -69,6 +98,7 @@
 # Blender internal features
 option(WITH_INTERNATIONAL "Enable I18N (International fonts and text)" ON)
 option(WITH_PYTHON        "Enable Embedded Python API  (only disable for development)" ON)
+mark_as_advanced(WITH_PYTHON)  # dont want people disabling this unless they really know what they are doing.
 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)
 option(WITH_BUILDINFO     "Include extra build details (only disable for development & faster builds)" ON)
@@ -87,12 +117,18 @@
 
 if(UNIX AND NOT APPLE)
 	option(WITH_X11_XINPUT "Enable X11 Xinput (tablet support)"	ON)
+	option(WITH_BUILTIN_GLEW "Use GLEW OpenGL wrapper library bundled with blender" ON)
+else()
+	# not an option for other OS's
+	set(WITH_BUILTIN_GLEW ON)
 endif()
 
 # Modifiers
 option(WITH_MOD_FLUID        	"Enable Elbeem Modifier (Fluid Simulation)" ON)
 option(WITH_MOD_DECIMATE       	"Enable Decimate Modifier" ON)
 option(WITH_MOD_BOOLEAN        	"Enable Boolean Modifier" ON)
+option(WITH_MOD_CLOTH_ELTOPO   	"Enable Experemental cloth solver" OFF)
+mark_as_advanced(WITH_MOD_CLOTH_ELTOPO)
 
 # Image format support
 option(WITH_IMAGE_OPENEXR       "Enable OpenEXR Support (http://www.openexr.com)" ON)
@@ -511,7 +547,7 @@
 
 	if(MSVC)
 		if(CMAKE_CL_64)
-			set(LLIBS kernel32 user32 vfw32 winmm ws2_32 )
+			set(LLIBS ws2_32 vfw32 winmm kernel32 user32 gdi32 comdlg32 advapi32 shfolder shell32 ole32 oleaut32 uuid )
 		else()
 			set(LLIBS kernel32 user32 gdi32 comdlg32 advapi32 shell32 ole32 oleaut32 uuid ws2_32 vfw32 winmm)
 		endif()
@@ -1026,6 +1062,23 @@
 endif() 
 
 #-----------------------------------------------------------------------------
+# Configure GLEW
+
+if(WITH_BUILTIN_GLEW)
+	# set(GLEW_LIBRARY "")  # unused
+	set(GLEW_INCLUDE_PATH "${CMAKE_SOURCE_DIR}/extern/glew/include")
+else()
+	find_package(GLEW)
+
+	if(NOT GLEW_FOUND)
+		message(FATAL_ERROR "GLEW is required to build blender, install it or use WITH_BUILTIN_GLEW")
+	endif()
+
+	mark_as_advanced(GLEW_LIBRARY)
+	mark_as_advanced(GLEW_INCLUDE_PATH)
+endif()
+
+#-----------------------------------------------------------------------------
 # Configure Python.
 
 if(WITH_PYTHON_MODULE)
@@ -1064,7 +1117,8 @@
 	ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_POINTER_ARITH -Wpointer-arith)
 	ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_UNUSED_PARAMETER -Wunused-parameter)
 	ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_WRITE_STRINGS -Wwrite-strings)
-	ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_DOUBLE_PROMOTION -Wdouble-promotion -Wno-error=double-promotion)
+	# disable because it gives warnings for printf() & friends.
+	# ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_DOUBLE_PROMOTION -Wdouble-promotion -Wno-error=double-promotion)
 	ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_NO_ERROR_UNUSED_BUT_SET_VARIABLE -Wno-error=unused-but-set-variable)
 
 	ADD_CHECK_CXX_COMPILER_FLAG(CXX_WARNINGS CXX_WARN_ALL -Wall)

Modified: branches/particles-2010/GNUmakefile
===================================================================
--- branches/particles-2010/GNUmakefile	2011-04-20 20:56:55 UTC (rev 36254)
+++ branches/particles-2010/GNUmakefile	2011-04-20 21:30:02 UTC (rev 36255)
@@ -98,6 +98,16 @@
 test:
 	cd $(BUILD_DIR) ; ctest . --output-on-failure
 
+# run pep8 check check on scripts we distribute.
+test_pep8:
+	python source/tests/pep8.py > test_pep8.log 2>&1
+	@echo "written: test_pep8.log"
+
+# run some checks on our cmakefiles.
+test_cmake:
+	python build_files/cmake/cmake_consistency_check.py > test_cmake_consistency.log 2>&1
+	@echo "written: test_cmake_consistency.log"
+
 clean:
 	cd $(BUILD_DIR) ; make clean
 

Deleted: branches/particles-2010/build_files/buildbot/config/user-config-i686.py
===================================================================
--- trunk/blender/build_files/buildbot/config/user-config-i686.py	2011-04-20 20:56:15 UTC (rev 36253)
+++ branches/particles-2010/build_files/buildbot/config/user-config-i686.py	2011-04-20 21:30:02 UTC (rev 36255)
@@ -1,87 +0,0 @@
-BF_BUILDDIR = '../blender-build/linux-glibc27-i686'
-BF_INSTALLDIR = '../blender-install/linux-glibc27-i686'
-BF_NUMJOBS = 2
-
-# Python configuration
-BF_PYTHON_VERSION = '3.2'
-BF_PYTHON_ABI_FLAGS = 'mu'
-BF_PYTHON = '/opt/python3.2'
-
-WITH_BF_STATICPYTHON = True
-
-# OpenCollada configuration
-WITH_BF_COLLADA = True
-BF_OPENCOLLADA = '/opt/opencollada'
-BF_OPENCOLLADA_INC = '${BF_OPENCOLLADA}/include'
-BF_OPENCOLLADA_LIB = 'OpenCOLLADAStreamWriter OpenCOLLADASaxFrameworkLoader OpenCOLLADAFramework OpenCOLLADABaseUtils GeneratedSaxParser UTF MathMLSolver buffer ftoa libxml2-static libexpat-static libpcre-static'
-BF_OPENCOLLADA_LIBPATH = '${BF_OPENCOLLADA}/lib /home/sources/staticlibs/lib32'
-BF_PCRE_LIB = ''
-BF_EXPAT_LIB = ''
-
-# FFMPEG configuration
-WITH_BF_FFMPEG = True
-WITH_BF_STATICFFMPEG = True
-
-# Used for linking against system ffmpeg, but it gives pixelization,, so fall back to ffmpeg from 2.52 temporary
-#BF_FFMPEG_LIB_STATIC = '${BF_FFMPEG_LIBPATH}/libavformat.a ${BF_FFMPEG_LIBPATH}/libavcodec.a ${BF_FFMPEG_LIBPATH}/libswscale.a ' + \
-#    '${BF_FFMPEG_LIBPATH}/libavutil.a ${BF_FFMPEG_LIBPATH}/libavdevice.a ${BF_FFMPEG_LIBPATH}/libdc1394.a ' + \
-#    '${BF_FFMPEG_LIBPATH}/libraw1394.a ${BF_FFMPEG_LIBPATH}/libdirac_encoder.a ${BF_FFMPEG_LIBPATH}/libschroedinger-1.0.a ' + \
-#    '${BF_FFMPEG_LIBPATH}/libfaad.a ${BF_FFMPEG_LIBPATH}/libtheora.a ' + \
-#    '${BF_FFMPEG_LIBPATH}/libspeex.a ${BF_FFMPEG_LIBPATH}/libbz2.a ${BF_FFMPEG_LIBPATH}/liboil-0.3.a ${BF_FFMPEG_LIBPATH}/libogg.a ' + \
-#    '${BF_FFMPEG_LIBPATH}/libvorbisenc.a ${BF_FFMPEG_LIBPATH}/libvorbis.a ${BF_FFMPEG_LIBPATH}/libgsm.a'
-
-BF_FFMPEG = '/home/sources/staticlibs/ffmpeg'
-BF_FFMPEG_LIBPATH = '${BF_FFMPEG}/lib32'
-BF_FFMPEG_LIB_STATIC = '${BF_FFMPEG_LIBPATH}/libextern_libavformat.a ${BF_FFMPEG_LIBPATH}/libextern_libswscale.a ' + \
-    '${BF_FFMPEG_LIBPATH}/libextern_libavcodec.a ${BF_FFMPEG_LIBPATH}/libextern_libavdevice.a ' + \
-    '${BF_FFMPEG_LIBPATH}/libextern_libavutil.a ${BF_FFMPEG_LIBPATH}/libextern_xvidcore.a ' + \
-    '${BF_FFMPEG_LIBPATH}/libextern_libmp3lame.a ${BF_FFMPEG_LIBPATH}/libextern_x264.a'
-
-# Don't depend on system's libstdc++
-WITH_BF_STATICCXX = True
-BF_CXX_LIB_STATIC = '/usr/lib/gcc/i486-linux-gnu/4.3.2/libstdc++.a'
-
-WITH_BF_OPENAL = True
-WITH_BF_STATICOPENAL = True
-BF_OPENAL_LIB_STATIC = '/opt/openal/lib/libopenal.a'
-
-WITH_BF_GETTEXT_STATIC = True
-BF_FREETYPE_LIB_STATIC = True
-
-WITH_BF_OPENEXR = True
-WITH_BF_STATICOPENEXR = True
-
-WITH_BF_TIFF = True
-WITH_BF_STATICTIFF = True
-BF_TIFF_LIB_STATIC = '${BF_TIFF}/lib/libtiff.a'
-
-WITH_BF_JPEG = True
-BF_JPEG_LIB = 'libjpeg'
-BF_JPEG_LIBPATH = '/home/sources/staticlibs/lib32'
-
-WITH_BF_PNG = True
-BF_PNG_LIB = 'libpng'
-BF_PNG_LIBPATH = '/home/sources/staticlibs/lib32'
-
-WITH_BF_STATICLIBSAMPLERATE = True
-
-WITH_BF_ZLIB = True
-WITH_BF_STATICZLIB = True
-BF_ZLIB_LIB_STATIC = '${BF_ZLIB}/lib/libz.a'
-
-WITH_BF_SDL = True
-WITH_BF_OGG = True
-
-WITH_BF_OPENMP = True
-
-WITH_BF_GAMEENGINE = True
-WITH_BF_BULLET = True
-
-# Blender player (would be enabled in it's own config)
-WITH_BF_PLAYER = False
-
-# Compilation and optimization
-BF_DEBUG = False
-REL_CFLAGS = ['-O2']
-REL_CCFLAGS = ['-O2']
-PLATFORM_LINKFLAGS = ['-L/home/sources/staticlibs/lib32']

Copied: branches/particles-2010/build_files/buildbot/config/user-config-i686.py (from rev 36253, trunk/blender/build_files/buildbot/config/user-config-i686.py)
===================================================================
--- branches/particles-2010/build_files/buildbot/config/user-config-i686.py	                        (rev 0)
+++ branches/particles-2010/build_files/buildbot/config/user-config-i686.py	2011-04-20 21:30:02 UTC (rev 36255)
@@ -0,0 +1,87 @@
+BF_BUILDDIR = '../blender-build/linux-glibc27-i686'
+BF_INSTALLDIR = '../blender-install/linux-glibc27-i686'
+BF_NUMJOBS = 2
+
+# Python configuration
+BF_PYTHON_VERSION = '3.2'
+BF_PYTHON_ABI_FLAGS = 'mu'
+BF_PYTHON = '/opt/python3.2'
+
+WITH_BF_STATICPYTHON = True
+
+# OpenCollada configuration
+WITH_BF_COLLADA = True
+BF_OPENCOLLADA = '/opt/opencollada'
+BF_OPENCOLLADA_INC = '${BF_OPENCOLLADA}/include'
+BF_OPENCOLLADA_LIB = 'OpenCOLLADAStreamWriter OpenCOLLADASaxFrameworkLoader OpenCOLLADAFramework OpenCOLLADABaseUtils GeneratedSaxParser UTF MathMLSolver buffer ftoa libxml2-static libexpat-static libpcre-static'
+BF_OPENCOLLADA_LIBPATH = '${BF_OPENCOLLADA}/lib /home/sources/staticlibs/lib32'
+BF_PCRE_LIB = ''
+BF_EXPAT_LIB = ''

@@ Diff output truncated at 10240 characters. @@



More information about the Bf-blender-cvs mailing list