[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [48821] branches/soc-2012-bratwurst: merge with trunk 48817
Antony Riakiotakis
kalast at gmail.com
Tue Jul 10 23:45:17 CEST 2012
Revision: 48821
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=48821
Author: psy-fi
Date: 2012-07-10 21:45:15 +0000 (Tue, 10 Jul 2012)
Log Message:
-----------
merge with trunk 48817
Modified Paths:
--------------
branches/soc-2012-bratwurst/SConstruct
branches/soc-2012-bratwurst/doc/python_api/rst/bge.types.rst
branches/soc-2012-bratwurst/intern/cycles/bvh/bvh.cpp
branches/soc-2012-bratwurst/intern/ghost/intern/GHOST_WindowX11.cpp
branches/soc-2012-bratwurst/intern/guardedalloc/MEM_guardedalloc.h
branches/soc-2012-bratwurst/intern/guardedalloc/intern/mallocn.c
branches/soc-2012-bratwurst/intern/memutil/MEM_CacheLimiter.h
branches/soc-2012-bratwurst/intern/memutil/MEM_CacheLimiterC-Api.h
branches/soc-2012-bratwurst/intern/memutil/intern/MEM_CacheLimiterC-Api.cpp
branches/soc-2012-bratwurst/intern/raskter/CMakeLists.txt
branches/soc-2012-bratwurst/intern/raskter/raskter.c
branches/soc-2012-bratwurst/intern/raskter/raskter.h
branches/soc-2012-bratwurst/release/scripts/modules/bl_i18n_utils/bl_process_msg.py
branches/soc-2012-bratwurst/release/scripts/modules/bl_i18n_utils/check_po.py
branches/soc-2012-bratwurst/release/scripts/modules/bl_i18n_utils/clean_po.py
branches/soc-2012-bratwurst/release/scripts/modules/bl_i18n_utils/import_po_from_branches.py
branches/soc-2012-bratwurst/release/scripts/modules/bl_i18n_utils/merge_po.py
branches/soc-2012-bratwurst/release/scripts/modules/bl_i18n_utils/rtl_preprocess.py
branches/soc-2012-bratwurst/release/scripts/modules/bl_i18n_utils/settings.py
branches/soc-2012-bratwurst/release/scripts/modules/bl_i18n_utils/update_branches.py
branches/soc-2012-bratwurst/release/scripts/modules/bl_i18n_utils/update_mo.py
branches/soc-2012-bratwurst/release/scripts/modules/bl_i18n_utils/update_msg.py
branches/soc-2012-bratwurst/release/scripts/modules/bl_i18n_utils/update_po.py
branches/soc-2012-bratwurst/release/scripts/modules/bl_i18n_utils/update_pot.py
branches/soc-2012-bratwurst/release/scripts/modules/bl_i18n_utils/update_trunk.py
branches/soc-2012-bratwurst/release/scripts/modules/bl_i18n_utils/utils.py
branches/soc-2012-bratwurst/release/scripts/startup/bl_operators/wm.py
branches/soc-2012-bratwurst/release/scripts/startup/bl_ui/space_userpref.py
branches/soc-2012-bratwurst/source/blender/avi/intern/avi.c
branches/soc-2012-bratwurst/source/blender/blenfont/BLF_api.h
branches/soc-2012-bratwurst/source/blender/blenfont/BLF_translation.h
branches/soc-2012-bratwurst/source/blender/blenfont/intern/blf.c
branches/soc-2012-bratwurst/source/blender/blenfont/intern/blf_font.c
branches/soc-2012-bratwurst/source/blender/blenfont/intern/blf_internal.h
branches/soc-2012-bratwurst/source/blender/blenfont/intern/blf_lang.c
branches/soc-2012-bratwurst/source/blender/blenkernel/BKE_blender.h
branches/soc-2012-bratwurst/source/blender/blenkernel/BKE_idprop.h
branches/soc-2012-bratwurst/source/blender/blenkernel/BKE_lamp.h
branches/soc-2012-bratwurst/source/blender/blenkernel/BKE_library.h
branches/soc-2012-bratwurst/source/blender/blenkernel/BKE_mask.h
branches/soc-2012-bratwurst/source/blender/blenkernel/BKE_node.h
branches/soc-2012-bratwurst/source/blender/blenkernel/intern/CCGSubSurf.c
branches/soc-2012-bratwurst/source/blender/blenkernel/intern/DerivedMesh.c
branches/soc-2012-bratwurst/source/blender/blenkernel/intern/action.c
branches/soc-2012-bratwurst/source/blender/blenkernel/intern/anim.c
branches/soc-2012-bratwurst/source/blender/blenkernel/intern/anim_sys.c
branches/soc-2012-bratwurst/source/blender/blenkernel/intern/armature.c
branches/soc-2012-bratwurst/source/blender/blenkernel/intern/blender.c
branches/soc-2012-bratwurst/source/blender/blenkernel/intern/bmfont.c
branches/soc-2012-bratwurst/source/blender/blenkernel/intern/booleanops_mesh.c
branches/soc-2012-bratwurst/source/blender/blenkernel/intern/brush.c
branches/soc-2012-bratwurst/source/blender/blenkernel/intern/bvhutils.c
branches/soc-2012-bratwurst/source/blender/blenkernel/intern/cloth.c
branches/soc-2012-bratwurst/source/blender/blenkernel/intern/collision.c
branches/soc-2012-bratwurst/source/blender/blenkernel/intern/constraint.c
branches/soc-2012-bratwurst/source/blender/blenkernel/intern/customdata.c
branches/soc-2012-bratwurst/source/blender/blenkernel/intern/depsgraph.c
branches/soc-2012-bratwurst/source/blender/blenkernel/intern/displist.c
branches/soc-2012-bratwurst/source/blender/blenkernel/intern/dynamicpaint.c
branches/soc-2012-bratwurst/source/blender/blenkernel/intern/effect.c
branches/soc-2012-bratwurst/source/blender/blenkernel/intern/fcurve.c
branches/soc-2012-bratwurst/source/blender/blenkernel/intern/fmodifier.c
branches/soc-2012-bratwurst/source/blender/blenkernel/intern/font.c
branches/soc-2012-bratwurst/source/blender/blenkernel/intern/idprop.c
branches/soc-2012-bratwurst/source/blender/blenkernel/intern/image.c
branches/soc-2012-bratwurst/source/blender/blenkernel/intern/implicit.c
branches/soc-2012-bratwurst/source/blender/blenkernel/intern/ipo.c
branches/soc-2012-bratwurst/source/blender/blenkernel/intern/lamp.c
branches/soc-2012-bratwurst/source/blender/blenkernel/intern/library.c
branches/soc-2012-bratwurst/source/blender/blenkernel/intern/mask.c
branches/soc-2012-bratwurst/source/blender/blenkernel/intern/material.c
branches/soc-2012-bratwurst/source/blender/blenkernel/intern/movieclip.c
branches/soc-2012-bratwurst/source/blender/blenkernel/intern/nla.c
branches/soc-2012-bratwurst/source/blender/blenkernel/intern/node.c
branches/soc-2012-bratwurst/source/blender/blenkernel/intern/object.c
branches/soc-2012-bratwurst/source/blender/blenkernel/intern/packedFile.c
branches/soc-2012-bratwurst/source/blender/blenkernel/intern/particle.c
branches/soc-2012-bratwurst/source/blender/blenkernel/intern/property.c
branches/soc-2012-bratwurst/source/blender/blenkernel/intern/scene.c
branches/soc-2012-bratwurst/source/blender/blenkernel/intern/seqcache.c
branches/soc-2012-bratwurst/source/blender/blenkernel/intern/seqeffects.c
branches/soc-2012-bratwurst/source/blender/blenkernel/intern/sequencer.c
branches/soc-2012-bratwurst/source/blender/blenkernel/intern/shrinkwrap.c
branches/soc-2012-bratwurst/source/blender/blenkernel/intern/smoke.c
branches/soc-2012-bratwurst/source/blender/blenkernel/intern/softbody.c
branches/soc-2012-bratwurst/source/blender/blenkernel/intern/texture.c
branches/soc-2012-bratwurst/source/blender/blenkernel/intern/tracking.c
branches/soc-2012-bratwurst/source/blender/blenkernel/intern/writeffmpeg.c
branches/soc-2012-bratwurst/source/blender/blenlib/BLI_string.h
branches/soc-2012-bratwurst/source/blender/blenlib/BLI_threads.h
branches/soc-2012-bratwurst/source/blender/blenlib/intern/BLI_ghash.c
branches/soc-2012-bratwurst/source/blender/blenlib/intern/BLI_kdopbvh.c
branches/soc-2012-bratwurst/source/blender/blenlib/intern/DLRB_tree.c
branches/soc-2012-bratwurst/source/blender/blenlib/intern/fileops.c
branches/soc-2012-bratwurst/source/blender/blenlib/intern/freetypefont.c
branches/soc-2012-bratwurst/source/blender/blenlib/intern/math_color_inline.c
branches/soc-2012-bratwurst/source/blender/blenlib/intern/math_geom.c
branches/soc-2012-bratwurst/source/blender/blenlib/intern/math_matrix.c
branches/soc-2012-bratwurst/source/blender/blenlib/intern/math_rotation.c
branches/soc-2012-bratwurst/source/blender/blenlib/intern/noise.c
branches/soc-2012-bratwurst/source/blender/blenlib/intern/string.c
branches/soc-2012-bratwurst/source/blender/blenlib/intern/voxel.c
branches/soc-2012-bratwurst/source/blender/blenlib/intern/winstuff.c
branches/soc-2012-bratwurst/source/blender/blenloader/intern/readfile.c
branches/soc-2012-bratwurst/source/blender/bmesh/intern/bmesh_opdefines.c
branches/soc-2012-bratwurst/source/blender/bmesh/intern/bmesh_polygon.c
branches/soc-2012-bratwurst/source/blender/bmesh/intern/bmesh_queries.c
branches/soc-2012-bratwurst/source/blender/bmesh/operators/bmo_hull.c
branches/soc-2012-bratwurst/source/blender/collada/EffectExporter.cpp
branches/soc-2012-bratwurst/source/blender/collada/ImageExporter.cpp
branches/soc-2012-bratwurst/source/blender/compositor/CMakeLists.txt
branches/soc-2012-bratwurst/source/blender/compositor/COM_compositor.h
branches/soc-2012-bratwurst/source/blender/compositor/intern/COM_Converter.cpp
branches/soc-2012-bratwurst/source/blender/compositor/intern/COM_ExecutionSystemHelper.cpp
branches/soc-2012-bratwurst/source/blender/compositor/intern/COM_MemoryBuffer.cpp
branches/soc-2012-bratwurst/source/blender/compositor/intern/COM_MemoryBuffer.h
branches/soc-2012-bratwurst/source/blender/compositor/intern/COM_WorkScheduler.cpp
branches/soc-2012-bratwurst/source/blender/compositor/intern/COM_compositor.cpp
branches/soc-2012-bratwurst/source/blender/compositor/nodes/COM_BokehBlurNode.cpp
branches/soc-2012-bratwurst/source/blender/compositor/nodes/COM_DefocusNode.cpp
branches/soc-2012-bratwurst/source/blender/compositor/nodes/COM_KeyingNode.cpp
branches/soc-2012-bratwurst/source/blender/compositor/nodes/COM_KeyingNode.h
branches/soc-2012-bratwurst/source/blender/compositor/nodes/COM_MathNode.cpp
branches/soc-2012-bratwurst/source/blender/compositor/nodes/COM_MixNode.cpp
branches/soc-2012-bratwurst/source/blender/compositor/nodes/COM_MovieClipNode.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_BokehBlurOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_BokehBlurOperation.h
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_ConvertDepthToRadiusOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_ConvertDepthToRadiusOperation.h
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_DilateErodeOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_FastGaussianBlurOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_FastGaussianBlurOperation.h
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_KeyingDespillOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_KeyingDespillOperation.h
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_KeyingOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_MaskOperation.h
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_MathBaseOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_MathBaseOperation.h
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_MixAddOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_MixBaseOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_MixBaseOperation.h
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_MixBlendOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_MixBurnOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_MixColorOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_MixDarkenOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_MixDifferenceOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_MixDivideOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_MixDodgeOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_MixGlareOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_MixHueOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_MixLightenOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_MixLinearLightOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_MixMultiplyOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_MixOverlayOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_MixSaturationOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_MixScreenOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_MixSoftLightOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_MixSubtractOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_MixValueOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_MovieClipOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_MovieClipOperation.h
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_OpenCLKernels.cl
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_OpenCLKernels.cl.h
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_VariableSizeBokehBlurOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_VariableSizeBokehBlurOperation.h
branches/soc-2012-bratwurst/source/blender/editors/animation/anim_channels_defines.c
branches/soc-2012-bratwurst/source/blender/editors/animation/anim_channels_edit.c
branches/soc-2012-bratwurst/source/blender/editors/animation/anim_deps.c
branches/soc-2012-bratwurst/source/blender/editors/animation/anim_draw.c
branches/soc-2012-bratwurst/source/blender/editors/animation/anim_filter.c
branches/soc-2012-bratwurst/source/blender/editors/animation/anim_ipo_utils.c
branches/soc-2012-bratwurst/source/blender/editors/animation/fmodifier_ui.c
branches/soc-2012-bratwurst/source/blender/editors/animation/keyframes_draw.c
branches/soc-2012-bratwurst/source/blender/editors/animation/keyframing.c
branches/soc-2012-bratwurst/source/blender/editors/animation/keyingsets.c
branches/soc-2012-bratwurst/source/blender/editors/armature/armature_ops.c
branches/soc-2012-bratwurst/source/blender/editors/armature/editarmature.c
branches/soc-2012-bratwurst/source/blender/editors/armature/poseSlide.c
branches/soc-2012-bratwurst/source/blender/editors/armature/poseUtils.c
branches/soc-2012-bratwurst/source/blender/editors/armature/poselib.c
branches/soc-2012-bratwurst/source/blender/editors/armature/poseobject.c
branches/soc-2012-bratwurst/source/blender/editors/armature/reeb.c
branches/soc-2012-bratwurst/source/blender/editors/curve/editfont.c
branches/soc-2012-bratwurst/source/blender/editors/gpencil/drawgpencil.c
branches/soc-2012-bratwurst/source/blender/editors/gpencil/gpencil_edit.c
branches/soc-2012-bratwurst/source/blender/editors/gpencil/gpencil_paint.c
branches/soc-2012-bratwurst/source/blender/editors/include/ED_armature.h
branches/soc-2012-bratwurst/source/blender/editors/include/UI_interface.h
branches/soc-2012-bratwurst/source/blender/editors/interface/interface.c
branches/soc-2012-bratwurst/source/blender/editors/interface/interface_anim.c
branches/soc-2012-bratwurst/source/blender/editors/interface/interface_draw.c
branches/soc-2012-bratwurst/source/blender/editors/interface/interface_handlers.c
branches/soc-2012-bratwurst/source/blender/editors/interface/interface_ops.c
branches/soc-2012-bratwurst/source/blender/editors/interface/interface_regions.c
branches/soc-2012-bratwurst/source/blender/editors/interface/interface_style.c
branches/soc-2012-bratwurst/source/blender/editors/interface/interface_templates.c
branches/soc-2012-bratwurst/source/blender/editors/interface/interface_widgets.c
branches/soc-2012-bratwurst/source/blender/editors/interface/resources.c
branches/soc-2012-bratwurst/source/blender/editors/interface/view2d.c
branches/soc-2012-bratwurst/source/blender/editors/interface/view2d_ops.c
branches/soc-2012-bratwurst/source/blender/editors/io/io_collada.c
branches/soc-2012-bratwurst/source/blender/editors/io/io_ops.c
branches/soc-2012-bratwurst/source/blender/editors/mask/mask_editaction.c
branches/soc-2012-bratwurst/source/blender/editors/mesh/editface.c
branches/soc-2012-bratwurst/source/blender/editors/mesh/editmesh_bvh.c
branches/soc-2012-bratwurst/source/blender/editors/mesh/editmesh_knife.c
branches/soc-2012-bratwurst/source/blender/editors/mesh/editmesh_select.c
branches/soc-2012-bratwurst/source/blender/editors/mesh/editmesh_tools.c
branches/soc-2012-bratwurst/source/blender/editors/mesh/meshtools.c
branches/soc-2012-bratwurst/source/blender/editors/object/object_add.c
branches/soc-2012-bratwurst/source/blender/editors/object/object_constraint.c
branches/soc-2012-bratwurst/source/blender/editors/object/object_edit.c
branches/soc-2012-bratwurst/source/blender/editors/object/object_hook.c
branches/soc-2012-bratwurst/source/blender/editors/object/object_modifier.c
branches/soc-2012-bratwurst/source/blender/editors/object/object_transform.c
branches/soc-2012-bratwurst/source/blender/editors/object/object_vgroup.c
branches/soc-2012-bratwurst/source/blender/editors/physics/physics_fluid.c
branches/soc-2012-bratwurst/source/blender/editors/render/render_opengl.c
branches/soc-2012-bratwurst/source/blender/editors/screen/area.c
branches/soc-2012-bratwurst/source/blender/editors/sculpt_paint/paint_cursor.c
branches/soc-2012-bratwurst/source/blender/editors/sculpt_paint/paint_image.c
branches/soc-2012-bratwurst/source/blender/editors/space_action/action_edit.c
branches/soc-2012-bratwurst/source/blender/editors/space_buttons/buttons_header.c
branches/soc-2012-bratwurst/source/blender/editors/space_file/filelist.c
branches/soc-2012-bratwurst/source/blender/editors/space_file/filesel.c
branches/soc-2012-bratwurst/source/blender/editors/space_file/fsmenu.c
branches/soc-2012-bratwurst/source/blender/editors/space_graph/graph_edit.c
branches/soc-2012-bratwurst/source/blender/editors/space_graph/graph_select.c
branches/soc-2012-bratwurst/source/blender/editors/space_image/image_buttons.c
branches/soc-2012-bratwurst/source/blender/editors/space_image/image_ops.c
branches/soc-2012-bratwurst/source/blender/editors/space_nla/nla_channels.c
branches/soc-2012-bratwurst/source/blender/editors/space_node/CMakeLists.txt
branches/soc-2012-bratwurst/source/blender/editors/space_node/SConscript
branches/soc-2012-bratwurst/source/blender/editors/space_node/drawnode.c
branches/soc-2012-bratwurst/source/blender/editors/space_node/node_draw.c
branches/soc-2012-bratwurst/source/blender/editors/space_node/node_edit.c
branches/soc-2012-bratwurst/source/blender/editors/space_node/node_intern.h
branches/soc-2012-bratwurst/source/blender/editors/space_node/space_node.c
branches/soc-2012-bratwurst/source/blender/editors/space_view3d/drawanimviz.c
branches/soc-2012-bratwurst/source/blender/editors/space_view3d/drawarmature.c
branches/soc-2012-bratwurst/source/blender/editors/space_view3d/drawmesh.c
branches/soc-2012-bratwurst/source/blender/editors/space_view3d/drawobject.c
branches/soc-2012-bratwurst/source/blender/editors/space_view3d/drawvolume.c
branches/soc-2012-bratwurst/source/blender/editors/space_view3d/space_view3d.c
branches/soc-2012-bratwurst/source/blender/editors/space_view3d/view3d_draw.c
branches/soc-2012-bratwurst/source/blender/editors/space_view3d/view3d_edit.c
branches/soc-2012-bratwurst/source/blender/editors/space_view3d/view3d_fly.c
branches/soc-2012-bratwurst/source/blender/editors/space_view3d/view3d_header.c
branches/soc-2012-bratwurst/source/blender/editors/space_view3d/view3d_select.c
branches/soc-2012-bratwurst/source/blender/editors/space_view3d/view3d_snap.c
branches/soc-2012-bratwurst/source/blender/editors/space_view3d/view3d_view.c
branches/soc-2012-bratwurst/source/blender/editors/transform/transform.c
branches/soc-2012-bratwurst/source/blender/editors/transform/transform_conversions.c
branches/soc-2012-bratwurst/source/blender/editors/uvedit/uvedit_ops.c
branches/soc-2012-bratwurst/source/blender/editors/uvedit/uvedit_parametrizer.c
branches/soc-2012-bratwurst/source/blender/editors/uvedit/uvedit_parametrizer.h
branches/soc-2012-bratwurst/source/blender/editors/uvedit/uvedit_smart_stitch.c
branches/soc-2012-bratwurst/source/blender/editors/uvedit/uvedit_unwrap_ops.c
branches/soc-2012-bratwurst/source/blender/gpu/intern/gpu_draw.c
branches/soc-2012-bratwurst/source/blender/gpu/intern/gpu_material.c
branches/soc-2012-bratwurst/source/blender/ikplugin/intern/iksolver_plugin.c
branches/soc-2012-bratwurst/source/blender/imbuf/IMB_moviecache.h
branches/soc-2012-bratwurst/source/blender/imbuf/intern/IMB_anim.h
branches/soc-2012-bratwurst/source/blender/imbuf/intern/allocimbuf.c
branches/soc-2012-bratwurst/source/blender/imbuf/intern/anim_movie.c
branches/soc-2012-bratwurst/source/blender/imbuf/intern/imageprocess.c
branches/soc-2012-bratwurst/source/blender/imbuf/intern/indexer.c
branches/soc-2012-bratwurst/source/blender/imbuf/intern/indexer_dv.c
branches/soc-2012-bratwurst/source/blender/imbuf/intern/jp2.c
branches/soc-2012-bratwurst/source/blender/imbuf/intern/jpeg.c
branches/soc-2012-bratwurst/source/blender/imbuf/intern/moviecache.c
branches/soc-2012-bratwurst/source/blender/imbuf/intern/openexr/openexr_api.cpp
branches/soc-2012-bratwurst/source/blender/imbuf/intern/openexr/openexr_multi.h
branches/soc-2012-bratwurst/source/blender/imbuf/intern/openexr/openexr_stub.cpp
branches/soc-2012-bratwurst/source/blender/imbuf/intern/png.c
branches/soc-2012-bratwurst/source/blender/imbuf/intern/radiance_hdr.c
branches/soc-2012-bratwurst/source/blender/imbuf/intern/tiff.c
branches/soc-2012-bratwurst/source/blender/makesdna/DNA_ID.h
branches/soc-2012-bratwurst/source/blender/makesdna/DNA_meshdata_types.h
branches/soc-2012-bratwurst/source/blender/makesdna/DNA_node_types.h
branches/soc-2012-bratwurst/source/blender/makesdna/DNA_space_types.h
branches/soc-2012-bratwurst/source/blender/makesdna/DNA_userdef_types.h
branches/soc-2012-bratwurst/source/blender/makesdna/intern/makesdna.c
branches/soc-2012-bratwurst/source/blender/makesrna/RNA_access.h
branches/soc-2012-bratwurst/source/blender/makesrna/intern/rna_access.c
branches/soc-2012-bratwurst/source/blender/makesrna/intern/rna_mesh_api.c
branches/soc-2012-bratwurst/source/blender/makesrna/intern/rna_nodetree.c
branches/soc-2012-bratwurst/source/blender/makesrna/intern/rna_nodetree_types.h
branches/soc-2012-bratwurst/source/blender/makesrna/intern/rna_space.c
branches/soc-2012-bratwurst/source/blender/makesrna/intern/rna_userdef.c
branches/soc-2012-bratwurst/source/blender/modifiers/intern/MOD_boolean_util.c
branches/soc-2012-bratwurst/source/blender/modifiers/intern/MOD_collision.c
branches/soc-2012-bratwurst/source/blender/modifiers/intern/MOD_fluidsim_util.c
branches/soc-2012-bratwurst/source/blender/modifiers/intern/MOD_multires.c
branches/soc-2012-bratwurst/source/blender/modifiers/intern/MOD_particleinstance.c
branches/soc-2012-bratwurst/source/blender/modifiers/intern/MOD_smoke.c
branches/soc-2012-bratwurst/source/blender/nodes/CMakeLists.txt
branches/soc-2012-bratwurst/source/blender/nodes/NOD_composite.h
branches/soc-2012-bratwurst/source/blender/nodes/composite/node_composite_tree.c
branches/soc-2012-bratwurst/source/blender/nodes/composite/nodes/node_composite_keying.c
branches/soc-2012-bratwurst/source/blender/python/bmesh/bmesh_py_types.c
branches/soc-2012-bratwurst/source/blender/python/bmesh/bmesh_py_types_meshdata.c
branches/soc-2012-bratwurst/source/blender/python/intern/bpy_interface.c
branches/soc-2012-bratwurst/source/blender/python/intern/bpy_library.c
branches/soc-2012-bratwurst/source/blender/python/intern/bpy_rna.c
branches/soc-2012-bratwurst/source/blender/python/intern/gpu.c
branches/soc-2012-bratwurst/source/blender/python/mathutils/mathutils_Matrix.c
branches/soc-2012-bratwurst/source/blender/quicktime/apple/quicktime_export.c
branches/soc-2012-bratwurst/source/blender/render/extern/include/RE_pipeline.h
branches/soc-2012-bratwurst/source/blender/render/intern/raytrace/rayobject_qbvh.cpp
branches/soc-2012-bratwurst/source/blender/render/intern/raytrace/rayobject_svbvh.cpp
branches/soc-2012-bratwurst/source/blender/render/intern/source/convertblender.c
branches/soc-2012-bratwurst/source/blender/render/intern/source/envmap.c
branches/soc-2012-bratwurst/source/blender/render/intern/source/external_engine.c
branches/soc-2012-bratwurst/source/blender/render/intern/source/imagetexture.c
branches/soc-2012-bratwurst/source/blender/render/intern/source/occlusion.c
branches/soc-2012-bratwurst/source/blender/render/intern/source/pipeline.c
branches/soc-2012-bratwurst/source/blender/render/intern/source/rayshade.c
branches/soc-2012-bratwurst/source/blender/render/intern/source/render_result.c
branches/soc-2012-bratwurst/source/blender/render/intern/source/render_texture.c
branches/soc-2012-bratwurst/source/blender/render/intern/source/rendercore.c
branches/soc-2012-bratwurst/source/blender/render/intern/source/shadbuf.c
branches/soc-2012-bratwurst/source/blender/render/intern/source/shadeinput.c
branches/soc-2012-bratwurst/source/blender/render/intern/source/shadeoutput.c
branches/soc-2012-bratwurst/source/blender/render/intern/source/sunsky.c
branches/soc-2012-bratwurst/source/blender/render/intern/source/texture_ocean.c
branches/soc-2012-bratwurst/source/blender/render/intern/source/volume_precache.c
branches/soc-2012-bratwurst/source/blender/render/intern/source/volumetric.c
branches/soc-2012-bratwurst/source/blender/render/intern/source/voxeldata.c
branches/soc-2012-bratwurst/source/blender/render/intern/source/zbuf.c
branches/soc-2012-bratwurst/source/blender/windowmanager/intern/wm_cursors.c
branches/soc-2012-bratwurst/source/blender/windowmanager/intern/wm_files.c
branches/soc-2012-bratwurst/source/blender/windowmanager/intern/wm_init_exit.c
branches/soc-2012-bratwurst/source/blender/windowmanager/intern/wm_keymap.c
branches/soc-2012-bratwurst/source/blender/windowmanager/intern/wm_subwindow.c
branches/soc-2012-bratwurst/source/creator/creator.c
branches/soc-2012-bratwurst/source/gameengine/GameLogic/Joystick/SCA_Joystick.cpp
branches/soc-2012-bratwurst/source/gameengine/GameLogic/SCA_PropertySensor.cpp
branches/soc-2012-bratwurst/source/gameengine/GameLogic/SCA_PropertySensor.h
branches/soc-2012-bratwurst/source/gameengine/GamePlayer/xembed/UnixShell.c
branches/soc-2012-bratwurst/source/gameengine/GamePlayer/xembed/blenderplayer-wrapper.c
branches/soc-2012-bratwurst/source/gameengine/Ketsji/BL_Texture.cpp
branches/soc-2012-bratwurst/source/gameengine/Ketsji/KX_BulletPhysicsController.cpp
branches/soc-2012-bratwurst/source/gameengine/Ketsji/KX_ConvertPhysicsObjects.cpp
branches/soc-2012-bratwurst/source/gameengine/Ketsji/KX_ObstacleSimulation.cpp
branches/soc-2012-bratwurst/source/gameengine/Ketsji/KX_Scene.cpp
branches/soc-2012-bratwurst/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp
branches/soc-2012-bratwurst/source/gameengine/Physics/Bullet/CcdPhysicsController.h
branches/soc-2012-bratwurst/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp
branches/soc-2012-bratwurst/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.h
branches/soc-2012-bratwurst/source/gameengine/Rasterizer/RAS_2DFilterManager.cpp
Added Paths:
-----------
branches/soc-2012-bratwurst/intern/raskter/raskter_kdtree.c
branches/soc-2012-bratwurst/intern/raskter/raskter_kdtree.h
branches/soc-2012-bratwurst/intern/raskter/raskter_mt.c
branches/soc-2012-bratwurst/source/blender/compositor/nodes/COM_TrackPositionNode.cpp
branches/soc-2012-bratwurst/source/blender/compositor/nodes/COM_TrackPositionNode.h
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_TrackPositionOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_TrackPositionOperation.h
branches/soc-2012-bratwurst/source/blender/nodes/composite/nodes/node_composite_trackpos.c
Property Changed:
----------------
branches/soc-2012-bratwurst/
branches/soc-2012-bratwurst/source/blender/editors/interface/interface.c
branches/soc-2012-bratwurst/source/blender/editors/space_outliner/
branches/soc-2012-bratwurst/source/tools/
Property changes on: branches/soc-2012-bratwurst
___________________________________________________________________
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
/trunk/blender:46808-48648
+ /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
/trunk/blender:46808-48817
Modified: branches/soc-2012-bratwurst/SConstruct
===================================================================
--- branches/soc-2012-bratwurst/SConstruct 2012-07-10 21:10:54 UTC (rev 48820)
+++ branches/soc-2012-bratwurst/SConstruct 2012-07-10 21:45:15 UTC (rev 48821)
@@ -775,7 +775,7 @@
dllsources.append('${LCGDIR}/thumbhandler/lib/BlendThumb64.dll')
dllsources.append('${LCGDIR}/binaries/libgcc_s_sjlj-1.dll')
dllsources.append('${LCGDIR}/binaries/libwinpthread-1.dll')
- dllsources.append('${LCGDIR}/binaries/libstdc++-6.dll)')
+ dllsources.append('${LCGDIR}/binaries/libstdc++-6.dll')
dllsources.append('#source/icons/blender.exe.manifest')
windlls = env.Install(dir=env['BF_INSTALLDIR'], source = dllsources)
Modified: branches/soc-2012-bratwurst/doc/python_api/rst/bge.types.rst
===================================================================
--- branches/soc-2012-bratwurst/doc/python_api/rst/bge.types.rst 2012-07-10 21:10:54 UTC (rev 48820)
+++ branches/soc-2012-bratwurst/doc/python_api/rst/bge.types.rst 2012-07-10 21:45:15 UTC (rev 48821)
@@ -1335,18 +1335,10 @@
Rigid body physics allows the object to roll on collisions.
- .. note::
-
- This is not working with bullet physics yet.
-
.. method:: disableRigidBody()
Disables rigid body physics for this object.
- .. note::
-
- This is not working with bullet physics yet. The angular is removed but rigid body physics can still rotate it later.
-
.. method:: setParent(parent, compound=True, ghost=True)
Sets this object's parent.
@@ -4222,6 +4214,10 @@
.. attribute:: projection_matrix
This camera's 4x4 projection matrix.
+
+ .. note::
+
+ This is the identity matrix prior to rendering the first frame (any Python done on frame 1).
:type: 4x4 Matrix [[float]]
@@ -4233,7 +4229,7 @@
.. note::
- This matrix is regenerated every frame from the camera's position and orientation.
+ This matrix is regenerated every frame from the camera's position and orientation. Also, this is the identity matrix prior to rendering the first frame (any Python done on frame 1).
.. attribute:: camera_to_world
Modified: branches/soc-2012-bratwurst/intern/cycles/bvh/bvh.cpp
===================================================================
--- branches/soc-2012-bratwurst/intern/cycles/bvh/bvh.cpp 2012-07-10 21:10:54 UTC (rev 48820)
+++ branches/soc-2012-bratwurst/intern/cycles/bvh/bvh.cpp 2012-07-10 21:45:15 UTC (rev 48821)
@@ -378,10 +378,19 @@
int mesh_tri_offset = mesh->tri_offset;
/* fill in node indexes for instances */
- if(bvh->pack.is_leaf[0])
+ if(
+ /* XXX, brecht. check this is needed!. it could be a bug elsewhere
+ * /mango/pro/scenes/04_2e/04_2e.blend r2158. on Ian's system 192.168.3.27 - campbell */
+ (bvh->pack.is_leaf.size() != 0) &&
+
+ /* previously only checked this */
+ bvh->pack.is_leaf[0])
+ {
pack.object_node[object_offset++] = -noffset-1;
- else
+ }
+ else {
pack.object_node[object_offset++] = noffset;
+ }
mesh_map[mesh] = pack.object_node[object_offset-1];
Modified: branches/soc-2012-bratwurst/intern/ghost/intern/GHOST_WindowX11.cpp
===================================================================
--- branches/soc-2012-bratwurst/intern/ghost/intern/GHOST_WindowX11.cpp 2012-07-10 21:10:54 UTC (rev 48820)
+++ branches/soc-2012-bratwurst/intern/ghost/intern/GHOST_WindowX11.cpp 2012-07-10 21:45:15 UTC (rev 48821)
@@ -419,8 +419,8 @@
x_image = XCreateImage(display, m_visual->visual, 24, ZPixmap, 0, NULL, BLENDER_ICON_WIDTH, BLENDER_ICON_HEIGHT, 32, 0);
mask_image = XCreateImage(display, m_visual->visual, 1, ZPixmap, 0, NULL, BLENDER_ICON_WIDTH, BLENDER_ICON_HEIGHT, 8, 0);
- x_image->data = (char *)malloc(x_image->bytes_per_line * BLENDER_ICON_HEIGHT);
- mask_image->data = (char *)malloc(mask_image->bytes_per_line * BLENDER_ICON_HEIGHT);
+ x_image->data = (char *)calloc(x_image->bytes_per_line * BLENDER_ICON_HEIGHT, 1);
+ mask_image->data = (char *)calloc(mask_image->bytes_per_line * BLENDER_ICON_HEIGHT, 1);
/* copy the BLENDER_ICON_48x48x24 into the XImage */
unsigned char *col = BLENDER_ICON_48x48x24;
@@ -429,7 +429,11 @@
for (py = 0; py < BLENDER_ICON_HEIGHT; py++, col += 3) {
/* mask out pink */
if (col[0] == 255 && col[1] == 0 && col[2] == 255) {
+#if 0
+ /* instead, use calloc above */
+ XPutPixel(x_image, px, py, 0); /* avoid uninitialized memory, otherwise not needed */
XPutPixel(mask_image, px, py, 0);
+#endif
}
else {
XPutPixel(x_image, px, py, (col[0] << 16) + (col[1] << 8) + col[2]);
@@ -1143,7 +1147,6 @@
}
#include <iostream>
-using namespace std;
GHOST_TSuccess
GHOST_WindowX11::
Modified: branches/soc-2012-bratwurst/intern/guardedalloc/MEM_guardedalloc.h
===================================================================
--- branches/soc-2012-bratwurst/intern/guardedalloc/MEM_guardedalloc.h 2012-07-10 21:10:54 UTC (rev 48820)
+++ branches/soc-2012-bratwurst/intern/guardedalloc/MEM_guardedalloc.h 2012-07-10 21:45:15 UTC (rev 48821)
@@ -63,14 +63,6 @@
#include <stdio.h> /* needed for FILE* */
#include "MEM_sys_types.h" /* needed for uintptr_t */
-#ifndef WARN_UNUSED
-# ifdef __GNUC__
-# define WARN_UNUSED __attribute__((warn_unused_result))
-# else
-# define WARN_UNUSED
-# endif
-#endif
-
#ifdef __cplusplus
extern "C" {
#endif
@@ -78,14 +70,17 @@
/** Returns the length of the allocated memory segment pointed at
* by vmemh. If the pointer was not previously allocated by this
* module, the result is undefined.*/
- size_t MEM_allocN_len(void *vmemh) WARN_UNUSED;
+ size_t MEM_allocN_len(void *vmemh)
+#ifdef __GNUC__
+ __attribute__((warn_unused_result))
+#endif
+ ;
/**
* Release memory previously allocatred by this module.
*/
short MEM_freeN(void *vmemh);
-
/**
* Return zero if memory is not in allocated list
*/
@@ -94,30 +89,57 @@
/**
* Duplicates a block of memory, and returns a pointer to the
* newly allocated block. */
- void *MEM_dupallocN(void *vmemh) WARN_UNUSED;
+ void *MEM_dupallocN(void *vmemh)
+#ifdef __GNUC__
+ __attribute__((warn_unused_result))
+#endif
+ ;
/**
* Reallocates a block of memory, and returns pointer to the newly
* allocated block, the old one is freed. this is not as optimized
* as a system realloc but just makes a new allocation and copies
* over from existing memory. */
- void *MEM_reallocN(void *vmemh, size_t len) WARN_UNUSED;
+ void *MEM_reallocN(void *vmemh, size_t len)
+#ifdef __GNUC__
+ __attribute__((warn_unused_result))
+ __attribute__((alloc_size(2)))
+#endif
+ ;
/**
* Allocate a block of memory of size len, with tag name str. The
* memory is cleared. The name must be static, because only a
* pointer to it is stored ! */
- void *MEM_callocN(size_t len, const char * str) WARN_UNUSED;
+ void *MEM_callocN(size_t len, const char * str)
+#ifdef __GNUC__
+ __attribute__((warn_unused_result))
+ __attribute__((nonnull))
+ __attribute__((alloc_size(1)))
+#endif
+ ;
/** Allocate a block of memory of size len, with tag name str. The
* name must be a static, because only a pointer to it is stored !
* */
- void *MEM_mallocN(size_t len, const char * str) WARN_UNUSED;
+ void *MEM_mallocN(size_t len, const char * str)
+#ifdef __GNUC__
+ __attribute__((warn_unused_result))
+ __attribute__((nonnull))
+ __attribute__((alloc_size(1)))
+#endif
+ ;
/** Same as callocN, clears memory and uses mmap (disk cached) if supported.
* Can be free'd with MEM_freeN as usual.
* */
- void *MEM_mapallocN(size_t len, const char * str) WARN_UNUSED;
+ void *MEM_mapallocN(size_t len, const char * str)
+#ifdef __GNUC__
+ __attribute__((warn_unused_result))
+ __attribute__((nonnull))
+ __attribute__((alloc_size(1)))
+#endif
+ ;
/** Print a list of the names and sizes of all allocated memory
* blocks. as a python dict for easy investigation */
@@ -162,7 +184,11 @@
void MEM_reset_peak_memory(void);
/** Get the peak memory usage in bytes, including mmap allocations. */
- uintptr_t MEM_get_peak_memory(void) WARN_UNUSED;
+ uintptr_t MEM_get_peak_memory(void)
+#ifdef __GNUC__
+ __attribute__((warn_unused_result))
+#endif
+ ;
#ifndef NDEBUG
const char *MEM_name_ptr(void *vmemh);
Modified: branches/soc-2012-bratwurst/intern/guardedalloc/intern/mallocn.c
===================================================================
--- branches/soc-2012-bratwurst/intern/guardedalloc/intern/mallocn.c 2012-07-10 21:10:54 UTC (rev 48820)
+++ branches/soc-2012-bratwurst/intern/guardedalloc/intern/mallocn.c 2012-07-10 21:45:15 UTC (rev 48821)
@@ -163,6 +163,9 @@
/* implementation */
/* --------------------------------------------------------------------- */
+#ifdef __GNUC__
+__attribute__ ((format(printf, 1, 2)))
+#endif
static void print_error(const char *str, ...)
{
char buf[512];
@@ -325,7 +328,7 @@
}
mem_unlock_thread();
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list