[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [58011] branches/soc-2013-cycles_mblur: Merged trunk into branch.
Gavin Howard
gavin.d.howard at gmail.com
Fri Jul 5 01:17:00 CEST 2013
Revision: 58011
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=58011
Author: gdh
Date: 2013-07-04 23:17:00 +0000 (Thu, 04 Jul 2013)
Log Message:
-----------
Merged trunk into branch. Includes r57909 to r57999.
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=57909
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=57999
Modified Paths:
--------------
branches/soc-2013-cycles_mblur/doc/doxygen/Doxyfile
branches/soc-2013-cycles_mblur/intern/audaspace/jack/AUD_JackLibrary.cpp
branches/soc-2013-cycles_mblur/intern/audaspace/jack/AUD_JackLibrary.h
branches/soc-2013-cycles_mblur/intern/cycles/render/light.cpp
branches/soc-2013-cycles_mblur/release/datafiles/blender_icons.svg
branches/soc-2013-cycles_mblur/release/datafiles/blender_icons16.png
branches/soc-2013-cycles_mblur/release/datafiles/blender_icons32.png
branches/soc-2013-cycles_mblur/release/scripts/modules/addon_utils.py
branches/soc-2013-cycles_mblur/release/scripts/startup/bl_operators/wm.py
branches/soc-2013-cycles_mblur/release/scripts/startup/bl_ui/properties_data_mesh.py
branches/soc-2013-cycles_mblur/release/scripts/startup/bl_ui/space_view3d.py
branches/soc-2013-cycles_mblur/release/scripts/startup/bl_ui/space_view3d_toolbar.py
branches/soc-2013-cycles_mblur/source/blender/blenkernel/BKE_bpath.h
branches/soc-2013-cycles_mblur/source/blender/blenkernel/BKE_brush.h
branches/soc-2013-cycles_mblur/source/blender/blenkernel/BKE_deform.h
branches/soc-2013-cycles_mblur/source/blender/blenkernel/BKE_idprop.h
branches/soc-2013-cycles_mblur/source/blender/blenkernel/BKE_mesh.h
branches/soc-2013-cycles_mblur/source/blender/blenkernel/BKE_modifier.h
branches/soc-2013-cycles_mblur/source/blender/blenkernel/BKE_object.h
branches/soc-2013-cycles_mblur/source/blender/blenkernel/BKE_ocean.h
branches/soc-2013-cycles_mblur/source/blender/blenkernel/BKE_report.h
branches/soc-2013-cycles_mblur/source/blender/blenkernel/BKE_speaker.h
branches/soc-2013-cycles_mblur/source/blender/blenkernel/CMakeLists.txt
branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/CCGSubSurf.c
branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/CCGSubSurf.h
branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/bpath.c
branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/brush.c
branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/context.c
branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/deform.c
branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/library.c
branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/mesh.c
branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/node.c
branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/particle_system.c
branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/rigidbody.c
branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/speaker.c
branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/subsurf_ccg.c
branches/soc-2013-cycles_mblur/source/blender/blenlib/BLI_callbacks.h
branches/soc-2013-cycles_mblur/source/blender/blenlib/BLI_edgehash.h
branches/soc-2013-cycles_mblur/source/blender/blenlib/BLI_heap.h
branches/soc-2013-cycles_mblur/source/blender/blenlib/BLI_kdtree.h
branches/soc-2013-cycles_mblur/source/blender/blenlib/intern/BLI_heap.c
branches/soc-2013-cycles_mblur/source/blender/blenlib/intern/BLI_kdtree.c
branches/soc-2013-cycles_mblur/source/blender/blenlib/intern/edgehash.c
branches/soc-2013-cycles_mblur/source/blender/blenloader/intern/versioning_250.c
branches/soc-2013-cycles_mblur/source/blender/bmesh/bmesh_class.h
branches/soc-2013-cycles_mblur/source/blender/bmesh/tools/bmesh_bevel.c
branches/soc-2013-cycles_mblur/source/blender/compositor/operations/COM_DoubleEdgeMaskOperation.cpp
branches/soc-2013-cycles_mblur/source/blender/compositor/operations/COM_WrapOperation.cpp
branches/soc-2013-cycles_mblur/source/blender/editors/armature/armature_add.c
branches/soc-2013-cycles_mblur/source/blender/editors/armature/editarmature_generate.c
branches/soc-2013-cycles_mblur/source/blender/editors/armature/meshlaplacian.c
branches/soc-2013-cycles_mblur/source/blender/editors/armature/meshlaplacian.h
branches/soc-2013-cycles_mblur/source/blender/editors/include/ED_armature.h
branches/soc-2013-cycles_mblur/source/blender/editors/include/ED_mesh.h
branches/soc-2013-cycles_mblur/source/blender/editors/interface/interface_handlers.c
branches/soc-2013-cycles_mblur/source/blender/editors/interface/resources.c
branches/soc-2013-cycles_mblur/source/blender/editors/mesh/editface.c
branches/soc-2013-cycles_mblur/source/blender/editors/object/object_add.c
branches/soc-2013-cycles_mblur/source/blender/editors/object/object_relations.c
branches/soc-2013-cycles_mblur/source/blender/editors/object/object_vgroup.c
branches/soc-2013-cycles_mblur/source/blender/editors/sculpt_paint/paint_ops.c
branches/soc-2013-cycles_mblur/source/blender/editors/sculpt_paint/paint_utils.c
branches/soc-2013-cycles_mblur/source/blender/editors/sculpt_paint/paint_vertex.c
branches/soc-2013-cycles_mblur/source/blender/editors/space_outliner/outliner_draw.c
branches/soc-2013-cycles_mblur/source/blender/editors/space_outliner/outliner_edit.c
branches/soc-2013-cycles_mblur/source/blender/editors/space_outliner/outliner_intern.h
branches/soc-2013-cycles_mblur/source/blender/editors/space_text/text_autocomplete.c
branches/soc-2013-cycles_mblur/source/blender/editors/space_text/text_format_lua.c
branches/soc-2013-cycles_mblur/source/blender/editors/space_text/text_format_osl.c
branches/soc-2013-cycles_mblur/source/blender/editors/space_text/text_format_py.c
branches/soc-2013-cycles_mblur/source/blender/editors/space_view3d/view3d_buttons.c
branches/soc-2013-cycles_mblur/source/blender/editors/space_view3d/view3d_project.c
branches/soc-2013-cycles_mblur/source/blender/editors/util/numinput.c
branches/soc-2013-cycles_mblur/source/blender/freestyle/intern/stroke/StrokeIterators.h
branches/soc-2013-cycles_mblur/source/blender/makesrna/intern/CMakeLists.txt
branches/soc-2013-cycles_mblur/source/blender/makesrna/intern/rna_access.c
branches/soc-2013-cycles_mblur/source/blender/makesrna/intern/rna_armature.c
branches/soc-2013-cycles_mblur/source/blender/makesrna/intern/rna_curve.c
branches/soc-2013-cycles_mblur/source/blender/makesrna/intern/rna_image.c
branches/soc-2013-cycles_mblur/source/blender/makesrna/intern/rna_internal.h
branches/soc-2013-cycles_mblur/source/blender/makesrna/intern/rna_lattice.c
branches/soc-2013-cycles_mblur/source/blender/makesrna/intern/rna_material.c
branches/soc-2013-cycles_mblur/source/blender/makesrna/intern/rna_mesh.c
branches/soc-2013-cycles_mblur/source/blender/makesrna/intern/rna_mesh_utils.h
branches/soc-2013-cycles_mblur/source/blender/makesrna/intern/rna_meta.c
branches/soc-2013-cycles_mblur/source/blender/makesrna/intern/rna_nodetree.c
branches/soc-2013-cycles_mblur/source/blender/makesrna/intern/rna_object.c
branches/soc-2013-cycles_mblur/source/blender/python/BPY_extern.h
branches/soc-2013-cycles_mblur/source/blender/python/generic/bgl.c
branches/soc-2013-cycles_mblur/source/blender/python/generic/bgl.h
branches/soc-2013-cycles_mblur/source/blender/python/generic/bpy_internal_import.c
branches/soc-2013-cycles_mblur/source/blender/python/generic/bpy_internal_import.h
branches/soc-2013-cycles_mblur/source/blender/python/mathutils/mathutils.c
branches/soc-2013-cycles_mblur/source/blender/python/mathutils/mathutils.h
branches/soc-2013-cycles_mblur/source/blender/python/mathutils/mathutils_Color.h
branches/soc-2013-cycles_mblur/source/blender/python/mathutils/mathutils_Euler.c
branches/soc-2013-cycles_mblur/source/blender/python/mathutils/mathutils_Euler.h
branches/soc-2013-cycles_mblur/source/blender/python/mathutils/mathutils_Matrix.c
branches/soc-2013-cycles_mblur/source/blender/python/mathutils/mathutils_Matrix.h
branches/soc-2013-cycles_mblur/source/blender/python/mathutils/mathutils_Quaternion.c
branches/soc-2013-cycles_mblur/source/blender/python/mathutils/mathutils_Quaternion.h
branches/soc-2013-cycles_mblur/source/blender/python/mathutils/mathutils_Vector.c
branches/soc-2013-cycles_mblur/source/blender/python/mathutils/mathutils_Vector.h
branches/soc-2013-cycles_mblur/source/blender/python/mathutils/mathutils_geometry.c
branches/soc-2013-cycles_mblur/source/blender/python/mathutils/mathutils_geometry.h
branches/soc-2013-cycles_mblur/source/blender/python/mathutils/mathutils_noise.c
branches/soc-2013-cycles_mblur/source/blender/render/intern/include/strand.h
branches/soc-2013-cycles_mblur/source/blender/render/intern/source/bake.c
branches/soc-2013-cycles_mblur/source/blender/render/intern/source/convertblender.c
branches/soc-2013-cycles_mblur/source/blender/render/intern/source/pipeline.c
branches/soc-2013-cycles_mblur/source/blender/render/intern/source/strand.c
branches/soc-2013-cycles_mblur/source/blender/windowmanager/WM_api.h
branches/soc-2013-cycles_mblur/source/blender/windowmanager/intern/wm_event_system.c
branches/soc-2013-cycles_mblur/source/blender/windowmanager/intern/wm_keymap.c
branches/soc-2013-cycles_mblur/source/blender/windowmanager/intern/wm_operators.c
branches/soc-2013-cycles_mblur/source/blender/windowmanager/wm_event_types.h
branches/soc-2013-cycles_mblur/source/creator/creator.c
branches/soc-2013-cycles_mblur/source/gameengine/Ketsji/BL_BlenderShader.cpp
branches/soc-2013-cycles_mblur/source/gameengine/Ketsji/BL_Material.cpp
branches/soc-2013-cycles_mblur/source/gameengine/Ketsji/BL_Shader.cpp
branches/soc-2013-cycles_mblur/source/gameengine/Ketsji/BL_Texture.cpp
branches/soc-2013-cycles_mblur/source/gameengine/Ketsji/KX_BlenderMaterial.cpp
branches/soc-2013-cycles_mblur/source/gameengine/Ketsji/KX_BulletPhysicsController.cpp
branches/soc-2013-cycles_mblur/source/gameengine/Ketsji/KX_CharacterWrapper.cpp
branches/soc-2013-cycles_mblur/source/gameengine/Ketsji/KX_MaterialIpoController.cpp
branches/soc-2013-cycles_mblur/source/gameengine/Ketsji/KX_PythonSeq.cpp
branches/soc-2013-cycles_mblur/source/gameengine/Ketsji/KX_VehicleWrapper.cpp
branches/soc-2013-cycles_mblur/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_ListRasterizer.cpp
Removed Paths:
-------------
branches/soc-2013-cycles_mblur/source/blender/blenkernel/BKE_script.h
Property Changed:
----------------
branches/soc-2013-cycles_mblur/
branches/soc-2013-cycles_mblur/source/blender/editors/space_outliner/
Property changes on: branches/soc-2013-cycles_mblur
___________________________________________________________________
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
/branches/soc-2013-depsgraph_mt:57516
/tags/blender-2.67b-release/blender:57122
/trunk/blender:57388-57916
+ /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
/branches/soc-2013-depsgraph_mt:57516
/tags/blender-2.67b-release/blender:57122
/trunk/blender:57388-58001
Modified: branches/soc-2013-cycles_mblur/doc/doxygen/Doxyfile
===================================================================
--- branches/soc-2013-cycles_mblur/doc/doxygen/Doxyfile 2013-07-04 22:41:57 UTC (rev 58010)
+++ branches/soc-2013-cycles_mblur/doc/doxygen/Doxyfile 2013-07-04 23:17:00 UTC (rev 58011)
@@ -1,34 +1,37 @@
-# Doxyfile 1.7.3
+# Doxyfile 1.8.4
# This file describes the settings to be used by the documentation system
-# doxygen (www.doxygen.org) for a project
+# doxygen (www.doxygen.org) for a project.
#
-# All text after a hash (#) is considered a comment and will be ignored
+# All text after a double hash (##) is considered a comment and is placed
+# in front of the TAG it is preceding .
+# All text after a hash (#) is considered a comment and will be ignored.
# The format is:
# TAG = value [value, ...]
# For lists items can also be appended using:
# TAG += value [value, ...]
-# Values that contain spaces should be placed between quotes (" ")
+# Values that contain spaces should be placed between quotes (" ").
#---------------------------------------------------------------------------
# Project related configuration options
#---------------------------------------------------------------------------
-# This tag specifies the encoding used for all characters in the config file
-# that follow. The default is UTF-8 which is also the encoding used for all
-# text before the first occurrence of this tag. Doxygen uses libiconv (or the
-# iconv built into libc) for the transcoding. See
+# This tag specifies the encoding used for all characters in the config file
+# that follow. The default is UTF-8 which is also the encoding used for all
+# text before the first occurrence of this tag. Doxygen uses libiconv (or the
+# iconv built into libc) for the transcoding. See
# http://www.gnu.org/software/libiconv for the list of possible encodings.
DOXYFILE_ENCODING = UTF-8
-# The PROJECT_NAME tag is a single word (or a sequence of words surrounded
-# by quotes) that should identify the project.
+# The PROJECT_NAME tag is a single word (or sequence of words) that should
+# identify the project. Note that if you do not use Doxywizard you need
+# to put quotes around the project name if it contains spaces.
PROJECT_NAME = Blender
-# The PROJECT_NUMBER tag can be used to enter a project or revision number.
-# This could be handy for archiving the generated documentation or
+# The PROJECT_NUMBER tag can be used to enter a project or revision number.
+# This could be handy for archiving the generated documentation or
# if some version control system is used.
PROJECT_NUMBER = "V2.6x"
@@ -37,66 +40,66 @@
# for a project that appears at the top of each page and should give viewer
# a quick idea about the purpose of the project. Keep the description short.
-PROJECT_BRIEF =
+PROJECT_BRIEF =
-# With the PROJECT_LOGO tag one can specify an logo or icon that is
-# included in the documentation. The maximum height of the logo should not
-# exceed 55 pixels and the maximum width should not exceed 200 pixels.
+# With the PROJECT_LOGO tag one can specify an logo or icon that is
+# included in the documentation. The maximum height of the logo should not
+# exceed 55 pixels and the maximum width should not exceed 200 pixels.
# Doxygen will copy the logo to the output directory.
PROJECT_LOGO = ../../release/freedesktop/icons/48x48/apps/blender.png
-# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
-# base path where the generated documentation will be put.
-# If a relative path is entered, it will be relative to the location
+# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
+# base path where the generated documentation will be put.
+# If a relative path is entered, it will be relative to the location
# where doxygen was started. If left blank the current directory will be used.
-OUTPUT_DIRECTORY =
+OUTPUT_DIRECTORY =
-# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create
-# 4096 sub-directories (in 2 levels) under the output directory of each output
-# format and will distribute the generated files over these directories.
-# Enabling this option can be useful when feeding doxygen a huge amount of
-# source files, where putting all generated files in the same directory would
+# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create
+# 4096 sub-directories (in 2 levels) under the output directory of each output
+# format and will distribute the generated files over these directories.
+# Enabling this option can be useful when feeding doxygen a huge amount of
+# source files, where putting all generated files in the same directory would
# otherwise cause performance problems for the file system.
CREATE_SUBDIRS = YES
-# The OUTPUT_LANGUAGE tag is used to specify the language in which all
-# documentation generated by doxygen is written. Doxygen will use this
-# information to generate all constant output in the proper language.
-# The default language is English, other supported languages are:
-# Afrikaans, Arabic, Brazilian, Catalan, Chinese, Chinese-Traditional,
-# Croatian, Czech, Danish, Dutch, Esperanto, Farsi, Finnish, French, German,
-# Greek, Hungarian, Italian, Japanese, Japanese-en (Japanese with English
-# messages), Korean, Korean-en, Lithuanian, Norwegian, Macedonian, Persian,
-# Polish, Portuguese, Romanian, Russian, Serbian, Serbian-Cyrillic, Slovak,
-# Slovene, Spanish, Swedish, Ukrainian, and Vietnamese.
+# The OUTPUT_LANGUAGE tag is used to specify the language in which all
+# documentation generated by doxygen is written. Doxygen will use this
+# information to generate all constant output in the proper language.
+# The default language is English, other supported languages are:
+# Afrikaans, Arabic, Brazilian, Catalan, Chinese, Chinese-Traditional,
+# Croatian, Czech, Danish, Dutch, Esperanto, Farsi, Finnish, French, German,
+# Greek, Hungarian, Italian, Japanese, Japanese-en (Japanese with English
+# messages), Korean, Korean-en, Latvian, Lithuanian, Norwegian, Macedonian,
+# Persian, Polish, Portuguese, Romanian, Russian, Serbian, Serbian-Cyrillic,
+# Slovak, Slovene, Spanish, Swedish, Ukrainian, and Vietnamese.
OUTPUT_LANGUAGE = English
-# If the BRIEF_MEMBER_DESC tag is set to YES (the default) Doxygen will
-# include brief member descriptions after the members that are listed in
-# the file and class documentation (similar to JavaDoc).
+# If the BRIEF_MEMBER_DESC tag is set to YES (the default) Doxygen will
+# include brief member descriptions after the members that are listed in
+# the file and class documentation (similar to JavaDoc).
# Set to NO to disable this.
BRIEF_MEMBER_DESC = YES
-# If the REPEAT_BRIEF tag is set to YES (the default) Doxygen will prepend
-# the brief description of a member or function before the detailed description.
-# Note: if both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the
+# If the REPEAT_BRIEF tag is set to YES (the default) Doxygen will prepend
+# the brief description of a member or function before the detailed description.
+# Note: if both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the
# brief descriptions will be completely suppressed.
REPEAT_BRIEF = YES
-# This tag implements a quasi-intelligent brief description abbreviator
-# that is used to form the text in various listings. Each string
-# in this list, if found as the leading text of the brief description, will be
-# stripped from the text and the result after processing the whole list, is
-# used as the annotated text. Otherwise, the brief description is used as-is.
-# If left blank, the following values are used ("$name" is automatically
-# replaced with the name of the entity): "The $name class" "The $name widget"
-# "The $name file" "is" "provides" "specifies" "contains"
+# This tag implements a quasi-intelligent brief description abbreviator
+# that is used to form the text in various listings. Each string
+# in this list, if found as the leading text of the brief description, will be
+# stripped from the text and the result after processing the whole list, is
+# used as the annotated text. Otherwise, the brief description is used as-is.
+# If left blank, the following values are used ("$name" is automatically
+# replaced with the name of the entity): "The $name class" "The $name widget"
+# "The $name file" "is" "provides" "specifies" "contains"
# "represents" "a" "an" "the"
ABBREVIATE_BRIEF = "The $name class" \
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list