[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [56637] branches/vgroup_modifiers: svn merge -r 56502:56636 https://svn.blender.org/svnroot/bf-blender/trunk/ blender

Bastien Montagne montagne29 at wanadoo.fr
Thu May 9 20:38:38 CEST 2013 

Revision: 56637
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=56637
Author:   mont29
Date:     2013-05-09 18:38:37 +0000 (Thu, 09 May 2013)
Log Message:
-----------
svn merge -r 56502:56636 https://svn.blender.org/svnroot/bf-blender/trunk/blender

Modified Paths:
--------------
    branches/vgroup_modifiers/CMakeLists.txt
    branches/vgroup_modifiers/build_files/buildbot/config/user-config-mac-i386.py
    branches/vgroup_modifiers/build_files/buildbot/config/user-config-mac-x86_64.py
    branches/vgroup_modifiers/doc/python_api/rst/change_log.rst
    branches/vgroup_modifiers/doc/python_api/sphinx_changelog_gen.py
    branches/vgroup_modifiers/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexHullShape.cpp
    branches/vgroup_modifiers/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexShape.cpp
    branches/vgroup_modifiers/extern/bullet2/src/BulletCollision/CollisionShapes/btMultiSphereShape.cpp
    branches/vgroup_modifiers/extern/bullet2/src/BulletCollision/CollisionShapes/btPolyhedralConvexShape.cpp
    branches/vgroup_modifiers/extern/bullet2/src/LinearMath/btVector3.cpp
    branches/vgroup_modifiers/extern/libmv/CMakeLists.txt
    branches/vgroup_modifiers/extern/libmv/files.txt
    branches/vgroup_modifiers/extern/libmv/libmv/simple_pipeline/bundle.cc
    branches/vgroup_modifiers/extern/libmv/libmv-capi.cpp
    branches/vgroup_modifiers/intern/audaspace/jack/AUD_JackLibrary.cpp
    branches/vgroup_modifiers/intern/cycles/SConscript
    branches/vgroup_modifiers/intern/cycles/blender/addon/ui.py
    branches/vgroup_modifiers/intern/cycles/blender/blender_mesh.cpp
    branches/vgroup_modifiers/intern/cycles/device/device_opencl.cpp
    branches/vgroup_modifiers/intern/cycles/kernel/kernel_bvh.h
    branches/vgroup_modifiers/intern/cycles/kernel/kernel_bvh_traversal.h
    branches/vgroup_modifiers/intern/cycles/kernel/kernel_compat_opencl.h
    branches/vgroup_modifiers/intern/cycles/kernel/kernel_curve.h
    branches/vgroup_modifiers/intern/cycles/kernel/kernel_emission.h
    branches/vgroup_modifiers/intern/cycles/kernel/kernel_light.h
    branches/vgroup_modifiers/intern/cycles/kernel/kernel_path.h
    branches/vgroup_modifiers/intern/cycles/kernel/kernel_shader.h
    branches/vgroup_modifiers/intern/cycles/kernel/kernel_types.h
    branches/vgroup_modifiers/intern/cycles/kernel/osl/osl_services.cpp
    branches/vgroup_modifiers/intern/cycles/kernel/shaders/node_bump.osl
    branches/vgroup_modifiers/intern/cycles/kernel/svm/svm_displace.h
    branches/vgroup_modifiers/intern/cycles/render/CMakeLists.txt
    branches/vgroup_modifiers/intern/cycles/render/film.cpp
    branches/vgroup_modifiers/intern/cycles/render/graph.cpp
    branches/vgroup_modifiers/intern/cycles/render/mesh_displace.cpp
    branches/vgroup_modifiers/intern/cycles/render/nodes.cpp
    branches/vgroup_modifiers/intern/cycles/render/osl.cpp
    branches/vgroup_modifiers/intern/cycles/render/svm.cpp
    branches/vgroup_modifiers/intern/cycles/render/tile.cpp
    branches/vgroup_modifiers/intern/cycles/render/tile.h
    branches/vgroup_modifiers/intern/cycles/util/util_transform.h
    branches/vgroup_modifiers/intern/ghost/intern/GHOST_WindowCocoa.mm
    branches/vgroup_modifiers/intern/guardedalloc/CMakeLists.txt
    branches/vgroup_modifiers/intern/guardedalloc/SConscript
    branches/vgroup_modifiers/intern/guardedalloc/intern/mallocn.c
    branches/vgroup_modifiers/intern/tools/credits_svn_gen.py
    branches/vgroup_modifiers/release/datafiles/splash.png
    branches/vgroup_modifiers/release/datafiles/startup.blend
    branches/vgroup_modifiers/release/scripts/modules/bpy_types.py
    branches/vgroup_modifiers/release/scripts/modules/console_python.py
    branches/vgroup_modifiers/release/scripts/modules/nodeitems_utils.py
    branches/vgroup_modifiers/release/scripts/modules/rna_info.py
    branches/vgroup_modifiers/release/scripts/startup/bl_operators/node.py
    branches/vgroup_modifiers/release/scripts/startup/bl_ui/space_clip.py
    branches/vgroup_modifiers/release/scripts/startup/bl_ui/space_node.py
    branches/vgroup_modifiers/release/scripts/startup/bl_ui/space_view3d.py
    branches/vgroup_modifiers/release/scripts/startup/nodeitems_builtins.py
    branches/vgroup_modifiers/release/scripts/templates_py/custom_nodes.py
    branches/vgroup_modifiers/release/scripts/templates_py/operator_uv.py
    branches/vgroup_modifiers/source/blender/blenkernel/BKE_blender.h
    branches/vgroup_modifiers/source/blender/blenkernel/BKE_bvhutils.h
    branches/vgroup_modifiers/source/blender/blenkernel/BKE_customdata.h
    branches/vgroup_modifiers/source/blender/blenkernel/BKE_mask.h
    branches/vgroup_modifiers/source/blender/blenkernel/BKE_mesh.h
    branches/vgroup_modifiers/source/blender/blenkernel/BKE_node.h
    branches/vgroup_modifiers/source/blender/blenkernel/BKE_pbvh.h
    branches/vgroup_modifiers/source/blender/blenkernel/BKE_scene.h
    branches/vgroup_modifiers/source/blender/blenkernel/intern/bvhutils.c
    branches/vgroup_modifiers/source/blender/blenkernel/intern/collision.c
    branches/vgroup_modifiers/source/blender/blenkernel/intern/customdata.c
    branches/vgroup_modifiers/source/blender/blenkernel/intern/editderivedmesh.c
    branches/vgroup_modifiers/source/blender/blenkernel/intern/mask_evaluate.c
    branches/vgroup_modifiers/source/blender/blenkernel/intern/mask_rasterize.c
    branches/vgroup_modifiers/source/blender/blenkernel/intern/mesh.c
    branches/vgroup_modifiers/source/blender/blenkernel/intern/modifiers_bmesh.c
    branches/vgroup_modifiers/source/blender/blenkernel/intern/movieclip.c
    branches/vgroup_modifiers/source/blender/blenkernel/intern/node.c
    branches/vgroup_modifiers/source/blender/blenkernel/intern/particle_system.c
    branches/vgroup_modifiers/source/blender/blenkernel/intern/pbvh.c
    branches/vgroup_modifiers/source/blender/blenkernel/intern/scene.c
    branches/vgroup_modifiers/source/blender/blenkernel/intern/seqmodifier.c
    branches/vgroup_modifiers/source/blender/blenkernel/intern/softbody.c
    branches/vgroup_modifiers/source/blender/blenkernel/intern/text.c
    branches/vgroup_modifiers/source/blender/blenkernel/intern/tracking.c
    branches/vgroup_modifiers/source/blender/blenlib/BLI_ghash.h
    branches/vgroup_modifiers/source/blender/blenlib/BLI_math_base.h
    branches/vgroup_modifiers/source/blender/blenlib/BLI_math_matrix.h
    branches/vgroup_modifiers/source/blender/blenlib/BLI_math_vector.h
    branches/vgroup_modifiers/source/blender/blenlib/BLI_smallhash.h
    branches/vgroup_modifiers/source/blender/blenlib/BLI_threads.h
    branches/vgroup_modifiers/source/blender/blenlib/BLI_utildefines.h
    branches/vgroup_modifiers/source/blender/blenlib/intern/BLI_ghash.c
    branches/vgroup_modifiers/source/blender/blenlib/intern/BLI_heap.c
    branches/vgroup_modifiers/source/blender/blenlib/intern/BLI_mempool.c
    branches/vgroup_modifiers/source/blender/blenlib/intern/edgehash.c
    branches/vgroup_modifiers/source/blender/blenlib/intern/math_matrix.c
    branches/vgroup_modifiers/source/blender/blenlib/intern/math_vector.c
    branches/vgroup_modifiers/source/blender/blenlib/intern/smallhash.c
    branches/vgroup_modifiers/source/blender/blenlib/intern/string.c
    branches/vgroup_modifiers/source/blender/blenlib/intern/string_cursor_utf8.c
    branches/vgroup_modifiers/source/blender/blenlib/intern/threads.c
    branches/vgroup_modifiers/source/blender/blenloader/intern/readfile.c
    branches/vgroup_modifiers/source/blender/blenloader/intern/writefile.c
    branches/vgroup_modifiers/source/blender/bmesh/intern/bmesh_construct.c
    branches/vgroup_modifiers/source/blender/bmesh/intern/bmesh_core.c
    branches/vgroup_modifiers/source/blender/bmesh/intern/bmesh_interp.c
    branches/vgroup_modifiers/source/blender/bmesh/intern/bmesh_mesh.c
    branches/vgroup_modifiers/source/blender/bmesh/intern/bmesh_mesh_conv.c
    branches/vgroup_modifiers/source/blender/bmesh/intern/bmesh_opdefines.c
    branches/vgroup_modifiers/source/blender/bmesh/intern/bmesh_operators.h
    branches/vgroup_modifiers/source/blender/bmesh/intern/bmesh_polygon.c
    branches/vgroup_modifiers/source/blender/bmesh/intern/bmesh_queries.c
    branches/vgroup_modifiers/source/blender/bmesh/intern/bmesh_queries.h
    branches/vgroup_modifiers/source/blender/bmesh/operators/bmo_beautify.c
    branches/vgroup_modifiers/source/blender/bmesh/operators/bmo_connect.c
    branches/vgroup_modifiers/source/blender/bmesh/operators/bmo_dissolve.c
    branches/vgroup_modifiers/source/blender/bmesh/operators/bmo_smooth_laplacian.c
    branches/vgroup_modifiers/source/blender/bmesh/operators/bmo_subdivide.c
    branches/vgroup_modifiers/source/blender/collada/AnimationExporter.cpp
    branches/vgroup_modifiers/source/blender/collada/ExtraHandler.cpp
    branches/vgroup_modifiers/source/blender/collada/ExtraHandler.h
    branches/vgroup_modifiers/source/blender/collada/SceneExporter.cpp
    branches/vgroup_modifiers/source/blender/compositor/intern/COM_InputSocket.h
    branches/vgroup_modifiers/source/blender/editors/animation/anim_channels_defines.c
    branches/vgroup_modifiers/source/blender/editors/animation/anim_filter.c
    branches/vgroup_modifiers/source/blender/editors/armature/editarmature_retarget.c
    branches/vgroup_modifiers/source/blender/editors/armature/editarmature_sketch.c
    branches/vgroup_modifiers/source/blender/editors/armature/reeb.c
    branches/vgroup_modifiers/source/blender/editors/curve/editcurve.c
    branches/vgroup_modifiers/source/blender/editors/gpencil/gpencil_edit.c
    branches/vgroup_modifiers/source/blender/editors/include/ED_view3d.h
    branches/vgroup_modifiers/source/blender/editors/interface/interface.c
    branches/vgroup_modifiers/source/blender/editors/interface/interface_layout.c
    branches/vgroup_modifiers/source/blender/editors/interface/interface_ops.c
    branches/vgroup_modifiers/source/blender/editors/interface/interface_templates.c
    branches/vgroup_modifiers/source/blender/editors/interface/interface_widgets.c
    branches/vgroup_modifiers/source/blender/editors/interface/resources.c
    branches/vgroup_modifiers/source/blender/editors/mask/mask_draw.c
    branches/vgroup_modifiers/source/blender/editors/mask/mask_select.c
    branches/vgroup_modifiers/source/blender/editors/mesh/editmesh_knife.c
    branches/vgroup_modifiers/source/blender/editors/mesh/editmesh_loopcut.c
    branches/vgroup_modifiers/source/blender/editors/mesh/editmesh_select.c
    branches/vgroup_modifiers/source/blender/editors/mesh/editmesh_tools.c
    branches/vgroup_modifiers/source/blender/editors/mesh/editmesh_utils.c
    branches/vgroup_modifiers/source/blender/editors/mesh/mesh_intern.h
    branches/vgroup_modifiers/source/blender/editors/mesh/mesh_ops.c
    branches/vgroup_modifiers/source/blender/editors/object/object_bake.c
    branches/vgroup_modifiers/source/blender/editors/object/object_edit.c
    branches/vgroup_modifiers/source/blender/editors/object/object_relations.c
    branches/vgroup_modifiers/source/blender/editors/object/object_shapekey.c
    branches/vgroup_modifiers/source/blender/editors/render/render_internal.c
    branches/vgroup_modifiers/source/blender/editors/screen/area.c
    branches/vgroup_modifiers/source/blender/editors/screen/screen_ops.c
    branches/vgroup_modifiers/source/blender/editors/sculpt_paint/paint_image_proj.c
    branches/vgroup_modifiers/source/blender/editors/sculpt_paint/sculpt.c
    branches/vgroup_modifiers/source/blender/editors/sculpt_paint/sculpt_uv.c
    branches/vgroup_modifiers/source/blender/editors/space_action/space_action.c
    branches/vgroup_modifiers/source/blender/editors/space_buttons/space_buttons.c
    branches/vgroup_modifiers/source/blender/editors/space_clip/clip_buttons.c
    branches/vgroup_modifiers/source/blender/editors/space_clip/clip_intern.h
    branches/vgroup_modifiers/source/blender/editors/space_clip/space_clip.c
    branches/vgroup_modifiers/source/blender/editors/space_clip/tracking_ops.c
    branches/vgroup_modifiers/source/blender/editors/space_file/space_file.c
    branches/vgroup_modifiers/source/blender/editors/space_graph/graph_buttons.c
    branches/vgroup_modifiers/source/blender/editors/space_graph/graph_utils.c
    branches/vgroup_modifiers/source/blender/editors/space_graph/space_graph.c
    branches/vgroup_modifiers/source/blender/editors/space_image/image_buttons.c
    branches/vgroup_modifiers/source/blender/editors/space_image/image_ops.c
    branches/vgroup_modifiers/source/blender/editors/space_info/space_info.c
    branches/vgroup_modifiers/source/blender/editors/space_nla/nla_buttons.c
    branches/vgroup_modifiers/source/blender/editors/space_nla/nla_channels.c
    branches/vgroup_modifiers/source/blender/editors/space_nla/nla_draw.c
    branches/vgroup_modifiers/source/blender/editors/space_nla/nla_edit.c
    branches/vgroup_modifiers/source/blender/editors/space_nla/nla_ops.c
    branches/vgroup_modifiers/source/blender/editors/space_nla/nla_select.c
    branches/vgroup_modifiers/source/blender/editors/space_nla/space_nla.c
    branches/vgroup_modifiers/source/blender/editors/space_node/drawnode.c
    branches/vgroup_modifiers/source/blender/editors/space_node/node_add.c
    branches/vgroup_modifiers/source/blender/editors/space_node/node_draw.c
    branches/vgroup_modifiers/source/blender/editors/space_node/node_edit.c
    branches/vgroup_modifiers/source/blender/editors/space_node/node_group.c
    branches/vgroup_modifiers/source/blender/editors/space_node/node_relationships.c
    branches/vgroup_modifiers/source/blender/editors/space_node/node_templates.c
    branches/vgroup_modifiers/source/blender/editors/space_outliner/outliner_draw.c
    branches/vgroup_modifiers/source/blender/editors/space_outliner/space_outliner.c
    branches/vgroup_modifiers/source/blender/editors/space_script/space_script.c
    branches/vgroup_modifiers/source/blender/editors/space_text/text_autocomplete.c
    branches/vgroup_modifiers/source/blender/editors/space_text/text_ops.c
    branches/vgroup_modifiers/source/blender/editors/space_view3d/drawarmature.c
    branches/vgroup_modifiers/source/blender/editors/space_view3d/drawobject.c
    branches/vgroup_modifiers/source/blender/editors/space_view3d/drawvolume.c
    branches/vgroup_modifiers/source/blender/editors/space_view3d/space_view3d.c
    branches/vgroup_modifiers/source/blender/editors/space_view3d/view3d_buttons.c
    branches/vgroup_modifiers/source/blender/editors/space_view3d/view3d_draw.c
    branches/vgroup_modifiers/source/blender/editors/space_view3d/view3d_edit.c
    branches/vgroup_modifiers/source/blender/editors/space_view3d/view3d_iterators.c
    branches/vgroup_modifiers/source/blender/editors/space_view3d/view3d_project.c
    branches/vgroup_modifiers/source/blender/editors/space_view3d/view3d_select.c
    branches/vgroup_modifiers/source/blender/editors/space_view3d/view3d_toolbar.c
    branches/vgroup_modifiers/source/blender/editors/space_view3d/view3d_view.c
    branches/vgroup_modifiers/source/blender/editors/uvedit/uvedit_smart_stitch.c
    branches/vgroup_modifiers/source/blender/editors/uvedit/uvedit_unwrap_ops.c
    branches/vgroup_modifiers/source/blender/freestyle/intern/stroke/AdvancedStrokeShaders.h
    branches/vgroup_modifiers/source/blender/gpu/intern/gpu_codegen.c
    branches/vgroup_modifiers/source/blender/imbuf/intern/moviecache.c
    branches/vgroup_modifiers/source/blender/makesdna/DNA_sequence_types.h
    branches/vgroup_modifiers/source/blender/makesdna/DNA_tracking_types.h
    branches/vgroup_modifiers/source/blender/makesdna/DNA_view3d_types.h
    branches/vgroup_modifiers/source/blender/makesdna/intern/CMakeLists.txt
    branches/vgroup_modifiers/source/blender/makesdna/intern/SConscript
    branches/vgroup_modifiers/source/blender/makesrna/intern/CMakeLists.txt
    branches/vgroup_modifiers/source/blender/makesrna/intern/SConscript
    branches/vgroup_modifiers/source/blender/makesrna/intern/rna_action.c
    branches/vgroup_modifiers/source/blender/makesrna/intern/rna_actuator.c
    branches/vgroup_modifiers/source/blender/makesrna/intern/rna_gpencil.c
    branches/vgroup_modifiers/source/blender/makesrna/intern/rna_mask.c
    branches/vgroup_modifiers/source/blender/makesrna/intern/rna_nodetree.c
    branches/vgroup_modifiers/source/blender/makesrna/intern/rna_scene.c
    branches/vgroup_modifiers/source/blender/makesrna/intern/rna_sequencer.c
    branches/vgroup_modifiers/source/blender/makesrna/intern/rna_space.c
    branches/vgroup_modifiers/source/blender/makesrna/intern/rna_userdef.c
    branches/vgroup_modifiers/source/blender/modifiers/intern/MOD_build.c
    branches/vgroup_modifiers/source/blender/modifiers/intern/MOD_mask.c
    branches/vgroup_modifiers/source/blender/modifiers/intern/MOD_solidify.c
    branches/vgroup_modifiers/source/blender/modifiers/intern/MOD_uvproject.c
    branches/vgroup_modifiers/source/blender/modifiers/intern/MOD_weightvg_util.h
    branches/vgroup_modifiers/source/blender/modifiers/intern/MOD_weightvgedit.c
    branches/vgroup_modifiers/source/blender/modifiers/intern/MOD_weightvgproximity.c
    branches/vgroup_modifiers/source/blender/nodes/NOD_static_types.h
    branches/vgroup_modifiers/source/blender/nodes/intern/node_exec.c
    branches/vgroup_modifiers/source/blender/nodes/shader/nodes/node_shader_bump.c
    branches/vgroup_modifiers/source/blender/python/bmesh/bmesh_py_types.c
    branches/vgroup_modifiers/source/blender/python/intern/bpy_operator.c
    branches/vgroup_modifiers/source/blender/python/intern/bpy_rna.c
    branches/vgroup_modifiers/source/blender/render/intern/raytrace/bvh.h
    branches/vgroup_modifiers/source/blender/render/intern/raytrace/rayobject_qbvh.cpp
    branches/vgroup_modifiers/source/blender/render/intern/raytrace/rayobject_svbvh.cpp
    branches/vgroup_modifiers/source/blender/render/intern/raytrace/rayobject_vbvh.cpp
    branches/vgroup_modifiers/source/blender/render/intern/raytrace/reorganize.h
    branches/vgroup_modifiers/source/blender/render/intern/raytrace/vbvh.h
    branches/vgroup_modifiers/source/blender/render/intern/source/convertblender.c
    branches/vgroup_modifiers/source/blender/render/intern/source/imagetexture.c
    branches/vgroup_modifiers/source/blender/render/intern/source/pipeline.c
    branches/vgroup_modifiers/source/blender/render/intern/source/render_texture.c
    branches/vgroup_modifiers/source/blender/render/intern/source/sss.c
    branches/vgroup_modifiers/source/blender/windowmanager/WM_keymap.h
    branches/vgroup_modifiers/source/blender/windowmanager/intern/wm.c
    branches/vgroup_modifiers/source/creator/blender.map
    branches/vgroup_modifiers/source/creator/creator.c
    branches/vgroup_modifiers/source/gameengine/Ketsji/KX_PythonInit.cpp
    branches/vgroup_modifiers/source/tools/tag_release.py

Added Paths:
-----------
    branches/vgroup_modifiers/extern/libmv/libmv/simple_pipeline/reconstruction_scale.cc
    branches/vgroup_modifiers/extern/libmv/libmv/simple_pipeline/reconstruction_scale.h

Removed Paths:
-------------
    branches/vgroup_modifiers/intern/cycles/render/film_response.cpp
    branches/vgroup_modifiers/intern/cycles/render/film_response.h

Property Changed:
----------------
    branches/vgroup_modifiers/
    branches/vgroup_modifiers/source/blender/editors/interface/interface.c
    branches/vgroup_modifiers/source/blender/editors/space_outliner/


Property changes on: branches/vgroup_modifiers
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/ge_harmony:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/soc-2011-tomato:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801,43872,44130,44141,44147-44149,44151-44152,44229-44230,45623-45625,46037,48089,48092,48551-48552,48679,48790,48792-48793,49076,49087,49292,49294,49466,49894,50052,50126,52854-52856,54573
/trunk/blender:38694-38739,38741-39198,39200-39651,39653-39988,39990-43541,43543-56502
   + /branches/ge_harmony:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/soc-2011-tomato:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801,43872,44130,44141,44147-44149,44151-44152,44229-44230,45623-45625,46037,48089,48092,48551-48552,48679,48790,48792-48793,49076,49087,49292,49294,49466,49894,50052,50126,52854-52856,54573
/trunk/blender:38694-38739,38741-39198,39200-39651,39653-39988,39990-43541,43543-56636

Modified: branches/vgroup_modifiers/CMakeLists.txt
===================================================================
--- branches/vgroup_modifiers/CMakeLists.txt	2013-05-09 16:38:58 UTC (rev 56636)
+++ branches/vgroup_modifiers/CMakeLists.txt	2013-05-09 18:38:37 UTC (rev 56637)
@@ -281,6 +281,9 @@
 option(WITH_CXX_GUARDEDALLOC "Enable GuardedAlloc for C++ memory allocation tracking (only enable for development)" OFF)
 mark_as_advanced(WITH_CXX_GUARDEDALLOC)
 
+option(WITH_GUARDEDALLOC "Enable GuardedAlloc (DISABLE AT OWN RISK!)" ON)
+mark_as_advanced(WITH_GUARDEDALLOC)
+
 option(WITH_ASSERT_ABORT "Call abort() when raising an assertion through BLI_assert()" OFF)
 mark_as_advanced(WITH_ASSERT_ABORT)
 

Modified: branches/vgroup_modifiers/build_files/buildbot/config/user-config-mac-i386.py
===================================================================
--- branches/vgroup_modifiers/build_files/buildbot/config/user-config-mac-i386.py	2013-05-09 16:38:58 UTC (rev 56636)
+++ branches/vgroup_modifiers/build_files/buildbot/config/user-config-mac-i386.py	2013-05-09 18:38:37 UTC (rev 56637)
@@ -317,6 +317,9 @@
 BF_CYCLES_CUDA_NVCC = '/usr/local/cuda/bin/nvcc'
 BF_CYCLES_CUDA_BINARIES_ARCH = ['sm_20', 'sm_21', 'sm_30']
 
+#Freestyle
+WITH_BF_FREESTYLE = True
+
 #Ray trace optimization
 if MACOSX_ARCHITECTURE == 'x86_64' or MACOSX_ARCHITECTURE == 'i386':
     WITH_BF_RAYOPTIMIZATION = True

Modified: branches/vgroup_modifiers/build_files/buildbot/config/user-config-mac-x86_64.py
===================================================================
--- branches/vgroup_modifiers/build_files/buildbot/config/user-config-mac-x86_64.py	2013-05-09 16:38:58 UTC (rev 56636)
+++ branches/vgroup_modifiers/build_files/buildbot/config/user-config-mac-x86_64.py	2013-05-09 18:38:37 UTC (rev 56637)
@@ -317,6 +317,9 @@
 BF_CYCLES_CUDA_NVCC = '/usr/local/cuda/bin/nvcc'
 BF_CYCLES_CUDA_BINARIES_ARCH = ['sm_20', 'sm_21', 'sm_30']
 
+#Freestyle
+WITH_BF_FREESTYLE = True
+
 #Ray trace optimization
 if MACOSX_ARCHITECTURE == 'x86_64' or MACOSX_ARCHITECTURE == 'i386':
     WITH_BF_RAYOPTIMIZATION = True

Modified: branches/vgroup_modifiers/doc/python_api/rst/change_log.rst
===================================================================
--- branches/vgroup_modifiers/doc/python_api/rst/change_log.rst	2013-05-09 16:38:58 UTC (rev 56636)
+++ branches/vgroup_modifiers/doc/python_api/rst/change_log.rst	2013-05-09 18:38:37 UTC (rev 56637)
@@ -4326,3 +4326,1325 @@
 ^^^^^^^^^^^^^^^^^^
 
 * :class:`bpy.types.Object.dupli_list_create` (scene, settings), *was (scene)*
+
+2.65 to 2.66
+============
+
+bpy.types.UILayout
+------------------
+
+Added
+^^^^^
+
+* :class:`bpy.types.UILayout.enum_item_description`
+* :class:`bpy.types.UILayout.enum_item_icon`
+* :class:`bpy.types.UILayout.enum_item_name`
+* :class:`bpy.types.UILayout.icon`
+* :class:`bpy.types.UILayout.template_icon_view`
+
+Function Arguments
+^^^^^^^^^^^^^^^^^^
+
+* :class:`bpy.types.UILayout.label` (text, text_ctxt, translate, icon, icon_value), *was (text, icon)*
+* :class:`bpy.types.UILayout.menu` (menu, text, text_ctxt, translate, icon), *was (menu, text, icon)*
+* :class:`bpy.types.UILayout.operator` (operator, text, text_ctxt, translate, icon, emboss), *was (operator, text, icon, emboss)*
+* :class:`bpy.types.UILayout.operator_menu_enum` (operator, property, text, text_ctxt, translate, icon), *was (operator, property, text, icon)*
+* :class:`bpy.types.UILayout.prop` (data, property, text, text_ctxt, translate, icon, expand, slider, toggle, icon_only, event, full_event, emboss, index), *was (data, property, text, icon, expand, slider, toggle, icon_only, event, full_event, emboss, index)*
+* :class:`bpy.types.UILayout.prop_enum` (data, property, value, text, text_ctxt, translate, icon), *was (data, property, value, text, icon)*
+* :class:`bpy.types.UILayout.prop_menu_enum` (data, property, text, text_ctxt, translate, icon), *was (data, property, text, icon)*
+* :class:`bpy.types.UILayout.prop_search` (data, property, search_data, search_property, text, text_ctxt, translate, icon), *was (data, property, search_data, search_property, text, icon)*
+* :class:`bpy.types.UILayout.template_any_ID` (data, property, type_property, text, text_ctxt, translate), *was (data, property, type_property, text)*
+* :class:`bpy.types.UILayout.template_list` (listtype_name, list_id, dataptr, propname, active_dataptr, active_propname, rows, maxrows, type), *was (data, property, active_data, active_property, prop_list, rows, maxrows, type)*
+* :class:`bpy.types.UILayout.template_path_builder` (data, property, root, text, text_ctxt, translate), *was (data, property, root, text)*
+
+bpy.types.Scene
+---------------
+
+Added
+^^^^^
+
+* :class:`bpy.types.Scene.cycles_curves`
+* :class:`bpy.types.Scene.rigidbody_world`
+
+Function Arguments
+^^^^^^^^^^^^^^^^^^
+
+* :class:`bpy.types.Scene.collada_export` (filepath, apply_modifiers, export_mesh_type, selected, include_children, include_armatures, include_shapekeys, deform_bones_only, active_uv_only, include_uv_textures, include_material_textures, use_texture_copies, use_object_instantiation, sort_by_name, second_life), *was (filepath, apply_modifiers, export_mesh_type, selected, include_children, include_armatures, deform_bones_only, active_uv_only, include_uv_textures, include_material_textures, use_texture_copies, use_object_instantiation, sort_by_name, second_life)*
+
+bpy.types.ThemeGraphEditor
+--------------------------
+
+Removed
+^^^^^^^
+
+* **panel**
+
+bpy.types.Mesh
+--------------
+
+Added
+^^^^^
+
+* :class:`bpy.types.Mesh.use_customdata_edge_bevel`
+* :class:`bpy.types.Mesh.use_customdata_edge_crease`
+* :class:`bpy.types.Mesh.use_customdata_vertex_bevel`
+
+Removed
+^^^^^^^
+
+* **show_all_edges**
+
+bpy.types.ThemeSpaceGeneric
+---------------------------
+
+Added
+^^^^^
+
+* :class:`bpy.types.ThemeSpaceGeneric.panelcolors`
+
+bpy.types.ImageFormatSettings
+-----------------------------
+
+Added
+^^^^^
+
+* :class:`bpy.types.ImageFormatSettings.jpeg2k_codec`
+
+bpy.types.ThemeUserInterface
+----------------------------
+
+Added
+^^^^^
+
+* :class:`bpy.types.ThemeUserInterface.menu_shadow_fac`
+* :class:`bpy.types.ThemeUserInterface.menu_shadow_width`
+
+Removed
+^^^^^^^
+
+* **panel**
+
+bpy.types.SceneSequence
+-----------------------
+
+Added
+^^^^^
+
+* :class:`bpy.types.SceneSequence.alpha_mode`
+
+Removed
+^^^^^^^
+
+* **use_premultiply**
+
+bpy.types.UserPreferencesFilePaths
+----------------------------------
+
+Added
+^^^^^
+
+* :class:`bpy.types.UserPreferencesFilePaths.use_keep_session`
+
+bpy.types.Node
+--------------
+
+Added
+^^^^^
+
+* :class:`bpy.types.Node.height`
+* :class:`bpy.types.Node.width`
+* :class:`bpy.types.Node.width_hidden`
+
+bpy.types.Sculpt
+----------------
+
+Added
+^^^^^
+
+* :class:`bpy.types.Sculpt.detail_size`
+* :class:`bpy.types.Sculpt.symmetrize_direction`
+* :class:`bpy.types.Sculpt.use_edge_collapse`
+* :class:`bpy.types.Sculpt.use_smooth_shading`
+
+bpy.types.EnumPropertyItem
+--------------------------
+
+Added
+^^^^^
+
+* :class:`bpy.types.EnumPropertyItem.icon`
+
+bpy.types.ThemePanelColors
+--------------------------
+
+Added
+^^^^^
+
+* :class:`bpy.types.ThemePanelColors.back`
+* :class:`bpy.types.ThemePanelColors.show_back`
+
+bpy.types.WindowManager
+-----------------------
+
+Removed
+^^^^^^^
+
+* **rigify_active_type**
+* **rigify_collection**
+* **rigify_types**
+
+bpy.types.ParticleSettings
+--------------------------
+
+Added
+^^^^^
+
+* :class:`bpy.types.ParticleSettings.cycles`
+
+bpy.types.RenderSettings
+------------------------
+
+Added
+^^^^^
+
+* :class:`bpy.types.RenderSettings.bake_samples`
+* :class:`bpy.types.RenderSettings.use_bake_to_vertex_color`
+* :class:`bpy.types.RenderSettings.use_sequencer_gl_textured_solid`
+
+Removed
+^^^^^^^
+
+* **use_color_unpremultiply**
+
+bpy.types.MovieClipSequence
+---------------------------
+
+Added
+^^^^^
+
+* :class:`bpy.types.MovieClipSequence.alpha_mode`
+
+Removed
+^^^^^^^
+
+* **use_premultiply**
+
+bpy.types.EffectSequence
+------------------------
+
+Added
+^^^^^
+
+* :class:`bpy.types.EffectSequence.alpha_mode`
+
+Removed
+^^^^^^^
+
+* **use_premultiply**
+
+bpy.types.BrushTextureSlot
+--------------------------
+
+Added
+^^^^^
+
+* :class:`bpy.types.BrushTextureSlot.tex_paint_map_mode`
+
+bpy.types.Sequences
+-------------------
+
+Function Arguments
+^^^^^^^^^^^^^^^^^^
+
+* :class:`bpy.types.Sequences.new_clip` (name, clip, channel, frame_start), *was (name, clip, channel, start_frame)*
+* :class:`bpy.types.Sequences.new_effect` (name, type, channel, frame_start, frame_end, seq1, seq2, seq3), *was (name, type, channel, start_frame, end_frame, seq1, seq2, seq3)*
+* :class:`bpy.types.Sequences.new_image` (name, filepath, channel, frame_start), *was (name, filepath, channel, start_frame)*

@@ Diff output truncated at 10240 characters. @@

More information about the Bf-blender-cvs mailing list