[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [42905] branches/soc-2008-mxcurioni: Merged changes in the trunk up to revision 42902.
Tamito Kajiyama
rd6t-kjym at asahi-net.or.jp
Tue Dec 27 23:12:56 CET 2011
Revision: 42905
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=42905
Author: kjym3
Date: 2011-12-27 22:12:46 +0000 (Tue, 27 Dec 2011)
Log Message:
-----------
Merged changes in the trunk up to revision 42902.
Conflicts resolved:
source/blender/editors/space_view3d/drawobject.c
source/blender/makesdna/DNA_mesh_types.h
source/blender/python/intern/bpy.c
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=42902
Modified Paths:
--------------
branches/soc-2008-mxcurioni/CMakeLists.txt
branches/soc-2008-mxcurioni/SConstruct
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/btools.py
branches/soc-2008-mxcurioni/doc/python_api/rst/change_log.rst
branches/soc-2008-mxcurioni/intern/audaspace/intern/AUD_SoftwareDevice.cpp
branches/soc-2008-mxcurioni/intern/cycles/app/cycles_test.cpp
branches/soc-2008-mxcurioni/intern/cycles/app/cycles_xml.cpp
branches/soc-2008-mxcurioni/intern/cycles/blender/addon/engine.py
branches/soc-2008-mxcurioni/intern/cycles/blender/addon/ui.py
branches/soc-2008-mxcurioni/intern/cycles/blender/blender_camera.cpp
branches/soc-2008-mxcurioni/intern/cycles/blender/blender_mesh.cpp
branches/soc-2008-mxcurioni/intern/cycles/blender/blender_object.cpp
branches/soc-2008-mxcurioni/intern/cycles/blender/blender_python.cpp
branches/soc-2008-mxcurioni/intern/cycles/blender/blender_session.cpp
branches/soc-2008-mxcurioni/intern/cycles/blender/blender_session.h
branches/soc-2008-mxcurioni/intern/cycles/blender/blender_shader.cpp
branches/soc-2008-mxcurioni/intern/cycles/blender/blender_sync.cpp
branches/soc-2008-mxcurioni/intern/cycles/blender/blender_sync.h
branches/soc-2008-mxcurioni/intern/cycles/device/device.cpp
branches/soc-2008-mxcurioni/intern/cycles/device/device.h
branches/soc-2008-mxcurioni/intern/cycles/device/device_cpu.cpp
branches/soc-2008-mxcurioni/intern/cycles/device/device_cuda.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.cl
branches/soc-2008-mxcurioni/intern/cycles/kernel/kernel.cpp
branches/soc-2008-mxcurioni/intern/cycles/kernel/kernel.cu
branches/soc-2008-mxcurioni/intern/cycles/kernel/kernel.h
branches/soc-2008-mxcurioni/intern/cycles/kernel/kernel_camera.h
branches/soc-2008-mxcurioni/intern/cycles/kernel/kernel_compat_opencl.h
branches/soc-2008-mxcurioni/intern/cycles/kernel/kernel_film.h
branches/soc-2008-mxcurioni/intern/cycles/kernel/kernel_optimized.cpp
branches/soc-2008-mxcurioni/intern/cycles/kernel/kernel_path.h
branches/soc-2008-mxcurioni/intern/cycles/kernel/kernel_random.h
branches/soc-2008-mxcurioni/intern/cycles/kernel/kernel_types.h
branches/soc-2008-mxcurioni/intern/cycles/render/buffers.cpp
branches/soc-2008-mxcurioni/intern/cycles/render/buffers.h
branches/soc-2008-mxcurioni/intern/cycles/render/camera.cpp
branches/soc-2008-mxcurioni/intern/cycles/render/graph.cpp
branches/soc-2008-mxcurioni/intern/cycles/render/graph.h
branches/soc-2008-mxcurioni/intern/cycles/render/integrator.cpp
branches/soc-2008-mxcurioni/intern/cycles/render/integrator.h
branches/soc-2008-mxcurioni/intern/cycles/render/nodes.cpp
branches/soc-2008-mxcurioni/intern/cycles/render/nodes.h
branches/soc-2008-mxcurioni/intern/cycles/render/session.cpp
branches/soc-2008-mxcurioni/intern/cycles/render/session.h
branches/soc-2008-mxcurioni/intern/cycles/render/tile.cpp
branches/soc-2008-mxcurioni/intern/cycles/render/tile.h
branches/soc-2008-mxcurioni/intern/cycles/util/util_math.h
branches/soc-2008-mxcurioni/intern/cycles/util/util_transform.h
branches/soc-2008-mxcurioni/intern/ghost/GHOST_C-api.h
branches/soc-2008-mxcurioni/intern/ghost/GHOST_ISystem.h
branches/soc-2008-mxcurioni/intern/ghost/GHOST_IWindow.h
branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_C-api.cpp
branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_CallbackEventConsumer.cpp
branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_Debug.h
branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_DisplayManager.h
branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_EventDragnDrop.h
branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_EventKey.h
branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_EventNDOF.h
branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_EventTrackpad.h
branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_System.cpp
branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_System.h
branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_SystemCocoa.h
branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_SystemX11.cpp
branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_TimerTask.h
branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_Window.cpp
branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_Window.h
branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_WindowCocoa.mm
branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_WindowWin32.cpp
branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_WindowWin32.h
branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_WindowX11.cpp
branches/soc-2008-mxcurioni/intern/guardedalloc/MEM_sys_types.h
branches/soc-2008-mxcurioni/intern/iksolver/intern/IK_Solver.cpp
branches/soc-2008-mxcurioni/intern/mikktspace/mikktspace.c
branches/soc-2008-mxcurioni/intern/opennl/intern/opennl.c
branches/soc-2008-mxcurioni/intern/opennl/superlu/get_perm_c.c
branches/soc-2008-mxcurioni/intern/opennl/superlu/scolumn_bmod.c
branches/soc-2008-mxcurioni/intern/opennl/superlu/strsv.c
branches/soc-2008-mxcurioni/intern/opennl/superlu/sutil.c
branches/soc-2008-mxcurioni/intern/opennl/superlu/util.h
branches/soc-2008-mxcurioni/release/scripts/modules/bpy_extras/io_utils.py
branches/soc-2008-mxcurioni/release/scripts/modules/bpy_extras/keyconfig_utils.py
branches/soc-2008-mxcurioni/release/scripts/modules/bpy_extras/view3d_utils.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_operators/clip.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_operators/sequencer.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_operators/uvcalc_smart_project.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_operators/wm.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_game.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_particle.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_render.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_scene.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/space_logic.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/space_node.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/space_text.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/space_view3d.py
branches/soc-2008-mxcurioni/source/blender/blenfont/BLF_translation.h
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_customdata.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_global.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_modifier.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_movieclip.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_node.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_texture.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_writeffmpeg.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/depsgraph_private.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/DerivedMesh.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/cdderivedmesh.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/customdata.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/depsgraph.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/ipo.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/mesh.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/movieclip.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/subsurf_ccg.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/unit.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/writeavi.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/writeffmpeg.c
branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_dynstr.h
branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_math_vector.h
branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_utildefines.h
branches/soc-2008-mxcurioni/source/blender/blenlib/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/BLI_dynstr.c
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/bpath.c
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/math_vector.c
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/path_util.c
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/storage.c
branches/soc-2008-mxcurioni/source/blender/blenloader/BLO_sys_types.h
branches/soc-2008-mxcurioni/source/blender/blenloader/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/blenloader/SConscript
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_filter.c
branches/soc-2008-mxcurioni/source/blender/editors/include/ED_mesh.h
branches/soc-2008-mxcurioni/source/blender/editors/include/ED_view3d.h
branches/soc-2008-mxcurioni/source/blender/editors/interface/interface.c
branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_handlers.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_templates.c
branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_widgets.c
branches/soc-2008-mxcurioni/source/blender/editors/interface/view2d.c
branches/soc-2008-mxcurioni/source/blender/editors/mesh/editface.c
branches/soc-2008-mxcurioni/source/blender/editors/mesh/editmesh.c
branches/soc-2008-mxcurioni/source/blender/editors/mesh/meshtools.c
branches/soc-2008-mxcurioni/source/blender/editors/object/object_edit.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/screen/screen_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/sculpt_paint/paint_image.c
branches/soc-2008-mxcurioni/source/blender/editors/sculpt_paint/paint_intern.h
branches/soc-2008-mxcurioni/source/blender/editors/sculpt_paint/paint_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/sculpt_paint/paint_stroke.c
branches/soc-2008-mxcurioni/source/blender/editors/sculpt_paint/paint_utils.c
branches/soc-2008-mxcurioni/source/blender/editors/sculpt_paint/sculpt.c
branches/soc-2008-mxcurioni/source/blender/editors/space_clip/clip_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/space_clip/tracking_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/space_node/node_buttons.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_intern.h
branches/soc-2008-mxcurioni/source/blender/editors/space_node/node_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/space_node/node_select.c
branches/soc-2008-mxcurioni/source/blender/editors/space_node/node_state.c
branches/soc-2008-mxcurioni/source/blender/editors/space_outliner/outliner_edit.c
branches/soc-2008-mxcurioni/source/blender/editors/space_outliner/outliner_select.c
branches/soc-2008-mxcurioni/source/blender/editors/space_text/text_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/drawmesh.c
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/drawobject.c
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/view3d_header.c
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/view3d_select.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.h
branches/soc-2008-mxcurioni/source/blender/editors/transform/transform_conversions.c
branches/soc-2008-mxcurioni/source/blender/editors/transform/transform_snap.c
branches/soc-2008-mxcurioni/source/blender/gpu/intern/gpu_codegen.c
branches/soc-2008-mxcurioni/source/blender/gpu/intern/gpu_codegen.h
branches/soc-2008-mxcurioni/source/blender/gpu/intern/gpu_draw.c
branches/soc-2008-mxcurioni/source/blender/gpu/intern/gpu_extensions.c
branches/soc-2008-mxcurioni/source/blender/gpu/intern/gpu_material.c
branches/soc-2008-mxcurioni/source/blender/imbuf/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/imbuf/intern/thumbs.c
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_defs.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_genfile.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_mesh_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_movieclip_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_object_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_scene_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_world_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/intern/dna_genfile.c
branches/soc-2008-mxcurioni/source/blender/makesdna/intern/makesdna.c
branches/soc-2008-mxcurioni/source/blender/makesrna/RNA_define.h
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_define.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_internal_types.h
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_material.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_mesh.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.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_object_api.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_rna.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_scene.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_space.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_userdef.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_world.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_decimate.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_edgesplit.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_mirror.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_multires.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_screw.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_shrinkwrap.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_smooth.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_solidify.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_uvproject.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_weightvgedit.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_weightvgmix.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_weightvgproximity.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_alphaOver.c
branches/soc-2008-mxcurioni/source/blender/nodes/shader/node_shader_util.c
branches/soc-2008-mxcurioni/source/blender/python/generic/bgl.c
branches/soc-2008-mxcurioni/source/blender/python/generic/bpy_internal_import.c
branches/soc-2008-mxcurioni/source/blender/python/generic/idprop_py_api.c
branches/soc-2008-mxcurioni/source/blender/python/generic/py_capi_utils.c
branches/soc-2008-mxcurioni/source/blender/python/intern/bpy.c
branches/soc-2008-mxcurioni/source/blender/python/intern/bpy_app.c
branches/soc-2008-mxcurioni/source/blender/python/intern/bpy_app_handlers.c
branches/soc-2008-mxcurioni/source/blender/python/intern/bpy_driver.c
branches/soc-2008-mxcurioni/source/blender/python/intern/bpy_interface.c
branches/soc-2008-mxcurioni/source/blender/python/intern/bpy_interface_atexit.c
branches/soc-2008-mxcurioni/source/blender/python/intern/bpy_intern_string.c
branches/soc-2008-mxcurioni/source/blender/python/intern/bpy_library.c
branches/soc-2008-mxcurioni/source/blender/python/intern/bpy_operator.c
branches/soc-2008-mxcurioni/source/blender/python/intern/bpy_operator_wrap.c
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/intern/bpy_rna_anim.c
branches/soc-2008-mxcurioni/source/blender/python/intern/bpy_rna_array.c
branches/soc-2008-mxcurioni/source/blender/python/intern/bpy_rna_callback.c
branches/soc-2008-mxcurioni/source/blender/python/intern/bpy_traceback.c
branches/soc-2008-mxcurioni/source/blender/python/intern/bpy_util.c
branches/soc-2008-mxcurioni/source/blender/python/intern/gpu.c
branches/soc-2008-mxcurioni/source/blender/python/mathutils/mathutils.c
branches/soc-2008-mxcurioni/source/blender/python/mathutils/mathutils.h
branches/soc-2008-mxcurioni/source/blender/python/mathutils/mathutils_Color.c
branches/soc-2008-mxcurioni/source/blender/python/mathutils/mathutils_Euler.c
branches/soc-2008-mxcurioni/source/blender/python/mathutils/mathutils_Euler.h
branches/soc-2008-mxcurioni/source/blender/python/mathutils/mathutils_Matrix.c
branches/soc-2008-mxcurioni/source/blender/python/mathutils/mathutils_Matrix.h
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_Vector.h
branches/soc-2008-mxcurioni/source/blender/python/mathutils/mathutils_geometry.c
branches/soc-2008-mxcurioni/source/blender/python/mathutils/mathutils_noise.c
branches/soc-2008-mxcurioni/source/blender/quicktime/apple/qtkit_export.m
branches/soc-2008-mxcurioni/source/blender/quicktime/apple/quicktime_export.c
branches/soc-2008-mxcurioni/source/blender/quicktime/quicktime_export.h
branches/soc-2008-mxcurioni/source/blender/render/intern/raytrace/rayobject_octree.cpp
branches/soc-2008-mxcurioni/source/blender/render/intern/source/convertblender.c
branches/soc-2008-mxcurioni/source/blender/render/intern/source/external_engine.c
branches/soc-2008-mxcurioni/source/blender/render/intern/source/pixelshading.c
branches/soc-2008-mxcurioni/source/blender/render/intern/source/rayshade.c
branches/soc-2008-mxcurioni/source/blender/render/intern/source/render_texture.c
branches/soc-2008-mxcurioni/source/blender/render/intern/source/renderdatabase.c
branches/soc-2008-mxcurioni/source/blender/render/intern/source/shadeoutput.c
branches/soc-2008-mxcurioni/source/blender/render/intern/source/strand.c
branches/soc-2008-mxcurioni/source/blender/render/intern/source/volumetric.c
branches/soc-2008-mxcurioni/source/blender/windowmanager/intern/wm_event_system.c
branches/soc-2008-mxcurioni/source/blender/windowmanager/intern/wm_operators.c
branches/soc-2008-mxcurioni/source/creator/CMakeLists.txt
branches/soc-2008-mxcurioni/source/creator/creator.c
branches/soc-2008-mxcurioni/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
branches/soc-2008-mxcurioni/source/gameengine/BlenderRoutines/KX_BlenderInputDevice.h
branches/soc-2008-mxcurioni/source/gameengine/BlenderRoutines/KX_BlenderKeyboardDevice.cpp
branches/soc-2008-mxcurioni/source/gameengine/BlenderRoutines/KX_BlenderKeyboardDevice.h
branches/soc-2008-mxcurioni/source/gameengine/Converter/BL_BlenderDataConversion.cpp
branches/soc-2008-mxcurioni/source/gameengine/Converter/BL_BlenderDataConversion.h
branches/soc-2008-mxcurioni/source/gameengine/Converter/KX_ConvertSensors.cpp
branches/soc-2008-mxcurioni/source/gameengine/GamePlayer/common/GPC_KeyboardDevice.h
branches/soc-2008-mxcurioni/source/gameengine/GamePlayer/ghost/GPG_Application.cpp
branches/soc-2008-mxcurioni/source/gameengine/GamePlayer/ghost/GPG_Application.h
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_IPO_SGController.cpp
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_KetsjiEngine.cpp
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_KetsjiEngine.h
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_PyMath.h
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_PythonInit.cpp
branches/soc-2008-mxcurioni/source/gameengine/Rasterizer/RAS_2DFilterManager.cpp
branches/soc-2008-mxcurioni/source/tests/CMakeLists.txt
Added Paths:
-----------
branches/soc-2008-mxcurioni/intern/cycles/app/io_export_cycles_xml.py
branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_md5.h
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/md5.c
branches/soc-2008-mxcurioni/source/tests/bl_pyapi_mathutils.py
Removed Paths:
-------------
branches/soc-2008-mxcurioni/source/blender/imbuf/intern/md5.c
branches/soc-2008-mxcurioni/source/blender/imbuf/intern/md5.h
Property Changed:
----------------
branches/soc-2008-mxcurioni/
branches/soc-2008-mxcurioni/release/scripts/startup/bl_operators/uvcalc_smart_project.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_game.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_particle.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/space_node.py
branches/soc-2008-mxcurioni/source/blender/editors/space_outliner/
Property changes on: branches/soc-2008-mxcurioni
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/soc-2011-cucumber:37517
/branches/soc-2011-tomato:42376,42378-42379,42397,42400
/trunk/blender:34011-39896,39898-40096,40098-42692
+ /branches/soc-2011-cucumber:37517
/branches/soc-2011-tomato:42376,42378-42379,42397,42400
/trunk/blender:34011-39896,39898-40096,40098-42902
Modified: branches/soc-2008-mxcurioni/CMakeLists.txt
===================================================================
--- branches/soc-2008-mxcurioni/CMakeLists.txt 2011-12-27 13:44:15 UTC (rev 42904)
+++ branches/soc-2008-mxcurioni/CMakeLists.txt 2011-12-27 22:12:46 UTC (rev 42905)
@@ -281,10 +281,12 @@
message(FATAL_ERROR "WITH_PYTHON_MODULE requires WITH_PYTHON_INSTALL to be OFF")
endif()
-if(WITH_CODEC_QUICKTIME AND MINGW)
- message(FATAL_ERROR "MINGW requires WITH_CODEC_QUICKTIME to be OFF "
- "because it is currently unsupported, remove this "
- "line if youre a developer who wants to add support.")
+if(MINGW)
+ if(WITH_CODEC_QUICKTIME)
+ message(FATAL_ERROR "MINGW requires WITH_CODEC_QUICKTIME to be OFF "
+ "because it is currently unsupported, remove this "
+ "line if youre a developer who wants to add support.")
+ endif()
endif()
if(NOT WITH_FFTW3 AND WITH_MOD_OCEANSIM)
@@ -649,10 +651,6 @@
set(ICONV_LIBPATH ${ICONV}/lib)
endif()
- set(PNG "${LIBDIR}/png")
- set(PNG_INCLUDE_DIR "${PNG}/include")
- set(PNG_LIBPATH ${PNG}/lib) # not cmake defined
-
set(JPEG "${LIBDIR}/jpeg")
set(JPEG_INCLUDE_DIR "${JPEG}/include")
set(JPEG_LIBPATH ${JPEG}/lib) # not cmake defined
@@ -662,7 +660,7 @@
if(WITH_OPENAL)
set(OPENAL ${LIBDIR}/openal)
set(OPENAL_INCLUDE_DIR ${OPENAL}/include)
- set(OPENAL_LIBRARY wrap_oal)
+ set(OPENAL_LIBRARY OpenAL32)
set(OPENAL_LIBPATH ${OPENAL}/lib)
endif()
@@ -727,12 +725,12 @@
set(GETTEXT_LIBRARIES gnu_gettext)
endif()
- if(CMAKE_CL_64)
- set(PNG_LIBRARIES libpng)
- else()
- set(PNG_LIBRARIES libpng_st)
- endif()
+ set(PNG_LIBRARIES libpng)
set(JPEG_LIBRARIES libjpeg)
+
+ set(PNG "${LIBDIR}/png")
+ set(PNG_INCLUDE_DIR "${PNG}/include")
+ set(PNG_LIBPATH ${PNG}/lib) # not cmake defined
set(ZLIB_INCLUDE_DIRS ${LIBDIR}/zlib/include)
if(CMAKE_CL_64)
@@ -913,6 +911,10 @@
set(GETTEXT_LIBPATH ${GETTEXT}/lib)
set(GETTEXT_LIBRARIES intl)
endif()
+
+ set(PNG "${LIBDIR}/gcc/png")
+ set(PNG_INCLUDE_DIR "${PNG}/include")
+ set(PNG_LIBPATH ${PNG}/lib) # not cmake defined
set(JPEG_LIBRARIES libjpeg)
set(PNG_LIBRARIES png)
Modified: branches/soc-2008-mxcurioni/SConstruct
===================================================================
--- branches/soc-2008-mxcurioni/SConstruct 2011-12-27 13:44:15 UTC (rev 42904)
+++ branches/soc-2008-mxcurioni/SConstruct 2011-12-27 22:12:46 UTC (rev 42905)
@@ -726,10 +726,6 @@
# For MinGW and linuxcross static linking will be used
dllsources += ['${LCGDIR}/gettext/lib/gnu_gettext.dll']
- #currently win64-vc doesn't appear to have libpng.dll
- if env['OURPLATFORM'] != 'win64-vc':
- dllsources += ['${BF_PNG_LIBPATH}/libpng.dll']
-
dllsources += ['${BF_ZLIB_LIBPATH}/zlib.dll']
# Used when linking to libtiff was dynamic
# keep it here until compilation on all platform would be ok
@@ -760,7 +756,6 @@
if env['WITH_BF_OPENAL']:
dllsources.append('${LCGDIR}/openal/lib/OpenAL32.dll')
- dllsources.append('${LCGDIR}/openal/lib/wrap_oal.dll')
if env['WITH_BF_SNDFILE']:
dllsources.append('${LCGDIR}/sndfile/lib/libsndfile-1.dll')
Modified: branches/soc-2008-mxcurioni/build_files/scons/config/linuxcross-config.py
===================================================================
--- branches/soc-2008-mxcurioni/build_files/scons/config/linuxcross-config.py 2011-12-27 13:44:15 UTC (rev 42904)
+++ branches/soc-2008-mxcurioni/build_files/scons/config/linuxcross-config.py 2011-12-27 22:12:46 UTC (rev 42905)
@@ -13,7 +13,7 @@
WITH_BF_STATICOPENAL = False
BF_OPENAL = LIBDIR + '/openal'
BF_OPENAL_INC = '${BF_OPENAL}/include'
-BF_OPENAL_LIB = 'OpenAL32 wrap_oal'
+BF_OPENAL_LIB = 'OpenAL32'
BF_OPENAL_LIBPATH = '${BF_OPENAL}/lib'
# Warning, this static lib configuration is untested! users of this OS please confirm.
BF_OPENAL_LIB_STATIC = '${BF_OPENAL}/lib/libopenal.a'
Modified: branches/soc-2008-mxcurioni/build_files/scons/config/win32-mingw-config.py
===================================================================
--- branches/soc-2008-mxcurioni/build_files/scons/config/win32-mingw-config.py 2011-12-27 13:44:15 UTC (rev 42904)
+++ branches/soc-2008-mxcurioni/build_files/scons/config/win32-mingw-config.py 2011-12-27 22:12:46 UTC (rev 42905)
@@ -14,7 +14,7 @@
WITH_BF_OPENAL = True
BF_OPENAL = LIBDIR + '/openal'
BF_OPENAL_INC = '${BF_OPENAL}/include'
-BF_OPENAL_LIB = 'wrap_oal'
+BF_OPENAL_LIB = 'OpenAL32'
BF_OPENAL_LIBPATH = '${BF_OPENAL}/lib'
WITH_BF_FFMPEG = True
@@ -64,7 +64,7 @@
BF_JPEG_LIBPATH = '${BF_JPEG}/lib'
WITH_BF_PNG = True
-BF_PNG = LIBDIR + '/png'
+BF_PNG = LIBDIR + '/gcc/png'
BF_PNG_INC = '${BF_PNG}/include'
BF_PNG_LIB = 'png'
BF_PNG_LIBPATH = '${BF_PNG}/lib'
Modified: branches/soc-2008-mxcurioni/build_files/scons/config/win32-vc-config.py
===================================================================
--- branches/soc-2008-mxcurioni/build_files/scons/config/win32-vc-config.py 2011-12-27 13:44:15 UTC (rev 42904)
+++ branches/soc-2008-mxcurioni/build_files/scons/config/win32-vc-config.py 2011-12-27 22:12:46 UTC (rev 42905)
@@ -20,7 +20,7 @@
WITH_BF_OPENAL = True
BF_OPENAL = LIBDIR + '/openal'
BF_OPENAL_INC = '${BF_OPENAL}/include '
-BF_OPENAL_LIB = 'wrap_oal'
+BF_OPENAL_LIB = 'OpenAL32'
BF_OPENAL_LIBPATH = '${BF_OPENAL}/lib'
WITH_BF_ICONV = True
@@ -72,7 +72,7 @@
WITH_BF_PNG = True
BF_PNG = LIBDIR + '/png'
BF_PNG_INC = '${BF_PNG}/include'
-BF_PNG_LIB = 'libpng_st'
+BF_PNG_LIB = 'libpng'
BF_PNG_LIBPATH = '${BF_PNG}/lib'
WITH_BF_TIFF = True
Modified: branches/soc-2008-mxcurioni/build_files/scons/config/win64-vc-config.py
===================================================================
--- branches/soc-2008-mxcurioni/build_files/scons/config/win64-vc-config.py 2011-12-27 13:44:15 UTC (rev 42904)
+++ branches/soc-2008-mxcurioni/build_files/scons/config/win64-vc-config.py 2011-12-27 22:12:46 UTC (rev 42905)
@@ -20,7 +20,7 @@
WITH_BF_OPENAL = True
BF_OPENAL = LIBDIR + '/openal'
BF_OPENAL_INC = '${BF_OPENAL}/include '
-BF_OPENAL_LIB = 'wrap_oal'
+BF_OPENAL_LIB = 'OpenAL32'
BF_OPENAL_LIBPATH = '${BF_OPENAL}/lib'
WITH_BF_SNDFILE = True
Modified: branches/soc-2008-mxcurioni/build_files/scons/tools/btools.py
===================================================================
--- branches/soc-2008-mxcurioni/build_files/scons/tools/btools.py 2011-12-27 13:44:15 UTC (rev 42904)
+++ branches/soc-2008-mxcurioni/build_files/scons/tools/btools.py 2011-12-27 22:12:46 UTC (rev 42905)
@@ -159,7 +159,8 @@
'WITH_BF_3DMOUSE', 'WITH_BF_STATIC3DMOUSE', 'BF_3DMOUSE', 'BF_3DMOUSE_INC', 'BF_3DMOUSE_LIB', 'BF_3DMOUSE_LIBPATH', 'BF_3DMOUSE_LIB_STATIC',
'WITH_BF_CYCLES', 'WITH_BF_CYCLES_CUDA_BINARIES' 'BF_CYCLES_CUDA_NVCC', 'BF_CYCLES_CUDA_NVCC', 'WITH_BF_CYCLES_CUDA_THREADED_COMPILE',
'WITH_BF_OIIO', 'WITH_BF_STATICOIIO', 'BF_OIIO', 'BF_OIIO_INC', 'BF_OIIO_LIB', 'BF_OIIO_LIB_STATIC', 'BF_OIIO_LIBPATH',
- 'WITH_BF_BOOST', 'WITH_BF_STATICBOOST', 'BF_BOOST', 'BF_BOOST_INC', 'BF_BOOST_LIB', 'BF_BOOST_LIB_STATIC', 'BF_BOOST_LIBPATH'
+ 'WITH_BF_BOOST', 'WITH_BF_STATICBOOST', 'BF_BOOST', 'BF_BOOST_INC', 'BF_BOOST_LIB', 'BF_BOOST_LIB_STATIC', 'BF_BOOST_LIBPATH',
+ 'WITH_BF_LIBMV'
]
# Have options here that scons expects to be lists
Modified: branches/soc-2008-mxcurioni/doc/python_api/rst/change_log.rst
===================================================================
--- branches/soc-2008-mxcurioni/doc/python_api/rst/change_log.rst 2011-12-27 13:44:15 UTC (rev 42904)
+++ branches/soc-2008-mxcurioni/doc/python_api/rst/change_log.rst 2011-12-27 22:12:46 UTC (rev 42905)
@@ -1480,3 +1480,640 @@
* :class:`bpy.types.SceneGameData.restrict_animation_updates`
* :class:`bpy.types.SceneGameData.show_obstacle_simulation`
+
+2.60 to 2.61
+============
+
+bpy.types.BlendDataGroups
+-------------------------
+
+Added
+^^^^^
+
+* :class:`bpy.types.BlendDataGroups.is_updated`
+
+bpy.types.BlendDataBrushes
+--------------------------
+
+Added
+^^^^^
+
+* :class:`bpy.types.BlendDataBrushes.is_updated`
+
+bpy.types.Theme
+---------------
+
+Added
+^^^^^
+
+* :class:`bpy.types.Theme.clip_editor`
+
+bpy.types.BlendData
+-------------------
+
+Added
+^^^^^
+
+* :class:`bpy.types.BlendData.movieclips`
+
+bpy.types.BlendDataGreasePencils
+--------------------------------
+
+Added
+^^^^^
+
+* :class:`bpy.types.BlendDataGreasePencils.is_updated`
+
+bpy.types.BlendDataImages
+-------------------------
+
+Added
+^^^^^
+
+* :class:`bpy.types.BlendDataImages.is_updated`
+
+bpy.types.CompositorNodes
+-------------------------
+
+Added
+^^^^^
+
+* :class:`bpy.types.CompositorNodes.clear`
+
+bpy.types.BlendDataScenes
+-------------------------
+
+Added
+^^^^^
+
+* :class:`bpy.types.BlendDataScenes.is_updated`
+
+bpy.types.RenderEngine
+----------------------
+
+Added
+^^^^^
+
+* :class:`bpy.types.RenderEngine.bl_use_shading_nodes`
+* :class:`bpy.types.RenderEngine.is_animation`
+* :class:`bpy.types.RenderEngine.is_preview`
+* :class:`bpy.types.RenderEngine.tag_redraw`
+* :class:`bpy.types.RenderEngine.tag_update`
+* :class:`bpy.types.RenderEngine.update`
+* :class:`bpy.types.RenderEngine.update_progress`
+* :class:`bpy.types.RenderEngine.view_draw`
+* :class:`bpy.types.RenderEngine.view_update`
+
+bpy.types.BackgroundImage
+-------------------------
+
+Added
+^^^^^
+
+* :class:`bpy.types.BackgroundImage.clip`
+* :class:`bpy.types.BackgroundImage.clip_user`
+* :class:`bpy.types.BackgroundImage.show_background_image`
+* :class:`bpy.types.BackgroundImage.source`
+* :class:`bpy.types.BackgroundImage.use_camera_clip`
+
+bpy.types.BlendDataMetaBalls
+----------------------------
+
+Added
+^^^^^
+
+* :class:`bpy.types.BlendDataMetaBalls.is_updated`
+
+bpy.types.SpaceTimeline
+-----------------------
+
+Added
+^^^^^
+
+* :class:`bpy.types.SpaceTimeline.cache_dynamicpaint`
+
+bpy.types.BlendDataMeshes
+-------------------------
+
+Added
+^^^^^
+
+* :class:`bpy.types.BlendDataMeshes.is_updated`
+
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list