[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [38935] branches/soc-2011-salad: Merging soc-2011-pepper up to r38934.
Joerg Mueller
nexyon at gmail.com
Tue Aug 2 15:51:01 CEST 2011
Revision: 38935
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=38935
Author: nexyon
Date: 2011-08-02 13:51:00 +0000 (Tue, 02 Aug 2011)
Log Message:
-----------
Merging soc-2011-pepper up to r38934.
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=38934
Modified Paths:
--------------
branches/soc-2011-salad/intern/audaspace/FX/AUD_DoubleReader.cpp
branches/soc-2011-salad/intern/audaspace/Python/AUD_PyAPI.cpp
branches/soc-2011-salad/intern/audaspace/intern/AUD_SequencerEntry.cpp
branches/soc-2011-salad/release/scripts/modules/bpy_types.py
branches/soc-2011-salad/release/scripts/startup/bl_ui/__init__.py
branches/soc-2011-salad/release/scripts/startup/bl_ui/properties_scene.py
branches/soc-2011-salad/release/scripts/startup/bl_ui/space_dopesheet.py
branches/soc-2011-salad/release/scripts/startup/bl_ui/space_info.py
branches/soc-2011-salad/source/blender/CMakeLists.txt
branches/soc-2011-salad/source/blender/blenkernel/BKE_main.h
branches/soc-2011-salad/source/blender/blenkernel/BKE_object.h
branches/soc-2011-salad/source/blender/blenkernel/intern/DerivedMesh.c
branches/soc-2011-salad/source/blender/blenkernel/intern/anim_sys.c
branches/soc-2011-salad/source/blender/blenkernel/intern/depsgraph.c
branches/soc-2011-salad/source/blender/blenkernel/intern/idcode.c
branches/soc-2011-salad/source/blender/blenkernel/intern/library.c
branches/soc-2011-salad/source/blender/blenkernel/intern/object.c
branches/soc-2011-salad/source/blender/blenloader/intern/readfile.c
branches/soc-2011-salad/source/blender/blenloader/intern/writefile.c
branches/soc-2011-salad/source/blender/collada/AnimationExporter.cpp
branches/soc-2011-salad/source/blender/collada/AnimationImporter.cpp
branches/soc-2011-salad/source/blender/collada/AnimationImporter.h
branches/soc-2011-salad/source/blender/editors/animation/anim_channels_defines.c
branches/soc-2011-salad/source/blender/editors/animation/anim_channels_edit.c
branches/soc-2011-salad/source/blender/editors/animation/anim_filter.c
branches/soc-2011-salad/source/blender/editors/animation/keyframes_draw.c
branches/soc-2011-salad/source/blender/editors/include/ED_anim_api.h
branches/soc-2011-salad/source/blender/editors/include/UI_resources.h
branches/soc-2011-salad/source/blender/editors/interface/interface_templates.c
branches/soc-2011-salad/source/blender/editors/interface/resources.c
branches/soc-2011-salad/source/blender/editors/object/object_add.c
branches/soc-2011-salad/source/blender/editors/object/object_intern.h
branches/soc-2011-salad/source/blender/editors/object/object_ops.c
branches/soc-2011-salad/source/blender/editors/object/object_relations.c
branches/soc-2011-salad/source/blender/editors/sound/sound_ops.c
branches/soc-2011-salad/source/blender/editors/space_buttons/buttons_context.c
branches/soc-2011-salad/source/blender/editors/space_file/filelist.c
branches/soc-2011-salad/source/blender/editors/space_nla/nla_buttons.c
branches/soc-2011-salad/source/blender/editors/space_nla/nla_channels.c
branches/soc-2011-salad/source/blender/editors/space_outliner/outliner_draw.c
branches/soc-2011-salad/source/blender/editors/space_outliner/outliner_tools.c
branches/soc-2011-salad/source/blender/editors/space_outliner/outliner_tree.c
branches/soc-2011-salad/source/blender/editors/space_view3d/drawobject.c
branches/soc-2011-salad/source/blender/makesdna/DNA_ID.h
branches/soc-2011-salad/source/blender/makesdna/DNA_action_types.h
branches/soc-2011-salad/source/blender/makesdna/DNA_object_types.h
branches/soc-2011-salad/source/blender/makesdna/DNA_userdef_types.h
branches/soc-2011-salad/source/blender/makesdna/intern/makesdna.c
branches/soc-2011-salad/source/blender/makesrna/RNA_access.h
branches/soc-2011-salad/source/blender/makesrna/intern/CMakeLists.txt
branches/soc-2011-salad/source/blender/makesrna/intern/makesrna.c
branches/soc-2011-salad/source/blender/makesrna/intern/rna_ID.c
branches/soc-2011-salad/source/blender/makesrna/intern/rna_action.c
branches/soc-2011-salad/source/blender/makesrna/intern/rna_internal.h
branches/soc-2011-salad/source/blender/makesrna/intern/rna_main.c
branches/soc-2011-salad/source/blender/makesrna/intern/rna_main_api.c
branches/soc-2011-salad/source/blender/makesrna/intern/rna_object.c
branches/soc-2011-salad/source/blender/makesrna/intern/rna_userdef.c
branches/soc-2011-salad/source/gameengine/Converter/BL_SkinDeformer.cpp
branches/soc-2011-salad/source/gameengine/Converter/BL_SkinDeformer.h
branches/soc-2011-salad/source/gameengine/Ketsji/BL_ActionManager.cpp
Added Paths:
-----------
branches/soc-2011-salad/release/scripts/startup/bl_ui/properties_data_speaker.py
branches/soc-2011-salad/source/blender/makesdna/DNA_speaker_types.h
branches/soc-2011-salad/source/blender/makesrna/intern/rna_speaker.c
Property Changed:
----------------
branches/soc-2011-salad/
Property changes on: branches/soc-2011-salad
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/soc-2010-jwilkins:28499-37009
/branches/soc-2010-nicolasbishop:28448-30783,30792-30793,30797-30798,30815
/branches/soc-2011-carrot:36854,37548,37564,37602,37622,37848,38043,38064,38226,38231,38282,38620,38661-38662
/branches/soc-2011-cucumber:36829-36994
/branches/soc-2011-onion:36833-38309
/branches/soc-2011-pepper:36830-38846
/branches/soc-2011-tomato:36831-38900
/trunk/blender:36834-38932
+ /branches/soc-2010-jwilkins:28499-37009
/branches/soc-2010-nicolasbishop:28448-30783,30792-30793,30797-30798,30815
/branches/soc-2011-carrot:36854,37548,37564,37602,37622,37848,38043,38064,38226,38231,38282,38620,38661-38662
/branches/soc-2011-cucumber:36829-36994
/branches/soc-2011-onion:36833-38309
/branches/soc-2011-pepper:36830-38934
/branches/soc-2011-tomato:36831-38900
/trunk/blender:36834-38932
Modified: branches/soc-2011-salad/intern/audaspace/FX/AUD_DoubleReader.cpp
===================================================================
--- branches/soc-2011-salad/intern/audaspace/FX/AUD_DoubleReader.cpp 2011-08-02 12:16:06 UTC (rev 38934)
+++ branches/soc-2011-salad/intern/audaspace/FX/AUD_DoubleReader.cpp 2011-08-02 13:51:00 UTC (rev 38935)
@@ -88,7 +88,24 @@
if(!m_finished1)
{
- m_reader1->read(length, m_finished1, buffer);
+ int len = length;
+
+ m_reader1->read(len, m_finished1, buffer);
+
+ if(len < length)
+ {
+ AUD_Specs specs1, specs2;
+ specs1 = m_reader1->getSpecs();
+ specs2 = m_reader2->getSpecs();
+ if(memcmp(&specs1, &specs2, sizeof(AUD_Specs)))
+ length = len;
+ else
+ {
+ int len2 = length - len;
+ m_reader2->read(len2, eos, buffer + specs1.channels * len);
+ length = len + len2;
+ }
+ }
}
else
{
Modified: branches/soc-2011-salad/intern/audaspace/Python/AUD_PyAPI.cpp
===================================================================
--- branches/soc-2011-salad/intern/audaspace/Python/AUD_PyAPI.cpp 2011-08-02 12:16:06 UTC (rev 38934)
+++ branches/soc-2011-salad/intern/audaspace/Python/AUD_PyAPI.cpp 2011-08-02 13:51:00 UTC (rev 38935)
@@ -144,9 +144,9 @@
Factory_sine(PyTypeObject* type, PyObject* args)
{
float frequency;
- int rate = 44100;
+ double rate = 44100;
- if(!PyArg_ParseTuple(args, "f|i:sine", &frequency, &rate))
+ if(!PyArg_ParseTuple(args, "f|d:sine", &frequency, &rate))
return NULL;
Factory *self;
@@ -2313,7 +2313,7 @@
try
{
AUD_DeviceSpecs specs = (*reinterpret_cast<AUD_Reference<AUD_IDevice>*>(self->device))->getSpecs();
- return Py_BuildValue("i", specs.rate);
+ return Py_BuildValue("d", specs.rate);
}
catch(AUD_Exception& e)
{
Modified: branches/soc-2011-salad/intern/audaspace/intern/AUD_SequencerEntry.cpp
===================================================================
--- branches/soc-2011-salad/intern/audaspace/intern/AUD_SequencerEntry.cpp 2011-08-02 12:16:06 UTC (rev 38934)
+++ branches/soc-2011-salad/intern/audaspace/intern/AUD_SequencerEntry.cpp 2011-08-02 13:51:00 UTC (rev 38935)
@@ -39,7 +39,7 @@
m_status(0),
m_pos_status(1),
m_sound_status(0),
- m_id(0),
+ m_id(id),
m_sound(sound),
m_begin(begin),
m_end(end),
Modified: branches/soc-2011-salad/release/scripts/modules/bpy_types.py
===================================================================
--- branches/soc-2011-salad/release/scripts/modules/bpy_types.py 2011-08-02 12:16:06 UTC (rev 38934)
+++ branches/soc-2011-salad/release/scripts/modules/bpy_types.py 2011-08-02 13:51:00 UTC (rev 38935)
@@ -57,7 +57,7 @@
"curves", "grease_pencil", "groups", "images", \
"lamps", "lattices", "materials", "metaballs", \
"meshes", "node_groups", "objects", "scenes", \
- "sounds", "textures", "texts", "fonts", "worlds"
+ "sounds", "speakers", "textures", "texts", "fonts", "worlds"
return tuple(id_block for attr in attr_links for id_block in getattr(bpy.data, attr) if id_block.library == self)
Modified: branches/soc-2011-salad/release/scripts/startup/bl_ui/__init__.py
===================================================================
--- branches/soc-2011-salad/release/scripts/startup/bl_ui/__init__.py 2011-08-02 12:16:06 UTC (rev 38934)
+++ branches/soc-2011-salad/release/scripts/startup/bl_ui/__init__.py 2011-08-02 13:51:00 UTC (rev 38935)
@@ -36,6 +36,7 @@
"properties_data_mesh",
"properties_data_metaball",
"properties_data_modifier",
+ "properties_data_speaker",
"properties_game",
"properties_material",
"properties_object_constraint",
Copied: branches/soc-2011-salad/release/scripts/startup/bl_ui/properties_data_speaker.py (from rev 38934, branches/soc-2011-pepper/release/scripts/startup/bl_ui/properties_data_speaker.py)
===================================================================
--- branches/soc-2011-salad/release/scripts/startup/bl_ui/properties_data_speaker.py (rev 0)
+++ branches/soc-2011-salad/release/scripts/startup/bl_ui/properties_data_speaker.py 2011-08-02 13:51:00 UTC (rev 38935)
@@ -0,0 +1,129 @@
+# ##### BEGIN GPL LICENSE BLOCK #####
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+#
+# ##### END GPL LICENSE BLOCK #####
+
+# <pep8 compliant>
+import bpy
+from rna_prop_ui import PropertyPanel
+
+
+class DataButtonsPanel():
+ bl_space_type = 'PROPERTIES'
+ bl_region_type = 'WINDOW'
+ bl_context = "data"
+
+ @classmethod
+ def poll(cls, context):
+ engine = context.scene.render.engine
+ return context.speaker and (engine in cls.COMPAT_ENGINES)
+
+
+class DATA_PT_context_speaker(DataButtonsPanel, bpy.types.Panel):
+ bl_label = ""
+ bl_options = {'HIDE_HEADER'}
+ COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_GAME'}
+
+ def draw(self, context):
+ layout = self.layout
+
+ ob = context.object
+ speaker = context.speaker
+ space = context.space_data
+
+ split = layout.split(percentage=0.65)
+
+ if ob:
+ split.template_ID(ob, "data")
+ elif speaker:
+ split.template_ID(space, "pin_id")
+
+
+class DATA_PT_speaker(DataButtonsPanel, bpy.types.Panel):
+ bl_label = "Sound"
+ COMPAT_ENGINES = {'BLENDER_RENDER'}
+
+ def draw(self, context):
+ layout = self.layout
+
+ speaker = context.speaker
+
+ split = layout.split(percentage=0.75)
+
+ split.template_ID(speaker, "sound", open="sound.open")
+ split.prop(speaker, "muted")
+
+ split = layout.split()
+
+ row = split.row()
+
+ row.prop(speaker, "volume")
+ row.prop(speaker, "pitch")
+
+
+class DATA_PT_distance(DataButtonsPanel, bpy.types.Panel):
+ bl_label = "Distance"
+ COMPAT_ENGINES = {'BLENDER_RENDER'}
+
+ def draw(self, context):
+ layout = self.layout
+
+ speaker = context.speaker
+
+ split = layout.split()
+ col = split.column()
+
+ col.label("Volume:")
+ col.prop(speaker, "volume_min", text="Minimum")
+ col.prop(speaker, "volume_max", text="Maximum")
+ col.prop(speaker, "attenuation")
+
+ col = split.column()
+
+ col.label("Distance:")
+ col.prop(speaker, "distance_max", text="Maximum")
+ col.prop(speaker, "distance_reference", text="Reference")
+
+
+class DATA_PT_cone(DataButtonsPanel, bpy.types.Panel):
+ bl_label = "Cone"
+ COMPAT_ENGINES = {'BLENDER_RENDER'}
+
+ def draw(self, context):
+ layout = self.layout
+
+ speaker = context.speaker
+
+ split = layout.split()
+ col = split.column()
+
+ col.label("Angle:")
+ col.prop(speaker, "cone_angle_outer", text="Outer")
+ col.prop(speaker, "cone_angle_inner", text="Inner")
+
+ col = split.column()
+
+ col.label("Volume:")
+ col.prop(speaker, "cone_volume_outer", text="Outer")
+
+
+class DATA_PT_custom_props_speaker(DataButtonsPanel, PropertyPanel, bpy.types.Panel):
+ COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_GAME'}
+ _context_path = "object.data"
+ _property_type = bpy.types.Speaker
+
+if __name__ == "__main__": # only for live edit.
+ bpy.utils.register_module(__name__)
Modified: branches/soc-2011-salad/release/scripts/startup/bl_ui/properties_scene.py
===================================================================
--- branches/soc-2011-salad/release/scripts/startup/bl_ui/properties_scene.py 2011-08-02 12:16:06 UTC (rev 38934)
+++ branches/soc-2011-salad/release/scripts/startup/bl_ui/properties_scene.py 2011-08-02 13:51:00 UTC (rev 38935)
@@ -51,22 +51,24 @@
layout = self.layout
scene = context.scene
rd = context.scene.render
-
- layout.prop(scene, "audio_distance_model")
- layout.prop(scene, "audio_doppler_speed", text="Speed")
- layout.prop(scene, "audio_doppler_factor")
-
layout.prop(scene, "audio_volume")
- layout.operator("sound.update_animation_flags")
layout.operator("sound.bake_animation")
split = layout.split()
col = split.column()
- col.prop(rd, "ffmpeg_audio_mixrate", text="Rate")
+
+ col.label("Listener:")
+ col.prop(scene, "audio_distance_model", text="")
+ col.prop(scene, "audio_doppler_speed", text="Speed")
+ col.prop(scene, "audio_doppler_factor", text="Doppler")
+
col = split.column()
+
+ col.label("Format:")
col.prop(rd, "ffmpeg_audio_channels", text="")
+ col.prop(rd, "ffmpeg_audio_mixrate", text="Rate")
class SCENE_PT_unit(SceneButtonsPanel, bpy.types.Panel):
@@ -101,7 +103,6 @@
col = row.column(align=True)
col.operator("anim.keying_set_add", icon='ZOOMIN', text="")
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list