Revision: 38664
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=38664
Author: miikah
Date: 2011-07-24 18:01:20 +0000 (Sun, 24 Jul 2011)
Log Message:
-----------
Merge with trunk r38663
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=38663
Modified Paths:
--------------
branches/soc-2011-carrot/intern/audaspace/OpenAL/AUD_OpenALDevice.cpp
branches/soc-2011-carrot/intern/audaspace/OpenAL/AUD_OpenALDevice.h
branches/soc-2011-carrot/release/scripts/startup/bl_operators/screen_play_rendered_anim.py
branches/soc-2011-carrot/release/scripts/startup/bl_ui/properties_world.py
branches/soc-2011-carrot/release/scripts/startup/bl_ui/space_info.py
branches/soc-2011-carrot/release/scripts/startup/bl_ui/space_view3d.py
branches/soc-2011-carrot/release/scripts/startup/bl_ui/space_view3d_toolbar.py
branches/soc-2011-carrot/source/blender/blenkernel/BKE_effect.h
branches/soc-2011-carrot/source/blender/blenkernel/intern/effect.c
branches/soc-2011-carrot/source/blender/editors/interface/interface_templates.c
branches/soc-2011-carrot/source/blender/editors/object/object_edit.c
branches/soc-2011-carrot/source/blender/editors/space_view3d/view3d_header.c
branches/soc-2011-carrot/source/blender/imbuf/IMB_imbuf.h
branches/soc-2011-carrot/source/blender/imbuf/intern/filter.c
branches/soc-2011-carrot/source/blender/makesrna/intern/rna_scene.c
branches/soc-2011-carrot/source/blender/render/intern/source/rendercore.c
Property Changed:
----------------
branches/soc-2011-carrot/
branches/soc-2011-carrot/intern/audaspace/OpenAL/
Property changes on: branches/soc-2011-carrot
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/blender:36828-38619
+ /trunk/blender:36828-38663
Property changes on: branches/soc-2011-carrot/intern/audaspace/OpenAL
___________________________________________________________________
Added: svn:mergeinfo
+ /branches/soc-2011-pepper/intern/audaspace/OpenAL:38630
/trunk/blender/intern/audaspace/OpenAL:36828-38663
Modified: branches/soc-2011-carrot/intern/audaspace/OpenAL/AUD_OpenALDevice.cpp
===================================================================
--- branches/soc-2011-carrot/intern/audaspace/OpenAL/AUD_OpenALDevice.cpp
2011-07-24 17:44:22 UTC (rev 38663)
+++ branches/soc-2011-carrot/intern/audaspace/OpenAL/AUD_OpenALDevice.cpp
2011-07-24 18:01:20 UTC (rev 38664)
@@ -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-carrot/intern/audaspace/OpenAL/AUD_OpenALDevice.h
===================================================================
--- branches/soc-2011-carrot/intern/audaspace/OpenAL/AUD_OpenALDevice.h
2011-07-24 17:44:22 UTC (rev 38663)
+++ branches/soc-2011-carrot/intern/audaspace/OpenAL/AUD_OpenALDevice.h
2011-07-24 18:01:20 UTC (rev 38664)
@@ -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-carrot/release/scripts/startup/bl_operators/screen_play_rendered_anim.py
===================================================================
---
branches/soc-2011-carrot/release/scripts/startup/bl_operators/screen_play_rendered_anim.py
2011-07-24 17:44:22 UTC (rev 38663)
+++
branches/soc-2011-carrot/release/scripts/startup/bl_operators/screen_play_rendered_anim.py
2011-07-24 18:01:20 UTC (rev 38664)
@@ -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'}
Modified:
branches/soc-2011-carrot/release/scripts/startup/bl_ui/properties_world.py
===================================================================
--- branches/soc-2011-carrot/release/scripts/startup/bl_ui/properties_world.py
2011-07-24 17:44:22 UTC (rev 38663)
+++ branches/soc-2011-carrot/release/scripts/startup/bl_ui/properties_world.py
2011-07-24 18:01:20 UTC (rev 38664)
@@ -20,9 +20,7 @@
import bpy
from rna_prop_ui import PropertyPanel
-# TODO, "color_range" not in the UI
-
class WorldButtonsPanel():
bl_space_type = 'PROPERTIES'
bl_region_type = 'WINDOW'
@@ -95,6 +93,10 @@
col.prop(world, "zenith_color")
col.active = world.use_sky_blend
row.column().prop(world, "ambient_color")
+
+ row = layout.row()
+ row.prop(world, "exposure")
+ row.prop(world, "color_range")
class WORLD_PT_ambient_occlusion(WorldButtonsPanel, bpy.types.Panel):
Modified: branches/soc-2011-carrot/release/scripts/startup/bl_ui/space_info.py
===================================================================
--- branches/soc-2011-carrot/release/scripts/startup/bl_ui/space_info.py
2011-07-24 17:44:22 UTC (rev 38663)
+++ branches/soc-2011-carrot/release/scripts/startup/bl_ui/space_info.py
2011-07-24 18:01:20 UTC (rev 38664)
@@ -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-carrot/release/scripts/startup/bl_ui/space_view3d.py
===================================================================
--- branches/soc-2011-carrot/release/scripts/startup/bl_ui/space_view3d.py
2011-07-24 17:44:22 UTC (rev 38663)
+++ branches/soc-2011-carrot/release/scripts/startup/bl_ui/space_view3d.py
2011-07-24 18:01:20 UTC (rev 38664)
@@ -54,21 +54,13 @@
sub.menu("VIEW3D_MT_object")
row = layout.row()
- row.template_header_3D()
+ # Contains buttons like Mode, Pivot, Manipulator, Layer, Mesh Select
Mode...
+ row.template_header_3D()
- # do in C for now since these buttons cant be both toggle AND
exclusive.
- '''
- if obj and obj.mode == 'EDIT' and obj.type == 'MESH':
- row_sub = row.row(align=True)
- row_sub.prop(toolsettings, "mesh_select_mode", text="", index=0,
icon='VERTEXSEL')
- row_sub.prop(toolsettings, "mesh_select_mode", text="", index=1,
icon='EDGESEL')
- row_sub.prop(toolsettings, "mesh_select_mode", text="", index=2,
icon='FACESEL')
- '''
-
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-carrot/release/scripts/startup/bl_ui/space_view3d_toolbar.py
===================================================================
---
branches/soc-2011-carrot/release/scripts/startup/bl_ui/space_view3d_toolbar.py
2011-07-24 17:44:22 UTC (rev 38663)
+++
branches/soc-2011-carrot/release/scripts/startup/bl_ui/space_view3d_toolbar.py
2011-07-24 18:01:20 UTC (rev 38664)
@@ -116,7 +116,8 @@
col.operator("transform.translate")
col.operator("transform.rotate")
col.operator("transform.resize", text="Scale")
- col.operator("transform.shrink_fatten", text="Along Normal")
+ col.operator("transform.shrink_fatten", text="Shrink/Fatten")
+ col.operator("transform.push_pull", text="Push/Pull")
col = layout.column(align=True)
col.label(text="Deform:")
Modified: branches/soc-2011-carrot/source/blender/blenkernel/BKE_effect.h
===================================================================
--- branches/soc-2011-carrot/source/blender/blenkernel/BKE_effect.h
2011-07-24 17:44:22 UTC (rev 38663)
+++ branches/soc-2011-carrot/source/blender/blenkernel/BKE_effect.h
2011-07-24 18:01:20 UTC (rev 38664)
@@ -105,6 +105,7 @@
/* precalculated for guides */
struct GuideEffectorData *guide_data;
float guide_loc[4], guide_dir[3], guide_radius;
+ float velocity[3];
float frame;
int flag;
Modified: branches/soc-2011-carrot/source/blender/blenkernel/intern/effect.c
===================================================================
--- branches/soc-2011-carrot/source/blender/blenkernel/intern/effect.c
2011-07-24 17:44:22 UTC (rev 38663)
+++ branches/soc-2011-carrot/source/blender/blenkernel/intern/effect.c
2011-07-24 18:01:20 UTC (rev 38664)
@@ -241,6 +241,16 @@
}
else if(eff->psys)
psys_update_particle_tree(eff->psys, eff->scene->r.cfra);
+
+ /* Store object velocity */
+ if(eff->ob) {
+ float old_vel[3];
+
+ where_is_object_time(eff->scene, eff->ob, cfra - 1.0f);
+ copy_v3_v3(old_vel, eff->ob->obmat[3]);
+ where_is_object_time(eff->scene, eff->ob, cfra);
+ sub_v3_v3v3(eff->velocity, eff->ob->obmat[3], old_vel);
+ }
}
static EffectorCache *new_effector_cache(Scene *scene, Object *ob,
ParticleSystem *psys, PartDeflect *pd)
{
@@ -680,10 +690,6 @@
Object *ob = eff->ob;
Object obcopy = *ob;
- /* XXX this is not thread-safe, but used from multiple threads
by
- particle system */
- where_is_object_time(eff->scene, ob, cfra);
-
/* use z-axis as normal*/
normalize_v3_v3(efd->nor, ob->obmat[2]);
@@ -702,14 +708,9 @@
VECCOPY(efd->loc, ob->obmat[3]);
}
- if(real_velocity) {
- VECCOPY(efd->vel, ob->obmat[3]);
+ if(real_velocity)
+ copy_v3_v3(efd->vel, eff->velocity);
- where_is_object_time(eff->scene, ob, cfra - 1.0f);
-
- sub_v3_v3v3(efd->vel, efd->vel, ob->obmat[3]);
- }
-
*eff->ob = obcopy;
efd->size = 0.0f;
Modified:
branches/soc-2011-carrot/source/blender/editors/interface/interface_templates.c
===================================================================
---
branches/soc-2011-carrot/source/blender/editors/interface/interface_templates.c
2011-07-24 17:44:22 UTC (rev 38663)
+++
branches/soc-2011-carrot/source/blender/editors/interface/interface_templates.c
2011-07-24 18:01:20 UTC (rev 38664)
@@ -853,7 +853,7 @@
/* verify we have valid data */
if(!RNA_struct_is_a(ptr->type, &RNA_Modifier)) {
- RNA_warning("uiTemplateModifier: expected modifier on
object.\n");
+ RNA_warning("uiTemplateModifier: Expected modifier on
object.\n");
return NULL;
}
@@ -861,7 +861,7 @@
md= ptr->data;
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
