[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [54596] branches/soc-2008-mxcurioni: Merged changes in the trunk up to revision 54594.

Sat Feb 16 19:38:04 CET 2013

Revision: 54596
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=54596
Author:   kjym3
Date:     2013-02-16 18:38:03 +0000 (Sat, 16 Feb 2013)
Log Message:
-----------
Merged changes in the trunk up to revision 54594.

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

Modified Paths:
--------------
    branches/soc-2008-mxcurioni/SConstruct
    branches/soc-2008-mxcurioni/build_files/scons/config/win32-vc-config.py
    branches/soc-2008-mxcurioni/doc/manpage/blender.1
    branches/soc-2008-mxcurioni/intern/bsp/intern/CSG_BooleanOps.cpp
    branches/soc-2008-mxcurioni/intern/cycles/SConscript
    branches/soc-2008-mxcurioni/intern/cycles/blender/blender_session.cpp
    branches/soc-2008-mxcurioni/intern/cycles/blender/blender_sync.cpp
    branches/soc-2008-mxcurioni/intern/cycles/blender/blender_util.h
    branches/soc-2008-mxcurioni/intern/cycles/bvh/bvh.cpp
    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/kernel/kernel_emission.h
    branches/soc-2008-mxcurioni/intern/cycles/kernel/kernel_light.h
    branches/soc-2008-mxcurioni/intern/cycles/kernel/kernel_passes.h
    branches/soc-2008-mxcurioni/intern/cycles/kernel/kernel_shader.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/image.cpp
    branches/soc-2008-mxcurioni/intern/cycles/render/image.h
    branches/soc-2008-mxcurioni/intern/cycles/render/light.cpp
    branches/soc-2008-mxcurioni/intern/cycles/render/mesh.cpp
    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/osl.cpp
    branches/soc-2008-mxcurioni/intern/cycles/render/osl.h
    branches/soc-2008-mxcurioni/intern/cycles/render/scene.cpp
    branches/soc-2008-mxcurioni/intern/cycles/render/scene.h
    branches/soc-2008-mxcurioni/intern/cycles/render/session.cpp
    branches/soc-2008-mxcurioni/intern/cycles/render/shader.h
    branches/soc-2008-mxcurioni/intern/cycles/render/svm.cpp
    branches/soc-2008-mxcurioni/intern/cycles/render/svm.h
    branches/soc-2008-mxcurioni/intern/cycles/util/util_boundbox.h
    branches/soc-2008-mxcurioni/intern/cycles/util/util_cache.h
    branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_SystemCocoa.mm
    branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_SystemX11.cpp
    branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_SystemX11.h
    branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_WindowX11.cpp
    branches/soc-2008-mxcurioni/intern/smoke/intern/FFT_NOISE.h
    branches/soc-2008-mxcurioni/intern/smoke/intern/FLUID_3D.cpp
    branches/soc-2008-mxcurioni/release/scripts/modules/bl_i18n_utils/bl_process_msg.py
    branches/soc-2008-mxcurioni/release/scripts/modules/bl_i18n_utils/settings.py
    branches/soc-2008-mxcurioni/release/scripts/modules/bl_i18n_utils/spell_check_utils.py
    branches/soc-2008-mxcurioni/release/scripts/modules/bl_i18n_utils/update_po.py
    branches/soc-2008-mxcurioni/release/scripts/modules/bl_i18n_utils/utils.py
    branches/soc-2008-mxcurioni/release/scripts/modules/bpy/__init__.py
    branches/soc-2008-mxcurioni/release/scripts/modules/rna_prop_ui.py
    branches/soc-2008-mxcurioni/release/scripts/presets/interface_theme/back_to_black.xml
    branches/soc-2008-mxcurioni/release/scripts/presets/interface_theme/blender_24x.xml
    branches/soc-2008-mxcurioni/release/scripts/presets/interface_theme/elsyiun.xml
    branches/soc-2008-mxcurioni/release/scripts/presets/interface_theme/hexagon.xml
    branches/soc-2008-mxcurioni/release/scripts/presets/interface_theme/ubuntu_ambiance.xml
    branches/soc-2008-mxcurioni/release/scripts/presets/keyconfig/maya.py
    branches/soc-2008-mxcurioni/release/scripts/startup/bl_operators/rigidbody.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_modifier.py
    branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_material.py
    branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_paint_common.py
    branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_particle.py
    branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_physics_common.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_rigidbody.py
    branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_physics_rigidbody_constraint.py
    branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_scene.py
    branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/space_clip.py
    branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/space_image.py
    branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/space_info.py
    branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/space_sequencer.py
    branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/space_text.py
    branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/space_userpref.py
    branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/space_userpref_keymap.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_translation.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_deform.h
    branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_object.h
    branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_rigidbody.h
    branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_text.h
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/anim.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/brush.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/cdderivedmesh.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/deform.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/depsgraph.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/dynamicpaint.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/effect.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/image.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/lattice.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/mball.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/mesh.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/object.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/particle_system.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/rigidbody.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/smoke.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/text.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/unit.c
    branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_math_geom.h
    branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_math_matrix.h
    branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_string_cursor_utf8.h
    branches/soc-2008-mxcurioni/source/blender/blenlib/intern/BLI_mempool.c
    branches/soc-2008-mxcurioni/source/blender/blenlib/intern/fileops.c
    branches/soc-2008-mxcurioni/source/blender/blenlib/intern/math_geom.c
    branches/soc-2008-mxcurioni/source/blender/blenlib/intern/math_matrix.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/scanfill.c
    branches/soc-2008-mxcurioni/source/blender/blenlib/intern/string_cursor_utf8.c
    branches/soc-2008-mxcurioni/source/blender/blenlib/intern/string_utf8.c
    branches/soc-2008-mxcurioni/source/blender/blenloader/intern/readfile.c
    branches/soc-2008-mxcurioni/source/blender/bmesh/bmesh_class.h
    branches/soc-2008-mxcurioni/source/blender/bmesh/intern/bmesh_core.c
    branches/soc-2008-mxcurioni/source/blender/bmesh/intern/bmesh_iterators_inline.h
    branches/soc-2008-mxcurioni/source/blender/bmesh/intern/bmesh_queries.c
    branches/soc-2008-mxcurioni/source/blender/bmesh/operators/bmo_subdivide.c
    branches/soc-2008-mxcurioni/source/blender/bmesh/operators/bmo_triangulate.c
    branches/soc-2008-mxcurioni/source/blender/bmesh/tools/bmesh_decimate_unsubdivide.c
    branches/soc-2008-mxcurioni/source/blender/collada/AnimationExporter.cpp
    branches/soc-2008-mxcurioni/source/blender/collada/ArmatureExporter.cpp
    branches/soc-2008-mxcurioni/source/blender/collada/ArmatureImporter.cpp
    branches/soc-2008-mxcurioni/source/blender/collada/ControllerExporter.cpp
    branches/soc-2008-mxcurioni/source/blender/collada/DocumentImporter.cpp
    branches/soc-2008-mxcurioni/source/blender/collada/DocumentImporter.h
    branches/soc-2008-mxcurioni/source/blender/collada/GeometryExporter.cpp
    branches/soc-2008-mxcurioni/source/blender/collada/MeshImporter.cpp
    branches/soc-2008-mxcurioni/source/blender/collada/MeshImporter.h
    branches/soc-2008-mxcurioni/source/blender/collada/SceneExporter.cpp
    branches/soc-2008-mxcurioni/source/blender/collada/TransformReader.cpp
    branches/soc-2008-mxcurioni/source/blender/collada/TransformWriter.cpp
    branches/soc-2008-mxcurioni/source/blender/collada/collada.cpp
    branches/soc-2008-mxcurioni/source/blender/collada/collada.h
    branches/soc-2008-mxcurioni/source/blender/collada/collada_internal.cpp
    branches/soc-2008-mxcurioni/source/blender/collada/collada_internal.h
    branches/soc-2008-mxcurioni/source/blender/collada/collada_utils.cpp
    branches/soc-2008-mxcurioni/source/blender/collada/collada_utils.h
    branches/soc-2008-mxcurioni/source/blender/compositor/nodes/COM_CompositorNode.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/nodes/COM_ViewerNode.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_CompositorOperation.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_CompositorOperation.h
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_InpaintOperation.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_ViewerBaseOperation.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_ViewerBaseOperation.h
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_ViewerOperation.cpp
    branches/soc-2008-mxcurioni/source/blender/editors/armature/editarmature.c
    branches/soc-2008-mxcurioni/source/blender/editors/armature/poselib.c
    branches/soc-2008-mxcurioni/source/blender/editors/include/ED_mball.h
    branches/soc-2008-mxcurioni/source/blender/editors/include/ED_object.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_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/io/io_collada.c
    branches/soc-2008-mxcurioni/source/blender/editors/mesh/editmesh_tools.c
    branches/soc-2008-mxcurioni/source/blender/editors/mesh/meshtools.c
    branches/soc-2008-mxcurioni/source/blender/editors/metaball/mball_edit.c
    branches/soc-2008-mxcurioni/source/blender/editors/metaball/mball_ops.c
    branches/soc-2008-mxcurioni/source/blender/editors/object/CMakeLists.txt
    branches/soc-2008-mxcurioni/source/blender/editors/object/SConscript
    branches/soc-2008-mxcurioni/source/blender/editors/object/object_constraint.c
    branches/soc-2008-mxcurioni/source/blender/editors/object/object_hook.c
    branches/soc-2008-mxcurioni/source/blender/editors/object/object_modifier.c
    branches/soc-2008-mxcurioni/source/blender/editors/object/object_relations.c
    branches/soc-2008-mxcurioni/source/blender/editors/object/object_transform.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/particle_edit.c
    branches/soc-2008-mxcurioni/source/blender/editors/physics/rigidbody_constraint.c
    branches/soc-2008-mxcurioni/source/blender/editors/physics/rigidbody_object.c
    branches/soc-2008-mxcurioni/source/blender/editors/physics/rigidbody_world.c
    branches/soc-2008-mxcurioni/source/blender/editors/render/render_preview.c
    branches/soc-2008-mxcurioni/source/blender/editors/render/render_view.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_image_2d.c
    branches/soc-2008-mxcurioni/source/blender/editors/sculpt_paint/paint_ops.c
    branches/soc-2008-mxcurioni/source/blender/editors/sculpt_paint/paint_vertex.c
    branches/soc-2008-mxcurioni/source/blender/editors/sculpt_paint/sculpt_intern.h
    branches/soc-2008-mxcurioni/source/blender/editors/space_buttons/buttons_header.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_buttons/buttons_ops.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_clip/clip_dopesheet_draw.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_clip/space_clip.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_console/console_draw.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_console/console_ops.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_file/file_draw.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_file/filesel.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_file/space_file.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_image/image_buttons.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_image/image_draw.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_image/space_image.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_info/info_stats.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_header.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_node/space_node.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_outliner/outliner_draw.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/view3d_draw.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/view3d_edit.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_input.c
    branches/soc-2008-mxcurioni/source/blender/editors/uvedit/uvedit_parametrizer.c
    branches/soc-2008-mxcurioni/source/blender/editors/uvedit/uvedit_smart_stitch.c
    branches/soc-2008-mxcurioni/source/blender/gpu/shaders/gpu_shader_material.glsl
    branches/soc-2008-mxcurioni/source/blender/imbuf/IMB_colormanagement.h
    branches/soc-2008-mxcurioni/source/blender/imbuf/IMB_imbuf_types.h
    branches/soc-2008-mxcurioni/source/blender/imbuf/intern/colormanagement.c
    branches/soc-2008-mxcurioni/source/blender/imbuf/intern/filter.c
    branches/soc-2008-mxcurioni/source/blender/imbuf/intern/rectop.c
    branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_meshdata_types.h
    branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_meta_types.h
    branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_rigidbody_types.h
    branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_userdef_types.h
    branches/soc-2008-mxcurioni/source/blender/makesrna/RNA_types.h
    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_brush.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_define.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_internal.h
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_main_api.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_meta.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_nodetree.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_nodetree_types.h
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_object_api.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_rigidbody.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_scene.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_sculpt_paint.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_texture.c
    branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_explode.c
    branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_ocean.c
    branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_alphaOver.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_viewer.c
    branches/soc-2008-mxcurioni/source/blender/nodes/shader/node_shader_util.c
    branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_brightness.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_decompose.c
    branches/soc-2008-mxcurioni/source/blender/python/bmesh/bmesh_py_ops_call.c
    branches/soc-2008-mxcurioni/source/blender/python/bmesh/bmesh_py_types.c
    branches/soc-2008-mxcurioni/source/blender/python/intern/bpy_app_translations.c
    branches/soc-2008-mxcurioni/source/blender/render/intern/source/imagetexture.c
    branches/soc-2008-mxcurioni/source/blender/render/intern/source/multires_bake.c
    branches/soc-2008-mxcurioni/source/blender/render/intern/source/pipeline.c
    branches/soc-2008-mxcurioni/source/blender/render/intern/source/render_result.c
    branches/soc-2008-mxcurioni/source/blender/render/intern/source/render_texture.c
    branches/soc-2008-mxcurioni/source/blender/render/intern/source/voxeldata.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_draw.c
    branches/soc-2008-mxcurioni/source/blender/windowmanager/intern/wm_event_system.c
    branches/soc-2008-mxcurioni/source/blender/windowmanager/intern/wm_gesture.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/blender/windowmanager/intern/wm_window.c
    branches/soc-2008-mxcurioni/source/blenderplayer/bad_level_call_stubs/stubs.c
    branches/soc-2008-mxcurioni/source/creator/creator.c
    branches/soc-2008-mxcurioni/source/gameengine/Converter/BL_BlenderDataConversion.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_GameObject.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_GameObject.h
    branches/soc-2008-mxcurioni/source/gameengine/Rasterizer/RAS_BucketManager.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_StorageIM.cpp
    branches/soc-2008-mxcurioni/source/tests/bl_load_py_modules.py
    branches/soc-2008-mxcurioni/source/tests/bl_run_operators.py

Added Paths:
-----------
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_meta_api.c

Property Changed:
----------------
    branches/soc-2008-mxcurioni/
    branches/soc-2008-mxcurioni/doc/python_api/rst/bge_types/bge.types.BL_ActionActuator.rst
    branches/soc-2008-mxcurioni/doc/python_api/rst/bge_types/bge.types.BL_ArmatureActuator.rst
    branches/soc-2008-mxcurioni/doc/python_api/rst/bge_types/bge.types.BL_ArmatureBone.rst
    branches/soc-2008-mxcurioni/doc/python_api/rst/bge_types/bge.types.BL_ArmatureChannel.rst
    branches/soc-2008-mxcurioni/doc/python_api/rst/bge_types/bge.types.BL_ArmatureConstraint.rst
    branches/soc-2008-mxcurioni/doc/python_api/rst/bge_types/bge.types.BL_ArmatureObject.rst
    branches/soc-2008-mxcurioni/doc/python_api/rst/bge_types/bge.types.BL_Shader.rst
    branches/soc-2008-mxcurioni/doc/python_api/rst/bge_types/bge.types.BL_ShapeActionActuator.rst
    branches/soc-2008-mxcurioni/doc/python_api/rst/bge_types/bge.types.CListValue.rst
    branches/soc-2008-mxcurioni/doc/python_api/rst/bge_types/bge.types.CPropValue.rst
    branches/soc-2008-mxcurioni/doc/python_api/rst/bge_types/bge.types.CValue.rst
    branches/soc-2008-mxcurioni/doc/python_api/rst/bge_types/bge.types.KX_ArmatureSensor.rst
    branches/soc-2008-mxcurioni/doc/python_api/rst/bge_types/bge.types.KX_BlenderMaterial.rst
    branches/soc-2008-mxcurioni/doc/python_api/rst/bge_types/bge.types.KX_Camera.rst
    branches/soc-2008-mxcurioni/doc/python_api/rst/bge_types/bge.types.KX_CameraActuator.rst
    branches/soc-2008-mxcurioni/doc/python_api/rst/bge_types/bge.types.KX_CharacterWrapper.rst
    branches/soc-2008-mxcurioni/doc/python_api/rst/bge_types/bge.types.KX_ConstraintActuator.rst
    branches/soc-2008-mxcurioni/doc/python_api/rst/bge_types/bge.types.KX_ConstraintWrapper.rst
    branches/soc-2008-mxcurioni/doc/python_api/rst/bge_types/bge.types.KX_FontObject.rst
    branches/soc-2008-mxcurioni/doc/python_api/rst/bge_types/bge.types.KX_GameActuator.rst
    branches/soc-2008-mxcurioni/doc/python_api/rst/bge_types/bge.types.KX_GameObject.rst
    branches/soc-2008-mxcurioni/doc/python_api/rst/bge_types/bge.types.KX_IpoActuator.rst
    branches/soc-2008-mxcurioni/doc/python_api/rst/bge_types/bge.types.KX_LibLoadStatus.rst
    branches/soc-2008-mxcurioni/doc/python_api/rst/bge_types/bge.types.KX_LightObject.rst
    branches/soc-2008-mxcurioni/doc/python_api/rst/bge_types/bge.types.KX_MeshProxy.rst
    branches/soc-2008-mxcurioni/doc/python_api/rst/bge_types/bge.types.KX_MouseFocusSensor.rst
    branches/soc-2008-mxcurioni/doc/python_api/rst/bge_types/bge.types.KX_NavMeshObject.rst
    branches/soc-2008-mxcurioni/doc/python_api/rst/bge_types/bge.types.KX_NearSensor.rst
    branches/soc-2008-mxcurioni/doc/python_api/rst/bge_types/bge.types.KX_NetworkMessageActuator.rst
    branches/soc-2008-mxcurioni/doc/python_api/rst/bge_types/bge.types.KX_NetworkMessageSensor.rst
    branches/soc-2008-mxcurioni/doc/python_api/rst/bge_types/bge.types.KX_ObjectActuator.rst
    branches/soc-2008-mxcurioni/doc/python_api/rst/bge_types/bge.types.KX_ParentActuator.rst
    branches/soc-2008-mxcurioni/doc/python_api/rst/bge_types/bge.types.KX_PolyProxy.rst
    branches/soc-2008-mxcurioni/doc/python_api/rst/bge_types/bge.types.KX_PolygonMaterial.rst
    branches/soc-2008-mxcurioni/doc/python_api/rst/bge_types/bge.types.KX_RadarSensor.rst
    branches/soc-2008-mxcurioni/doc/python_api/rst/bge_types/bge.types.KX_RaySensor.rst
    branches/soc-2008-mxcurioni/doc/python_api/rst/bge_types/bge.types.KX_SCA_AddObjectActuator.rst
    branches/soc-2008-mxcurioni/doc/python_api/rst/bge_types/bge.types.KX_SCA_DynamicActuator.rst
    branches/soc-2008-mxcurioni/doc/python_api/rst/bge_types/bge.types.KX_SCA_EndObjectActuator.rst
    branches/soc-2008-mxcurioni/doc/python_api/rst/bge_types/bge.types.KX_SCA_ReplaceMeshActuator.rst
    branches/soc-2008-mxcurioni/doc/python_api/rst/bge_types/bge.types.KX_Scene.rst
    branches/soc-2008-mxcurioni/doc/python_api/rst/bge_types/bge.types.KX_SceneActuator.rst
    branches/soc-2008-mxcurioni/doc/python_api/rst/bge_types/bge.types.KX_SoundActuator.rst
    branches/soc-2008-mxcurioni/doc/python_api/rst/bge_types/bge.types.KX_StateActuator.rst
    branches/soc-2008-mxcurioni/doc/python_api/rst/bge_types/bge.types.KX_SteeringActuator.rst
    branches/soc-2008-mxcurioni/doc/python_api/rst/bge_types/bge.types.KX_TouchSensor.rst
    branches/soc-2008-mxcurioni/doc/python_api/rst/bge_types/bge.types.KX_TrackToActuator.rst
    branches/soc-2008-mxcurioni/doc/python_api/rst/bge_types/bge.types.KX_VehicleWrapper.rst
    branches/soc-2008-mxcurioni/doc/python_api/rst/bge_types/bge.types.KX_VertexProxy.rst
    branches/soc-2008-mxcurioni/doc/python_api/rst/bge_types/bge.types.KX_VisibilityActuator.rst
    branches/soc-2008-mxcurioni/doc/python_api/rst/bge_types/bge.types.PyObjectPlus.rst
    branches/soc-2008-mxcurioni/doc/python_api/rst/bge_types/bge.types.SCA_2DFilterActuator.rst
    branches/soc-2008-mxcurioni/doc/python_api/rst/bge_types/bge.types.SCA_ANDController.rst
    branches/soc-2008-mxcurioni/doc/python_api/rst/bge_types/bge.types.SCA_ActuatorSensor.rst
    branches/soc-2008-mxcurioni/doc/python_api/rst/bge_types/bge.types.SCA_AlwaysSensor.rst
    branches/soc-2008-mxcurioni/doc/python_api/rst/bge_types/bge.types.SCA_DelaySensor.rst
    branches/soc-2008-mxcurioni/doc/python_api/rst/bge_types/bge.types.SCA_IActuator.rst
    branches/soc-2008-mxcurioni/doc/python_api/rst/bge_types/bge.types.SCA_IController.rst
    branches/soc-2008-mxcurioni/doc/python_api/rst/bge_types/bge.types.SCA_ILogicBrick.rst
    branches/soc-2008-mxcurioni/doc/python_api/rst/bge_types/bge.types.SCA_IObject.rst
    branches/soc-2008-mxcurioni/doc/python_api/rst/bge_types/bge.types.SCA_ISensor.rst
    branches/soc-2008-mxcurioni/doc/python_api/rst/bge_types/bge.types.SCA_JoystickSensor.rst
    branches/soc-2008-mxcurioni/doc/python_api/rst/bge_types/bge.types.SCA_KeyboardSensor.rst
    branches/soc-2008-mxcurioni/doc/python_api/rst/bge_types/bge.types.SCA_MouseSensor.rst
    branches/soc-2008-mxcurioni/doc/python_api/rst/bge_types/bge.types.SCA_NANDController.rst
    branches/soc-2008-mxcurioni/doc/python_api/rst/bge_types/bge.types.SCA_NORController.rst
    branches/soc-2008-mxcurioni/doc/python_api/rst/bge_types/bge.types.SCA_ORController.rst
    branches/soc-2008-mxcurioni/doc/python_api/rst/bge_types/bge.types.SCA_PropertyActuator.rst
    branches/soc-2008-mxcurioni/doc/python_api/rst/bge_types/bge.types.SCA_PropertySensor.rst
    branches/soc-2008-mxcurioni/doc/python_api/rst/bge_types/bge.types.SCA_PythonController.rst
    branches/soc-2008-mxcurioni/doc/python_api/rst/bge_types/bge.types.SCA_PythonJoystick.rst
    branches/soc-2008-mxcurioni/doc/python_api/rst/bge_types/bge.types.SCA_PythonKeyboard.rst
    branches/soc-2008-mxcurioni/doc/python_api/rst/bge_types/bge.types.SCA_PythonMouse.rst
    branches/soc-2008-mxcurioni/doc/python_api/rst/bge_types/bge.types.SCA_RandomActuator.rst
    branches/soc-2008-mxcurioni/doc/python_api/rst/bge_types/bge.types.SCA_RandomSensor.rst
    branches/soc-2008-mxcurioni/doc/python_api/rst/bge_types/bge.types.SCA_XNORController.rst
    branches/soc-2008-mxcurioni/doc/python_api/rst/bge_types/bge.types.SCA_XORController.rst
    branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_data_armature.py
    branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_data_modifier.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_fluid.py
    branches/soc-2008-mxcurioni/source/blender/editors/interface/interface.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_outliner/


Property changes on: branches/soc-2008-mxcurioni
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/ge_harmony:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/soc-2011-tomato:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801,43872,44130,44141,44147-44149,44151-44152,44229-44230,45623-45625,46037,48089,48092,48551-48552,48679,48790,48792-48793,49076,49087,49292,49294,49466,49894,50052,50126
/trunk/blender:34011-39896,39898-40096,40098-44221,44223-44419,44421-47664,47667-51853,51855-54421
   + /branches/ge_harmony:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/soc-2011-tomato:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801,43872,44130,44141,44147-44149,44151-44152,44229-44230,45623-45625,46037,48089,48092,48551-48552,48679,48790,48792-48793,49076,49087,49292,49294,49466,49894,50052,50126
/trunk/blender:34011-39896,39898-40096,40098-44221,44223-44419,44421-47664,47667-51853,51855-54594

Modified: branches/soc-2008-mxcurioni/SConstruct
===================================================================

--- branches/soc-2008-mxcurioni/SConstruct	2013-02-16 17:13:59 UTC (rev 54595)
+++ branches/soc-2008-mxcurioni/SConstruct	2013-02-16 18:38:03 UTC (rev 54596)
@@ -518,88 +518,89 @@
 	data_to_c(FILE_FROM, FILE_TO, VAR_NAME)
 	
 
-data_to_c("source/blender/compositor/operations/COM_OpenCLKernels.cl",
-          B.root_build_dir + "data_headers/COM_OpenCLKernels.cl.h",
-          "datatoc_COM_OpenCLKernels_cl")
+if B.targets != ['cudakernels']:
+    data_to_c("source/blender/compositor/operations/COM_OpenCLKernels.cl",
+              B.root_build_dir + "data_headers/COM_OpenCLKernels.cl.h",
+              "datatoc_COM_OpenCLKernels_cl")
 
-data_to_c_simple("release/datafiles/startup.blend")
-data_to_c_simple("release/datafiles/preview.blend")
-data_to_c_simple("release/datafiles/preview_cycles.blend")
+    data_to_c_simple("release/datafiles/startup.blend")
+    data_to_c_simple("release/datafiles/preview.blend")
+    data_to_c_simple("release/datafiles/preview_cycles.blend")
 
-# --- glsl ---
-data_to_c_simple("source/blender/gpu/shaders/gpu_shader_material.glsl")
-data_to_c_simple("source/blender/gpu/shaders/gpu_shader_vertex.glsl")
-data_to_c_simple("source/blender/gpu/shaders/gpu_shader_sep_gaussian_blur_frag.glsl")
-data_to_c_simple("source/blender/gpu/shaders/gpu_shader_sep_gaussian_blur_vert.glsl")
-data_to_c_simple("source/blender/gpu/shaders/gpu_shader_material.glsl")
-data_to_c_simple("source/blender/gpu/shaders/gpu_shader_vsm_store_frag.glsl")
-data_to_c_simple("source/blender/gpu/shaders/gpu_shader_vsm_store_vert.glsl")
+    # --- glsl ---
+    data_to_c_simple("source/blender/gpu/shaders/gpu_shader_material.glsl")
+    data_to_c_simple("source/blender/gpu/shaders/gpu_shader_vertex.glsl")
+    data_to_c_simple("source/blender/gpu/shaders/gpu_shader_sep_gaussian_blur_frag.glsl")
+    data_to_c_simple("source/blender/gpu/shaders/gpu_shader_sep_gaussian_blur_vert.glsl")
+    data_to_c_simple("source/blender/gpu/shaders/gpu_shader_material.glsl")
+    data_to_c_simple("source/blender/gpu/shaders/gpu_shader_vsm_store_frag.glsl")
+    data_to_c_simple("source/blender/gpu/shaders/gpu_shader_vsm_store_vert.glsl")
 
-# --- blender ---
-data_to_c_simple("release/datafiles/bfont.pfb")
-data_to_c_simple("release/datafiles/bfont.ttf")
-data_to_c_simple("release/datafiles/bmonofont.ttf")
+    # --- blender ---
+    data_to_c_simple("release/datafiles/bfont.pfb")
+    data_to_c_simple("release/datafiles/bfont.ttf")
+    data_to_c_simple("release/datafiles/bmonofont.ttf")
 
-data_to_c_simple("release/datafiles/splash.png")
-data_to_c_simple("release/datafiles/blender_icons16.png")
-data_to_c_simple("release/datafiles/blender_icons32.png")
-data_to_c_simple("release/datafiles/prvicons.png")
+    data_to_c_simple("release/datafiles/splash.png")
+    data_to_c_simple("release/datafiles/blender_icons16.png")
+    data_to_c_simple("release/datafiles/blender_icons32.png")
+    data_to_c_simple("release/datafiles/prvicons.png")
 
-data_to_c_simple("release/datafiles/brushicons/add.png")
-data_to_c_simple("release/datafiles/brushicons/blob.png")
-data_to_c_simple("release/datafiles/brushicons/blur.png")
-data_to_c_simple("release/datafiles/brushicons/clay.png")
-data_to_c_simple("release/datafiles/brushicons/claystrips.png")
-data_to_c_simple("release/datafiles/brushicons/clone.png")
-data_to_c_simple("release/datafiles/brushicons/crease.png")
-data_to_c_simple("release/datafiles/brushicons/darken.png")
-data_to_c_simple("release/datafiles/brushicons/draw.png")
-data_to_c_simple("release/datafiles/brushicons/fill.png")
-data_to_c_simple("release/datafiles/brushicons/flatten.png")
-data_to_c_simple("release/datafiles/brushicons/grab.png")
-data_to_c_simple("release/datafiles/brushicons/inflate.png")
-data_to_c_simple("release/datafiles/brushicons/layer.png")
-data_to_c_simple("release/datafiles/brushicons/lighten.png")
-data_to_c_simple("release/datafiles/brushicons/mask.png")
-data_to_c_simple("release/datafiles/brushicons/mix.png")
-data_to_c_simple("release/datafiles/brushicons/multiply.png")
-data_to_c_simple("release/datafiles/brushicons/nudge.png")
-data_to_c_simple("release/datafiles/brushicons/pinch.png")
-data_to_c_simple("release/datafiles/brushicons/scrape.png")
-data_to_c_simple("release/datafiles/brushicons/smear.png")
-data_to_c_simple("release/datafiles/brushicons/smooth.png")
-data_to_c_simple("release/datafiles/brushicons/snake_hook.png")
-data_to_c_simple("release/datafiles/brushicons/soften.png")
-data_to_c_simple("release/datafiles/brushicons/subtract.png")
-data_to_c_simple("release/datafiles/brushicons/texdraw.png")
-data_to_c_simple("release/datafiles/brushicons/thumb.png")
-data_to_c_simple("release/datafiles/brushicons/twist.png")
-data_to_c_simple("release/datafiles/brushicons/vertexdraw.png")
+    data_to_c_simple("release/datafiles/brushicons/add.png")
+    data_to_c_simple("release/datafiles/brushicons/blob.png")
+    data_to_c_simple("release/datafiles/brushicons/blur.png")
+    data_to_c_simple("release/datafiles/brushicons/clay.png")
+    data_to_c_simple("release/datafiles/brushicons/claystrips.png")
+    data_to_c_simple("release/datafiles/brushicons/clone.png")
+    data_to_c_simple("release/datafiles/brushicons/crease.png")
+    data_to_c_simple("release/datafiles/brushicons/darken.png")
+    data_to_c_simple("release/datafiles/brushicons/draw.png")
+    data_to_c_simple("release/datafiles/brushicons/fill.png")
+    data_to_c_simple("release/datafiles/brushicons/flatten.png")
+    data_to_c_simple("release/datafiles/brushicons/grab.png")
+    data_to_c_simple("release/datafiles/brushicons/inflate.png")
+    data_to_c_simple("release/datafiles/brushicons/layer.png")
+    data_to_c_simple("release/datafiles/brushicons/lighten.png")
+    data_to_c_simple("release/datafiles/brushicons/mask.png")
+    data_to_c_simple("release/datafiles/brushicons/mix.png")
+    data_to_c_simple("release/datafiles/brushicons/multiply.png")
+    data_to_c_simple("release/datafiles/brushicons/nudge.png")
+    data_to_c_simple("release/datafiles/brushicons/pinch.png")
+    data_to_c_simple("release/datafiles/brushicons/scrape.png")
+    data_to_c_simple("release/datafiles/brushicons/smear.png")
+    data_to_c_simple("release/datafiles/brushicons/smooth.png")
+    data_to_c_simple("release/datafiles/brushicons/snake_hook.png")
+    data_to_c_simple("release/datafiles/brushicons/soften.png")
+    data_to_c_simple("release/datafiles/brushicons/subtract.png")
+    data_to_c_simple("release/datafiles/brushicons/texdraw.png")
+    data_to_c_simple("release/datafiles/brushicons/thumb.png")
+    data_to_c_simple("release/datafiles/brushicons/twist.png")
+    data_to_c_simple("release/datafiles/brushicons/vertexdraw.png")
 
-data_to_c_simple("release/datafiles/matcaps/mc01.jpg")
-data_to_c_simple("release/datafiles/matcaps/mc02.jpg")
-data_to_c_simple("release/datafiles/matcaps/mc03.jpg")
-data_to_c_simple("release/datafiles/matcaps/mc04.jpg")
-data_to_c_simple("release/datafiles/matcaps/mc05.jpg")
-data_to_c_simple("release/datafiles/matcaps/mc06.jpg")
-data_to_c_simple("release/datafiles/matcaps/mc07.jpg")
-data_to_c_simple("release/datafiles/matcaps/mc08.jpg")
-data_to_c_simple("release/datafiles/matcaps/mc09.jpg")
-data_to_c_simple("release/datafiles/matcaps/mc10.jpg")
-data_to_c_simple("release/datafiles/matcaps/mc11.jpg")
-data_to_c_simple("release/datafiles/matcaps/mc12.jpg")
-data_to_c_simple("release/datafiles/matcaps/mc13.jpg")
-data_to_c_simple("release/datafiles/matcaps/mc14.jpg")
-data_to_c_simple("release/datafiles/matcaps/mc15.jpg")
-data_to_c_simple("release/datafiles/matcaps/mc16.jpg")
-data_to_c_simple("release/datafiles/matcaps/mc17.jpg")
-data_to_c_simple("release/datafiles/matcaps/mc18.jpg")
-data_to_c_simple("release/datafiles/matcaps/mc19.jpg")
-data_to_c_simple("release/datafiles/matcaps/mc20.jpg")
-data_to_c_simple("release/datafiles/matcaps/mc21.jpg")
-data_to_c_simple("release/datafiles/matcaps/mc22.jpg")
-data_to_c_simple("release/datafiles/matcaps/mc23.jpg")
-data_to_c_simple("release/datafiles/matcaps/mc24.jpg")
+    data_to_c_simple("release/datafiles/matcaps/mc01.jpg")
+    data_to_c_simple("release/datafiles/matcaps/mc02.jpg")
+    data_to_c_simple("release/datafiles/matcaps/mc03.jpg")
+    data_to_c_simple("release/datafiles/matcaps/mc04.jpg")
+    data_to_c_simple("release/datafiles/matcaps/mc05.jpg")
+    data_to_c_simple("release/datafiles/matcaps/mc06.jpg")
+    data_to_c_simple("release/datafiles/matcaps/mc07.jpg")
+    data_to_c_simple("release/datafiles/matcaps/mc08.jpg")
+    data_to_c_simple("release/datafiles/matcaps/mc09.jpg")

@@ Diff output truncated at 10240 characters. @@

