[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [46994] branches/soc-2012-swiss_cheese: Merged r46824-r46992
Jason Wilkins
Jason.A.Wilkins at gmail.com
Fri May 25 04:41:53 CEST 2012
Revision: 46994
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=46994
Author: jwilkins
Date: 2012-05-25 02:41:50 +0000 (Fri, 25 May 2012)
Log Message:
-----------
Merged r46824-r46992
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=46824
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=46992
Modified Paths:
--------------
branches/soc-2012-swiss_cheese/CMakeLists.txt
branches/soc-2012-swiss_cheese/intern/guardedalloc/intern/mmap_win.c
branches/soc-2012-swiss_cheese/source/blender/blenkernel/BKE_blender.h
branches/soc-2012-swiss_cheese/source/blender/blenkernel/BKE_fcurve.h
branches/soc-2012-swiss_cheese/source/blender/blenkernel/BKE_key.h
branches/soc-2012-swiss_cheese/source/blender/blenkernel/BKE_mesh.h
branches/soc-2012-swiss_cheese/source/blender/blenkernel/BKE_node.h
branches/soc-2012-swiss_cheese/source/blender/blenkernel/BKE_object.h
branches/soc-2012-swiss_cheese/source/blender/blenkernel/BKE_screen.h
branches/soc-2012-swiss_cheese/source/blender/blenkernel/intern/blender.c
branches/soc-2012-swiss_cheese/source/blender/blenkernel/intern/brush.c
branches/soc-2012-swiss_cheese/source/blender/blenkernel/intern/cdderivedmesh.c
branches/soc-2012-swiss_cheese/source/blender/blenkernel/intern/cloth.c
branches/soc-2012-swiss_cheese/source/blender/blenkernel/intern/collision.c
branches/soc-2012-swiss_cheese/source/blender/blenkernel/intern/constraint.c
branches/soc-2012-swiss_cheese/source/blender/blenkernel/intern/customdata.c
branches/soc-2012-swiss_cheese/source/blender/blenkernel/intern/deform.c
branches/soc-2012-swiss_cheese/source/blender/blenkernel/intern/editderivedmesh.c
branches/soc-2012-swiss_cheese/source/blender/blenkernel/intern/fcurve.c
branches/soc-2012-swiss_cheese/source/blender/blenkernel/intern/key.c
branches/soc-2012-swiss_cheese/source/blender/blenkernel/intern/lattice.c
branches/soc-2012-swiss_cheese/source/blender/blenkernel/intern/mesh.c
branches/soc-2012-swiss_cheese/source/blender/blenkernel/intern/movieclip.c
branches/soc-2012-swiss_cheese/source/blender/blenkernel/intern/node.c
branches/soc-2012-swiss_cheese/source/blender/blenkernel/intern/object.c
branches/soc-2012-swiss_cheese/source/blender/blenkernel/intern/particle_system.c
branches/soc-2012-swiss_cheese/source/blender/blenkernel/intern/pointcache.c
branches/soc-2012-swiss_cheese/source/blender/blenkernel/intern/smoke.c
branches/soc-2012-swiss_cheese/source/blender/blenkernel/intern/softbody.c
branches/soc-2012-swiss_cheese/source/blender/blenkernel/intern/tracking.c
branches/soc-2012-swiss_cheese/source/blender/blenkernel/intern/unit.c
branches/soc-2012-swiss_cheese/source/blender/blenlib/intern/noise.c
branches/soc-2012-swiss_cheese/source/blender/blenloader/intern/readfile.c
branches/soc-2012-swiss_cheese/source/blender/blenloader/intern/versioning_250.c
branches/soc-2012-swiss_cheese/source/blender/blenloader/intern/writefile.c
branches/soc-2012-swiss_cheese/source/blender/bmesh/bmesh_class.h
branches/soc-2012-swiss_cheese/source/blender/bmesh/intern/bmesh_construct.c
branches/soc-2012-swiss_cheese/source/blender/bmesh/intern/bmesh_interp.c
branches/soc-2012-swiss_cheese/source/blender/bmesh/intern/bmesh_marking.c
branches/soc-2012-swiss_cheese/source/blender/bmesh/intern/bmesh_mesh_conv.c
branches/soc-2012-swiss_cheese/source/blender/bmesh/intern/bmesh_queries.c
branches/soc-2012-swiss_cheese/source/blender/bmesh/intern/bmesh_queries.h
branches/soc-2012-swiss_cheese/source/blender/bmesh/operators/bmo_extrude.c
branches/soc-2012-swiss_cheese/source/blender/bmesh/operators/bmo_slide.c
branches/soc-2012-swiss_cheese/source/blender/compositor/intern/COM_ExecutionSystem.cpp
branches/soc-2012-swiss_cheese/source/blender/compositor/intern/COM_InputSocket.cpp
branches/soc-2012-swiss_cheese/source/blender/compositor/intern/COM_InputSocket.h
branches/soc-2012-swiss_cheese/source/blender/compositor/intern/COM_Node.cpp
branches/soc-2012-swiss_cheese/source/blender/compositor/intern/COM_WorkScheduler.cpp
branches/soc-2012-swiss_cheese/source/blender/compositor/intern/COM_compositor.cpp
branches/soc-2012-swiss_cheese/source/blender/compositor/nodes/COM_AlphaOverNode.cpp
branches/soc-2012-swiss_cheese/source/blender/compositor/nodes/COM_BilateralBlurNode.cpp
branches/soc-2012-swiss_cheese/source/blender/compositor/nodes/COM_BlurNode.cpp
branches/soc-2012-swiss_cheese/source/blender/compositor/nodes/COM_BokehBlurNode.cpp
branches/soc-2012-swiss_cheese/source/blender/compositor/nodes/COM_BoxMaskNode.cpp
branches/soc-2012-swiss_cheese/source/blender/compositor/nodes/COM_BrightnessNode.cpp
branches/soc-2012-swiss_cheese/source/blender/compositor/nodes/COM_ChannelMatteNode.cpp
branches/soc-2012-swiss_cheese/source/blender/compositor/nodes/COM_ChromaMatteNode.cpp
branches/soc-2012-swiss_cheese/source/blender/compositor/nodes/COM_ColorBalanceNode.cpp
branches/soc-2012-swiss_cheese/source/blender/compositor/nodes/COM_ColorCorrectionNode.cpp
branches/soc-2012-swiss_cheese/source/blender/compositor/nodes/COM_ColorCurveNode.cpp
branches/soc-2012-swiss_cheese/source/blender/compositor/nodes/COM_ColorMatteNode.cpp
branches/soc-2012-swiss_cheese/source/blender/compositor/nodes/COM_ColorRampNode.cpp
branches/soc-2012-swiss_cheese/source/blender/compositor/nodes/COM_ColorSpillNode.cpp
branches/soc-2012-swiss_cheese/source/blender/compositor/nodes/COM_ColorToBWNode.cpp
branches/soc-2012-swiss_cheese/source/blender/compositor/nodes/COM_CombineRGBANode.cpp
branches/soc-2012-swiss_cheese/source/blender/compositor/nodes/COM_ConvertAlphaNode.cpp
branches/soc-2012-swiss_cheese/source/blender/compositor/nodes/COM_CropNode.cpp
branches/soc-2012-swiss_cheese/source/blender/compositor/nodes/COM_DefocusNode.cpp
branches/soc-2012-swiss_cheese/source/blender/compositor/nodes/COM_DifferenceMatteNode.cpp
branches/soc-2012-swiss_cheese/source/blender/compositor/nodes/COM_DilateErodeNode.cpp
branches/soc-2012-swiss_cheese/source/blender/compositor/nodes/COM_DirectionalBlurNode.cpp
branches/soc-2012-swiss_cheese/source/blender/compositor/nodes/COM_DisplaceNode.cpp
branches/soc-2012-swiss_cheese/source/blender/compositor/nodes/COM_DistanceMatteNode.cpp
branches/soc-2012-swiss_cheese/source/blender/compositor/nodes/COM_DoubleEdgeMaskNode.cpp
branches/soc-2012-swiss_cheese/source/blender/compositor/nodes/COM_EllipseMaskNode.cpp
branches/soc-2012-swiss_cheese/source/blender/compositor/nodes/COM_FilterNode.cpp
branches/soc-2012-swiss_cheese/source/blender/compositor/nodes/COM_FlipNode.cpp
branches/soc-2012-swiss_cheese/source/blender/compositor/nodes/COM_GammaNode.cpp
branches/soc-2012-swiss_cheese/source/blender/compositor/nodes/COM_GlareNode.cpp
branches/soc-2012-swiss_cheese/source/blender/compositor/nodes/COM_GroupNode.cpp
branches/soc-2012-swiss_cheese/source/blender/compositor/nodes/COM_HueSaturationValueCorrectNode.cpp
branches/soc-2012-swiss_cheese/source/blender/compositor/nodes/COM_HueSaturationValueNode.cpp
branches/soc-2012-swiss_cheese/source/blender/compositor/nodes/COM_IDMaskNode.cpp
branches/soc-2012-swiss_cheese/source/blender/compositor/nodes/COM_InvertNode.cpp
branches/soc-2012-swiss_cheese/source/blender/compositor/nodes/COM_LensDistortionNode.cpp
branches/soc-2012-swiss_cheese/source/blender/compositor/nodes/COM_LuminanceMatteNode.cpp
branches/soc-2012-swiss_cheese/source/blender/compositor/nodes/COM_MapUVNode.cpp
branches/soc-2012-swiss_cheese/source/blender/compositor/nodes/COM_MapValueNode.cpp
branches/soc-2012-swiss_cheese/source/blender/compositor/nodes/COM_MathNode.cpp
branches/soc-2012-swiss_cheese/source/blender/compositor/nodes/COM_MixNode.cpp
branches/soc-2012-swiss_cheese/source/blender/compositor/nodes/COM_MovieClipNode.cpp
branches/soc-2012-swiss_cheese/source/blender/compositor/nodes/COM_MovieDistortionNode.cpp
branches/soc-2012-swiss_cheese/source/blender/compositor/nodes/COM_NormalNode.cpp
branches/soc-2012-swiss_cheese/source/blender/compositor/nodes/COM_NormalizeNode.cpp
branches/soc-2012-swiss_cheese/source/blender/compositor/nodes/COM_RotateNode.cpp
branches/soc-2012-swiss_cheese/source/blender/compositor/nodes/COM_ScaleNode.cpp
branches/soc-2012-swiss_cheese/source/blender/compositor/nodes/COM_SeparateRGBANode.cpp
branches/soc-2012-swiss_cheese/source/blender/compositor/nodes/COM_SetAlphaNode.cpp
branches/soc-2012-swiss_cheese/source/blender/compositor/nodes/COM_SplitViewerNode.cpp
branches/soc-2012-swiss_cheese/source/blender/compositor/nodes/COM_Stabilize2dNode.cpp
branches/soc-2012-swiss_cheese/source/blender/compositor/nodes/COM_SwitchNode.cpp
branches/soc-2012-swiss_cheese/source/blender/compositor/nodes/COM_TextureNode.cpp
branches/soc-2012-swiss_cheese/source/blender/compositor/nodes/COM_TonemapNode.cpp
branches/soc-2012-swiss_cheese/source/blender/compositor/nodes/COM_TransformNode.cpp
branches/soc-2012-swiss_cheese/source/blender/compositor/nodes/COM_TranslateNode.cpp
branches/soc-2012-swiss_cheese/source/blender/compositor/nodes/COM_VectorBlurNode.cpp
branches/soc-2012-swiss_cheese/source/blender/compositor/nodes/COM_VectorCurveNode.cpp
branches/soc-2012-swiss_cheese/source/blender/compositor/nodes/COM_ViewLevelsNode.cpp
branches/soc-2012-swiss_cheese/source/blender/compositor/nodes/COM_ViewerNode.cpp
branches/soc-2012-swiss_cheese/source/blender/compositor/nodes/COM_ZCombineNode.cpp
branches/soc-2012-swiss_cheese/source/blender/compositor/operations/COM_BokehImageOperation.cpp
branches/soc-2012-swiss_cheese/source/blender/compositor/operations/COM_ColorCorrectionOperation.cpp
branches/soc-2012-swiss_cheese/source/blender/compositor/operations/COM_CompositorOperation.cpp
branches/soc-2012-swiss_cheese/source/blender/compositor/operations/COM_CompositorOperation.h
branches/soc-2012-swiss_cheese/source/blender/compositor/operations/COM_ConvertColorToBWOperation.cpp
branches/soc-2012-swiss_cheese/source/blender/compositor/operations/COM_ConvertColourToValueProg.cpp
branches/soc-2012-swiss_cheese/source/blender/compositor/operations/COM_DilateErodeOperation.cpp
branches/soc-2012-swiss_cheese/source/blender/compositor/operations/COM_DilateErodeOperation.h
branches/soc-2012-swiss_cheese/source/blender/compositor/operations/COM_GlareBaseOperation.cpp
branches/soc-2012-swiss_cheese/source/blender/compositor/operations/COM_LensGhostOperation.cpp
branches/soc-2012-swiss_cheese/source/blender/compositor/operations/COM_MathBaseOperation.cpp
branches/soc-2012-swiss_cheese/source/blender/compositor/operations/COM_MovieClipOperation.cpp
branches/soc-2012-swiss_cheese/source/blender/compositor/operations/COM_MovieDistortionOperation.cpp
branches/soc-2012-swiss_cheese/source/blender/compositor/operations/COM_MovieDistortionOperation.h
branches/soc-2012-swiss_cheese/source/blender/compositor/operations/COM_PreviewOperation.cpp
branches/soc-2012-swiss_cheese/source/blender/compositor/operations/COM_TextureOperation.cpp
branches/soc-2012-swiss_cheese/source/blender/compositor/operations/COM_TextureOperation.h
branches/soc-2012-swiss_cheese/source/blender/editors/animation/anim_channels_defines.c
branches/soc-2012-swiss_cheese/source/blender/editors/armature/editarmature.c
branches/soc-2012-swiss_cheese/source/blender/editors/curve/editcurve.c
branches/soc-2012-swiss_cheese/source/blender/editors/datafiles/blender_icons.png.c
branches/soc-2012-swiss_cheese/source/blender/editors/datafiles/startup.blend.c
branches/soc-2012-swiss_cheese/source/blender/editors/include/ED_armature.h
branches/soc-2012-swiss_cheese/source/blender/editors/include/ED_curve.h
branches/soc-2012-swiss_cheese/source/blender/editors/include/ED_mball.h
branches/soc-2012-swiss_cheese/source/blender/editors/include/ED_mesh.h
branches/soc-2012-swiss_cheese/source/blender/editors/include/ED_node.h
branches/soc-2012-swiss_cheese/source/blender/editors/include/ED_object.h
branches/soc-2012-swiss_cheese/source/blender/editors/include/ED_particle.h
branches/soc-2012-swiss_cheese/source/blender/editors/include/ED_transform.h
branches/soc-2012-swiss_cheese/source/blender/editors/include/UI_icons.h
branches/soc-2012-swiss_cheese/source/blender/editors/include/UI_interface.h
branches/soc-2012-swiss_cheese/source/blender/editors/include/UI_resources.h
branches/soc-2012-swiss_cheese/source/blender/editors/interface/interface.c
branches/soc-2012-swiss_cheese/source/blender/editors/interface/interface_intern.h
branches/soc-2012-swiss_cheese/source/blender/editors/interface/interface_regions.c
branches/soc-2012-swiss_cheese/source/blender/editors/interface/interface_templates.c
branches/soc-2012-swiss_cheese/source/blender/editors/interface/interface_widgets.c
branches/soc-2012-swiss_cheese/source/blender/editors/interface/resources.c
branches/soc-2012-swiss_cheese/source/blender/editors/mesh/editface.c
branches/soc-2012-swiss_cheese/source/blender/editors/mesh/editmesh_select.c
branches/soc-2012-swiss_cheese/source/blender/editors/mesh/editmesh_tools.c
branches/soc-2012-swiss_cheese/source/blender/editors/mesh/mesh_data.c
branches/soc-2012-swiss_cheese/source/blender/editors/metaball/mball_edit.c
branches/soc-2012-swiss_cheese/source/blender/editors/object/object_bake.c
branches/soc-2012-swiss_cheese/source/blender/editors/object/object_intern.h
branches/soc-2012-swiss_cheese/source/blender/editors/object/object_lattice.c
branches/soc-2012-swiss_cheese/source/blender/editors/object/object_modifier.c
branches/soc-2012-swiss_cheese/source/blender/editors/object/object_ops.c
branches/soc-2012-swiss_cheese/source/blender/editors/physics/particle_edit.c
branches/soc-2012-swiss_cheese/source/blender/editors/screen/screen_edit.c
branches/soc-2012-swiss_cheese/source/blender/editors/sculpt_paint/paint_intern.h
branches/soc-2012-swiss_cheese/source/blender/editors/sculpt_paint/paint_mask.c
branches/soc-2012-swiss_cheese/source/blender/editors/sculpt_paint/paint_stroke.c
branches/soc-2012-swiss_cheese/source/blender/editors/sculpt_paint/paint_vertex.c
branches/soc-2012-swiss_cheese/source/blender/editors/sculpt_paint/sculpt.c
branches/soc-2012-swiss_cheese/source/blender/editors/sound/sound_ops.c
branches/soc-2012-swiss_cheese/source/blender/editors/space_clip/tracking_ops.c
branches/soc-2012-swiss_cheese/source/blender/editors/space_file/fsmenu.c
branches/soc-2012-swiss_cheese/source/blender/editors/space_graph/graph_edit.c
branches/soc-2012-swiss_cheese/source/blender/editors/space_graph/graph_intern.h
branches/soc-2012-swiss_cheese/source/blender/editors/space_graph/space_graph.c
branches/soc-2012-swiss_cheese/source/blender/editors/space_node/drawnode.c
branches/soc-2012-swiss_cheese/source/blender/editors/space_node/node_buttons.c
branches/soc-2012-swiss_cheese/source/blender/editors/space_node/node_draw.c
branches/soc-2012-swiss_cheese/source/blender/editors/space_node/node_edit.c
branches/soc-2012-swiss_cheese/source/blender/editors/space_node/node_intern.h
branches/soc-2012-swiss_cheese/source/blender/editors/space_node/node_ops.c
branches/soc-2012-swiss_cheese/source/blender/editors/space_node/node_select.c
branches/soc-2012-swiss_cheese/source/blender/editors/space_node/node_templates.c
branches/soc-2012-swiss_cheese/source/blender/editors/space_node/space_node.c
branches/soc-2012-swiss_cheese/source/blender/editors/space_outliner/outliner_draw.c
branches/soc-2012-swiss_cheese/source/blender/editors/space_sequencer/sequencer_add.c
branches/soc-2012-swiss_cheese/source/blender/editors/space_view3d/drawobject.c
branches/soc-2012-swiss_cheese/source/blender/editors/space_view3d/view3d_draw.c
branches/soc-2012-swiss_cheese/source/blender/editors/space_view3d/view3d_fly.c
branches/soc-2012-swiss_cheese/source/blender/editors/space_view3d/view3d_ops.c
branches/soc-2012-swiss_cheese/source/blender/editors/space_view3d/view3d_select.c
branches/soc-2012-swiss_cheese/source/blender/editors/transform/transform.c
branches/soc-2012-swiss_cheese/source/blender/editors/transform/transform.h
branches/soc-2012-swiss_cheese/source/blender/editors/transform/transform_conversions.c
branches/soc-2012-swiss_cheese/source/blender/editors/transform/transform_input.c
branches/soc-2012-swiss_cheese/source/blender/editors/transform/transform_ops.c
branches/soc-2012-swiss_cheese/source/blender/editors/transform/transform_snap.c
branches/soc-2012-swiss_cheese/source/blender/gpu/intern/gpu_buffers.c
branches/soc-2012-swiss_cheese/source/blender/gpu/intern/gpu_codegen.c
branches/soc-2012-swiss_cheese/source/blender/gpu/intern/gpu_draw.c
branches/soc-2012-swiss_cheese/source/blender/gpu/intern/gpu_extensions.c
branches/soc-2012-swiss_cheese/source/blender/gpu/intern/gpu_material.c
branches/soc-2012-swiss_cheese/source/blender/gpu/shaders/gpu_shader_material.glsl.c
branches/soc-2012-swiss_cheese/source/blender/makesdna/DNA_action_types.h
branches/soc-2012-swiss_cheese/source/blender/makesdna/DNA_customdata_types.h
branches/soc-2012-swiss_cheese/source/blender/makesdna/DNA_meshdata_types.h
branches/soc-2012-swiss_cheese/source/blender/makesdna/DNA_modifier_types.h
branches/soc-2012-swiss_cheese/source/blender/makesdna/DNA_node_types.h
branches/soc-2012-swiss_cheese/source/blender/makesdna/DNA_scene_types.h
branches/soc-2012-swiss_cheese/source/blender/makesdna/DNA_smoke_types.h
branches/soc-2012-swiss_cheese/source/blender/makesdna/DNA_space_types.h
branches/soc-2012-swiss_cheese/source/blender/makesdna/DNA_userdef_types.h
branches/soc-2012-swiss_cheese/source/blender/makesrna/RNA_access.h
branches/soc-2012-swiss_cheese/source/blender/makesrna/RNA_enum_types.h
branches/soc-2012-swiss_cheese/source/blender/makesrna/intern/rna_action.c
branches/soc-2012-swiss_cheese/source/blender/makesrna/intern/rna_image_api.c
branches/soc-2012-swiss_cheese/source/blender/makesrna/intern/rna_internal.h
branches/soc-2012-swiss_cheese/source/blender/makesrna/intern/rna_key.c
branches/soc-2012-swiss_cheese/source/blender/makesrna/intern/rna_lamp.c
branches/soc-2012-swiss_cheese/source/blender/makesrna/intern/rna_lattice.c
branches/soc-2012-swiss_cheese/source/blender/makesrna/intern/rna_mesh.c
branches/soc-2012-swiss_cheese/source/blender/makesrna/intern/rna_modifier.c
branches/soc-2012-swiss_cheese/source/blender/makesrna/intern/rna_nodetree.c
branches/soc-2012-swiss_cheese/source/blender/makesrna/intern/rna_nodetree_types.h
branches/soc-2012-swiss_cheese/source/blender/makesrna/intern/rna_pose.c
branches/soc-2012-swiss_cheese/source/blender/makesrna/intern/rna_scene.c
branches/soc-2012-swiss_cheese/source/blender/makesrna/intern/rna_scene_api.c
branches/soc-2012-swiss_cheese/source/blender/makesrna/intern/rna_sculpt_paint.c
branches/soc-2012-swiss_cheese/source/blender/makesrna/intern/rna_space.c
branches/soc-2012-swiss_cheese/source/blender/makesrna/intern/rna_userdef.c
branches/soc-2012-swiss_cheese/source/blender/modifiers/CMakeLists.txt
branches/soc-2012-swiss_cheese/source/blender/modifiers/MOD_modifiertypes.h
branches/soc-2012-swiss_cheese/source/blender/modifiers/intern/MOD_solidify.c
branches/soc-2012-swiss_cheese/source/blender/modifiers/intern/MOD_util.c
branches/soc-2012-swiss_cheese/source/blender/nodes/CMakeLists.txt
branches/soc-2012-swiss_cheese/source/blender/nodes/NOD_shader.h
branches/soc-2012-swiss_cheese/source/blender/nodes/composite/node_composite_tree.c
branches/soc-2012-swiss_cheese/source/blender/nodes/composite/nodes/node_composite_boxmask.c
branches/soc-2012-swiss_cheese/source/blender/nodes/composite/nodes/node_composite_colorcorrection.c
branches/soc-2012-swiss_cheese/source/blender/nodes/composite/nodes/node_composite_defocus.c
branches/soc-2012-swiss_cheese/source/blender/nodes/composite/nodes/node_composite_ellipsemask.c
branches/soc-2012-swiss_cheese/source/blender/nodes/intern/node_common.c
branches/soc-2012-swiss_cheese/source/blender/nodes/intern/node_util.c
branches/soc-2012-swiss_cheese/source/blender/python/bmesh/bmesh_py_types.c
branches/soc-2012-swiss_cheese/source/blender/python/bmesh/bmesh_py_types_customdata.c
branches/soc-2012-swiss_cheese/source/blender/python/generic/bpy_internal_import.c
branches/soc-2012-swiss_cheese/source/blender/python/intern/bpy_interface.c
branches/soc-2012-swiss_cheese/source/blender/python/intern/bpy_rna.c
branches/soc-2012-swiss_cheese/source/blender/render/intern/source/convertblender.c
branches/soc-2012-swiss_cheese/source/blender/render/intern/source/rendercore.c
branches/soc-2012-swiss_cheese/source/blender/windowmanager/intern/wm_event_system.c
branches/soc-2012-swiss_cheese/source/blender/windowmanager/intern/wm_files.c
branches/soc-2012-swiss_cheese/source/blender/windowmanager/intern/wm_operators.c
branches/soc-2012-swiss_cheese/source/blender/windowmanager/intern/wm_window.c
branches/soc-2012-swiss_cheese/source/creator/CMakeLists.txt
branches/soc-2012-swiss_cheese/source/creator/creator.c
branches/soc-2012-swiss_cheese/source/gameengine/Ketsji/BL_Action.cpp
branches/soc-2012-swiss_cheese/source/gameengine/Ketsji/KX_KetsjiEngine.cpp
Added Paths:
-----------
branches/soc-2012-swiss_cheese/source/blender/modifiers/intern/MOD_skin.c
branches/soc-2012-swiss_cheese/source/blender/nodes/shader/nodes/node_shader_object_info.c
Property Changed:
----------------
branches/soc-2012-swiss_cheese/source/blender/editors/interface/interface.c
Modified: branches/soc-2012-swiss_cheese/CMakeLists.txt
===================================================================
--- branches/soc-2012-swiss_cheese/CMakeLists.txt 2012-05-25 02:37:05 UTC (rev 46993)
+++ branches/soc-2012-swiss_cheese/CMakeLists.txt 2012-05-25 02:41:50 UTC (rev 46994)
@@ -238,8 +238,14 @@
option(WITH_CYCLES "Enable cycles Render Engine" ON)
option(WITH_CYCLES_TEST "Build cycles test application" OFF)
option(WITH_CYCLES_CUDA_BINARIES "Build cycles CUDA binaries" OFF)
-set(CYCLES_CUDA_BINARIES_ARCH sm_13 sm_20 sm_21 CACHE STRING "CUDA architectures to build binaries for")
+if(WIN32 AND NOT CMAKE_CL_64 AND NOT WITH_MINGW64)
+ set(PLATFORM_DEFAULT sm_20 sm_21)
+else()
+ set(PLATFORM_DEFAULT sm_13 sm_20 sm_21)
+endif()
+set(CYCLES_CUDA_BINARIES_ARCH ${PLATFORM_DEFAULT} CACHE STRING "CUDA architectures to build binaries for")
mark_as_advanced(CYCLES_CUDA_BINARIES_ARCH)
+unset(PLATFORM_DEFAULT)
# disable for now, but plan to support on all platforms eventually
option(WITH_MEM_JEMALLOC "Enable malloc replacement (http://www.canonware.com/jemalloc)" OFF)
Modified: branches/soc-2012-swiss_cheese/intern/guardedalloc/intern/mmap_win.c
===================================================================
--- branches/soc-2012-swiss_cheese/intern/guardedalloc/intern/mmap_win.c 2012-05-25 02:37:05 UTC (rev 46993)
+++ branches/soc-2012-swiss_cheese/intern/guardedalloc/intern/mmap_win.c 2012-05-25 02:41:50 UTC (rev 46994)
@@ -29,8 +29,7 @@
* \ingroup MEM
*/
-
-#if defined(WIN32)
+#ifdef WIN32
#include <windows.h>
#include <errno.h>
@@ -53,21 +52,19 @@
#endif
/* --------------------------------------------------------------------- */
-/* local storage definitions */
+/* local storage definitions */
/* --------------------------------------------------------------------- */
/* all memory mapped chunks are put in linked lists */
-typedef struct mmapLink
-{
- struct mmapLink *next,*prev;
+typedef struct mmapLink {
+ struct mmapLink *next, *prev;
} mmapLink;
-typedef struct mmapListBase
-{
+typedef struct mmapListBase {
void *first, *last;
} mmapListBase;
typedef struct MemMap {
- struct MemMap *next,*prev;
+ struct MemMap *next, *prev;
void *mmap;
HANDLE fhandle;
HANDLE maphandle;
@@ -81,8 +78,8 @@
static void mmap_remlink(volatile mmapListBase *listbase, void *vlink);
static void *mmap_findlink(volatile mmapListBase *listbase, void *ptr);
-static int mmap_get_prot_flags (int flags);
-static int mmap_get_access_flags (int flags);
+static int mmap_get_prot_flags(int flags);
+static int mmap_get_access_flags(int flags);
/* --------------------------------------------------------------------- */
/* vars */
@@ -105,52 +102,53 @@
MemMap *mm = NULL;
void *ptr = NULL;
- if ( flags & MAP_FIXED ) {
+ if (flags & MAP_FIXED) {
return MAP_FAILED;
}
- /*
+#if 0
if ( fd == -1 ) {
_set_errno( EBADF );
return MAP_FAILED;
}
- */
+#endif
- if ( fd != -1 ) {
- fhandle = (HANDLE) _get_osfhandle (fd);
+ if (fd != -1) {
+ fhandle = (HANDLE) _get_osfhandle(fd);
}
- if ( fhandle == INVALID_HANDLE_VALUE ) {
+ if (fhandle == INVALID_HANDLE_VALUE) {
if (!(flags & MAP_ANONYMOUS)) {
errno = EBADF;
return MAP_FAILED;
}
- } else {
- if ( !DuplicateHandle( GetCurrentProcess(), fhandle, GetCurrentProcess(),
- &fhandle, 0, FALSE, DUPLICATE_SAME_ACCESS ) ) {
+ }
+ else {
+ if (!DuplicateHandle(GetCurrentProcess(), fhandle, GetCurrentProcess(),
+ &fhandle, 0, FALSE, DUPLICATE_SAME_ACCESS) ) {
return MAP_FAILED;
}
}
maphandle = CreateFileMapping(fhandle, NULL, prot_flags, 0, len, NULL);
- if ( maphandle == 0 ) {
+ if (maphandle == 0) {
errno = EBADF;
return MAP_FAILED;
}
ptr = MapViewOfFile(maphandle, access_flags, 0, offset, 0);
- if ( ptr == NULL ) {
+ if (ptr == NULL) {
DWORD dwLastErr = GetLastError();
- if ( dwLastErr == ERROR_MAPPED_ALIGNMENT )
- errno=EINVAL;
+ if (dwLastErr == ERROR_MAPPED_ALIGNMENT)
+ errno = EINVAL;
else
- errno=EACCES;
+ errno = EACCES;
CloseHandle(maphandle);
return MAP_FAILED;
}
- mm= (MemMap *)malloc(sizeof(MemMap));
+ mm = (MemMap *)malloc(sizeof(MemMap));
if (!mm) {
- errno=ENOMEM;
+ errno = ENOMEM;
}
mm->fhandle = fhandle;
mm->maphandle = maphandle;
@@ -165,12 +163,12 @@
{
MemMap *mm = mmap_findlink(mmapbase, ptr);
if (!mm) {
- errno=EINVAL;
+ errno = EINVAL;
return -1;
}
- UnmapViewOfFile( mm->mmap );
- CloseHandle( mm->maphandle );
- CloseHandle( mm->fhandle);
+ UnmapViewOfFile(mm->mmap);
+ CloseHandle(mm->maphandle);
+ CloseHandle(mm->fhandle);
mmap_remlink(mmapbase, mm);
free(mm);
return 0;
@@ -182,7 +180,7 @@
static void mmap_addtail(volatile mmapListBase *listbase, void *vlink)
{
- struct mmapLink *link= vlink;
+ struct mmapLink *link = vlink;
if (link == 0) return;
if (listbase == 0) return;
@@ -197,7 +195,7 @@
static void mmap_remlink(volatile mmapListBase *listbase, void *vlink)
{
- struct mmapLink *link= vlink;
+ struct mmapLink *link = vlink;
if (link == 0) return;
if (listbase == 0) return;
@@ -226,46 +224,46 @@
return NULL;
}
-static int mmap_get_prot_flags (int flags)
+static int mmap_get_prot_flags(int flags)
{
int prot = PAGE_NOACCESS;
- if ( ( flags & PROT_READ ) == PROT_READ ) {
- if ( ( flags & PROT_WRITE ) == PROT_WRITE ) {
+ if ( (flags & PROT_READ) == PROT_READ) {
+ if ( (flags & PROT_WRITE) == PROT_WRITE) {
prot = (flags & PROT_EXEC) ? PAGE_EXECUTE_READWRITE : PAGE_READWRITE;
- } else {
+ }
+ else {
prot = (flags & PROT_EXEC) ? PAGE_EXECUTE_READ : PAGE_READONLY;
}
- } else if ( ( flags & PROT_WRITE ) == PROT_WRITE ) {
+ }
+ else if ( (flags & PROT_WRITE) == PROT_WRITE) {
prot = (flags & PROT_EXEC) ? PAGE_EXECUTE_READ : PAGE_WRITECOPY;
- } else if ( ( flags & PROT_EXEC ) == PROT_EXEC ) {
+ }
+ else if ( (flags & PROT_EXEC) == PROT_EXEC) {
prot = PAGE_EXECUTE_READ;
}
return prot;
}
-static int mmap_get_access_flags (int flags)
+static int mmap_get_access_flags(int flags)
{
int access = 0;
- if ( ( flags & PROT_READ ) == PROT_READ ) {
- if ( ( flags & PROT_WRITE ) == PROT_WRITE ) {
+ if ( (flags & PROT_READ) == PROT_READ) {
+ if ( (flags & PROT_WRITE) == PROT_WRITE) {
access = FILE_MAP_WRITE;
- } else {
+ }
+ else {
access = (flags & PROT_EXEC) ? FILE_MAP_EXECUTE : FILE_MAP_READ;
}
- } else if ( ( flags & PROT_WRITE ) == PROT_WRITE ) {
+ }
+ else if ( (flags & PROT_WRITE) == PROT_WRITE) {
access = FILE_MAP_COPY;
- } else if ( ( flags & PROT_EXEC ) == PROT_EXEC ) {
+ }
+ else if ( (flags & PROT_EXEC) == PROT_EXEC) {
access = FILE_MAP_EXECUTE;
}
return access;
}
-
#endif // WIN32
-
-
-
-
-
Modified: branches/soc-2012-swiss_cheese/source/blender/blenkernel/BKE_blender.h
===================================================================
--- branches/soc-2012-swiss_cheese/source/blender/blenkernel/BKE_blender.h 2012-05-25 02:37:05 UTC (rev 46993)
+++ branches/soc-2012-swiss_cheese/source/blender/blenkernel/BKE_blender.h 2012-05-25 02:41:50 UTC (rev 46994)
@@ -42,14 +42,14 @@
* and keep comment above the defines.
* Use STRINGIFY() rather than defining with quotes */
#define BLENDER_VERSION 263
-#define BLENDER_SUBVERSION 5
+#define BLENDER_SUBVERSION 7
#define BLENDER_MINVERSION 250
#define BLENDER_MINSUBVERSION 0
/* used by packaging tools */
/* can be left blank, otherwise a,b,c... etc with no quotes */
-#define BLENDER_VERSION_CHAR
+#define BLENDER_VERSION_CHAR a
/* alpha/beta/rc/release, docs use this */
#define BLENDER_VERSION_CYCLE alpha
Modified: branches/soc-2012-swiss_cheese/source/blender/blenkernel/BKE_fcurve.h
===================================================================
--- branches/soc-2012-swiss_cheese/source/blender/blenkernel/BKE_fcurve.h 2012-05-25 02:37:05 UTC (rev 46993)
+++ branches/soc-2012-swiss_cheese/source/blender/blenkernel/BKE_fcurve.h 2012-05-25 02:41:50 UTC (rev 46994)
@@ -218,7 +218,7 @@
/* get the bounding-box extents for F-Curve */
void calc_fcurve_bounds(struct FCurve *fcu, float *xmin, float *xmax, float *ymin, float *ymax,
- const short do_sel_only);
+ const short do_sel_only, const short include_handles);
/* .............. */
Modified: branches/soc-2012-swiss_cheese/source/blender/blenkernel/BKE_key.h
===================================================================
--- branches/soc-2012-swiss_cheese/source/blender/blenkernel/BKE_key.h 2012-05-25 02:37:05 UTC (rev 46993)
+++ branches/soc-2012-swiss_cheese/source/blender/blenkernel/BKE_key.h 2012-05-25 02:41:50 UTC (rev 46994)
@@ -55,9 +55,9 @@
void BKE_key_make_local(struct Key *key);
void sort_keys(struct Key *key);
-void key_curve_position_weights(float t, float *data, int type);
-void key_curve_tangent_weights(float t, float *data, int type);
-void key_curve_normal_weights(float t, float *data, int type);
+void key_curve_position_weights(float t, float data[4], int type);
+void key_curve_tangent_weights(float t, float data[4], int type);
+void key_curve_normal_weights(float t, float data[4], int type);
float *do_ob_key(struct Scene *scene, struct Object *ob);
Modified: branches/soc-2012-swiss_cheese/source/blender/blenkernel/BKE_mesh.h
===================================================================
--- branches/soc-2012-swiss_cheese/source/blender/blenkernel/BKE_mesh.h 2012-05-25 02:37:05 UTC (rev 46993)
+++ branches/soc-2012-swiss_cheese/source/blender/blenkernel/BKE_mesh.h 2012-05-25 02:41:50 UTC (rev 46994)
@@ -111,6 +111,10 @@
int poly_get_adj_loops_from_vert(unsigned adj_r[3], const struct MPoly *poly,
const struct MLoop *mloop, unsigned vert);
+/* Return the index of the edge vert that is not equal to 'v'. If
+ * neither edge vertex is equal to 'v', returns -1. */
+int BKE_mesh_edge_other_vert(const struct MEdge *e, int v);
+
/* update the hide flag for edges and polys from the corresponding
* flag in verts */
void BKE_mesh_flush_hidden_from_verts(const struct MVert *mvert,
Modified: branches/soc-2012-swiss_cheese/source/blender/blenkernel/BKE_node.h
===================================================================
--- branches/soc-2012-swiss_cheese/source/blender/blenkernel/BKE_node.h 2012-05-25 02:37:05 UTC (rev 46993)
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list