Merging trunk up to r39447.
authorJoerg Mueller <nexyon@gmail.com>
Tue, 16 Aug 2011 14:11:58 +0000 (14:11 +0000)
committerJoerg Mueller <nexyon@gmail.com>
Tue, 16 Aug 2011 14:11:58 +0000 (14:11 +0000)
34 files changed:
1  2 
build_files/scons/config/darwin-config.py
release/scripts/startup/bl_operators/nla.py
release/scripts/startup/bl_operators/object.py
release/scripts/startup/bl_ui/properties_data_armature.py
release/scripts/startup/bl_ui/properties_game.py
release/scripts/startup/bl_ui/properties_object_constraint.py
release/scripts/startup/bl_ui/properties_render.py
release/scripts/startup/bl_ui/properties_scene.py
release/scripts/startup/bl_ui/space_dopesheet.py
release/scripts/startup/bl_ui/space_graph.py
release/scripts/startup/bl_ui/space_info.py
release/scripts/startup/bl_ui/space_nla.py
release/scripts/startup/bl_ui/space_sequencer.py
release/scripts/startup/bl_ui/space_userpref.py
release/scripts/startup/bl_ui/space_view3d.py
source/blender/blenkernel/intern/depsgraph.c
source/blender/blenkernel/intern/fcurve.c
source/blender/blenkernel/intern/nla.c
source/blender/blenkernel/intern/sequencer.c
source/blender/editors/armature/poseSlide.c
source/blender/editors/gpencil/gpencil_paint.c
source/blender/editors/interface/interface_intern.h
source/blender/editors/object/object_add.c
source/blender/editors/space_file/filelist.c
source/blender/editors/space_nla/nla_edit.c
source/blender/editors/space_outliner/outliner_select.c
source/blender/editors/space_sequencer/sequencer_add.c
source/blender/editors/space_sequencer/sequencer_draw.c
source/blender/editors/space_sequencer/sequencer_edit.c
source/blender/editors/space_view3d/drawobject.c
source/blender/makesrna/RNA_access.h
source/blender/makesrna/intern/rna_access.c
source/blender/makesrna/intern/rna_object.c
source/blender/windowmanager/intern/wm_files.c

@@@ -70,11 -71,8 +71,11 @@@ class DATA_PT_skeleton(ArmatureButtonsP
          flow.prop(arm, "use_deform_envelopes", text="Envelopes")
          flow.prop(arm, "use_deform_preserve_volume", text="Quaternion")
  
 +        if context.scene.render.engine == "BLENDER_GAME":
 +            col = layout.column()
 +            col.prop(arm, "vert_deformer")
  
- class DATA_PT_display(ArmatureButtonsPanel, bpy.types.Panel):
+ class DATA_PT_display(ArmatureButtonsPanel, Panel):
      bl_label = "Display"
  
      def draw(self, context):
          col.prop(arm, "use_deform_delay", text="Delay Refresh")
  
  
- class DATA_PT_bone_group_specials(bpy.types.Menu):
++class DATA_PT_bone_group_specials(Menu):
 +    bl_label = "Bone Group Specials"
 +
 +    def draw(self, context):
 +        layout = self.layout
 +
 +        layout.operator("pose.group_sort", icon='SORTALPHA')
 +
 +
- class DATA_PT_bone_groups(ArmatureButtonsPanel, bpy.types.Panel):
+ class DATA_PT_bone_groups(ArmatureButtonsPanel, Panel):
      bl_label = "Bone Groups"
  
      @classmethod
@@@ -342,10 -343,9 +343,10 @@@ class RENDER_PT_game_performance(Render
          row = layout.row()
          row.prop(gs, "use_frame_rate")
          row.prop(gs, "use_display_lists")
 +        row.prop(gs, "restrict_animation_updates")
  
  
- class RENDER_PT_game_display(RenderButtonsPanel, bpy.types.Panel):
+ class RENDER_PT_game_display(RenderButtonsPanel, Panel):
      bl_label = "Display"
      COMPAT_ENGINES = {'BLENDER_GAME'}
  
@@@ -595,11 -596,12 +596,11 @@@ class RENDER_PT_encoding(RenderButtonsP
  
          col = split.column()
          col.prop(rd, "ffmpeg_audio_bitrate")
 -        col.prop(rd, "ffmpeg_audio_mixrate")
 -
 -        split.prop(rd, "ffmpeg_audio_volume", slider=True)
 +        col = split.column()
 +        col.prop(rd, "ffmpeg_audio_volume", slider=True)
  
  
- class RENDER_PT_bake(RenderButtonsPanel, bpy.types.Panel):
+ class RENDER_PT_bake(RenderButtonsPanel, Panel):
      bl_label = "Bake"
      bl_options = {'DEFAULT_CLOSED'}
      COMPAT_ENGINES = {'BLENDER_RENDER'}
@@@ -43,37 -44,7 +44,37 @@@ class SCENE_PT_scene(SceneButtonsPanel
          layout.prop(scene, "background_set", text="Background")
  
  
- class SCENE_PT_audio(SceneButtonsPanel, bpy.types.Panel):
++class SCENE_PT_audio(SceneButtonsPanel, Panel):
 +    bl_label = "Audio"
 +    COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_GAME'}
 +
 +    def draw(self, context):
 +        layout = self.layout
 +        scene = context.scene
 +        rd = context.scene.render
 +
 +        layout.prop(scene, "audio_volume")
 +        layout.operator("sound.bake_animation")
 +
 +        split = layout.split()
 +
 +        col = split.column()
 +
 +        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")
 +
 +        layout.operator("sound.mixdown")
 +
 +
- class SCENE_PT_unit(SceneButtonsPanel, bpy.types.Panel):
+ class SCENE_PT_unit(SceneButtonsPanel, Panel):
      bl_label = "Units"
      COMPAT_ENGINES = {'BLENDER_RENDER'}
  
@@@ -170,10 -160,8 +164,9 @@@ class NLA_MT_add(Menu)
      def draw(self, context):
          layout = self.layout
  
-         layout.column()
          layout.operator("nla.actionclip_add")
          layout.operator("nla.transition_add")
 +        layout.operator("nla.soundclip_add")
  
          layout.separator()
          layout.operator("nla.meta_add")
@@@ -218,10 -221,9 +225,10 @@@ class SEQUENCER_MT_add_effect(Menu)
          layout.operator("sequencer.effect_strip_add", text="Speed Control").type = 'SPEED'
          layout.operator("sequencer.effect_strip_add", text="Multicam Selector").type = 'MULTICAM'
          layout.operator("sequencer.effect_strip_add", text="Adjustment Layer").type = 'ADJUSTMENT'
 +        layout.operator("sequencer.effect_strip_add", text="Title Card").type = 'TITLE_CARD'
  
  
- class SEQUENCER_MT_strip(bpy.types.Menu):
+ class SEQUENCER_MT_strip(Menu):
      bl_label = "Strip"
  
      def draw(self, context):
@@@ -178,13 -179,9 +179,13 @@@ class VIEW3D_MT_transform(Menu)
  
          layout.operator("object.randomize_transform")
          layout.operator("object.align")
 +        
 +        layout.separator()
 +        
 +        layout.operator("object.anim_transforms_to_deltas")
  
  
- class VIEW3D_MT_mirror(bpy.types.Menu):
+ class VIEW3D_MT_mirror(Menu):
      bl_label = "Mirror"
  
      def draw(self, context):
@@@ -1268,12 -1263,10 +1269,11 @@@ class VIEW3D_MT_pose_transform(Menu)
          layout.operator("pose.rot_clear", text="Rotation")
          layout.operator("pose.scale_clear", text="Scale")
  
 -        layout.label(text="Origin")
 +        layout.separator()
  
 +        layout.operator("pose.user_transforms_clear", text="Reset unkeyed")
  
- class VIEW3D_MT_pose_slide(bpy.types.Menu):
+ class VIEW3D_MT_pose_slide(Menu):
      bl_label = "In-Betweens"
  
      def draw(self, context):
Simple merge