Revision: 38668
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=38668
Author: kjym3
Date: 2011-07-24 23:42:20 +0000 (Sun, 24 Jul 2011)
Log Message:
-----------
Merged changes in the trunk up to revision 38663.
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=38663
Modified Paths:
--------------
branches/soc-2008-mxcurioni/CMakeLists.txt
branches/soc-2008-mxcurioni/intern/audaspace/OpenAL/AUD_OpenALDevice.cpp
branches/soc-2008-mxcurioni/intern/audaspace/OpenAL/AUD_OpenALDevice.h
branches/soc-2008-mxcurioni/release/scripts/startup/bl_operators/object_align.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_operators/screen_play_rendered_anim.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_world.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/space_image.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/space_info.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/space_view3d.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/space_view3d_toolbar.py
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_effect.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/blenkernel/SConscript
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/effect.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/image.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/writeavi.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/writeframeserver.c
branches/soc-2008-mxcurioni/source/blender/editors/include/ED_node.h
branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_templates.c
branches/soc-2008-mxcurioni/source/blender/editors/object/object_bake.c
branches/soc-2008-mxcurioni/source/blender/editors/object/object_edit.c
branches/soc-2008-mxcurioni/source/blender/editors/render/render_shading.c
branches/soc-2008-mxcurioni/source/blender/editors/space_image/image_buttons.c
branches/soc-2008-mxcurioni/source/blender/editors/space_image/image_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/space_node/drawnode.c
branches/soc-2008-mxcurioni/source/blender/editors/space_node/node_edit.c
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/drawobject.c
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/view3d_draw.c
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/view3d_header.c
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/view3d_intern.h
branches/soc-2008-mxcurioni/source/blender/editors/transform/transform.c
branches/soc-2008-mxcurioni/source/blender/editors/transform/transform_conversions.c
branches/soc-2008-mxcurioni/source/blender/editors/transform/transform_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/uvedit/uvedit_ops.c
branches/soc-2008-mxcurioni/source/blender/imbuf/IMB_imbuf.h
branches/soc-2008-mxcurioni/source/blender/imbuf/intern/filter.c
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_image_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_node_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_scene_types.h
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/SConscript
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_image.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_object.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_scene.c
branches/soc-2008-mxcurioni/source/blender/python/mathutils/mathutils_Matrix.c
branches/soc-2008-mxcurioni/source/blender/render/intern/source/convertblender.c
branches/soc-2008-mxcurioni/source/blender/render/intern/source/rendercore.c
branches/soc-2008-mxcurioni/source/gameengine/Expressions/PyObjectPlus.cpp
branches/soc-2008-mxcurioni/source/gameengine/Expressions/PyObjectPlus.h
Property Changed:
----------------
branches/soc-2008-mxcurioni/
branches/soc-2008-mxcurioni/intern/audaspace/OpenAL/
branches/soc-2008-mxcurioni/release/scripts/startup/bl_operators/add_mesh_torus.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_operators/uvcalc_smart_project.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_operators/vertexpaint_dirt.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_data_armature.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_data_bone.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_data_camera.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_data_empty.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_data_lamp.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_data_lattice.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_data_mesh.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_data_metaball.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_data_modifier.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_game.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_material.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_particle.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_physics_field.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_physics_fluid.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_physics_smoke.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_texture.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_world.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/space_node.py
branches/soc-2008-mxcurioni/source/blender/editors/render/render_update.c
branches/soc-2008-mxcurioni/source/blender/editors/uvedit/uvedit_buttons.c
Property changes on: branches/soc-2008-mxcurioni
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/blender:34011-38543
+ /trunk/blender:34011-38663
Modified: branches/soc-2008-mxcurioni/CMakeLists.txt
===================================================================
--- branches/soc-2008-mxcurioni/CMakeLists.txt 2011-07-24 23:29:19 UTC (rev
38667)
+++ branches/soc-2008-mxcurioni/CMakeLists.txt 2011-07-24 23:42:20 UTC (rev
38668)
@@ -155,6 +155,7 @@
option(WITH_IMAGE_CINEON "Enable CINEON and DPX Image Support" ON)
option(WITH_IMAGE_HDR "Enable HDR Image Support" ON)
option(WITH_IMAGE_REDCODE "Enable RedCode Image Support" OFF)
+option(WITH_IMAGE_FRAMESERVER "Enable image FrameServer Support for
rendering" ON)
# Audio/Video format support
option(WITH_CODEC_FFMPEG "Enable FFMPeg Support (http://ffmpeg.org)"
OFF)
Property changes on: branches/soc-2008-mxcurioni/intern/audaspace/OpenAL
___________________________________________________________________
Added: svn:mergeinfo
+ /branches/soc-2011-pepper/intern/audaspace/OpenAL:38630
/trunk/blender/intern/audaspace/OpenAL:34011-38663
Modified:
branches/soc-2008-mxcurioni/intern/audaspace/OpenAL/AUD_OpenALDevice.cpp
===================================================================
--- branches/soc-2008-mxcurioni/intern/audaspace/OpenAL/AUD_OpenALDevice.cpp
2011-07-24 23:29:19 UTC (rev 38667)
+++ branches/soc-2008-mxcurioni/intern/audaspace/OpenAL/AUD_OpenALDevice.cpp
2011-07-24 23:42:20 UTC (rev 38668)
@@ -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-2008-mxcurioni/intern/audaspace/OpenAL/AUD_OpenALDevice.h
===================================================================
--- branches/soc-2008-mxcurioni/intern/audaspace/OpenAL/AUD_OpenALDevice.h
2011-07-24 23:29:19 UTC (rev 38667)
+++ branches/soc-2008-mxcurioni/intern/audaspace/OpenAL/AUD_OpenALDevice.h
2011-07-24 23:42:20 UTC (rev 38668)
@@ -106,7 +106,7 @@
/**
* Starts the streaming thread.
*/
- void start();
+ void start(bool join = true);
/**
* Checks if a handle is valid.
Property changes on:
branches/soc-2008-mxcurioni/release/scripts/startup/bl_operators/add_mesh_torus.py
___________________________________________________________________
Modified: svn:mergeinfo
-
/trunk/blender/release/scripts/startup/bl_operators/add_mesh_torus.py:35829-38543
+
/trunk/blender/release/scripts/startup/bl_operators/add_mesh_torus.py:35829-38663
Modified:
branches/soc-2008-mxcurioni/release/scripts/startup/bl_operators/object_align.py
===================================================================
---
branches/soc-2008-mxcurioni/release/scripts/startup/bl_operators/object_align.py
2011-07-24 23:29:19 UTC (rev 38667)
+++
branches/soc-2008-mxcurioni/release/scripts/startup/bl_operators/object_align.py
2011-07-24 23:42:20 UTC (rev 38668)
@@ -340,7 +340,7 @@
bb_quality = BoolProperty(
name="High Quality",
description="Enables high quality calculation of the bounding box
for perfect results on complex shape meshes with rotation/scale (Slow)",
- default=False)
+ default=True)
align_mode = EnumProperty(items=(
('OPT_1', "Negative Sides", ""),
@@ -380,4 +380,4 @@
self.report({'WARNING'}, "No objects with bound-box selected")
return {'CANCELLED'}
else:
- return {'FINISHED'}
\ No newline at end of file
+ return {'FINISHED'}
Modified:
branches/soc-2008-mxcurioni/release/scripts/startup/bl_operators/screen_play_rendered_anim.py
===================================================================
---
branches/soc-2008-mxcurioni/release/scripts/startup/bl_operators/screen_play_rendered_anim.py
2011-07-24 23:29:19 UTC (rev 38667)
+++
branches/soc-2008-mxcurioni/release/scripts/startup/bl_operators/screen_play_rendered_anim.py
2011-07-24 23:42:20 UTC (rev 38668)
@@ -59,6 +59,9 @@
elif preset == 'MPLAYER':
player_path = "mplayer"
+
+ else:
+ player_path = ""
return player_path
@@ -131,12 +134,14 @@
cmd.extend(opts)
else: # 'CUSTOM'
cmd.append(file)
+
+ if (player_path == "") or (os.path.exists(player_path)==False):
+ self.report({'ERROR'}, "Couldn't find an external animation
player")
+ else:
+ # launch it
+ try:
+ process = subprocess.Popen(cmd)
+ except:
+ pass
- # launch it
- try:
- process = subprocess.Popen(cmd)
- except:
- pass
- #raise OSError("Couldn't find an external animation player.")
-
return {'FINISHED'}
Property changes on:
branches/soc-2008-mxcurioni/release/scripts/startup/bl_operators/uvcalc_smart_project.py
___________________________________________________________________
Modified: svn:mergeinfo
-
/trunk/blender/release/scripts/startup/bl_operators/uvcalc_smart_project.py:35829-38543
+
/trunk/blender/release/scripts/startup/bl_operators/uvcalc_smart_project.py:35829-38663
Property changes on:
branches/soc-2008-mxcurioni/release/scripts/startup/bl_operators/vertexpaint_dirt.py
___________________________________________________________________
Modified: svn:mergeinfo
-
/trunk/blender/release/scripts/startup/bl_operators/vertexpaint_dirt.py:35829-38543
+
/trunk/blender/release/scripts/startup/bl_operators/vertexpaint_dirt.py:35829-38663
Property changes on:
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_data_armature.py
___________________________________________________________________
Modified: svn:mergeinfo
-
/trunk/blender/release/scripts/startup/bl_ui/properties_data_armature.py:35829-38543
+
/trunk/blender/release/scripts/startup/bl_ui/properties_data_armature.py:35829-38663
Property changes on:
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_data_bone.py
___________________________________________________________________
Modified: svn:mergeinfo
-
/trunk/blender/release/scripts/startup/bl_ui/properties_data_bone.py:35829-38543
+
/trunk/blender/release/scripts/startup/bl_ui/properties_data_bone.py:35829-38663
Property changes on:
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_data_camera.py
___________________________________________________________________
Modified: svn:mergeinfo
-
/trunk/blender/release/scripts/startup/bl_ui/properties_data_camera.py:35829-38543
+
/trunk/blender/release/scripts/startup/bl_ui/properties_data_camera.py:35829-38663
Property changes on:
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_data_empty.py
___________________________________________________________________
Modified: svn:mergeinfo
-
/trunk/blender/release/scripts/startup/bl_ui/properties_data_empty.py:35829-38543
+
/trunk/blender/release/scripts/startup/bl_ui/properties_data_empty.py:35829-38663
Property changes on:
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_data_lamp.py
___________________________________________________________________
Modified: svn:mergeinfo
-
/trunk/blender/release/scripts/startup/bl_ui/properties_data_lamp.py:35829-38543
+
/trunk/blender/release/scripts/startup/bl_ui/properties_data_lamp.py:35829-38663
Property changes on:
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_data_lattice.py
___________________________________________________________________
Modified: svn:mergeinfo
-
/trunk/blender/release/scripts/startup/bl_ui/properties_data_lattice.py:35829-38543
+
/trunk/blender/release/scripts/startup/bl_ui/properties_data_lattice.py:35829-38663
Property changes on:
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_data_mesh.py
___________________________________________________________________
Modified: svn:mergeinfo
-
/trunk/blender/release/scripts/startup/bl_ui/properties_data_mesh.py:35829-38543
+
/trunk/blender/release/scripts/startup/bl_ui/properties_data_mesh.py:35829-38663
Property changes on:
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_data_metaball.py
___________________________________________________________________
Modified: svn:mergeinfo
-
/trunk/blender/release/scripts/startup/bl_ui/properties_data_metaball.py:35829-38543
+
/trunk/blender/release/scripts/startup/bl_ui/properties_data_metaball.py:35829-38663
Property changes on:
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_data_modifier.py
___________________________________________________________________
Modified: svn:mergeinfo
-
/trunk/blender/release/scripts/startup/bl_ui/properties_data_modifier.py:35829-38543
+
/trunk/blender/release/scripts/startup/bl_ui/properties_data_modifier.py:35829-38663
Property changes on:
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_game.py
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/blender/release/scripts/startup/bl_ui/properties_game.py:35829-38543
+ /trunk/blender/release/scripts/startup/bl_ui/properties_game.py:35829-38663
Property changes on:
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_material.py
___________________________________________________________________
Modified: svn:mergeinfo
-
/trunk/blender/release/scripts/startup/bl_ui/properties_material.py:35829-38543
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
