[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [37759] branches/soc-2011-onion: slowest ever merge with trunk 37756
Antony Riakiotakis
kalast at gmail.com
Thu Jun 23 19:32:21 CEST 2011
Revision: 37759
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=37759
Author: psy-fi
Date: 2011-06-23 17:32:21 +0000 (Thu, 23 Jun 2011)
Log Message:
-----------
slowest ever merge with trunk 37756
Modified Paths:
--------------
branches/soc-2011-onion/CMakeLists.txt
branches/soc-2011-onion/SConstruct
branches/soc-2011-onion/doc/python_api/rst/change_log.rst
branches/soc-2011-onion/doc/python_api/sphinx_changelog_gen.py
branches/soc-2011-onion/intern/CMakeLists.txt
branches/soc-2011-onion/intern/ffmpeg/ffmpeg_compat.h
branches/soc-2011-onion/source/blender/blenkernel/CMakeLists.txt
branches/soc-2011-onion/source/blender/blenkernel/intern/sequencer.c
branches/soc-2011-onion/source/blender/blenkernel/intern/sound.c
branches/soc-2011-onion/source/blender/blenkernel/intern/writeffmpeg.c
branches/soc-2011-onion/source/blender/editors/sound/CMakeLists.txt
branches/soc-2011-onion/source/blender/editors/sound/sound_ops.c
branches/soc-2011-onion/source/blender/editors/space_file/file_ops.c
branches/soc-2011-onion/source/blender/editors/space_graph/CMakeLists.txt
branches/soc-2011-onion/source/blender/editors/space_graph/graph_edit.c
branches/soc-2011-onion/source/blender/editors/space_sequencer/CMakeLists.txt
branches/soc-2011-onion/source/blender/editors/space_sequencer/sequencer_add.c
branches/soc-2011-onion/source/blender/imbuf/CMakeLists.txt
branches/soc-2011-onion/source/blender/makesrna/intern/CMakeLists.txt
branches/soc-2011-onion/source/blender/makesrna/intern/makesrna.c
branches/soc-2011-onion/source/blender/makesrna/intern/rna_access.c
branches/soc-2011-onion/source/blender/makesrna/intern/rna_curve.c
branches/soc-2011-onion/source/blender/makesrna/intern/rna_mesh.c
branches/soc-2011-onion/source/blender/makesrna/intern/rna_modifier.c
branches/soc-2011-onion/source/blender/makesrna/intern/rna_object.c
branches/soc-2011-onion/source/blender/makesrna/intern/rna_scene.c
branches/soc-2011-onion/source/blender/makesrna/intern/rna_space.c
branches/soc-2011-onion/source/blender/python/intern/CMakeLists.txt
branches/soc-2011-onion/source/blender/python/intern/bpy.c
branches/soc-2011-onion/source/blender/python/intern/bpy_interface.c
branches/soc-2011-onion/source/blender/quicktime/CMakeLists.txt
branches/soc-2011-onion/source/blender/quicktime/apple/qtkit_export.m
branches/soc-2011-onion/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
branches/soc-2011-onion/source/gameengine/BlenderRoutines/CMakeLists.txt
branches/soc-2011-onion/source/gameengine/Converter/CMakeLists.txt
branches/soc-2011-onion/source/gameengine/Converter/KX_ConvertActuators.cpp
branches/soc-2011-onion/source/gameengine/Ketsji/CMakeLists.txt
branches/soc-2011-onion/source/gameengine/Ketsji/KX_KetsjiEngine.cpp
branches/soc-2011-onion/source/gameengine/Ketsji/KX_SoundActuator.cpp
branches/soc-2011-onion/source/gameengine/Ketsji/KX_SoundActuator.h
Property Changed:
----------------
branches/soc-2011-onion/
Property changes on: branches/soc-2011-onion
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/soc-2010-jwilkins:28499-37009
/branches/soc-2010-nicolasbishop:28448-30783,30792-30793,30797-30798,30815
/trunk/blender:36833-37725
+ /branches/soc-2010-jwilkins:28499-37009
/branches/soc-2010-nicolasbishop:28448-30783,30792-30793,30797-30798,30815
/trunk/blender:36833-37756
Modified: branches/soc-2011-onion/CMakeLists.txt
===================================================================
--- branches/soc-2011-onion/CMakeLists.txt 2011-06-23 17:30:56 UTC (rev 37758)
+++ branches/soc-2011-onion/CMakeLists.txt 2011-06-23 17:32:21 UTC (rev 37759)
@@ -104,6 +104,9 @@
option(WITH_GAMEENGINE "Enable Game Engine" ON)
option(WITH_PLAYER "Build Player" OFF)
+option(WITH_AUDASPACE "Build with blenders audio library" ON)
+mark_as_advanced(WITH_AUDASPACE)
+
option(WITH_HEADLESS "Build without graphical support (renderfarm, server mode only)" OFF)
mark_as_advanced(WITH_HEADLESS)
@@ -201,6 +204,10 @@
message(FATAL_ERROR "WITH_PLAYER requires WITH_GAMEENGINE")
endif()
+if(NOT WITH_AUDASPACE AND (WITH_OPENAL OR WITH_SDL OR WITH_JACK))
+ message(FATAL_ERROR "WITH_OPENAL/WITH_SDL/WITH_JACK/WITH_CODEC_FFMPEG require WITH_AUDASPACE")
+endif()
+
if(NOT WITH_SAMPLERATE AND (WITH_OPENAL OR WITH_SDL OR WITH_JACK))
message(FATAL_ERROR "WITH_OPENAL/WITH_SDL/WITH_JACK require WITH_SAMPLERATE")
endif()
@@ -794,7 +801,7 @@
set(PYTHON_VERSION 3.2)
set(PYTHON_INCLUDE_DIRS "${PYTHON}/include/python${PYTHON_VERSION}")
# set(PYTHON_BINARY python) # not used yet
- set(PYTHON_LIBRARIES python32mw)
+ set(PYTHON_LIBRARIES ${PYTHON}/lib/python32mw.lib)
set(PYTHON_LIBPATH ${PYTHON}/lib)
endif()
Modified: branches/soc-2011-onion/SConstruct
===================================================================
--- branches/soc-2011-onion/SConstruct 2011-06-23 17:30:56 UTC (rev 37758)
+++ branches/soc-2011-onion/SConstruct 2011-06-23 17:32:21 UTC (rev 37759)
@@ -306,6 +306,11 @@
env['CXXFLAGS'].append('-DDISABLE_ELBEEM')
env['CCFLAGS'].append('-DDISABLE_ELBEEM')
+# TODO, make optional
+env['CPPFLAGS'].append('-DWITH_AUDASPACE')
+env['CXXFLAGS'].append('-DWITH_AUDASPACE')
+env['CCFLAGS'].append('-DWITH_AUDASPACE')
+
# lastly we check for root_build_dir ( we should not do before, otherwise we might do wrong builddir
B.root_build_dir = env['BF_BUILDDIR']
B.doc_build_dir = os.path.join(env['BF_INSTALLDIR'], 'doc')
Modified: branches/soc-2011-onion/doc/python_api/rst/change_log.rst
===================================================================
--- branches/soc-2011-onion/doc/python_api/rst/change_log.rst 2011-06-23 17:30:56 UTC (rev 37758)
+++ branches/soc-2011-onion/doc/python_api/rst/change_log.rst 2011-06-23 17:32:21 UTC (rev 37759)
@@ -696,3 +696,199 @@
* **force** -> :class:`bpy.types.MaterialPhysics.fh_force`
* **use_normal_align** -> :class:`bpy.types.MaterialPhysics.use_fh_normal`
+
+2.57 to 2.58
+============
+
+bpy.types.RenderSettings
+------------------------
+
+Added
+^^^^^
+
+* :class:`bpy.types.RenderSettings.use_bake_lores_mesh`
+* :class:`bpy.types.RenderSettings.use_bake_multires`
+
+bpy.types.Camera
+----------------
+
+Added
+^^^^^
+
+* :class:`bpy.types.Camera.show_guide`
+
+bpy.types.SpaceImageEditor
+--------------------------
+
+Added
+^^^^^
+
+* :class:`bpy.types.SpaceImageEditor.zoom`
+
+bpy.types.SpaceView3D
+---------------------
+
+Added
+^^^^^
+
+* :class:`bpy.types.SpaceView3D.lock_camera`
+
+bpy.types.RegionView3D
+----------------------
+
+Added
+^^^^^
+
+* :class:`bpy.types.RegionView3D.is_perspective`
+
+bpy.types.Scene
+---------------
+
+Added
+^^^^^
+
+* :class:`bpy.types.Scene.frame_subframe`
+
+bpy.types.Area
+--------------
+
+Removed
+^^^^^^^
+
+* **active_space**
+
+bpy.types.DisplaceModifier
+--------------------------
+
+Renamed
+^^^^^^^
+
+* **texture_coordinate_object** -> :class:`bpy.types.DisplaceModifier.texture_coords_object`
+
+bpy.types.UserPreferencesView
+-----------------------------
+
+Added
+^^^^^
+
+* :class:`bpy.types.UserPreferencesView.use_camera_lock_parent`
+
+bpy.types.DomainFluidSettings
+-----------------------------
+
+Added
+^^^^^
+
+* :class:`bpy.types.DomainFluidSettings.fluid_mesh_vertices`
+* :class:`bpy.types.DomainFluidSettings.surface_noobs`
+
+bpy.types.Sculpt
+----------------
+
+Added
+^^^^^
+
+* :class:`bpy.types.Sculpt.use_deform_only`
+
+bpy.types.ClothCollisionSettings
+--------------------------------
+
+Added
+^^^^^
+
+* :class:`bpy.types.ClothCollisionSettings.distance_repel`
+* :class:`bpy.types.ClothCollisionSettings.repel_force`
+
+bpy.types.UILayout
+------------------
+
+Added
+^^^^^
+
+* :class:`bpy.types.UILayout.template_edit_mode_selection`
+
+bpy.types.ToolSettings
+----------------------
+
+Added
+^^^^^
+
+* :class:`bpy.types.ToolSettings.use_snap_project_self`
+
+bpy.types.Mesh
+--------------
+
+Removed
+^^^^^^^
+
+* **edge_face_count**
+* **edge_face_count_dict**
+* **edge_loops_from_edges**
+* **edge_loops_from_faces**
+
+bpy.types.PointDensity
+----------------------
+
+Added
+^^^^^
+
+* :class:`bpy.types.PointDensity.falloff_curve`
+* :class:`bpy.types.PointDensity.falloff_speed_scale`
+* :class:`bpy.types.PointDensity.use_falloff_curve`
+
+bpy.types.SpaceTextEditor
+-------------------------
+
+Added
+^^^^^
+
+* :class:`bpy.types.SpaceTextEditor.use_match_case`
+
+bpy.types.CameraActuator
+------------------------
+
+Added
+^^^^^
+
+* :class:`bpy.types.CameraActuator.damping`
+
+bpy.types.Property
+------------------
+
+Added
+^^^^^
+
+* :class:`bpy.types.Property.is_skip_save`
+
+bpy.types.UserPreferencesSystem
+-------------------------------
+
+Added
+^^^^^
+
+* :class:`bpy.types.UserPreferencesSystem.anisotropic_filter`
+
+bpy.types.Object
+----------------
+
+Added
+^^^^^
+
+* :class:`bpy.types.Object.empty_image_offset`
+
+bpy.types.Image
+---------------
+
+Added
+^^^^^
+
+* :class:`bpy.types.Image.resolution`
+
+bpy.types.SceneGameData
+-----------------------
+
+Added
+^^^^^
+
+* :class:`bpy.types.SceneGameData.use_glsl_color_management`
+
Modified: branches/soc-2011-onion/doc/python_api/sphinx_changelog_gen.py
===================================================================
--- branches/soc-2011-onion/doc/python_api/sphinx_changelog_gen.py 2011-06-23 17:30:56 UTC (rev 37758)
+++ branches/soc-2011-onion/doc/python_api/sphinx_changelog_gen.py 2011-06-23 17:32:21 UTC (rev 37759)
@@ -24,17 +24,17 @@
output from this tool should be added into "doc/python_api/rst/change_log.rst"
# dump api blender_version.py in CWD
-blender --background --python intern/tools/rna_api_dump.py -- --dump
+blender --background --python doc/python_api/sphinx_changelog_gen.py -- --dump
# create changelog
-blender --background --python intern/tools/rna_api_dump.py -- \
+blender --background --python doc/python_api/sphinx_changelog_gen.py -- \
--api_from blender_2_56_1.py \
--api_to blender_2_57_0.py \
--api_out changes.rst
# Api comparison can also run without blender
-python intern/tools/rna_api_dump.py
+python doc/python_api/sphinx_changelog_gen.py \
--api_from blender_api_2_56_6.py \
--api_to blender_api_2_57.py \
--api_out changes.rst
Modified: branches/soc-2011-onion/intern/CMakeLists.txt
===================================================================
--- branches/soc-2011-onion/intern/CMakeLists.txt 2011-06-23 17:30:56 UTC (rev 37758)
+++ branches/soc-2011-onion/intern/CMakeLists.txt 2011-06-23 17:32:21 UTC (rev 37759)
@@ -24,7 +24,6 @@
#
# ***** END GPL LICENSE BLOCK *****
-add_subdirectory(audaspace)
add_subdirectory(string)
add_subdirectory(ghost)
add_subdirectory(guardedalloc)
@@ -35,6 +34,10 @@
add_subdirectory(smoke)
add_subdirectory(mikktspace)
+if(WITH_AUDASPACE)
+ add_subdirectory(audaspace)
+endif()
+
if(WITH_MOD_FLUID)
add_subdirectory(elbeem)
endif()
Modified: branches/soc-2011-onion/intern/ffmpeg/ffmpeg_compat.h
===================================================================
--- branches/soc-2011-onion/intern/ffmpeg/ffmpeg_compat.h 2011-06-23 17:30:56 UTC (rev 37758)
+++ branches/soc-2011-onion/intern/ffmpeg/ffmpeg_compat.h 2011-06-23 17:32:21 UTC (rev 37759)
@@ -40,7 +40,7 @@
#define FFMPEG_HAVE_AVIO 1
#endif
-#if (LIBAVCODEC_VERSION_MAJOR > 53) || ((LIBAVCODEC_VERSION_MAJOR == 53) && (LIBAVCODEC_VERSION_MINOR > 1)) || ((LIBAVCODEC_VERSION_MAJOR == 53) && (LIBAVCODEC_VERSION_MINOR == 1) && (LIBAVCODEC_VERSION_MICRO >= 1))
+#if (LIBAVCODEC_VERSION_MAJOR > 53) || ((LIBAVCODEC_VERSION_MAJOR == 53) && (LIBAVCODEC_VERSION_MINOR > 1)) || ((LIBAVCODEC_VERSION_MAJOR == 53) && (LIBAVCODEC_VERSION_MINOR == 1) && (LIBAVCODEC_VERSION_MICRO >= 1)) || ((LIBAVCODEC_VERSION_MAJOR == 52) && (LIBAVCODEC_VERSION_MINOR >= 122))
#define FFMPEG_HAVE_DEFAULT_VAL_UNION 1
#endif
Modified: branches/soc-2011-onion/source/blender/blenkernel/CMakeLists.txt
===================================================================
--- branches/soc-2011-onion/source/blender/blenkernel/CMakeLists.txt 2011-06-23 17:30:56 UTC (rev 37758)
+++ branches/soc-2011-onion/source/blender/blenkernel/CMakeLists.txt 2011-06-23 17:32:21 UTC (rev 37759)
@@ -43,8 +43,6 @@
../nodes
../editors/include
../render/extern/include
- ../../../intern/audaspace/intern
- ../../../intern/ffmpeg
../../../intern/bsp/extern ../blenfont
../../../intern/decimation/extern
../../../intern/elbeem/extern
@@ -237,6 +235,13 @@
add_definitions(-DGLEW_STATIC)
+if(WITH_AUDASPACE)
+ list(APPEND INC
+ ../../../intern/audaspace/intern
+ )
+ add_definitions(-DWITH_AUDASPACE)
+endif()
+
if(WITH_BULLET)
list(APPEND INC ../../../extern/bullet2/src)
add_definitions(-DUSE_BULLET)
@@ -278,6 +283,7 @@
endif()
if(WITH_CODEC_FFMPEG)
+ list(APPEND INC ../../../intern/ffmpeg)
list(APPEND INC_SYS ${FFMPEG_INCLUDE_DIRS})
add_definitions(-DWITH_FFMPEG)
endif()
Modified: branches/soc-2011-onion/source/blender/blenkernel/intern/sequencer.c
===================================================================
--- branches/soc-2011-onion/source/blender/blenkernel/intern/sequencer.c 2011-06-23 17:30:56 UTC (rev 37758)
+++ branches/soc-2011-onion/source/blender/blenkernel/intern/sequencer.c 2011-06-23 17:32:21 UTC (rev 37759)
@@ -73,8 +73,11 @@
#include "BKE_context.h"
#include "BKE_sound.h"
-#include "AUD_C-API.h"
+#ifdef WITH_AUDASPACE
+# include "AUD_C-API.h"
+#endif
+
#ifdef WIN32
#define snprintf _snprintf
#endif
@@ -697,6 +700,7 @@
}
seq->strip->len = seq->len;
case SEQ_SOUND:
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list