Revision: 42024
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=42024
Author: kjym3
Date: 2011-11-20 21:02:12 +0000 (Sun, 20 Nov 2011)
Log Message:
-----------
Merged changes in the trunk up to revision 42021.
Conflicts resolved:
source/blender/blenkernel/intern/scene.c
source/blender/blenloader/intern/readfile.c
source/blender/editors/interface/resources.c
source/blender/render/intern/source/pipeline.c
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=42021
Modified Paths:
--------------
branches/soc-2008-mxcurioni/CMakeLists.txt
branches/soc-2008-mxcurioni/GNUmakefile
branches/soc-2008-mxcurioni/SConstruct
branches/soc-2008-mxcurioni/build_files/buildbot/config/user-config-i686.py
branches/soc-2008-mxcurioni/build_files/buildbot/config/user-config-player-i686.py
branches/soc-2008-mxcurioni/build_files/buildbot/config/user-config-player-x86_64.py
branches/soc-2008-mxcurioni/build_files/buildbot/config/user-config-x86_64.py
branches/soc-2008-mxcurioni/build_files/cmake/Modules/FindPythonLibsUnix.cmake
branches/soc-2008-mxcurioni/build_files/cmake/cmake_consistency_check.py
branches/soc-2008-mxcurioni/build_files/cmake/cmake_qtcreator_project.py
branches/soc-2008-mxcurioni/build_files/cmake/config/blender_lite.cmake
branches/soc-2008-mxcurioni/build_files/cmake/project_info.py
branches/soc-2008-mxcurioni/build_files/cmake/project_source_info.py
branches/soc-2008-mxcurioni/build_files/scons/config/darwin-config.py
branches/soc-2008-mxcurioni/build_files/scons/config/freebsd7-config.py
branches/soc-2008-mxcurioni/build_files/scons/config/freebsd8-config.py
branches/soc-2008-mxcurioni/build_files/scons/config/freebsd9-config.py
branches/soc-2008-mxcurioni/build_files/scons/config/linux-config.py
branches/soc-2008-mxcurioni/build_files/scons/config/linuxcross-config.py
branches/soc-2008-mxcurioni/build_files/scons/config/win32-mingw-config.py
branches/soc-2008-mxcurioni/build_files/scons/config/win32-vc-config.py
branches/soc-2008-mxcurioni/build_files/scons/config/win64-vc-config.py
branches/soc-2008-mxcurioni/build_files/scons/tools/Blender.py
branches/soc-2008-mxcurioni/build_files/scons/tools/btools.py
branches/soc-2008-mxcurioni/doc/manpage/blender.1.py
branches/soc-2008-mxcurioni/doc/python_api/rst/info_gotcha.rst
branches/soc-2008-mxcurioni/doc/python_api/sphinx_doc_gen.py
branches/soc-2008-mxcurioni/extern/libmv/CMakeLists.txt
branches/soc-2008-mxcurioni/extern/libmv/libmv/simple_pipeline/bundle.cc
branches/soc-2008-mxcurioni/extern/libmv/libmv/simple_pipeline/bundle.h
branches/soc-2008-mxcurioni/extern/libmv/libmv/simple_pipeline/camera_intrinsics.cc
branches/soc-2008-mxcurioni/extern/libmv/libmv/simple_pipeline/camera_intrinsics.h
branches/soc-2008-mxcurioni/extern/libmv/libmv/simple_pipeline/initialize_reconstruction.cc
branches/soc-2008-mxcurioni/extern/libmv/libmv/simple_pipeline/pipeline.cc
branches/soc-2008-mxcurioni/extern/libmv/libmv/tracking/klt_region_tracker.cc
branches/soc-2008-mxcurioni/extern/libmv/libmv/tracking/pyramid_region_tracker.cc
branches/soc-2008-mxcurioni/extern/libmv/libmv/tracking/trklt_region_tracker.cc
branches/soc-2008-mxcurioni/extern/libmv/libmv-capi.cpp
branches/soc-2008-mxcurioni/extern/libmv/libmv-capi.h
branches/soc-2008-mxcurioni/extern/libmv/third_party/glog/src/config_linux.h
branches/soc-2008-mxcurioni/extern/libmv/third_party/ssba/Geometry/v3d_metricbundle.cpp
branches/soc-2008-mxcurioni/extern/libmv/third_party/ssba/Geometry/v3d_metricbundle.h
branches/soc-2008-mxcurioni/intern/audaspace/intern/AUD_LinearResampleReader.cpp
branches/soc-2008-mxcurioni/intern/cycles/CMakeLists.txt
branches/soc-2008-mxcurioni/intern/cycles/SConscript
branches/soc-2008-mxcurioni/intern/cycles/blender/CMakeLists.txt
branches/soc-2008-mxcurioni/intern/cycles/blender/addon/__init__.py
branches/soc-2008-mxcurioni/intern/cycles/blender/addon/engine.py
branches/soc-2008-mxcurioni/intern/cycles/blender/addon/enums.py
branches/soc-2008-mxcurioni/intern/cycles/blender/addon/presets.py
branches/soc-2008-mxcurioni/intern/cycles/blender/addon/properties.py
branches/soc-2008-mxcurioni/intern/cycles/blender/addon/ui.py
branches/soc-2008-mxcurioni/intern/cycles/blender/addon/xml.py
branches/soc-2008-mxcurioni/intern/cycles/blender/blender_shader.cpp
branches/soc-2008-mxcurioni/intern/cycles/blender/blender_util.h
branches/soc-2008-mxcurioni/intern/cycles/cmake/external_libs.cmake
branches/soc-2008-mxcurioni/intern/cycles/device/device_cpu.cpp
branches/soc-2008-mxcurioni/intern/cycles/device/device_opencl.cpp
branches/soc-2008-mxcurioni/intern/cycles/kernel/CMakeLists.txt
branches/soc-2008-mxcurioni/intern/cycles/kernel/kernel.h
branches/soc-2008-mxcurioni/intern/cycles/kernel/kernel_globals.h
branches/soc-2008-mxcurioni/intern/cycles/kernel/kernel_shader.h
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/CMakeLists.txt
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/nodes/node_diffuse_bsdf.osl
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/nodes/stdosl.h
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/osl_closures.cpp
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/osl_closures.h
branches/soc-2008-mxcurioni/intern/cycles/kernel/svm/bsdf_microfacet.h
branches/soc-2008-mxcurioni/intern/cycles/kernel/svm/svm_bsdf.h
branches/soc-2008-mxcurioni/intern/cycles/kernel/svm/svm_closure.h
branches/soc-2008-mxcurioni/intern/cycles/kernel/svm/svm_types.h
branches/soc-2008-mxcurioni/intern/cycles/render/nodes.cpp
branches/soc-2008-mxcurioni/intern/cycles/util/CMakeLists.txt
branches/soc-2008-mxcurioni/intern/cycles/util/util_opencl.h
branches/soc-2008-mxcurioni/intern/cycles/util/util_system.cpp
branches/soc-2008-mxcurioni/intern/cycles/util/util_system.h
branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_SystemCocoa.mm
branches/soc-2008-mxcurioni/intern/itasc/kdl/chain.hpp
branches/soc-2008-mxcurioni/intern/itasc/kdl/tree.hpp
branches/soc-2008-mxcurioni/release/scripts/modules/addon_utils.py
branches/soc-2008-mxcurioni/release/scripts/modules/animsys_refactor.py
branches/soc-2008-mxcurioni/release/scripts/modules/bpy/path.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_operators/clip.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_operators/image.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_operators/presets.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_operators/wm.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/__init__.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_data_modifier.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_object_constraint.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_particle.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_physics_dynamicpaint.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_scene.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_texture.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/space_clip.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/space_sequencer.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/space_userpref.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/space_view3d.py
branches/soc-2008-mxcurioni/source/blender/blenfont/intern/blf_lang.c
branches/soc-2008-mxcurioni/source/blender/blenfont/intern/blf_translation.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_blender.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_camera.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_dynamicpaint.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_idprop.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_image.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_modifier.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_node.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_object.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_scene.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_screen.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_texture.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_tracking.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/blenkernel/SConscript
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/BME_Customdata.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/BME_mesh.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/anim_sys.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/camera.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/cdderivedmesh.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/constraint.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/customdata.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/dynamicpaint.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/fcurve.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/idprop.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/image.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/implicit.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/mball.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/mesh_validate.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/modifier.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/nla.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/node.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/object.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/particle.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/particle_system.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/scene.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/sequencer.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/softbody.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/text.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/texture.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/tracking.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/writeffmpeg.c
branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_math_geom.h
branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_mempool.h
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/BLI_ghash.c
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/BLI_mempool.c
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/DLRB_tree.c
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/bpath.c
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/math_geom.c
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/math_rotation.c
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/math_vector_inline.c
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/path_util.c
branches/soc-2008-mxcurioni/source/blender/blenloader/intern/readfile.c
branches/soc-2008-mxcurioni/source/blender/blenloader/intern/writefile.c
branches/soc-2008-mxcurioni/source/blender/editors/animation/anim_channels_edit.c
branches/soc-2008-mxcurioni/source/blender/editors/animation/anim_markers.c
branches/soc-2008-mxcurioni/source/blender/editors/curve/editcurve.c
branches/soc-2008-mxcurioni/source/blender/editors/gpencil/drawgpencil.c
branches/soc-2008-mxcurioni/source/blender/editors/gpencil/gpencil_edit.c
branches/soc-2008-mxcurioni/source/blender/editors/gpencil/gpencil_paint.c
branches/soc-2008-mxcurioni/source/blender/editors/include/ED_curve.h
branches/soc-2008-mxcurioni/source/blender/editors/include/ED_transform.h
branches/soc-2008-mxcurioni/source/blender/editors/include/ED_view3d.h
branches/soc-2008-mxcurioni/source/blender/editors/include/UI_interface.h
branches/soc-2008-mxcurioni/source/blender/editors/include/UI_resources.h
branches/soc-2008-mxcurioni/source/blender/editors/interface/interface.c
branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_anim.c
branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_handlers.c
branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_icons.c
branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_intern.h
branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_layout.c
branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_panel.c
branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_regions.c
branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_style.c
branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_templates.c
branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_widgets.c
branches/soc-2008-mxcurioni/source/blender/editors/interface/resources.c
branches/soc-2008-mxcurioni/source/blender/editors/interface/view2d.c
branches/soc-2008-mxcurioni/source/blender/editors/interface/view2d_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/object/object_add.c
branches/soc-2008-mxcurioni/source/blender/editors/object/object_bake.c
branches/soc-2008-mxcurioni/source/blender/editors/object/object_constraint.c
branches/soc-2008-mxcurioni/source/blender/editors/object/object_intern.h
branches/soc-2008-mxcurioni/source/blender/editors/object/object_modifier.c
branches/soc-2008-mxcurioni/source/blender/editors/object/object_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/object/object_vgroup.c
branches/soc-2008-mxcurioni/source/blender/editors/physics/dynamicpaint_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/physics/physics_fluid.c
branches/soc-2008-mxcurioni/source/blender/editors/render/render_internal.c
branches/soc-2008-mxcurioni/source/blender/editors/render/render_opengl.c
branches/soc-2008-mxcurioni/source/blender/editors/render/render_shading.c
branches/soc-2008-mxcurioni/source/blender/editors/screen/area.c
branches/soc-2008-mxcurioni/source/blender/editors/screen/screendump.c
branches/soc-2008-mxcurioni/source/blender/editors/sculpt_paint/paint_image.c
branches/soc-2008-mxcurioni/source/blender/editors/space_action/action_select.c
branches/soc-2008-mxcurioni/source/blender/editors/space_buttons/buttons_context.c
branches/soc-2008-mxcurioni/source/blender/editors/space_clip/clip_buttons.c
branches/soc-2008-mxcurioni/source/blender/editors/space_clip/clip_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/space_clip/clip_toolbar.c
branches/soc-2008-mxcurioni/source/blender/editors/space_clip/tracking_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/space_file/file_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/space_graph/graph_select.c
branches/soc-2008-mxcurioni/source/blender/editors/space_info/info_report.c
branches/soc-2008-mxcurioni/source/blender/editors/space_info/info_stats.c
branches/soc-2008-mxcurioni/source/blender/editors/space_nla/nla_select.c
branches/soc-2008-mxcurioni/source/blender/editors/space_node/drawnode.c
branches/soc-2008-mxcurioni/source/blender/editors/space_node/node_draw.c
branches/soc-2008-mxcurioni/source/blender/editors/space_node/node_edit.c
branches/soc-2008-mxcurioni/source/blender/editors/space_node/node_select.c
branches/soc-2008-mxcurioni/source/blender/editors/space_node/node_templates.c
branches/soc-2008-mxcurioni/source/blender/editors/space_outliner/outliner_tools.c
branches/soc-2008-mxcurioni/source/blender/editors/space_sequencer/sequencer_select.c
branches/soc-2008-mxcurioni/source/blender/editors/space_text/text_draw.c
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/drawarmature.c
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/drawobject.c
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/view3d_draw.c
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/view3d_edit.c
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/view3d_header.c
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/view3d_intern.h
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/view3d_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/view3d_view.c
branches/soc-2008-mxcurioni/source/blender/editors/transform/transform.c
branches/soc-2008-mxcurioni/source/blender/editors/transform/transform_generics.c
branches/soc-2008-mxcurioni/source/blender/editors/transform/transform_manipulator.c
branches/soc-2008-mxcurioni/source/blender/editors/transform/transform_snap.c
branches/soc-2008-mxcurioni/source/blender/editors/uvedit/uvedit_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/uvedit/uvedit_parametrizer.c
branches/soc-2008-mxcurioni/source/blender/gpu/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/gpu/GPU_material.h
branches/soc-2008-mxcurioni/source/blender/gpu/SConscript
branches/soc-2008-mxcurioni/source/blender/gpu/intern/gpu_codegen.c
branches/soc-2008-mxcurioni/source/blender/gpu/intern/gpu_shader_material.glsl
branches/soc-2008-mxcurioni/source/blender/gpu/intern/gpu_shader_material.glsl.c
branches/soc-2008-mxcurioni/source/blender/ikplugin/intern/iksolver_plugin.c
branches/soc-2008-mxcurioni/source/blender/ikplugin/intern/itasc_plugin.cpp
branches/soc-2008-mxcurioni/source/blender/imbuf/intern/IMB_anim.h
branches/soc-2008-mxcurioni/source/blender/imbuf/intern/anim_movie.c
branches/soc-2008-mxcurioni/source/blender/imbuf/intern/moviecache.c
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_ID.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_constraint_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_dynamicpaint_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_modifier_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_node_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_object_fluidsim.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_particle_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_texture_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_tracking_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_userdef_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/intern/makesdna.c
branches/soc-2008-mxcurioni/source/blender/makesrna/RNA_access.h
branches/soc-2008-mxcurioni/source/blender/makesrna/RNA_define.h
branches/soc-2008-mxcurioni/source/blender/makesrna/RNA_types.h
branches/soc-2008-mxcurioni/source/blender/makesrna/SConscript
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/makesrna.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_access.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_actuator.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_armature.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_camera.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_constraint.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_context.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_controller.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_define.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_dynamicpaint.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_fcurve.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_fluidsim.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_mesh.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_modifier.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_movieclip.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_nodetree.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_object_api.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_pose.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_scene.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_scene_api.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_sequencer.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_space.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_text.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_text_api.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_texture.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_tracking.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_ui.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_ui_api.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_userdef.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_wm.c
branches/soc-2008-mxcurioni/source/blender/modifiers/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/modifiers/MOD_modifiertypes.h
branches/soc-2008-mxcurioni/source/blender/modifiers/SConscript
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_dynamicpaint.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_fluidsim_util.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_util.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_uvproject.c
branches/soc-2008-mxcurioni/source/blender/nodes/NOD_composite.h
branches/soc-2008-mxcurioni/source/blender/nodes/NOD_shader.h
branches/soc-2008-mxcurioni/source/blender/nodes/NOD_socket.h
branches/soc-2008-mxcurioni/source/blender/nodes/NOD_texture.h
branches/soc-2008-mxcurioni/source/blender/nodes/composite/node_composite_tree.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/node_composite_util.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/node_composite_util.h
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_alphaOver.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_bilateralblur.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_blur.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_brightness.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_channelMatte.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_chromaMatte.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_colorMatte.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_colorSpill.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_colorbalance.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_common.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_composite.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_crop.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_curves.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_defocus.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_diffMatte.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_dilate.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_directionalblur.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_displace.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_distanceMatte.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_filter.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_flip.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_gamma.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_glare.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_hueSatVal.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_huecorrect.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_idMask.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_image.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_invert.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_lensdist.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_levels.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_lummaMatte.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_mapUV.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_mapValue.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_math.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_mixrgb.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_movieclip.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_moviedistortion.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_normal.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_normalize.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_outputFile.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_premulkey.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_rgb.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_rotate.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_scale.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_sepcombHSVA.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_sepcombRGBA.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_sepcombYCCA.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_sepcombYUVA.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_setalpha.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_splitViewer.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_stabilize2d.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_texture.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_tonemap.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_transform.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_translate.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_valToRgb.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_value.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_vecBlur.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_viewer.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_zcombine.c
branches/soc-2008-mxcurioni/source/blender/nodes/intern/node_common.c
branches/soc-2008-mxcurioni/source/blender/nodes/intern/node_exec.c
branches/soc-2008-mxcurioni/source/blender/nodes/intern/node_util.c
branches/soc-2008-mxcurioni/source/blender/nodes/intern/node_util.h
branches/soc-2008-mxcurioni/source/blender/nodes/shader/node_shader_tree.c
branches/soc-2008-mxcurioni/source/blender/nodes/shader/node_shader_util.c
branches/soc-2008-mxcurioni/source/blender/nodes/shader/node_shader_util.h
branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_add_shader.c
branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_attribute.c
branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_background.c
branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_bsdf_anisotropic.c
branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_bsdf_diffuse.c
branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_bsdf_glass.c
branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_bsdf_glossy.c
branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_bsdf_translucent.c
branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_bsdf_transparent.c
branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_bsdf_velvet.c
branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_camera.c
branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_common.c
branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_curves.c
branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_dynamic.c
branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_emission.c
branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_fresnel.c
branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_geom.c
branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_geometry.c
branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_holdout.c
branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_hueSatVal.c
branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_invert.c
branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_layer_weight.c
branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_light_path.c
branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_mapping.c
branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_material.c
branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_math.c
branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_mixRgb.c
branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_mix_shader.c
branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_normal.c
branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_output.c
branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_output_lamp.c
branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_output_material.c
branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_output_world.c
branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_rgb.c
branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_sepcombRGB.c
branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_squeeze.c
branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_tex_coord.c
branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_tex_environment.c
branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_tex_gradient.c
branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_tex_image.c
branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_tex_magic.c
branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_tex_musgrave.c
branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_tex_noise.c
branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_tex_sky.c
branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_tex_voronoi.c
branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_tex_wave.c
branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_texture.c
branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_valToRgb.c
branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_value.c
branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_vectMath.c
branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_volume_isotropic.c
branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_volume_transparent.c
branches/soc-2008-mxcurioni/source/blender/nodes/texture/node_texture_tree.c
branches/soc-2008-mxcurioni/source/blender/nodes/texture/node_texture_util.c
branches/soc-2008-mxcurioni/source/blender/nodes/texture/node_texture_util.h
branches/soc-2008-mxcurioni/source/blender/nodes/texture/nodes/node_texture_at.c
branches/soc-2008-mxcurioni/source/blender/nodes/texture/nodes/node_texture_bricks.c
branches/soc-2008-mxcurioni/source/blender/nodes/texture/nodes/node_texture_checker.c
branches/soc-2008-mxcurioni/source/blender/nodes/texture/nodes/node_texture_common.c
branches/soc-2008-mxcurioni/source/blender/nodes/texture/nodes/node_texture_compose.c
branches/soc-2008-mxcurioni/source/blender/nodes/texture/nodes/node_texture_coord.c
branches/soc-2008-mxcurioni/source/blender/nodes/texture/nodes/node_texture_curves.c
branches/soc-2008-mxcurioni/source/blender/nodes/texture/nodes/node_texture_decompose.c
branches/soc-2008-mxcurioni/source/blender/nodes/texture/nodes/node_texture_distance.c
branches/soc-2008-mxcurioni/source/blender/nodes/texture/nodes/node_texture_hueSatVal.c
branches/soc-2008-mxcurioni/source/blender/nodes/texture/nodes/node_texture_image.c
branches/soc-2008-mxcurioni/source/blender/nodes/texture/nodes/node_texture_invert.c
branches/soc-2008-mxcurioni/source/blender/nodes/texture/nodes/node_texture_math.c
branches/soc-2008-mxcurioni/source/blender/nodes/texture/nodes/node_texture_mixRgb.c
branches/soc-2008-mxcurioni/source/blender/nodes/texture/nodes/node_texture_output.c
branches/soc-2008-mxcurioni/source/blender/nodes/texture/nodes/node_texture_proc.c
branches/soc-2008-mxcurioni/source/blender/nodes/texture/nodes/node_texture_rotate.c
branches/soc-2008-mxcurioni/source/blender/nodes/texture/nodes/node_texture_scale.c
branches/soc-2008-mxcurioni/source/blender/nodes/texture/nodes/node_texture_texture.c
branches/soc-2008-mxcurioni/source/blender/nodes/texture/nodes/node_texture_translate.c
branches/soc-2008-mxcurioni/source/blender/nodes/texture/nodes/node_texture_valToNor.c
branches/soc-2008-mxcurioni/source/blender/nodes/texture/nodes/node_texture_valToRgb.c
branches/soc-2008-mxcurioni/source/blender/nodes/texture/nodes/node_texture_viewer.c
branches/soc-2008-mxcurioni/source/blender/python/BPY_extern.h
branches/soc-2008-mxcurioni/source/blender/python/generic/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/python/generic/noise_py_api.c
branches/soc-2008-mxcurioni/source/blender/python/intern/bpy.c
branches/soc-2008-mxcurioni/source/blender/python/intern/bpy_driver.c
branches/soc-2008-mxcurioni/source/blender/python/intern/bpy_driver.h
branches/soc-2008-mxcurioni/source/blender/python/intern/bpy_props.c
branches/soc-2008-mxcurioni/source/blender/python/intern/bpy_rna.c
branches/soc-2008-mxcurioni/source/blender/python/mathutils/mathutils_Color.c
branches/soc-2008-mxcurioni/source/blender/python/mathutils/mathutils_Matrix.c
branches/soc-2008-mxcurioni/source/blender/python/mathutils/mathutils_Quaternion.c
branches/soc-2008-mxcurioni/source/blender/python/mathutils/mathutils_Vector.c
branches/soc-2008-mxcurioni/source/blender/python/mathutils/mathutils_geometry.c
branches/soc-2008-mxcurioni/source/blender/render/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/render/extern/include/RE_pipeline.h
branches/soc-2008-mxcurioni/source/blender/render/intern/include/render_types.h
branches/soc-2008-mxcurioni/source/blender/render/intern/source/convertblender.c
branches/soc-2008-mxcurioni/source/blender/render/intern/source/envmap.c
branches/soc-2008-mxcurioni/source/blender/render/intern/source/external_engine.c
branches/soc-2008-mxcurioni/source/blender/render/intern/source/initrender.c
branches/soc-2008-mxcurioni/source/blender/render/intern/source/pipeline.c
branches/soc-2008-mxcurioni/source/blender/render/intern/source/render_texture.c
branches/soc-2008-mxcurioni/source/blender/render/intern/source/shadeoutput.c
branches/soc-2008-mxcurioni/source/blender/windowmanager/WM_api.h
branches/soc-2008-mxcurioni/source/blender/windowmanager/WM_keymap.h
branches/soc-2008-mxcurioni/source/blender/windowmanager/intern/wm.c
branches/soc-2008-mxcurioni/source/blender/windowmanager/intern/wm_apple.c
branches/soc-2008-mxcurioni/source/blender/windowmanager/intern/wm_event_system.c
branches/soc-2008-mxcurioni/source/blender/windowmanager/intern/wm_files.c
branches/soc-2008-mxcurioni/source/blender/windowmanager/intern/wm_keymap.c
branches/soc-2008-mxcurioni/source/blender/windowmanager/intern/wm_operators.c
branches/soc-2008-mxcurioni/source/blenderplayer/bad_level_call_stubs/stubs.c
branches/soc-2008-mxcurioni/source/creator/CMakeLists.txt
branches/soc-2008-mxcurioni/source/creator/creator.c
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/BL_Shader.cpp
branches/soc-2008-mxcurioni/source/tests/pep8.py
Added Paths:
-----------
branches/soc-2008-mxcurioni/extern/libmv/libmv/tracking/esm_region_tracker.cc
branches/soc-2008-mxcurioni/extern/libmv/libmv/tracking/esm_region_tracker.h
branches/soc-2008-mxcurioni/extern/libmv/libmv/tracking/lmicklt_region_tracker.cc
branches/soc-2008-mxcurioni/extern/libmv/libmv/tracking/lmicklt_region_tracker.h
branches/soc-2008-mxcurioni/intern/cycles/kernel/kernel_optimized.cpp
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/bsdf_oren_nayar.cpp
branches/soc-2008-mxcurioni/intern/cycles/kernel/svm/bsdf_oren_nayar.h
branches/soc-2008-mxcurioni/intern/cycles/util/util_opencl.cpp
branches/soc-2008-mxcurioni/release/scripts/presets/camera/Sony_A55.py
branches/soc-2008-mxcurioni/release/scripts/presets/tracking_camera/Sony_A55.py
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_ocean.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/ocean.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_ocean.c
branches/soc-2008-mxcurioni/source/blender/python/generic/idprop_py_api.c
branches/soc-2008-mxcurioni/source/blender/python/generic/idprop_py_api.h
branches/soc-2008-mxcurioni/source/blender/render/intern/include/texture_ocean.h
branches/soc-2008-mxcurioni/source/blender/render/intern/source/texture_ocean.c
Removed Paths:
-------------
branches/soc-2008-mxcurioni/doc/python_api/epy/testbgl.py
branches/soc-2008-mxcurioni/extern/Eigen2/
branches/soc-2008-mxcurioni/intern/cycles/util/util_opencl.c
branches/soc-2008-mxcurioni/source/blender/python/generic/IDProp.c
branches/soc-2008-mxcurioni/source/blender/python/generic/IDProp.h
Property Changed:
----------------
branches/soc-2008-mxcurioni/
branches/soc-2008-mxcurioni/extern/libmv/third_party/ssba/README.libmv
branches/soc-2008-mxcurioni/intern/cycles/util/util_opencl.h
branches/soc-2008-mxcurioni/release/scripts/
branches/soc-2008-mxcurioni/release/scripts/startup/bl_operators/add_mesh_torus.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_operators/uvcalc_smart_project.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_operators/vertexpaint_dirt.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_data_armature.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_data_bone.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_data_camera.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_data_empty.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_data_lamp.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_data_lattice.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_data_mesh.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_data_metaball.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_data_modifier.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_game.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_material.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_particle.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_physics_field.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_physics_fluid.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_physics_smoke.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_texture.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_world.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/space_node.py
branches/soc-2008-mxcurioni/source/blender/editors/render/render_update.c
branches/soc-2008-mxcurioni/source/blender/editors/space_outliner/
branches/soc-2008-mxcurioni/source/blender/editors/uvedit/uvedit_buttons.c
Property changes on: branches/soc-2008-mxcurioni
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/blender:34011-39896,39898-40096,40098-41768
+ /trunk/blender:34011-39896,39898-40096,40098-42021
Modified: branches/soc-2008-mxcurioni/CMakeLists.txt
===================================================================
--- branches/soc-2008-mxcurioni/CMakeLists.txt 2011-11-20 19:03:52 UTC (rev
42023)
+++ branches/soc-2008-mxcurioni/CMakeLists.txt 2011-11-20 21:02:12 UTC (rev
42024)
@@ -171,6 +171,7 @@
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)
+option(WITH_MOD_OCEANSIM "Enable Ocean Modifier" OFF)
# Image format support
option(WITH_IMAGE_OPENEXR "Enable OpenEXR Support
(http://www.openexr.com)" ON)
@@ -218,6 +219,7 @@
option(WITH_CYCLES_TEST "Build cycles test
application" OFF)
option(WITH_CYCLES_CUDA_BINARIES "Build cycles CUDA binaries" OFF)
set(CYCLES_CUDA_BINARIES_ARCH sm_13 sm_20 sm_21 CACHE STRING "CUDA
architectures to build binaries for")
+mark_as_advanced(CYCLES_CUDA_BINARIES_ARCH)
# disable for now, but plan to support on all platforms eventually
option(WITH_MEM_JEMALLOC "Enable malloc replacement
(http://www.canonware.com/jemalloc)" OFF)
@@ -285,6 +287,10 @@
"line if youre a developer who
wants to add support.")
endif()
+if(NOT WITH_FFTW3 AND WITH_MOD_OCEANSIM)
+ message(FATAL_ERROR "WITH_MOD_OCEANSIM requires WITH_FFTW3 to be ON")
+endif()
+
# may as well build python module without a UI
if(WITH_PYTHON_MODULE)
set(WITH_HEADLESS ON)
@@ -1562,6 +1568,7 @@
info_cfg_option(WITH_MOD_BOOLEAN)
info_cfg_option(WITH_MOD_DECIMATE)
info_cfg_option(WITH_MOD_FLUID)
+ info_cfg_option(WITH_MOD_OCEANSIM)
info_cfg_text("")
Modified: branches/soc-2008-mxcurioni/GNUmakefile
===================================================================
--- branches/soc-2008-mxcurioni/GNUmakefile 2011-11-20 19:03:52 UTC (rev
42023)
+++ branches/soc-2008-mxcurioni/GNUmakefile 2011-11-20 21:02:12 UTC (rev
42024)
@@ -34,8 +34,11 @@
# Source and Build DIR's
BLENDER_DIR:=$(shell pwd -P)
BUILD_TYPE:=Release
-BUILD_CMAKE_ARGS:=
+ifndef BUILD_CMAKE_ARGS
+ BUILD_CMAKE_ARGS:=
+endif
+
ifndef BUILD_DIR
BUILD_DIR:=$(shell dirname $(BLENDER_DIR))/build/$(OS_NCASE)
endif
@@ -123,6 +126,7 @@
@echo " * bpy - build as a python module which can be loaded
from python directly"
@echo ""
@echo " Note, passing the argument 'BUILD_DIR=path' when calling make
will override the default build dir."
+ @echo " Note, passing the argument 'BUILD_CMAKE_ARGS=args' lets you
add cmake arguments."
@echo ""
@echo ""
@echo "Project Files for IDE's"
Modified: branches/soc-2008-mxcurioni/SConstruct
===================================================================
--- branches/soc-2008-mxcurioni/SConstruct 2011-11-20 19:03:52 UTC (rev
42023)
+++ branches/soc-2008-mxcurioni/SConstruct 2011-11-20 21:02:12 UTC (rev
42024)
@@ -70,6 +70,7 @@
B = Blender
VERSION = btools.VERSION # This is used in creating the local config
directories
+VERSION_RELEASE_CYCLE = btools.VERSION_RELEASE_CYCLE
### globals ###
platform = sys.platform
@@ -254,6 +255,7 @@
target_env_defs['WITH_BF_BINRELOC'] = False
target_env_defs['BF_BUILDINFO'] = False
target_env_defs['WITH_BF_FLUID'] = False
+ target_env_defs['WITH_BF_OCEANSIM'] = False
target_env_defs['WITH_BF_DECIMATE'] = False
target_env_defs['WITH_BF_BOOLEAN'] = False
target_env_defs['WITH_BF_PYTHON'] = False
@@ -329,7 +331,12 @@
if env['WITH_BF_FLUID'] == 1:
env['CPPFLAGS'].append('-DWITH_MOD_FLUID')
+# build with ocean sim?
+if env['WITH_BF_OCEANSIM'] == 1:
+ env['WITH_BF_FFTW3'] = 1 # ocean needs fftw3 so enable it
+ env['CPPFLAGS'].append('-DWITH_MOD_OCEANSIM')
+
if btools.ENDIAN == "big":
env['CPPFLAGS'].append('-D__BIG_ENDIAN__')
else:
@@ -518,6 +525,10 @@
if '__pycache__' in dn: # py3.2 cache dir
dn.remove('__pycache__')
+ # only for testing builds
+ if VERSION_RELEASE_CYCLE == "release" and "addons_contrib" in
dn:
+ dn.remove('addons_contrib')
+
dir = os.path.join(env['BF_INSTALLDIR'], VERSION)
dir += os.sep + os.path.basename(scriptpath) +
dp[len(scriptpath):]
Modified:
branches/soc-2008-mxcurioni/build_files/buildbot/config/user-config-i686.py
===================================================================
--- branches/soc-2008-mxcurioni/build_files/buildbot/config/user-config-i686.py
2011-11-20 19:03:52 UTC (rev 42023)
+++ branches/soc-2008-mxcurioni/build_files/buildbot/config/user-config-i686.py
2011-11-20 21:02:12 UTC (rev 42024)
@@ -109,6 +109,9 @@
BF_BOOST_LIB_STATIC = '${BF_BOOST_LIBPATH}/libboost_filesystem.a
${BF_BOOST_LIBPATH}/libboost_date_time.a ${BF_BOOST_LIBPATH}/libboost_regex.a
${BF_BOOST_LIBPATH}/libboost_system.a ${BF_BOOST_LIBPATH}/libboost_thread.a'
BF_BOOST_LIBPATH = '${BF_BOOST}/lib'
+# Ocean Simulation
+WITH_BF_OCEANSIM = True
+
# Compilation and optimization
BF_DEBUG = False
REL_CCFLAGS = ['-O2', '-msse', '-msse2'] # C & C++
Modified:
branches/soc-2008-mxcurioni/build_files/buildbot/config/user-config-player-i686.py
===================================================================
---
branches/soc-2008-mxcurioni/build_files/buildbot/config/user-config-player-i686.py
2011-11-20 19:03:52 UTC (rev 42023)
+++
branches/soc-2008-mxcurioni/build_files/buildbot/config/user-config-player-i686.py
2011-11-20 21:02:12 UTC (rev 42024)
@@ -86,6 +86,11 @@
# Motion Tracking
WITH_BF_LIBMV = False
+# Ocean Simulation
+WITH_BF_FFTW3 = True
+WITH_BF_STATICFFTW3 = True
+WITH_BF_OCEANSIM = True
+
# Compilation and optimization
BF_DEBUG = False
REL_CCFLAGS = ['-O2', '-msse', '-msse2'] # C & C++
Modified:
branches/soc-2008-mxcurioni/build_files/buildbot/config/user-config-player-x86_64.py
===================================================================
---
branches/soc-2008-mxcurioni/build_files/buildbot/config/user-config-player-x86_64.py
2011-11-20 19:03:52 UTC (rev 42023)
+++
branches/soc-2008-mxcurioni/build_files/buildbot/config/user-config-player-x86_64.py
2011-11-20 21:02:12 UTC (rev 42024)
@@ -86,6 +86,11 @@
# Motion Tracking
WITH_BF_LIBMV = False
+# Ocean Simulation
+WITH_BF_FFTW3 = True
+WITH_BF_STATICFFTW3 = True
+WITH_BF_OCEANSIM = True
+
# Compilation and optimization
BF_DEBUG = False
REL_CCFLAGS = ['-O2', '-msse', '-msse2'] # C & C++
Modified:
branches/soc-2008-mxcurioni/build_files/buildbot/config/user-config-x86_64.py
===================================================================
---
branches/soc-2008-mxcurioni/build_files/buildbot/config/user-config-x86_64.py
2011-11-20 19:03:52 UTC (rev 42023)
+++
branches/soc-2008-mxcurioni/build_files/buildbot/config/user-config-x86_64.py
2011-11-20 21:02:12 UTC (rev 42024)
@@ -109,6 +109,9 @@
BF_BOOST_LIB_STATIC = '${BF_BOOST_LIBPATH}/libboost_filesystem.a
${BF_BOOST_LIBPATH}/libboost_date_time.a ${BF_BOOST_LIBPATH}/libboost_regex.a
${BF_BOOST_LIBPATH}/libboost_system.a ${BF_BOOST_LIBPATH}/libboost_thread.a'
BF_BOOST_LIBPATH = '${BF_BOOST}/lib'
+# Ocean Simulation
+WITH_BF_OCEANSIM = True
+
# Compilation and optimization
BF_DEBUG = False
REL_CCFLAGS = ['-O2', '-msse', '-msse2'] # C & C++
Modified:
branches/soc-2008-mxcurioni/build_files/cmake/Modules/FindPythonLibsUnix.cmake
===================================================================
---
branches/soc-2008-mxcurioni/build_files/cmake/Modules/FindPythonLibsUnix.cmake
2011-11-20 19:03:52 UTC (rev 42023)
+++
branches/soc-2008-mxcurioni/build_files/cmake/Modules/FindPythonLibsUnix.cmake
2011-11-20 21:02:12 UTC (rev 42024)
@@ -139,9 +139,9 @@
# not used
# SET(PYTHON_BINARY ${PYTHON_EXECUTABLE} CACHE STRING "")
+ENDIF()
- MARK_AS_ADVANCED(
- PYTHON_INCLUDE_DIR
- PYTHON_LIBRARY
- )
-ENDIF()
+MARK_AS_ADVANCED(
+ PYTHON_INCLUDE_DIR
+ PYTHON_LIBRARY
+)
Modified:
branches/soc-2008-mxcurioni/build_files/cmake/cmake_consistency_check.py
===================================================================
--- branches/soc-2008-mxcurioni/build_files/cmake/cmake_consistency_check.py
2011-11-20 19:03:52 UTC (rev 42023)
+++ branches/soc-2008-mxcurioni/build_files/cmake/cmake_consistency_check.py
2011-11-20 21:02:12 UTC (rev 42024)
@@ -22,6 +22,12 @@
# <pep8 compliant>
+import sys
+if not sys.version.startswith("3"):
+ print("\nPython3.x needed, found %s.\nAborting!\n" %
+ sys.version.partition(" ")[0])
+ sys.exit(1)
+
from cmake_consistency_check_config import IGNORE, UTF8_CHECK, SOURCE_DIR
import os
Modified:
branches/soc-2008-mxcurioni/build_files/cmake/cmake_qtcreator_project.py
===================================================================
--- branches/soc-2008-mxcurioni/build_files/cmake/cmake_qtcreator_project.py
2011-11-20 19:03:52 UTC (rev 42023)
+++ branches/soc-2008-mxcurioni/build_files/cmake/cmake_qtcreator_project.py
2011-11-20 21:02:12 UTC (rev 42024)
@@ -89,7 +89,7 @@
f = open(os.path.join(PROJECT_DIR, "%s.files" % FILE_NAME), 'w')
f.write("\n".join(files_rel))
- f = open(os.path.join(PROJECT_DIR, "%s.includes" % FILE_NAME), 'w')
+ f = open(os.path.join(PROJECT_DIR, "%s.includes" % FILE_NAME), 'w',
encoding='utf-8')
f.write("\n".join(sorted(includes)))
qtc_prj = os.path.join(PROJECT_DIR, "%s.creator" % FILE_NAME)
@@ -104,7 +104,7 @@
defines_final += cmake_compiler_defines()
f.write("\n".join(defines_final))
- print("Blender project file written to: %s" % qtc_prj)
+ print("Blender project file written to: %r" % qtc_prj)
# --- end
@@ -133,7 +133,7 @@
f = open(qtc_cfg, 'w')
f.write("// ADD PREDEFINED MACROS HERE!\n")
- print("Python project file written to: %s" % qtc_prj)
+ print("Python project file written to: %r" % qtc_prj)
def main():
Modified:
branches/soc-2008-mxcurioni/build_files/cmake/config/blender_lite.cmake
===================================================================
--- branches/soc-2008-mxcurioni/build_files/cmake/config/blender_lite.cmake
2011-11-20 19:03:52 UTC (rev 42023)
+++ branches/soc-2008-mxcurioni/build_files/cmake/config/blender_lite.cmake
2011-11-20 21:02:12 UTC (rev 42024)
@@ -34,6 +34,7 @@
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
