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

Tamito Kajiyama rd6t-kjym at asahi-net.or.jp
Sat Jul 21 01:12:05 CEST 2012 

Revision: 49094
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=49094
Author:   kjym3
Date:     2012-07-20 23:12:05 +0000 (Fri, 20 Jul 2012)
Log Message:
-----------
Merged changes in the trunk up to revision 49090.

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

Modified Paths:
--------------
    branches/soc-2008-mxcurioni/build_files/cmake/config/blender_lite.cmake
    branches/soc-2008-mxcurioni/build_files/cmake/macros.cmake
    branches/soc-2008-mxcurioni/doc/manpage/blender.1
    branches/soc-2008-mxcurioni/intern/bsp/intern/BSP_CSGMesh.cpp
    branches/soc-2008-mxcurioni/intern/cycles/kernel/kernel_differential.h
    branches/soc-2008-mxcurioni/intern/cycles/render/graph.cpp
    branches/soc-2008-mxcurioni/intern/dualcon/intern/octree.cpp
    branches/soc-2008-mxcurioni/intern/guardedalloc/MEM_guardedalloc.h
    branches/soc-2008-mxcurioni/intern/guardedalloc/intern/mallocn.c
    branches/soc-2008-mxcurioni/intern/itasc/Scene.cpp
    branches/soc-2008-mxcurioni/intern/raskter/raskter.c
    branches/soc-2008-mxcurioni/intern/smoke/intern/FLUID_3D.h
    branches/soc-2008-mxcurioni/release/scripts/modules/bl_i18n_utils/merge_po.py
    branches/soc-2008-mxcurioni/release/scripts/modules/bpy/path.py
    branches/soc-2008-mxcurioni/release/scripts/startup/bl_operators/wm.py
    branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/space_clip.py
    branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_cdderivedmesh.h
    branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_mask.h
    branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_mesh.h
    branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_object.h
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/cdderivedmesh.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/curve.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/displist.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/effect.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/fmodifier.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/group.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/implicit.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/lattice.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/mask.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/mask_rasterize.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/multires.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/pointcache.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/seqeffects.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/sequencer.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/softbody.c
    branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_math_geom.h
    branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_memarena.h
    branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_mempool.h
    branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_rect.h
    branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_utildefines.h
    branches/soc-2008-mxcurioni/source/blender/blenlib/intern/BLI_kdopbvh.c
    branches/soc-2008-mxcurioni/source/blender/blenlib/intern/DLRB_tree.c
    branches/soc-2008-mxcurioni/source/blender/blenlib/intern/freetypefont.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_vector_inline.c
    branches/soc-2008-mxcurioni/source/blender/blenlib/intern/noise.c
    branches/soc-2008-mxcurioni/source/blender/blenlib/intern/path_util.c
    branches/soc-2008-mxcurioni/source/blender/blenlib/intern/rct.c
    branches/soc-2008-mxcurioni/source/blender/blenloader/intern/readfile.c
    branches/soc-2008-mxcurioni/source/blender/bmesh/intern/bmesh_core.c
    branches/soc-2008-mxcurioni/source/blender/bmesh/intern/bmesh_marking.c
    branches/soc-2008-mxcurioni/source/blender/bmesh/intern/bmesh_marking.h
    branches/soc-2008-mxcurioni/source/blender/bmesh/intern/bmesh_operator_api.h
    branches/soc-2008-mxcurioni/source/blender/bmesh/intern/bmesh_polygon.c
    branches/soc-2008-mxcurioni/source/blender/bmesh/intern/bmesh_queries.c
    branches/soc-2008-mxcurioni/source/blender/bmesh/intern/bmesh_structure.h
    branches/soc-2008-mxcurioni/source/blender/bmesh/operators/bmo_bevel.c
    branches/soc-2008-mxcurioni/source/blender/bmesh/operators/bmo_dissolve.c
    branches/soc-2008-mxcurioni/source/blender/bmesh/operators/bmo_hull.c
    branches/soc-2008-mxcurioni/source/blender/bmesh/operators/bmo_inset.c
    branches/soc-2008-mxcurioni/source/blender/bmesh/operators/bmo_utils.c
    branches/soc-2008-mxcurioni/source/blender/bmesh/tools/BME_bevel.c
    branches/soc-2008-mxcurioni/source/blender/compositor/COM_compositor.h
    branches/soc-2008-mxcurioni/source/blender/compositor/SConscript
    branches/soc-2008-mxcurioni/source/blender/compositor/intern/COM_ExecutionGroup.h
    branches/soc-2008-mxcurioni/source/blender/compositor/intern/COM_ExecutionSystem.h
    branches/soc-2008-mxcurioni/source/blender/compositor/intern/COM_MemoryBuffer.h
    branches/soc-2008-mxcurioni/source/blender/compositor/intern/COM_MemoryProxy.h
    branches/soc-2008-mxcurioni/source/blender/compositor/intern/COM_Node.h
    branches/soc-2008-mxcurioni/source/blender/compositor/intern/COM_NodeOperation.h
    branches/soc-2008-mxcurioni/source/blender/compositor/intern/COM_WorkScheduler.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/nodes/COM_BlurNode.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_DoubleEdgeMaskOperation.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_GaussianBokehBlurOperation.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_GaussianBokehBlurOperation.h
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_KeyingBlurOperation.h
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_KeyingScreenOperation.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_MaskOperation.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_MaskOperation.h
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_MixBaseOperation.cpp
    branches/soc-2008-mxcurioni/source/blender/editors/animation/anim_channels_defines.c
    branches/soc-2008-mxcurioni/source/blender/editors/animation/anim_filter.c
    branches/soc-2008-mxcurioni/source/blender/editors/animation/anim_intern.h
    branches/soc-2008-mxcurioni/source/blender/editors/animation/anim_markers.c
    branches/soc-2008-mxcurioni/source/blender/editors/animation/anim_ops.c
    branches/soc-2008-mxcurioni/source/blender/editors/animation/keyframes_draw.c
    branches/soc-2008-mxcurioni/source/blender/editors/animation/keyframing.c
    branches/soc-2008-mxcurioni/source/blender/editors/armature/editarmature.c
    branches/soc-2008-mxcurioni/source/blender/editors/armature/editarmature_retarget.c
    branches/soc-2008-mxcurioni/source/blender/editors/armature/editarmature_sketch.c
    branches/soc-2008-mxcurioni/source/blender/editors/armature/reeb.c
    branches/soc-2008-mxcurioni/source/blender/editors/curve/editcurve.c
    branches/soc-2008-mxcurioni/source/blender/editors/gpencil/drawgpencil.c
    branches/soc-2008-mxcurioni/source/blender/editors/include/ED_mesh.h
    branches/soc-2008-mxcurioni/source/blender/editors/include/ED_numinput.h
    branches/soc-2008-mxcurioni/source/blender/editors/include/ED_object.h
    branches/soc-2008-mxcurioni/source/blender/editors/include/UI_interface.h
    branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_anim.c
    branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_draw.c
    branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_handlers.c
    branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_intern.h
    branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_templates.c
    branches/soc-2008-mxcurioni/source/blender/editors/interface/view2d.c
    branches/soc-2008-mxcurioni/source/blender/editors/mask/mask_draw.c
    branches/soc-2008-mxcurioni/source/blender/editors/mask/mask_ops.c
    branches/soc-2008-mxcurioni/source/blender/editors/mesh/editmesh_loopcut.c
    branches/soc-2008-mxcurioni/source/blender/editors/mesh/editmesh_select.c
    branches/soc-2008-mxcurioni/source/blender/editors/mesh/editmesh_tools.c
    branches/soc-2008-mxcurioni/source/blender/editors/mesh/editmesh_utils.c
    branches/soc-2008-mxcurioni/source/blender/editors/object/object_add.c
    branches/soc-2008-mxcurioni/source/blender/editors/object/object_group.c
    branches/soc-2008-mxcurioni/source/blender/editors/object/object_lattice.c
    branches/soc-2008-mxcurioni/source/blender/editors/object/object_relations.c
    branches/soc-2008-mxcurioni/source/blender/editors/physics/physics_fluid.c
    branches/soc-2008-mxcurioni/source/blender/editors/screen/area.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_ops.c
    branches/soc-2008-mxcurioni/source/blender/editors/sculpt_paint/sculpt.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_file/file_ops.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_node/CMakeLists.txt
    branches/soc-2008-mxcurioni/source/blender/editors/space_node/SConscript
    branches/soc-2008-mxcurioni/source/blender/editors/space_node/drawnode.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_node/node_draw.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_node/node_edit.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_node/node_select.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_node/node_state.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_outliner/outliner_edit.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_sequencer/sequencer_edit.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_sequencer/sequencer_select.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/drawobject.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/view3d_buttons.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/view3d_draw.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_constraints.c
    branches/soc-2008-mxcurioni/source/blender/editors/transform/transform_generics.c
    branches/soc-2008-mxcurioni/source/blender/editors/transform/transform_orientations.c
    branches/soc-2008-mxcurioni/source/blender/editors/transform/transform_snap.c
    branches/soc-2008-mxcurioni/source/blender/editors/util/numinput.c
    branches/soc-2008-mxcurioni/source/blender/gpu/intern/gpu_buffers.c
    branches/soc-2008-mxcurioni/source/blender/imbuf/IMB_moviecache.h
    branches/soc-2008-mxcurioni/source/blender/imbuf/intern/imageprocess.c
    branches/soc-2008-mxcurioni/source/blender/imbuf/intern/jp2.c
    branches/soc-2008-mxcurioni/source/blender/imbuf/intern/jpeg.c
    branches/soc-2008-mxcurioni/source/blender/imbuf/intern/scaling.c
    branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_anim_types.h
    branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_mask_types.h
    branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_node_types.h
    branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_texture_types.h
    branches/soc-2008-mxcurioni/source/blender/makesdna/intern/dna_genfile.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/RNA_types.h
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_fcurve.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_lattice.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_mask.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_nla.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_nodetree.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_object_api.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_scene_api.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_sequencer.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_texture.c
    branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_array.c
    branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_edgesplit.c
    branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_particleinstance.c
    branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_solidify.c
    branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_weightvgproximity.c
    branches/soc-2008-mxcurioni/source/blender/nodes/composite/node_composite_tree.c
    branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_doubleEdgeMask.c
    branches/soc-2008-mxcurioni/source/blender/nodes/shader/node_shader_util.c
    branches/soc-2008-mxcurioni/source/blender/python/bmesh/bmesh_py_types.c
    branches/soc-2008-mxcurioni/source/blender/python/bmesh/bmesh_py_types_meshdata.c
    branches/soc-2008-mxcurioni/source/blender/python/bmesh/bmesh_py_types_select.c
    branches/soc-2008-mxcurioni/source/blender/python/generic/bpy_internal_import.c
    branches/soc-2008-mxcurioni/source/blender/python/generic/bpy_internal_import.h
    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/generic/py_capi_utils.h
    branches/soc-2008-mxcurioni/source/blender/python/intern/bpy_operator.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_array.c
    branches/soc-2008-mxcurioni/source/blender/python/mathutils/mathutils_Color.c
    branches/soc-2008-mxcurioni/source/blender/python/mathutils/mathutils_Matrix.c
    branches/soc-2008-mxcurioni/source/blender/python/mathutils/mathutils_Vector.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/qtkit_import.m
    branches/soc-2008-mxcurioni/source/blender/quicktime/apple/quicktime_import.c
    branches/soc-2008-mxcurioni/source/blender/render/intern/include/zbuf.h
    branches/soc-2008-mxcurioni/source/blender/render/intern/raytrace/reorganize.h
    branches/soc-2008-mxcurioni/source/blender/render/intern/source/convertblender.c
    branches/soc-2008-mxcurioni/source/blender/render/intern/source/imagetexture.c
    branches/soc-2008-mxcurioni/source/blender/render/intern/source/initrender.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/shadbuf.c
    branches/soc-2008-mxcurioni/source/blender/render/intern/source/sunsky.c
    branches/soc-2008-mxcurioni/source/blender/render/intern/source/volumetric.c
    branches/soc-2008-mxcurioni/source/blender/render/intern/source/zbuf.c
    branches/soc-2008-mxcurioni/source/blender/windowmanager/CMakeLists.txt
    branches/soc-2008-mxcurioni/source/blender/windowmanager/SConscript
    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_init_exit.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/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
    branches/soc-2008-mxcurioni/source/gameengine/BlenderRoutines/KX_BlenderRenderTools.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Converter/BL_ActionActuator.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Converter/BL_ArmatureChannel.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Converter/BL_ArmatureConstraint.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Converter/BL_BlenderDataConversion.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Converter/KX_ConvertActuators.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Converter/KX_ConvertSensors.cpp
    branches/soc-2008-mxcurioni/source/gameengine/GameLogic/SCA_KeyboardSensor.h
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_BlenderMaterial.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_BlenderMaterial.h
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_CameraActuator.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_GameActuator.h
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_SCA_AddObjectActuator.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_SCA_AddObjectActuator.h
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_SCA_DynamicActuator.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_SCA_DynamicActuator.h
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_SCA_EndObjectActuator.h
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_SCA_ReplaceMeshActuator.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_SCA_ReplaceMeshActuator.h
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_SceneActuator.h
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_TrackToActuator.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_TrackToActuator.h
    branches/soc-2008-mxcurioni/source/gameengine/Rasterizer/RAS_2DFilterManager.cpp
    branches/soc-2008-mxcurioni/source/gameengine/VideoTexture/VideoBase.h

Property Changed:
----------------
    branches/soc-2008-mxcurioni/
    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
/trunk/blender:34011-39896,39898-40096,40098-44221,44223-44419,44421-47664,47667-48893
   + /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:34011-39896,39898-40096,40098-44221,44223-44419,44421-47664,47667-49090

Modified: branches/soc-2008-mxcurioni/build_files/cmake/config/blender_lite.cmake
===================================================================
--- branches/soc-2008-mxcurioni/build_files/cmake/config/blender_lite.cmake	2012-07-20 23:05:54 UTC (rev 49093)
+++ branches/soc-2008-mxcurioni/build_files/cmake/config/blender_lite.cmake	2012-07-20 23:12:05 UTC (rev 49094)
@@ -17,6 +17,7 @@
 set(WITH_LIBMV               OFF CACHE FORCE BOOL)
 set(WITH_CARVE               OFF CACHE FORCE BOOL)
 set(WITH_GAMEENGINE          OFF CACHE FORCE BOOL)
+set(WITH_COMPOSITOR          OFF CACHE FORCE BOOL)
 set(WITH_GHOST_XDND          OFF CACHE FORCE BOOL)
 set(WITH_IK_ITASC            OFF CACHE FORCE BOOL)
 set(WITH_IMAGE_CINEON        OFF CACHE FORCE BOOL)

Modified: branches/soc-2008-mxcurioni/build_files/cmake/macros.cmake
===================================================================
--- branches/soc-2008-mxcurioni/build_files/cmake/macros.cmake	2012-07-20 23:05:54 UTC (rev 49093)
+++ branches/soc-2008-mxcurioni/build_files/cmake/macros.cmake	2012-07-20 23:12:05 UTC (rev 49094)
@@ -23,6 +23,25 @@
 #
 # ***** END GPL LICENSE BLOCK *****
 
+macro(list_insert_after
+	list_id item_check item_add
+	)
+	set(_index)
+	list(FIND ${list_id} "${item_check}" _index)
+	math(EXPR _index "${_index} + 1")
+	list(INSERT ${list_id} "${_index}" ${item_add})
+	unset(_index)
+endmacro()
+
+macro(list_insert_before
+	list_id item_check item_add
+	)
+	set(_index)
+	list(FIND ${list_id} "${item_check}" _index)
+	list(INSERT ${list_id} "${_index}" ${item_add})
+	unset(_index)
+endmacro()
+
 # foo_bar.spam --> foo_barMySuffix.spam
 macro(file_suffix
 	file_name_new file_name file_suffix

Modified: branches/soc-2008-mxcurioni/doc/manpage/blender.1
===================================================================
(Binary files differ)

Modified: branches/soc-2008-mxcurioni/intern/bsp/intern/BSP_CSGMesh.cpp
===================================================================
--- branches/soc-2008-mxcurioni/intern/bsp/intern/BSP_CSGMesh.cpp	2012-07-20 23:05:54 UTC (rev 49093)
+++ branches/soc-2008-mxcurioni/intern/bsp/intern/BSP_CSGMesh.cpp	2012-07-20 23:12:05 UTC (rev 49094)
@@ -486,7 +486,7 @@
 		BSP_MEdge &e = edges[*e_it]; 
 
 		// iterate through the faces of this edge - push unselected
-		// edges to ouput and then select the edge
+		// edges to output and then select the edge
 
 		vector<BSP_FaceInd>::const_iterator e_faces_end = e.m_faces.end();
 		vector<BSP_FaceInd>::iterator e_faces_it = e.m_faces.begin();

Modified: branches/soc-2008-mxcurioni/intern/cycles/kernel/kernel_differential.h
===================================================================
--- branches/soc-2008-mxcurioni/intern/cycles/kernel/kernel_differential.h	2012-07-20 23:05:54 UTC (rev 49093)
+++ branches/soc-2008-mxcurioni/intern/cycles/kernel/kernel_differential.h	2012-07-20 23:12:05 UTC (rev 49094)
@@ -22,7 +22,7 @@
 
 __device void differential_transfer(differential3 *dP_, const differential3 dP, float3 D, const differential3 dD, float3 Ng, float t)
 {
-	/* ray differential transfer through homogenous medium, to
+	/* ray differential transfer through homogeneous medium, to
 	 * compute dPdx/dy at a shading point from the incoming ray */
 
 	float3 tmp = D/dot(D, Ng);

Modified: branches/soc-2008-mxcurioni/intern/cycles/render/graph.cpp
===================================================================
--- branches/soc-2008-mxcurioni/intern/cycles/render/graph.cpp	2012-07-20 23:05:54 UTC (rev 49093)
+++ branches/soc-2008-mxcurioni/intern/cycles/render/graph.cpp	2012-07-20 23:12:05 UTC (rev 49094)
@@ -187,7 +187,10 @@
 	if(from->type != to->type) {
 		/* for closures we can't do automatic conversion */
 		if(from->type == SHADER_SOCKET_CLOSURE || to->type == SHADER_SOCKET_CLOSURE) {
-			fprintf(stderr, "ShaderGraph connect: can only connect closure to closure.\n");
+			fprintf(stderr, "ShaderGraph connect: can only connect closure to closure "
+			        "(ShaderNode:%s, ShaderOutput:%s , type:%d -> to ShaderNode:%s, ShaderInput:%s, type:%d).\n",
+			        from->parent->name.c_str(), from->name, (int)from->type,
+			        to->parent->name.c_str(),   to->name,   (int)to->type);
 			return;
 		}
 

Modified: branches/soc-2008-mxcurioni/intern/dualcon/intern/octree.cpp
===================================================================
--- branches/soc-2008-mxcurioni/intern/dualcon/intern/octree.cpp	2012-07-20 23:05:54 UTC (rev 49093)
+++ branches/soc-2008-mxcurioni/intern/dualcon/intern/octree.cpp	2012-07-20 23:12:05 UTC (rev 49094)
@@ -54,7 +54,7 @@
 	   After playing around with this option, the only case I could
 	   find where this option gives different results is on
 	   relatively thin corners. Sometimes along these corners two
-	   vertices from seperate sides will be placed in the same
+	   vertices from separate sides will be placed in the same
 	   position, so hole gets filled with a 5-sided face, where two
 	   of those vertices are in the same 3D location. If
 	   `use_manifold' is disabled, then the modifier doesn't

Modified: branches/soc-2008-mxcurioni/intern/guardedalloc/MEM_guardedalloc.h
===================================================================
--- branches/soc-2008-mxcurioni/intern/guardedalloc/MEM_guardedalloc.h	2012-07-20 23:05:54 UTC (rev 49093)
+++ branches/soc-2008-mxcurioni/intern/guardedalloc/MEM_guardedalloc.h	2012-07-20 23:12:05 UTC (rev 49094)
@@ -20,19 +20,19 @@
  *
  * The Original Code is: all of this file.
  *
- * Contributor(s): none yet.
+ * Contributor(s): Brecht Van Lommel
+ *                 Campbell Barton
  *
  * ***** END GPL LICENSE BLOCK *****
  */
 
-/** \file MEM_guardedalloc.h
- *  \ingroup MEM
+/**
+ * \file MEM_guardedalloc.h
+ * \ingroup MEM
  *
- *  \author Copyright (C) 2001 NaN Technologies B.V.
- *  \brief Read \ref MEMPage
- */
-
-/** 
+ * \author Copyright (C) 2001 NaN Technologies B.V.
+ * \brief Read \ref MEMPage
+ *
  * \page MEMPage Guarded memory(de)allocation
  *
  * \section aboutmem c-style guarded memory allocation
@@ -60,8 +60,8 @@
 #ifndef __MEM_GUARDEDALLOC_H__
 #define __MEM_GUARDEDALLOC_H__
 
-#include <stdio.h> /* needed for FILE* */
-#include "MEM_sys_types.h" /* needed for uintptr_t */
+#include <stdio.h>          /* needed for FILE* */
+#include "MEM_sys_types.h"  /* needed for uintptr_t */
 
 #ifdef __cplusplus
 extern "C" {
@@ -70,7 +70,7 @@
 	/** 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)
+	size_t MEM_allocN_len(const void *vmemh)
 #ifdef __GNUC__
 	__attribute__((warn_unused_result))
 #endif
@@ -111,32 +111,34 @@
 	 * 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)
+	void *MEM_callocN(size_t len, const char *str)
 #ifdef __GNUC__
 	__attribute__((warn_unused_result))
-	__attribute__((nonnull))
+	__attribute__((nonnull(2)))
 	__attribute__((alloc_size(1)))
 #endif
 	;
-	
-	/** Allocate a block of memory of size len, with tag name str. The
+
+	/**
+	 * 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)
+	void *MEM_mallocN(size_t len, const char *str)
 #ifdef __GNUC__
 	__attribute__((warn_unused_result))
-	__attribute__((nonnull))
+	__attribute__((nonnull(2)))
 	__attribute__((alloc_size(1)))
 #endif
 	;
-	
-	/** Same as callocN, clears memory and uses mmap (disk cached) if supported.
+
+	/**
+	 * 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)
+	void *MEM_mapallocN(size_t len, const char *str)
 #ifdef __GNUC__
 	__attribute__((warn_unused_result))
-	__attribute__((nonnull))
+	__attribute__((nonnull(2)))
 	__attribute__((alloc_size(1)))
 #endif
 	;
@@ -171,7 +173,8 @@
 	/** Attempt to enforce OSX (or other OS's) to have malloc and stack nonzero */
 	void MEM_set_memory_debug(void);
 
-	/** Memory usage stats
+	/**
+	 * Memory usage stats
 	 * - MEM_get_memory_in_use is all memory
 	 * - MEM_get_mapped_memory_in_use is a subset of all memory */
 	uintptr_t MEM_get_memory_in_use(void);
@@ -213,11 +216,10 @@
 			MEM_freeN(mem);                                                   \
 	}                                                                         \
 
-#endif
+#endif  /* __cplusplus */
 
-
 #ifdef __cplusplus
 }
-#endif
+#endif  /* __cplusplus */
 
-#endif
+#endif  /* __MEM_GUARDEDALLOC_H__ */

Modified: branches/soc-2008-mxcurioni/intern/guardedalloc/intern/mallocn.c
===================================================================

@@ Diff output truncated at 10240 characters. @@

More information about the Bf-blender-cvs mailing list