From 1263965f83b15e774ab83255030cf25768de5838 Mon Sep 17 00:00:00 2001 From: Antonioya Date: Wed, 7 Sep 2016 09:54:50 +0200 Subject: GPencil: New interpolate strokes operators Two new modal operators to create a grease pencil interpolate drawing for one frame or a complete sequence between two frames. For drawing the temporary strokes in the viewport, two drawing handlers have been added to manage 3D and 2D stuff. Video: https://youtu.be/qxYwO5sSg5Y The operator shortcuts are Ctrl+E and Ctrl+Shift+E. During the modal operator, the interpolation can be adjusted using the mouse (moving left/right) or the wheel mouse. --- source/blender/makesdna/DNA_gpencil_types.h | 2 +- source/blender/makesdna/DNA_scene_types.h | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) (limited to 'source/blender/makesdna') diff --git a/source/blender/makesdna/DNA_gpencil_types.h b/source/blender/makesdna/DNA_gpencil_types.h index 773d203bdb3..23b73424da5 100644 --- a/source/blender/makesdna/DNA_gpencil_types.h +++ b/source/blender/makesdna/DNA_gpencil_types.h @@ -336,7 +336,7 @@ typedef enum eGPdata_Flag { /* Convenience/cache flag to make it easier to quickly toggle onion skinning on/off */ GP_DATA_SHOW_ONIONSKINS = (1 << 9), /* Draw a green and red point to indicate start and end of the stroke */ - GP_DATA_SHOW_DIRECTION = (1 << 10) + GP_DATA_SHOW_DIRECTION = (1 << 10) } eGPdata_Flag; #endif /* __DNA_GPENCIL_TYPES_H__ */ diff --git a/source/blender/makesdna/DNA_scene_types.h b/source/blender/makesdna/DNA_scene_types.h index 9f18a702aef..5c5264afcba 100644 --- a/source/blender/makesdna/DNA_scene_types.h +++ b/source/blender/makesdna/DNA_scene_types.h @@ -1167,7 +1167,11 @@ typedef enum eGP_BrushEdit_SettingsFlag { /* apply brush to strength */ GP_BRUSHEDIT_FLAG_APPLY_STRENGTH = (1 << 2), /* apply brush to thickness */ - GP_BRUSHEDIT_FLAG_APPLY_THICKNESS = (1 << 3) + GP_BRUSHEDIT_FLAG_APPLY_THICKNESS = (1 << 3), + /* apply interpolation to all layers */ + GP_BRUSHEDIT_FLAG_INTERPOLATE_ALL_LAYERS = (1 << 4), + /* apply interpolation to only selected */ + GP_BRUSHEDIT_FLAG_INTERPOLATE_ONLY_SELECTED = (1 << 5) } eGP_BrushEdit_SettingsFlag; -- cgit v1.2.3 From 98c7e7589754500eb4a24825f71e46dd77e29983 Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Mon, 12 Sep 2016 15:31:28 +0200 Subject: Graph editor: Add channel option to make it persistent on display The idea is to allow certain animation channels to be always visible in animation editors. So, for example, one can pin Camera animation to the editor so it is always possible to refine/tweak camera animation when animating something else in the scene. There is probably some more polishing required, and some current limitations could be solved in the future but should be a good starting point already. Currently only works for object without recursing into deeper datablock (so for example, it's not possible to pin object material animation). Studio request by Colin Levy. --- source/blender/makesdna/DNA_anim_types.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'source/blender/makesdna') diff --git a/source/blender/makesdna/DNA_anim_types.h b/source/blender/makesdna/DNA_anim_types.h index 31fe8fe563e..e50a2637fff 100644 --- a/source/blender/makesdna/DNA_anim_types.h +++ b/source/blender/makesdna/DNA_anim_types.h @@ -939,7 +939,10 @@ typedef enum eAnimData_Flag { ADT_UI_ACTIVE = (1<<15), /* F-Curves from this AnimData block are not visible in the Graph Editor */ - ADT_CURVES_NOT_VISIBLE = (1<<16) + ADT_CURVES_NOT_VISIBLE = (1<<16), + + /* F-Curves from this AnimData block are always visible */ + ADT_CURVES_ALWAYS_VISIBLE = (1<<17), } eAnimData_Flag; /* Animation Data recalculation settings (to be set by depsgraph) */ -- cgit v1.2.3