[Bf-blender-cvs] [5b643018348] blender2.8: Merge branch 'master' into blender2.8
Campbell Barton
noreply at git.blender.org
Mon Jun 4 09:07:07 CEST 2018
Commit: 5b643018348280ee601a20fb9329d5a313c23446
Author: Campbell Barton
Date: Mon Jun 4 09:06:14 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB5b643018348280ee601a20fb9329d5a313c23446
Merge branch 'master' into blender2.8
===================================================================
===================================================================
diff --cc release/scripts/startup/bl_ui/space_dopesheet.py
index f3841de3ba4,371ab088190..3fedf8bc08c
--- a/release/scripts/startup/bl_ui/space_dopesheet.py
+++ b/release/scripts/startup/bl_ui/space_dopesheet.py
@@@ -118,33 -117,12 +118,33 @@@ class DOPESHEET_HT_header(Header)
row = layout.row(align=True)
row.template_header()
-
+
- DOPESHEET_MT_editor_menus.draw_collapsible(context, layout)
-
+ # XXX: perhaps our mode menu can be retired eventually when we get editor submodes in the main menu?
layout.prop(st, "mode", text="")
+ if st.mode == 'TIMELINE':
+ TIME_MT_editor_menus.draw_collapsible(context, layout)
+ TIME_HT_editor_buttons.draw_header(context, layout)
+ else:
+ DOPESHEET_MT_editor_menus.draw_collapsible(context, layout)
+ DOPESHEET_HT_editor_buttons.draw_header(context, layout)
+
+
+# Header for "normal" dopesheet editor modes (e.g. Dope Sheet, Action, Shape Keys, etc.)
+# XXX: Temporary, until we have editor submodes in the actual editors menu
+class DOPESHEET_HT_editor_buttons(Header):
+ bl_idname = "DOPESHEET_HT_editor_buttons"
+ bl_space_type = 'DOPESHEET_EDITOR'
+ bl_label = ""
+
+ def draw(self, context):
+ pass
+
+ @staticmethod
+ def draw_header(context, layout):
+ st = context.space_data
+ toolsettings = context.tool_settings
+
if st.mode in {'ACTION', 'SHAPEKEY'}:
row = layout.row(align=True)
row.operator("action.layer_prev", text="", icon='TRIA_DOWN')
diff --cc release/scripts/startup/bl_ui/space_time.py
index 48ac85f0d0e,9026a93aa99..d5609e219e3
--- a/release/scripts/startup/bl_ui/space_time.py
+++ b/release/scripts/startup/bl_ui/space_time.py
@@@ -277,35 -232,46 +277,35 @@@ class TIME_PT_keyframing_settings(Timel
def draw(self, context):
layout = self.layout
- toolsettings = context.tool_settings
-
- layout.prop_enum(toolsettings, "auto_keying_mode", 'ADD_REPLACE_KEYS')
- layout.prop_enum(toolsettings, "auto_keying_mode", 'REPLACE_KEYS')
+ scene = context.scene
+ toolsettings = context.tool_settings
+ userprefs = context.user_preferences
-def marker_menu_generic(layout):
- from bpy import context
-
- # layout.operator_context = 'EXEC_REGION_WIN'
-
- layout.column()
- layout.operator("marker.add", "Add Marker")
- layout.operator("marker.duplicate", text="Duplicate Marker")
-
- if len(bpy.data.scenes) > 10:
- layout.operator_context = 'INVOKE_DEFAULT'
- layout.operator("marker.make_links_scene", text="Duplicate Marker to Scene...", icon='OUTLINER_OB_EMPTY')
- else:
- layout.operator_menu_enum("marker.make_links_scene", "scene", text="Duplicate Marker to Scene")
-
- layout.operator("marker.delete", text="Delete Marker")
-
- layout.separator()
-
- layout.operator("marker.rename", text="Rename Marker")
- layout.operator("marker.move", text="Grab/Move Marker")
+ col = layout.column(align=True)
+ col.label("Active Keying Set:")
+ row = col.row(align=True)
+ row.prop_search(scene.keying_sets_all, "active", scene, "keying_sets_all", text="")
+ row.operator("anim.keyframe_insert", text="", icon='KEY_HLT')
+ row.operator("anim.keyframe_delete", text="", icon='KEY_DEHLT')
- layout.separator()
+ col = layout.column(align=True)
+ col.label("New Keyframe Type:")
+ col.prop(toolsettings, "keyframe_type", text="")
-
+
- layout.operator("screen.marker_jump", text="Jump to Next Marker").next = True
- layout.operator("screen.marker_jump", text="Jump to Previous Marker").next = False
+ col = layout.column(align=True)
+ col.label("Auto Keyframing:")
+ row = col.row()
+ row.prop(toolsettings, "auto_keying_mode", text="")
+ row.prop(toolsettings, "use_keyframe_insert_keyingset", text="")
+ if not userprefs.edit.use_keyframe_insert_available:
+ col.prop(toolsettings, "use_record_with_nla", text="Layered Recording")
- layout.separator()
- ts = context.tool_settings
- layout.prop(ts, "lock_markers")
+###################################
classes = (
- TIME_HT_header,
+ TIME_HT_editor_buttons,
TIME_MT_editor_menus,
TIME_MT_marker,
TIME_MT_view,
diff --cc source/blender/python/intern/bpy_rna_anim.c
index 3bbeaea2674,693ff954993..192738535b4
--- a/source/blender/python/intern/bpy_rna_anim.c
+++ b/source/blender/python/intern/bpy_rna_anim.c
@@@ -231,10 -231,9 +231,10 @@@ PyObject *pyrna_struct_keyframe_insert(
* strips themselves. These are stored separately or else the properties will
* not have any effect.
*/
+ struct Depsgraph *depsgraph = CTX_data_depsgraph(BPy_GetContext());
ReportList reports;
short result = 0;
-
+
PointerRNA ptr = self->ptr;
PropertyRNA *prop = NULL;
const char *prop_name;
@@@ -252,8 -251,8 +252,8 @@@
if (prop) {
NlaStrip *strip = (NlaStrip *)ptr.data;
FCurve *fcu = list_find_fcurve(&strip->fcurves, RNA_property_identifier(prop), index);
-
+
- result = insert_keyframe_direct(&reports, ptr, prop, fcu, cfra, keytype, options);
+ result = insert_keyframe_direct(depsgraph, &reports, ptr, prop, fcu, cfra, keytype, options);
}
else {
BKE_reportf(&reports, RPT_ERROR, "Could not resolve path (%s)", path_full);
More information about the Bf-blender-cvs
mailing list