Revision: 38637
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=38637
Author: nazgul
Date: 2011-07-23 18:42:58 +0000 (Sat, 23 Jul 2011)
Log Message:
-----------
Merging r38615 through r38636 from trunk into soc-2011-tomato
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=38615
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=38636
Modified Paths:
--------------
branches/soc-2011-tomato/intern/audaspace/OpenAL/AUD_OpenALDevice.cpp
branches/soc-2011-tomato/intern/audaspace/OpenAL/AUD_OpenALDevice.h
branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_info.py
branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_view3d.py
branches/soc-2011-tomato/source/blender/editors/object/object_edit.c
Property Changed:
----------------
branches/soc-2011-tomato/
branches/soc-2011-tomato/intern/audaspace/OpenAL/
Property changes on: branches/soc-2011-tomato
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/blender:36831-38614
+ /trunk/blender:36831-38636
Property changes on: branches/soc-2011-tomato/intern/audaspace/OpenAL
___________________________________________________________________
Added: svn:mergeinfo
+ /branches/soc-2011-pepper/intern/audaspace/OpenAL:38630
/trunk/blender/intern/audaspace/OpenAL:36831-38636
Modified: branches/soc-2011-tomato/intern/audaspace/OpenAL/AUD_OpenALDevice.cpp
===================================================================
--- branches/soc-2011-tomato/intern/audaspace/OpenAL/AUD_OpenALDevice.cpp
2011-07-23 18:37:20 UTC (rev 38636)
+++ branches/soc-2011-tomato/intern/audaspace/OpenAL/AUD_OpenALDevice.cpp
2011-07-23 18:42:58 UTC (rev 38637)
@@ -105,12 +105,15 @@
return NULL;
}
-void AUD_OpenALDevice::start()
+void AUD_OpenALDevice::start(bool join)
{
lock();
if(!m_playing)
{
+ if(join)
+ pthread_join(m_thread, NULL);
+
pthread_attr_t attr;
pthread_attr_init(&attr);
pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_JOINABLE);
@@ -271,8 +274,8 @@
// stop thread
if(m_playingSounds->empty() || (cerr != ALC_NO_ERROR))
{
+ m_playing = false;
unlock();
- m_playing = false;
pthread_exit(NULL);
}
@@ -366,6 +369,8 @@
pthread_mutex_init(&m_mutex, &attr);
pthread_mutexattr_destroy(&attr);
+
+ start(false);
}
AUD_OpenALDevice::~AUD_OpenALDevice()
@@ -414,13 +419,8 @@
alcProcessContext(m_context);
// wait for the thread to stop
- if(m_playing)
- {
- unlock();
- pthread_join(m_thread, NULL);
- }
- else
- unlock();
+ unlock();
+ pthread_join(m_thread, NULL);
delete m_playingSounds;
delete m_pausedSounds;
Modified: branches/soc-2011-tomato/intern/audaspace/OpenAL/AUD_OpenALDevice.h
===================================================================
--- branches/soc-2011-tomato/intern/audaspace/OpenAL/AUD_OpenALDevice.h
2011-07-23 18:37:20 UTC (rev 38636)
+++ branches/soc-2011-tomato/intern/audaspace/OpenAL/AUD_OpenALDevice.h
2011-07-23 18:42:58 UTC (rev 38637)
@@ -106,7 +106,7 @@
/**
* Starts the streaming thread.
*/
- void start();
+ void start(bool join = true);
/**
* Checks if a handle is valid.
Modified: branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_info.py
===================================================================
--- branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_info.py
2011-07-23 18:37:20 UTC (rev 38636)
+++ branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_info.py
2011-07-23 18:42:58 UTC (rev 38637)
@@ -60,9 +60,11 @@
layout.template_running_jobs()
layout.template_reports_banner()
+
+ row = layout.row(align=True)
+ row.operator("wm.splash", text="", icon='BLENDER', emboss=False)
+ row.label(text=scene.statistics())
- layout.label(text=scene.statistics())
-
# XXX: this should be right-aligned to the RHS of the region
layout.operator("wm.window_fullscreen_toggle",
icon='FULLSCREEN_ENTER', text="")
Modified: branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_view3d.py
===================================================================
--- branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_view3d.py
2011-07-23 18:37:20 UTC (rev 38636)
+++ branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_view3d.py
2011-07-23 18:42:58 UTC (rev 38637)
@@ -68,7 +68,7 @@
if obj:
# Particle edit
if obj.mode == 'PARTICLE_EDIT':
- row.prop(toolsettings.particle_edit, "select_mode", text="",
expand=True, toggle=True)
+ row.prop(toolsettings.particle_edit, "select_mode", text="",
expand=True)
# Occlude geometry
if view.viewport_shade in {'SOLID', 'SHADED', 'TEXTURED'} and
(obj.mode == 'PARTICLE_EDIT' or (obj.mode == 'EDIT' and obj.type == 'MESH')):
Modified: branches/soc-2011-tomato/source/blender/editors/object/object_edit.c
===================================================================
--- branches/soc-2011-tomato/source/blender/editors/object/object_edit.c
2011-07-23 18:37:20 UTC (rev 38636)
+++ branches/soc-2011-tomato/source/blender/editors/object/object_edit.c
2011-07-23 18:42:58 UTC (rev 38637)
@@ -2162,16 +2162,20 @@
} CTX_DATA_END;
}
}
- else if (ELEM(type, COPY_PROPERTIES_REPLACE, COPY_PROPERTIES_MERGE)) {
+
+ else {
CTX_DATA_BEGIN(C, Object*, ob_iter, selected_editable_objects) {
if (ob != ob_iter) {
if (ob->data != ob_iter->data){
- if (type == 2) {/* merge */
+ if (type == COPY_PROPERTIES_REPLACE)
+ copy_properties(
&ob_iter->prop, &ob->prop );
+
+ /* merge - the default when calling
with no argument */
+ else {
for(prop = ob->prop.first;
prop; prop= prop->next ) {
set_ob_property(ob_iter, prop);
}
- } else /* replace */
- copy_properties(
&ob_iter->prop, &ob->prop );
+ }
}
}
}
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
