[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [59173] branches/soc-2011-tomato: Merging r59088 through r59172 from trunk into soc-2011-tomato
Sergey Sharybin
sergey.vfx at gmail.com
Fri Aug 16 10:21:06 CEST 2013
Revision: 59173
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=59173
Author: nazgul
Date: 2013-08-16 08:21:05 +0000 (Fri, 16 Aug 2013)
Log Message:
-----------
Merging r59088 through r59172 from trunk into soc-2011-tomato
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=59088
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=59172
Modified Paths:
--------------
branches/soc-2011-tomato/build_files/scons/tools/Blender.py
branches/soc-2011-tomato/doc/python_api/rst/bge.logic.rst
branches/soc-2011-tomato/doc/python_api/rst/bge_types/bge.types.KX_GameObject.rst
branches/soc-2011-tomato/extern/libmv/libmv/tracking/track_region.cc
branches/soc-2011-tomato/intern/audaspace/OpenAL/AUD_OpenALDevice.cpp
branches/soc-2011-tomato/intern/audaspace/OpenAL/AUD_OpenALDevice.h
branches/soc-2011-tomato/intern/audaspace/Python/AUD_PyAPI.cpp
branches/soc-2011-tomato/intern/audaspace/intern/AUD_IHandle.h
branches/soc-2011-tomato/intern/audaspace/intern/AUD_SoftwareDevice.cpp
branches/soc-2011-tomato/intern/audaspace/intern/AUD_SoftwareDevice.h
branches/soc-2011-tomato/intern/audaspace/intern/AUD_Space.h
branches/soc-2011-tomato/intern/cycles/kernel/kernel_passes.h
branches/soc-2011-tomato/intern/cycles/kernel/kernel_shader.h
branches/soc-2011-tomato/intern/cycles/kernel/osl/osl_closures.h
branches/soc-2011-tomato/intern/cycles/render/graph.cpp
branches/soc-2011-tomato/intern/cycles/render/session.cpp
branches/soc-2011-tomato/intern/cycles/render/svm.cpp
branches/soc-2011-tomato/intern/guardedalloc/intern/mallocn.c
branches/soc-2011-tomato/release/scripts/modules/bpy_extras/image_utils.py
branches/soc-2011-tomato/release/scripts/startup/bl_operators/add_mesh_torus.py
branches/soc-2011-tomato/source/blender/blenkernel/BKE_curve.h
branches/soc-2011-tomato/source/blender/blenkernel/BKE_material.h
branches/soc-2011-tomato/source/blender/blenkernel/BKE_mesh.h
branches/soc-2011-tomato/source/blender/blenkernel/intern/armature.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/camera.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/curve.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/material.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/mesh.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/object.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/sound.c
branches/soc-2011-tomato/source/blender/blenlib/BLI_array.h
branches/soc-2011-tomato/source/blender/blenlib/BLI_linklist.h
branches/soc-2011-tomato/source/blender/blenlib/BLI_math_base.h
branches/soc-2011-tomato/source/blender/blenlib/intern/BLI_array.c
branches/soc-2011-tomato/source/blender/blenlib/intern/BLI_linklist.c
branches/soc-2011-tomato/source/blender/blenloader/intern/readfile.c
branches/soc-2011-tomato/source/blender/bmesh/bmesh.h
branches/soc-2011-tomato/source/blender/bmesh/intern/bmesh_construct.c
branches/soc-2011-tomato/source/blender/bmesh/intern/bmesh_construct.h
branches/soc-2011-tomato/source/blender/bmesh/intern/bmesh_core.c
branches/soc-2011-tomato/source/blender/bmesh/intern/bmesh_core.h
branches/soc-2011-tomato/source/blender/bmesh/intern/bmesh_marking.c
branches/soc-2011-tomato/source/blender/bmesh/intern/bmesh_marking.h
branches/soc-2011-tomato/source/blender/bmesh/intern/bmesh_queries.c
branches/soc-2011-tomato/source/blender/bmesh/operators/bmo_edgenet.c
branches/soc-2011-tomato/source/blender/bmesh/operators/bmo_inset.c
branches/soc-2011-tomato/source/blender/bmesh/operators/bmo_split_edges.c
branches/soc-2011-tomato/source/blender/bmesh/operators/bmo_subdivide_edgering.c
branches/soc-2011-tomato/source/blender/bmesh/tools/bmesh_edgesplit.c
branches/soc-2011-tomato/source/blender/bmesh/tools/bmesh_edgesplit.h
branches/soc-2011-tomato/source/blender/editors/include/ED_transform.h
branches/soc-2011-tomato/source/blender/editors/mesh/editmesh_knife.c
branches/soc-2011-tomato/source/blender/editors/mesh/editmesh_rip.c
branches/soc-2011-tomato/source/blender/editors/mesh/editmesh_tools.c
branches/soc-2011-tomato/source/blender/editors/space_file/file_panels.c
branches/soc-2011-tomato/source/blender/editors/space_logic/logic_window.c
branches/soc-2011-tomato/source/blender/editors/space_outliner/outliner_edit.c
branches/soc-2011-tomato/source/blender/editors/space_outliner/space_outliner.c
branches/soc-2011-tomato/source/blender/editors/space_view3d/view3d_view.c
branches/soc-2011-tomato/source/blender/editors/transform/transform.c
branches/soc-2011-tomato/source/blender/editors/transform/transform_conversions.c
branches/soc-2011-tomato/source/blender/imbuf/intern/bmp.c
branches/soc-2011-tomato/source/blender/makesdna/DNA_actuator_types.h
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_ID.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_actuator.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_curve.c
branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_edgesplit.c
branches/soc-2011-tomato/source/blender/python/bmesh/bmesh_py_utils.c
branches/soc-2011-tomato/source/blender/render/intern/source/convertblender.c
branches/soc-2011-tomato/source/gameengine/Converter/BL_ActionActuator.cpp
branches/soc-2011-tomato/source/gameengine/Converter/BL_ActionActuator.h
branches/soc-2011-tomato/source/gameengine/Converter/BL_ArmatureObject.cpp
branches/soc-2011-tomato/source/gameengine/Converter/BL_ArmatureObject.h
branches/soc-2011-tomato/source/gameengine/Converter/KX_ConvertActuators.cpp
branches/soc-2011-tomato/source/gameengine/Ketsji/BL_Action.cpp
branches/soc-2011-tomato/source/gameengine/Ketsji/BL_Action.h
branches/soc-2011-tomato/source/gameengine/Ketsji/BL_ActionManager.cpp
branches/soc-2011-tomato/source/gameengine/Ketsji/BL_ActionManager.h
branches/soc-2011-tomato/source/gameengine/Ketsji/KX_Dome.cpp
branches/soc-2011-tomato/source/gameengine/Ketsji/KX_GameObject.cpp
branches/soc-2011-tomato/source/gameengine/Ketsji/KX_GameObject.h
branches/soc-2011-tomato/source/gameengine/Ketsji/KX_KetsjiEngine.cpp
branches/soc-2011-tomato/source/gameengine/Ketsji/KX_KetsjiEngine.h
branches/soc-2011-tomato/source/gameengine/Ketsji/KX_PythonInit.cpp
branches/soc-2011-tomato/source/gameengine/Ketsji/KX_SoundActuator.cpp
Property Changed:
----------------
branches/soc-2011-tomato/
branches/soc-2011-tomato/source/blender/editors/interface/interface.c
branches/soc-2011-tomato/source/blender/editors/space_outliner/
Property changes on: branches/soc-2011-tomato
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/ge_dev:58091-58422
/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-2013-depsgraph_mt:57516
/branches/soc-2013-dingto:57424,57487,57507,57525,57599,57670,57918-57919,57981,58091,58245,58253,58587,58772,58774-58775,58828,58835,59032
/branches/vgroup_modifiers:38694-39989
/tags/blender-2.67b-release/blender:57122
/trunk/blender:36831-59087
+ /branches/ge_dev:58091-58422
/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-2013-depsgraph_mt:57516
/branches/soc-2013-dingto:57424,57487,57507,57525,57599,57670,57918-57919,57981,58091,58245,58253,58587,58772,58774-58775,58828,58835,59032
/branches/vgroup_modifiers:38694-39989
/tags/blender-2.67b-release/blender:57122
/trunk/blender:36831-59172
Modified: branches/soc-2011-tomato/build_files/scons/tools/Blender.py
===================================================================
--- branches/soc-2011-tomato/build_files/scons/tools/Blender.py 2013-08-16 08:03:35 UTC (rev 59172)
+++ branches/soc-2011-tomato/build_files/scons/tools/Blender.py 2013-08-16 08:21:05 UTC (rev 59173)
@@ -151,12 +151,6 @@
libincs += Split(lenv['BF_JACK_LIBPATH'])
if lenv['WITH_BF_SNDFILE']:
libincs += Split(lenv['BF_SNDFILE_LIBPATH'])
- if lenv['WITH_BF_OPENEXR']:
- libincs += Split(lenv['BF_OPENEXR_LIBPATH'])
- if lenv['WITH_BF_STATICOPENEXR']:
- statlibs += Split(lenv['BF_OPENEXR_LIB_STATIC'])
- if lenv['WITH_BF_ZLIB'] and lenv['WITH_BF_STATICZLIB']:
- statlibs += Split(lenv['BF_ZLIB_LIB_STATIC'])
if lenv['WITH_BF_TIFF']:
libincs += Split(lenv['BF_TIFF_LIBPATH'])
if lenv['WITH_BF_STATICTIFF']:
@@ -212,6 +206,12 @@
libincs += Split(lenv['BF_OIIO_LIBPATH'])
if lenv['WITH_BF_STATICOIIO']:
statlibs += Split(lenv['BF_OIIO_LIB_STATIC'])
+ if lenv['WITH_BF_OPENEXR']:
+ libincs += Split(lenv['BF_OPENEXR_LIBPATH'])
+ if lenv['WITH_BF_STATICOPENEXR']:
+ statlibs += Split(lenv['BF_OPENEXR_LIB_STATIC'])
+ if lenv['WITH_BF_ZLIB'] and lenv['WITH_BF_STATICZLIB']:
+ statlibs += Split(lenv['BF_ZLIB_LIB_STATIC'])
if lenv['WITH_BF_OCIO']:
libincs += Split(lenv['BF_OCIO_LIBPATH'])
Modified: branches/soc-2011-tomato/doc/python_api/rst/bge.logic.rst
===================================================================
--- branches/soc-2011-tomato/doc/python_api/rst/bge.logic.rst 2013-08-16 08:03:35 UTC (rev 59172)
+++ branches/soc-2011-tomato/doc/python_api/rst/bge.logic.rst 2013-08-16 08:21:05 UTC (rev 59173)
@@ -362,9 +362,9 @@
Use / as directory separator in path
You can use '//' at the start of the string to define a relative path;
- Blender replaces that string by the directory of the startup .blend or runtime file
- to make a full path name (doesn't change during the game, even if you load other .blend).
- The function also converts the directory separator to the local file system format.
+ Blender replaces that string by the directory of the current .blend or runtime file
+ to make a full path name. The function also converts the directory separator to
+ the local file system format.
:arg path: The path string to be converted/expanded.
:type path: string
@@ -1114,7 +1114,20 @@
:value: 2
+.. _gameobject-playaction-blend:
+.. data:: KX_ACTION_BLEND_BLEND
+
+ Blend layers using linear interpolation
+
+ :value: 0
+
+.. data:: KX_ACTION_BLEND_ADD
+
+ Adds the layers together
+
+ :value: 1
+
-------------
Mouse Buttons
-------------
Modified: branches/soc-2011-tomato/doc/python_api/rst/bge_types/bge.types.KX_GameObject.rst
===================================================================
--- branches/soc-2011-tomato/doc/python_api/rst/bge_types/bge.types.KX_GameObject.rst 2013-08-16 08:03:35 UTC (rev 59172)
+++ branches/soc-2011-tomato/doc/python_api/rst/bge_types/bge.types.KX_GameObject.rst 2013-08-16 08:21:05 UTC (rev 59173)
@@ -776,7 +776,7 @@
Return the value matching key, or the default value if its not found.
:return: The key value or a default.
- .. method:: playAction(name, start_frame, end_frame, layer=0, priority=0, blendin=0, play_mode=ACT_MODE_PLAY, layer_weight=0.0, ipo_flags=0, speed=1.0)
+ .. method:: playAction(name, start_frame, end_frame, layer=0, priority=0, blendin=0, play_mode=KX_ACTION_MODE_PLAY, layer_weight=0.0, ipo_flags=0, speed=1.0, blend_mode=KX_ACTION_BLEND_BLEND)
Plays an action.
@@ -794,12 +794,14 @@
:type blendin: float
:arg play_mode: the play mode
:type play_mode: one of :ref:`these constants <gameobject-playaction-mode>`
- :arg layer_weight: how much of the previous layer to use for blending (0 = add)
+ :arg layer_weight: how much of the previous layer to use for blending
:type layer_weight: float
:arg ipo_flags: flags for the old IPO behaviors (force, etc)
:type ipo_flags: int bitfield
:arg speed: the playback speed of the action as a factor (1.0 = normal speed, 2.0 = 2x speed, etc)
:type speed: float
+ :arg blend_mode: how to blend this layer with previous layers
+ :type blend_mode: one of :ref:`these constants <gameobject-playaction-blend>`
.. method:: stopAction(layer=0)
Modified: branches/soc-2011-tomato/extern/libmv/libmv/tracking/track_region.cc
===================================================================
--- branches/soc-2011-tomato/extern/libmv/libmv/tracking/track_region.cc 2013-08-16 08:03:35 UTC (rev 59172)
+++ branches/soc-2011-tomato/extern/libmv/libmv/tracking/track_region.cc 2013-08-16 08:21:05 UTC (rev 59173)
@@ -796,7 +796,7 @@
parameters[1] = t[1];
// Obtain the rotation via orthorgonal procrustes.
- Mat2 correlation_matrix;
+ Mat2 correlation_matrix = Mat2::Zero();
for (int i = 0; i < 4; ++i) {
correlation_matrix += q1.CornerRelativeToCentroid(i) *
q2.CornerRelativeToCentroid(i).transpose();
@@ -864,7 +864,7 @@
parameters[2] = 1.0 - q2.Scale() / q1.Scale();
// Obtain the rotation via orthorgonal procrustes.
- Mat2 correlation_matrix;
+ Mat2 correlation_matrix = Mat2::Zero();
for (int i = 0; i < 4; ++i) {
correlation_matrix += q1.CornerRelativeToCentroid(i) *
q2.CornerRelativeToCentroid(i).transpose();
Modified: branches/soc-2011-tomato/intern/audaspace/OpenAL/AUD_OpenALDevice.cpp
===================================================================
--- branches/soc-2011-tomato/intern/audaspace/OpenAL/AUD_OpenALDevice.cpp 2013-08-16 08:03:35 UTC (rev 59172)
+++ branches/soc-2011-tomato/intern/audaspace/OpenAL/AUD_OpenALDevice.cpp 2013-08-16 08:21:05 UTC (rev 59173)
@@ -67,6 +67,35 @@
static const char* bufferdata_error = "AUD_OpenALDevice: Buffer couldn't be "
"filled with data.";
+bool AUD_OpenALDevice::AUD_OpenALHandle::pause(bool keep)
+{
+ if(m_status)
+ {
+ AUD_MutexLock lock(*m_device);
+
+ if(m_status == AUD_STATUS_PLAYING)
+ {
+ for(AUD_HandleIterator it = m_device->m_playingSounds.begin(); it != m_device->m_playingSounds.end(); it++)
+ {
+ if(it->get() == this)
+ {
+ boost::shared_ptr<AUD_OpenALHandle> This = *it;
+
+ m_device->m_playingSounds.erase(it);
+ m_device->m_pausedSounds.push_back(This);
+
+ alSourcePause(m_source);
+
+ m_status = keep ? AUD_STATUS_STOPPED : AUD_STATUS_PAUSED;
+
+ return true;
+ }
+ }
+ }
+ }
+
+ return false;}
+
AUD_OpenALDevice::AUD_OpenALHandle::AUD_OpenALHandle(AUD_OpenALDevice* device, ALenum format, boost::shared_ptr<AUD_IReader> reader, bool keep) :
m_isBuffered(false), m_reader(reader), m_keep(keep), m_format(format), m_current(0),
m_eos(false), m_loopcount(0), m_stop(NULL), m_stop_data(NULL), m_status(AUD_STATUS_PLAYING),
@@ -124,32 +153,7 @@
bool AUD_OpenALDevice::AUD_OpenALHandle::pause()
{
- if(m_status)
- {
- AUD_MutexLock lock(*m_device);
-
- if(m_status == AUD_STATUS_PLAYING)
- {
- for(AUD_HandleIterator it = m_device->m_playingSounds.begin(); it != m_device->m_playingSounds.end(); it++)
- {
- if(it->get() == this)
- {
- boost::shared_ptr<AUD_OpenALHandle> This = *it;
-
- m_device->m_playingSounds.erase(it);
- m_device->m_pausedSounds.push_back(This);
-
- alSourcePause(m_source);
-
- m_status = AUD_STATUS_PAUSED;
-
- return true;
- }
- }
- }
- }
-
- return false;
+ return pause(false);
}
bool AUD_OpenALDevice::AUD_OpenALHandle::resume()
@@ -302,6 +306,9 @@
}
}
+ if(m_status == AUD_STATUS_STOPPED)
+ m_status = AUD_STATUS_PAUSED;
+
return true;
}
@@ -409,7 +416,12 @@
{
if(!m_status)
return false;
+
+ if(m_status == AUD_STATUS_STOPPED && (count > m_loopcount || count < 0))
+ m_status = AUD_STATUS_PAUSED;
+
m_loopcount = count;
+
return true;
}
@@ -987,7 +999,7 @@
}
for(it = pauseSounds.begin(); it != pauseSounds.end(); it++)
- (*it)->pause();
+ (*it)->pause(true);
for(it = stopSounds.begin(); it != stopSounds.end(); it++)
(*it)->stop();
Modified: branches/soc-2011-tomato/intern/audaspace/OpenAL/AUD_OpenALDevice.h
===================================================================
--- branches/soc-2011-tomato/intern/audaspace/OpenAL/AUD_OpenALDevice.h 2013-08-16 08:03:35 UTC (rev 59172)
+++ branches/soc-2011-tomato/intern/audaspace/OpenAL/AUD_OpenALDevice.h 2013-08-16 08:21:05 UTC (rev 59173)
@@ -96,6 +96,8 @@
/// Own device.
AUD_OpenALDevice* m_device;
+ bool pause(bool keep);
+
public:
/**
Modified: branches/soc-2011-tomato/intern/audaspace/Python/AUD_PyAPI.cpp
===================================================================
--- branches/soc-2011-tomato/intern/audaspace/Python/AUD_PyAPI.cpp 2013-08-16 08:03:35 UTC (rev 59172)
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list