archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity
This repository has been archived on 2023-10-09. You can view files and clone it, but cannot push or open issues or pull requests.
Files
da6dea5701311f41c7d70429b111b901b6bcf966
blender-archive/source/blender/editors/space_nla/nla_buttons.c

Ignoring revisions in .git-blame-ignore-revs. Click here to bypass and see the normal blame view.

662 lines
20 KiB
C
Raw Normal View History

doxygen: prevent GPL license block from being parsed as doxygen comment.
2011-02-23 10:52:22 +00:00
/*
NLA SoC: Adding skeleton code for a buttons region in NLA If anyone's doing any testing at this point, please check if this works ok for files with new/old NLA Editors, as I was having some problems with one of my testing (saved from this branch) files with this.
2009-06-07 11:37:15 +00:00
* 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
Cleanup: trailing whitespace (comment blocks) Strip unindented comment blocks - mainly headers to avoid conflicts.
2018-06-01 18:19:39 +02:00
* of the License, or (at your option) any later version.
NLA SoC: Adding skeleton code for a buttons region in NLA If anyone's doing any testing at this point, please check if this works ok for files with new/old NLA Editors, as I was having some problems with one of my testing (saved from this branch) files with this.
2009-06-07 11:37:15 +00:00
*
* 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,
correct fsf address
2010-02-12 13:34:04 +00:00
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
NLA SoC: Adding skeleton code for a buttons region in NLA If anyone's doing any testing at this point, please check if this works ok for files with new/old NLA Editors, as I was having some problems with one of my testing (saved from this branch) files with this.
2009-06-07 11:37:15 +00:00
*
* The Original Code is Copyright (C) 2009 Blender Foundation.
* All rights reserved.
*/
doxygen: add newline after \file While \file doesn't need an argument, it can't have another doxy command after it.
2019-02-18 08:08:12 +11:00
/** \file
* \ingroup spnla
doxygen: blender/editors tagged.
2011-02-27 20:29:51 +00:00
*/
NLA SoC: Adding skeleton code for a buttons region in NLA If anyone's doing any testing at this point, please check if this works ok for files with new/old NLA Editors, as I was having some problems with one of my testing (saved from this branch) files with this.
2009-06-07 11:37:15 +00:00
#include <float.h>
Cleanup: `make format` after SortedIncludes change
2020-03-19 09:33:03 +01:00
#include <math.h>
#include <stdio.h>
#include <string.h>
NLA SoC: Adding skeleton code for a buttons region in NLA If anyone's doing any testing at this point, please check if this works ok for files with new/old NLA Editors, as I was having some problems with one of my testing (saved from this branch) files with this.
2009-06-07 11:37:15 +00:00
#include "DNA_anim_types.h"
split BKE_utildefines.h, now it only has blender specific defines like GS() MAKE_ID, FILE_MAXDIR, moved the generic defines to BLI_utildefines.h. no functional changes.
2011-01-07 18:36:47 +00:00
#include "BLI_utildefines.h"
NLA SoC: Adding skeleton code for a buttons region in NLA If anyone's doing any testing at this point, please check if this works ok for files with new/old NLA Editors, as I was having some problems with one of my testing (saved from this branch) files with this.
2009-06-07 11:37:15 +00:00
#include "MEM_guardedalloc.h"
#include "BLI_blenlib.h"
Refactor translation code out of blenfont - Add blentranslation `BLT_*` module. - moved & split `BLF_translation.h` into (`BLT_translation.h`, `BLT_lang.h`). - moved `BLF_*_unifont` functions from `blf_translation.c` to new source file `blf_font_i18n.c`.
2015-08-16 17:32:01 +10:00
#include "BLT_translation.h"
finish user preference dlg's input handles
2011-07-08 04:32:45 +00:00
NLA SoC: Adding skeleton code for a buttons region in NLA If anyone's doing any testing at this point, please check if this works ok for files with new/old NLA Editors, as I was having some problems with one of my testing (saved from this branch) files with this.
2009-06-07 11:37:15 +00:00
#include "BKE_context.h"
Cleanup: `make format` after SortedIncludes change
2020-03-19 09:33:03 +01:00
#include "BKE_nla.h"
NLA SoC: Adding skeleton code for a buttons region in NLA If anyone's doing any testing at this point, please check if this works ok for files with new/old NLA Editors, as I was having some problems with one of my testing (saved from this branch) files with this.
2009-06-07 11:37:15 +00:00
#include "BKE_screen.h"
#include "WM_api.h"
#include "WM_types.h"
#include "RNA_access.h"
#include "ED_anim_api.h"
#include "ED_screen.h"
#include "UI_interface.h"
#include "UI_resources.h"
style cleanup: nla
2012-05-08 18:05:57 +00:00
#include "nla_intern.h" /* own include */
NLA SoC: Adding skeleton code for a buttons region in NLA If anyone's doing any testing at this point, please check if this works ok for files with new/old NLA Editors, as I was having some problems with one of my testing (saved from this branch) files with this.
2009-06-07 11:37:15 +00:00
/* ******************* nla editor space & buttons ************** */
/* -------------- */
code cleanup: some structs were declaring data when only typedef's were intended, make local vars and functions static.
2013-08-07 03:44:05 +00:00
static void do_nla_region_buttons(bContext *C, void *UNUSED(arg), int UNUSED(event))
NLA SoC: Adding skeleton code for a buttons region in NLA If anyone's doing any testing at this point, please check if this works ok for files with new/old NLA Editors, as I was having some problems with one of my testing (saved from this branch) files with this.
2009-06-07 11:37:15 +00:00
{
ClangFormat: run with ReflowComments on source/ Prepare for enabling ReflowComments.
2019-05-01 11:09:22 +10:00
// Scene *scene = CTX_data_scene(C);
code cleanup: some structs were declaring data when only typedef's were intended, make local vars and functions static.
2013-08-07 03:44:05 +00:00
#if 0
style cleanup: changes to brace placement / newlines - for/while/if/switch
2012-04-28 06:31:57 +00:00
switch (event) {
Cleanup: indentation
2018-04-16 17:08:27 +02:00
/* pass */
NLA SoC: Adding skeleton code for a buttons region in NLA If anyone's doing any testing at this point, please check if this works ok for files with new/old NLA Editors, as I was having some problems with one of my testing (saved from this branch) files with this.
2009-06-07 11:37:15 +00:00
}
code cleanup: some structs were declaring data when only typedef's were intended, make local vars and functions static.
2013-08-07 03:44:05 +00:00
#endif
NLA SoC: Adding skeleton code for a buttons region in NLA If anyone's doing any testing at this point, please check if this works ok for files with new/old NLA Editors, as I was having some problems with one of my testing (saved from this branch) files with this.
2009-06-07 11:37:15 +00:00
/* default for now */
style cleanup: nla
2012-05-08 18:05:57 +00:00
WM_event_add_notifier(C, NC_OBJECT | ND_TRANSFORM, NULL);
WM_event_add_notifier(C, NC_SCENE | ND_TRANSFORM, NULL);
NLA SoC: Adding skeleton code for a buttons region in NLA If anyone's doing any testing at this point, please check if this works ok for files with new/old NLA Editors, as I was having some problems with one of my testing (saved from this branch) files with this.
2009-06-07 11:37:15 +00:00
}
NLA Pushdown Operator: Active animdata option + More error handling * If channel_index = -1, the pushdown operator will try to use the active AnimData block. To see which one this will be, check the properties (NKEY) region in NLA Editor. * Added more detailed error handling for the various cases where things are not in a valid state for pushing down an action. This is notably to stop scripters from putting the NLA into an inconsistent state.
2014-05-05 14:15:28 +12:00
bool nla_panel_context(const bContext *C,
PointerRNA *adt_ptr,
PointerRNA *nlt_ptr,
PointerRNA *strip_ptr)
NLA SoC: Adding skeleton code for a buttons region in NLA If anyone's doing any testing at this point, please check if this works ok for files with new/old NLA Editors, as I was having some problems with one of my testing (saved from this branch) files with this.
2009-06-07 11:37:15 +00:00
{
bAnimContext ac;
style cleanup: nla
2012-05-08 18:05:57 +00:00
bAnimListElem *ale = NULL;
NLA SoC: Added buttons in NKEY region for NLA Editor - Most of the settings wrapped in RNA have been exposed here using the new layout engine stuff from Brecht (C-API). I've tried to maintain a hierarchy of high-level (owner, generic-settings) to low-level (children, specialised-settings) here, which seems to be the prevailing guidelines? (It took a while to try to understand how this all fitted together, since there were no clear examples on how to use this anywhere) - NLA-Strip Modifiers have not been exposed yet. They still use the old-style drawing, which may/may not be compatible here. - Fixed a bug with how the notifiers from this panel get sent. I really don't know how the compiler would have missed the undeclared pointer that was being used ('ob').
2009-06-09 04:39:33 +00:00
ListBase anim_data = {NULL, NULL};
NLA Pushdown Operator: Active animdata option + More error handling * If channel_index = -1, the pushdown operator will try to use the active AnimData block. To see which one this will be, check the properties (NKEY) region in NLA Editor. * Added more detailed error handling for the various cases where things are not in a valid state for pushing down an action. This is notably to stop scripters from putting the NLA into an inconsistent state.
2014-05-05 14:15:28 +12:00
short found = 0; /* not bool, since we need to indicate "found but not ideal" status */
NLA SoC: Added buttons in NKEY region for NLA Editor - Most of the settings wrapped in RNA have been exposed here using the new layout engine stuff from Brecht (C-API). I've tried to maintain a hierarchy of high-level (owner, generic-settings) to low-level (children, specialised-settings) here, which seems to be the prevailing guidelines? (It took a while to try to understand how this all fitted together, since there were no clear examples on how to use this anywhere) - NLA-Strip Modifiers have not been exposed yet. They still use the old-style drawing, which may/may not be compatible here. - Fixed a bug with how the notifiers from this panel get sent. I really don't know how the compiler would have missed the undeclared pointer that was being used ('ob').
2009-06-09 04:39:33 +00:00
int filter;
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Cleanup: comments (long lines) in editors
2019-04-22 00:18:34 +10:00
/* For now, only draw if we could init the anim-context info
* (necessary for all animation-related tools)
* to work correctly is able to be correctly retrieved. There's no point showing empty panels? */
Cleanup: style, use braces for editors
2019-04-22 09:19:45 +10:00
if (ANIM_animdata_get_context(C, &ac) == 0) {
NLA Pushdown Operator: Active animdata option + More error handling * If channel_index = -1, the pushdown operator will try to use the active AnimData block. To see which one this will be, check the properties (NKEY) region in NLA Editor. * Added more detailed error handling for the various cases where things are not in a valid state for pushing down an action. This is notably to stop scripters from putting the NLA into an inconsistent state.
2014-05-05 14:15:28 +12:00
return false;
Cleanup: style, use braces for editors
2019-04-22 09:19:45 +10:00
}
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Cleanup: strip trailing space in editors
2018-06-04 09:31:30 +02:00
/* extract list of active channel(s), of which we should only take the first one
Cleanup: comment block tabs
2018-11-14 12:53:15 +11:00
* - we need the channels flag to get the active AnimData block when there are no NLA Tracks
2.5 - Assorted Animation UI/Editing Tweaks Main Feature: * It is now possible to choose which AnimData block is the 'active' one for editing, and/or select them too. AnimData blocks are generally the dark blue and lighter-blue expanders (i.e. Scene, Object, Camera, Lamp, Curve, Armature, etc.) * Objects are no longer selected/deselected when AKEY is used to toggle selection of channels. This was getting a bit annoying. * Following on from selection of AnimData blocks, it is now possible to select/make active an AnimData block in the animation editors, and change the active action for that block via the 'Animation Data' panel in NLA Editor's properties region. --> Be aware that user-counts are not totally handled correctly there yet, so some funky behaviour might be seen... --> It is possible to assign a new action, or to assign an existing one, allowing to switch between actions as in the past with Actions/IPO Editors... Other tweaks: * Some code tweaks towards making the 'Euler Filter' feature for Graph Editor working sometime soon * Added some backend code for snapping the values of keyframes to a single value. Still need to work out some UI for it though. * Shuffled the code for ACT_OT_new() around, and removed the poll() callback so that it worked in NLA too. * Fixed some more notifier bugs with deleting bones and a few other editmode operations for Armatures.
2009-09-27 04:22:04 +00:00
*/
Animation Channel Filtering Refactor - Part 3 (Visibility Flag Split) * This (big) commit is aimed at cleaning up the filtering flags used by the animation channel filtering code. The list of filtering flags has been growing a bit "organically" since it's humble origins for use in the Action Editor some 3 years (IIRC) ago now during a weekend hackathon. Obviously, some things have ended up tacked on, while others have been the product of other flag options. Nevertheless, it was time for a bit of a spring clean! * Most notably, one area where the system outgrown its original design for the Action Editor was in terms of the "visibility" filtering flag it was using. While in the Action Editor the concept of what channels to include was strictly dictated by whether the channel hierarchy showed it, in the Graph Editor this is not always the case. In other words, there was a difference between the data the channels represented being visible and the channels for that data being visible in the hierarchy. Long story short: this lead to bug report [#27076] (and many like it), where if you selected an F-Curve, then collapsed the Group it was in, then even after selecting another F-Curve in another Group, the original F-Curve's properties would still be shown in the Properties Region. The good news is that this commit fixes this issue right away! * More good news will follow, as I start checking on the flag usage of other tools, but I'm committing this first so that we have a stable reference (of code similar to the old buggy stuff) on which we can fall back to later to find bugs (should they pop up). Anyways, back to the trenches!
2011-06-22 11:41:26 +00:00
/* XXX: double-check active! */
style cleanup: nla
2012-05-08 18:05:57 +00:00
filter = (ANIMFILTER_DATA_VISIBLE | ANIMFILTER_LIST_VISIBLE | ANIMFILTER_ACTIVE |
ANIMFILTER_LIST_CHANNELS);
NLA SoC: Added buttons in NKEY region for NLA Editor - Most of the settings wrapped in RNA have been exposed here using the new layout engine stuff from Brecht (C-API). I've tried to maintain a hierarchy of high-level (owner, generic-settings) to low-level (children, specialised-settings) here, which seems to be the prevailing guidelines? (It took a while to try to understand how this all fitted together, since there were no clear examples on how to use this anywhere) - NLA-Strip Modifiers have not been exposed yet. They still use the old-style drawing, which may/may not be compatible here. - Fixed a bug with how the notifiers from this panel get sent. I really don't know how the compiler would have missed the undeclared pointer that was being used ('ob').
2009-06-09 04:39:33 +00:00
ANIM_animdata_filter(&ac, &anim_data, filter, ac.data, ac.datatype);
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
style cleanup: nla
2012-05-08 18:05:57 +00:00
for (ale = anim_data.first; ale; ale = ale->next) {
2.5 - Assorted Animation UI/Editing Tweaks Main Feature: * It is now possible to choose which AnimData block is the 'active' one for editing, and/or select them too. AnimData blocks are generally the dark blue and lighter-blue expanders (i.e. Scene, Object, Camera, Lamp, Curve, Armature, etc.) * Objects are no longer selected/deselected when AKEY is used to toggle selection of channels. This was getting a bit annoying. * Following on from selection of AnimData blocks, it is now possible to select/make active an AnimData block in the animation editors, and change the active action for that block via the 'Animation Data' panel in NLA Editor's properties region. --> Be aware that user-counts are not totally handled correctly there yet, so some funky behaviour might be seen... --> It is possible to assign a new action, or to assign an existing one, allowing to switch between actions as in the past with Actions/IPO Editors... Other tweaks: * Some code tweaks towards making the 'Euler Filter' feature for Graph Editor working sometime soon * Added some backend code for snapping the values of keyframes to a single value. Still need to work out some UI for it though. * Shuffled the code for ACT_OT_new() around, and removed the poll() callback so that it worked in NLA too. * Fixed some more notifier bugs with deleting bones and a few other editmode operations for Armatures.
2009-09-27 04:22:04 +00:00
switch (ale->type) {
case ANIMTYPE_NLATRACK: /* NLA Track - The primary data type which should get caught */
{
style cleanup: nla
2012-05-08 18:05:57 +00:00
NlaTrack *nlt = (NlaTrack *)ale->data;
AnimData *adt = ale->adt;
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
2.5 - Assorted Animation UI/Editing Tweaks Main Feature: * It is now possible to choose which AnimData block is the 'active' one for editing, and/or select them too. AnimData blocks are generally the dark blue and lighter-blue expanders (i.e. Scene, Object, Camera, Lamp, Curve, Armature, etc.) * Objects are no longer selected/deselected when AKEY is used to toggle selection of channels. This was getting a bit annoying. * Following on from selection of AnimData blocks, it is now possible to select/make active an AnimData block in the animation editors, and change the active action for that block via the 'Animation Data' panel in NLA Editor's properties region. --> Be aware that user-counts are not totally handled correctly there yet, so some funky behaviour might be seen... --> It is possible to assign a new action, or to assign an existing one, allowing to switch between actions as in the past with Actions/IPO Editors... Other tweaks: * Some code tweaks towards making the 'Euler Filter' feature for Graph Editor working sometime soon * Added some backend code for snapping the values of keyframes to a single value. Still need to work out some UI for it though. * Shuffled the code for ACT_OT_new() around, and removed the poll() callback so that it worked in NLA too. * Fixed some more notifier bugs with deleting bones and a few other editmode operations for Armatures.
2009-09-27 04:22:04 +00:00
/* found it, now set the pointers */
if (adt_ptr) {
/* AnimData pointer */
RNA_pointer_create(ale->id, &RNA_AnimData, adt, adt_ptr);
}
if (nlt_ptr) {
/* NLA-Track pointer */
RNA_pointer_create(ale->id, &RNA_NlaTrack, nlt, nlt_ptr);
}
if (strip_ptr) {
/* NLA-Strip pointer */
style cleanup: nla
2012-05-08 18:05:57 +00:00
NlaStrip *strip = BKE_nlastrip_find_active(nlt);
2.5 - Assorted Animation UI/Editing Tweaks Main Feature: * It is now possible to choose which AnimData block is the 'active' one for editing, and/or select them too. AnimData blocks are generally the dark blue and lighter-blue expanders (i.e. Scene, Object, Camera, Lamp, Curve, Armature, etc.) * Objects are no longer selected/deselected when AKEY is used to toggle selection of channels. This was getting a bit annoying. * Following on from selection of AnimData blocks, it is now possible to select/make active an AnimData block in the animation editors, and change the active action for that block via the 'Animation Data' panel in NLA Editor's properties region. --> Be aware that user-counts are not totally handled correctly there yet, so some funky behaviour might be seen... --> It is possible to assign a new action, or to assign an existing one, allowing to switch between actions as in the past with Actions/IPO Editors... Other tweaks: * Some code tweaks towards making the 'Euler Filter' feature for Graph Editor working sometime soon * Added some backend code for snapping the values of keyframes to a single value. Still need to work out some UI for it though. * Shuffled the code for ACT_OT_new() around, and removed the poll() callback so that it worked in NLA too. * Fixed some more notifier bugs with deleting bones and a few other editmode operations for Armatures.
2009-09-27 04:22:04 +00:00
RNA_pointer_create(ale->id, &RNA_NlaStrip, strip, strip_ptr);
}
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
style cleanup: nla
2012-05-08 18:05:57 +00:00
found = 1;
style cleanup: switch statements, include break statements within braces & indent. also indent case's within the switch (we already did both of these almost everywhere)
2013-07-19 15:23:42 +00:00
break;
NLA SoC: Added buttons in NKEY region for NLA Editor - Most of the settings wrapped in RNA have been exposed here using the new layout engine stuff from Brecht (C-API). I've tried to maintain a hierarchy of high-level (owner, generic-settings) to low-level (children, specialised-settings) here, which seems to be the prevailing guidelines? (It took a while to try to understand how this all fitted together, since there were no clear examples on how to use this anywhere) - NLA-Strip Modifiers have not been exposed yet. They still use the old-style drawing, which may/may not be compatible here. - Fixed a bug with how the notifiers from this panel get sent. I really don't know how the compiler would have missed the undeclared pointer that was being used ('ob').
2009-06-09 04:39:33 +00:00
}
style cleanup: nla
2012-05-08 18:05:57 +00:00
case ANIMTYPE_SCENE: /* Top-Level Widgets doubling up as datablocks */
2.5 - Assorted Animation UI/Editing Tweaks Main Feature: * It is now possible to choose which AnimData block is the 'active' one for editing, and/or select them too. AnimData blocks are generally the dark blue and lighter-blue expanders (i.e. Scene, Object, Camera, Lamp, Curve, Armature, etc.) * Objects are no longer selected/deselected when AKEY is used to toggle selection of channels. This was getting a bit annoying. * Following on from selection of AnimData blocks, it is now possible to select/make active an AnimData block in the animation editors, and change the active action for that block via the 'Animation Data' panel in NLA Editor's properties region. --> Be aware that user-counts are not totally handled correctly there yet, so some funky behaviour might be seen... --> It is possible to assign a new action, or to assign an existing one, allowing to switch between actions as in the past with Actions/IPO Editors... Other tweaks: * Some code tweaks towards making the 'Euler Filter' feature for Graph Editor working sometime soon * Added some backend code for snapping the values of keyframes to a single value. Still need to work out some UI for it though. * Shuffled the code for ACT_OT_new() around, and removed the poll() callback so that it worked in NLA too. * Fixed some more notifier bugs with deleting bones and a few other editmode operations for Armatures.
2009-09-27 04:22:04 +00:00
case ANIMTYPE_OBJECT:
style cleanup: nla
2012-05-08 18:05:57 +00:00
case ANIMTYPE_DSMAT: /* Datablock AnimData Expanders */
2.5 - Assorted Animation UI/Editing Tweaks Main Feature: * It is now possible to choose which AnimData block is the 'active' one for editing, and/or select them too. AnimData blocks are generally the dark blue and lighter-blue expanders (i.e. Scene, Object, Camera, Lamp, Curve, Armature, etc.) * Objects are no longer selected/deselected when AKEY is used to toggle selection of channels. This was getting a bit annoying. * Following on from selection of AnimData blocks, it is now possible to select/make active an AnimData block in the animation editors, and change the active action for that block via the 'Animation Data' panel in NLA Editor's properties region. --> Be aware that user-counts are not totally handled correctly there yet, so some funky behaviour might be seen... --> It is possible to assign a new action, or to assign an existing one, allowing to switch between actions as in the past with Actions/IPO Editors... Other tweaks: * Some code tweaks towards making the 'Euler Filter' feature for Graph Editor working sometime soon * Added some backend code for snapping the values of keyframes to a single value. Still need to work out some UI for it though. * Shuffled the code for ACT_OT_new() around, and removed the poll() callback so that it worked in NLA too. * Fixed some more notifier bugs with deleting bones and a few other editmode operations for Armatures.
2009-09-27 04:22:04 +00:00
case ANIMTYPE_DSLAM:
case ANIMTYPE_DSCAM:
Basic Alembic support All in all, this patch adds an Alembic importer, an Alembic exporter, and a new CacheFile data block which, for now, wraps around an Alembic archive. This data block is made available through a new modifier ("Mesh Sequence Cache") as well as a new constraint ("Transform Cache") to somewhat properly support respectively geometric and transformation data streaming from alembic caches. A more in-depth documentation is to be found on the wiki, as well as a guide to compile alembic: https://wiki.blender.org/index.php/ User:Kevindietrich/AlembicBasicIo. Many thanks to everyone involved in this little project, and huge shout out to "cgstrive" for the thorough testings with Maya, 3ds Max, Houdini and Realflow as well as @fjuhec, @jensverwiebe and @jasperge for the custom builds and compile fixes. Reviewers: sergey, campbellbarton, mont29 Reviewed By: sergey, campbellbarton, mont29 Differential Revision: https://developer.blender.org/D2060
2016-08-06 06:20:37 +02:00
case ANIMTYPE_DSCACHEFILE:
2.5 - Assorted Animation UI/Editing Tweaks Main Feature: * It is now possible to choose which AnimData block is the 'active' one for editing, and/or select them too. AnimData blocks are generally the dark blue and lighter-blue expanders (i.e. Scene, Object, Camera, Lamp, Curve, Armature, etc.) * Objects are no longer selected/deselected when AKEY is used to toggle selection of channels. This was getting a bit annoying. * Following on from selection of AnimData blocks, it is now possible to select/make active an AnimData block in the animation editors, and change the active action for that block via the 'Animation Data' panel in NLA Editor's properties region. --> Be aware that user-counts are not totally handled correctly there yet, so some funky behaviour might be seen... --> It is possible to assign a new action, or to assign an existing one, allowing to switch between actions as in the past with Actions/IPO Editors... Other tweaks: * Some code tweaks towards making the 'Euler Filter' feature for Graph Editor working sometime soon * Added some backend code for snapping the values of keyframes to a single value. Still need to work out some UI for it though. * Shuffled the code for ACT_OT_new() around, and removed the poll() callback so that it worked in NLA too. * Fixed some more notifier bugs with deleting bones and a few other editmode operations for Armatures.
2009-09-27 04:22:04 +00:00
case ANIMTYPE_DSCUR:
case ANIMTYPE_DSSKEY:
case ANIMTYPE_DSWOR:
Added compositing node support to the animation editors Now when nodes are keyed, they will show up in the dopesheet/graph editor/etc in a new 'Nodetree' category. Still a major problem left, nodes need unique names in order for the rna paths to hold animation data properly...
2009-11-11 05:03:49 +00:00
case ANIMTYPE_DSNTREE:
2.5 - Assorted Animation UI/Editing Tweaks Main Feature: * It is now possible to choose which AnimData block is the 'active' one for editing, and/or select them too. AnimData blocks are generally the dark blue and lighter-blue expanders (i.e. Scene, Object, Camera, Lamp, Curve, Armature, etc.) * Objects are no longer selected/deselected when AKEY is used to toggle selection of channels. This was getting a bit annoying. * Following on from selection of AnimData blocks, it is now possible to select/make active an AnimData block in the animation editors, and change the active action for that block via the 'Animation Data' panel in NLA Editor's properties region. --> Be aware that user-counts are not totally handled correctly there yet, so some funky behaviour might be seen... --> It is possible to assign a new action, or to assign an existing one, allowing to switch between actions as in the past with Actions/IPO Editors... Other tweaks: * Some code tweaks towards making the 'Euler Filter' feature for Graph Editor working sometime soon * Added some backend code for snapping the values of keyframes to a single value. Still need to work out some UI for it though. * Shuffled the code for ACT_OT_new() around, and removed the poll() callback so that it worked in NLA too. * Fixed some more notifier bugs with deleting bones and a few other editmode operations for Armatures.
2009-09-27 04:22:04 +00:00
case ANIMTYPE_DSPART:
case ANIMTYPE_DSMBALL:
case ANIMTYPE_DSARM:
More AnimData selection fixes * Not all supported datatypes would show up in the NLA Properties Region when selected * Clicking on the name part of the "Active Action" tracks now selects the AnimData block that action is attached to
2013-03-14 05:44:56 +00:00
case ANIMTYPE_DSMESH:
case ANIMTYPE_DSTEX:
case ANIMTYPE_DSLAT:
Added support for line styles in the Graph Editor, DopeSheet and NLA Editor.
2010-09-21 22:23:10 +00:00
case ANIMTYPE_DSLINESTYLE:
3D Audio GSoC: Adds new speaker object type. Notes: * Needs some nice icons * Quickily review by Joshua Leung (5 mins) * Properties UI updated (with help of Thomans Dinges) * Speakers have their own theme color * No real audio functionality yet. * Minor bug regarding lamps/lattices fixed in interface_templates.c I personality tested: * Creation, Deletion, Duplication * Saving, Loading * Library linking (incl. make local) * Tracking * Dope Sheet, Outliner * Animation * Drawing (incl. Theme)
2011-08-01 11:44:20 +00:00
case ANIMTYPE_DSSPK:
Grease Pencil - Storyboarding Features (merge from GPencil_EditStrokes branch) This merge-commit brings in a number of new features and workflow/UI improvements for working with Grease Pencil. While these were originally targetted at improving the workflow for creating 3D storyboards in Blender using the Grease Pencil, many of these changes should also prove useful in other workflows too. The main highlights here are: 1) It is now possible to edit Grease Pencil strokes - Use D Tab, or toggle the "Enable Editing" toggles in the Toolbar/Properties regions to enter "Stroke Edit Mode". In this mode, many common editing tools will operate on Grease Pencil stroke points instead. - Tools implemented include Select, Select All/Border/Circle/Linked/More/Less, Grab, Rotate, Scale, Bend, Shear, To Sphere, Mirror, Duplicate, Delete. - Proportional Editing works when using the transform tools 2) Grease Pencil stroke settings can now be animated NOTE: Currently drivers don't work, but if time allows, this may still be added before the release. 3) Strokes can be drawn with "filled" interiors, using a separate set of colour/opacity settings to the ones used for the lines themselves. This makes use of OpenGL filled polys, which has the limitation of only being able to fill convex shapes. Some artifacts may be visible on concave shapes (e.g. pacman's mouth will be overdrawn) 4) "Volumetric Strokes" - An alternative drawing technique for stroke drawing has been added which draws strokes as a series of screen-aligned discs. While this was originally a partial experimental technique at getting better quality 3D lines, the effects possible using this technique were interesting enough to warrant making this a dedicated feature. Best results when partial opacity and large stroke widths are used. 5) Improved Onion Skinning Support - Different colours can be selected for the before/after ghosts. To do so, enable the "colour wheel" toggle beside the Onion Skinning toggle, and set the colours accordingly. - Different numbers of ghosts can be shown before/after the current frame 6) Grease Pencil datablocks are now attached to the scene by default instead of the active object. - For a long time, the object-attachment has proved to be quite problematic for users to keep track of. Now that this is done at scene level, it is easier for most users to use. - An exception for old files (and for any addons which may benefit from object attachment instead), is that if the active object has a Grease Pencil datablock, that will be used instead. - It is not currently possible to choose object-attachment from the UI, but it is simple to do this from the console instead, by doing: context.active_object.grease_pencil = bpy.data.grease_pencil["blah"] 7) Various UI Cleanups - The layers UI has been cleaned up to use a list instead of the nested-panels design. Apart from saving space, this is also much nicer to look at now. - The UI code is now all defined in Python. To support this, it has been necessary to add some new context properties to make it easier to access these settings. e.g. "gpencil_data" for the datablock "active_gpencil_layer" and "active_gpencil_frame" for active data, "editable_gpencil_strokes" for the strokes that can be edited - The "stroke placement/alignment" settings (previously "Drawing Settings" at the bottom of the Grease Pencil panel in the Properties Region) is now located in the toolbar. These were more toolsettings than properties for how GPencil got drawn. - "Use Sketching Sessions" has been renamed "Continuous Drawing", as per a suggestion for an earlier discussion on developer.blender.org - By default, the painting operator will wait for a mouse button to be pressed before it starts creating the stroke. This is to make it easier to include this operator in various toolbars/menus/etc. To get it immediately starting (as when you hold down DKEy to draw), set "wait_for_input" to False. - GPencil Layers can be rearranged in the "Grease Pencil" mode of the Action Editor - Toolbar panels have been added to all the other editors which support these. 8) Pie menus for quick-access to tools A set of experimental pie menus has been included for quick access to many tools and settings. It is not necessary to use these to get things done, but they have been designed to help make certain common tasks easier. - Ctrl-D = The main pie menu. Reveals tools in a context sensitive and spatially stable manner. - D Q = "Quick Settings" pie. This allows quick access to the active layer's settings. Notably, colours, thickness, and turning onion skinning on/off.
2014-12-01 01:52:06 +13:00
case ANIMTYPE_DSGPENCIL:
Objects: add Volume object type, and prototypes for Hair and PointCloud Only the volume object is exposed in the user interface. It is based on OpenVDB internally. Drawing and rendering code will follow in another commit. https://wiki.blender.org/wiki/Source/Objects/Volume https://wiki.blender.org/wiki/Reference/Release_Notes/2.83/Volumes Hair and PointCloud object types are hidden behind a WITH_NEW_OBJECT_TYPES build option. These are unfinished, and included only to make it easier to cooperate on development in the future and avoid tricky merges. https://wiki.blender.org/wiki/Source/Objects/New_Object_Types Ref T73201, T68981 Differential Revision: https://developer.blender.org/D6945
2020-03-17 14:41:48 +01:00
case ANIMTYPE_PALETTE:
case ANIMTYPE_DSHAIR:
case ANIMTYPE_DSPOINTCLOUD:
Simulations: Add new simulation data block This data block will be the container for simulation node trees. It will be used for the new particle node system (T73324). The new data block has the type `ID_SIM`. It is not visible to users and other developers by default yet. To enable it, activate the cmake option `WITH_NEW_SIMULATION_TYPE`. New simulation data blocks can be created by running `bpy.data.simulations.new("name")`. Reviewers: brecht Differential Revision: https://developer.blender.org/D7225
2020-04-20 10:37:38 +02:00
case ANIMTYPE_DSVOLUME:
case ANIMTYPE_DSSIMULATION: {
2.5 - Assorted Animation UI/Editing Tweaks Main Feature: * It is now possible to choose which AnimData block is the 'active' one for editing, and/or select them too. AnimData blocks are generally the dark blue and lighter-blue expanders (i.e. Scene, Object, Camera, Lamp, Curve, Armature, etc.) * Objects are no longer selected/deselected when AKEY is used to toggle selection of channels. This was getting a bit annoying. * Following on from selection of AnimData blocks, it is now possible to select/make active an AnimData block in the animation editors, and change the active action for that block via the 'Animation Data' panel in NLA Editor's properties region. --> Be aware that user-counts are not totally handled correctly there yet, so some funky behaviour might be seen... --> It is possible to assign a new action, or to assign an existing one, allowing to switch between actions as in the past with Actions/IPO Editors... Other tweaks: * Some code tweaks towards making the 'Euler Filter' feature for Graph Editor working sometime soon * Added some backend code for snapping the values of keyframes to a single value. Still need to work out some UI for it though. * Shuffled the code for ACT_OT_new() around, and removed the poll() callback so that it worked in NLA too. * Fixed some more notifier bugs with deleting bones and a few other editmode operations for Armatures.
2009-09-27 04:22:04 +00:00
/* for these channels, we only do AnimData */
NLA Editor: Show the ID+AnimData block that the AnimData panel is showing the active action for
2013-03-16 02:42:19 +00:00
if (ale->adt && adt_ptr) {
ID *id;
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
NLA Editor: Show the ID+AnimData block that the AnimData panel is showing the active action for
2013-03-16 02:42:19 +00:00
if ((ale->data == NULL) || (ale->type == ANIMTYPE_OBJECT)) {
/* ale->data is not an ID block! */
id = ale->id;
2.5 - Assorted Animation UI/Editing Tweaks Main Feature: * It is now possible to choose which AnimData block is the 'active' one for editing, and/or select them too. AnimData blocks are generally the dark blue and lighter-blue expanders (i.e. Scene, Object, Camera, Lamp, Curve, Armature, etc.) * Objects are no longer selected/deselected when AKEY is used to toggle selection of channels. This was getting a bit annoying. * Following on from selection of AnimData blocks, it is now possible to select/make active an AnimData block in the animation editors, and change the active action for that block via the 'Animation Data' panel in NLA Editor's properties region. --> Be aware that user-counts are not totally handled correctly there yet, so some funky behaviour might be seen... --> It is possible to assign a new action, or to assign an existing one, allowing to switch between actions as in the past with Actions/IPO Editors... Other tweaks: * Some code tweaks towards making the 'Euler Filter' feature for Graph Editor working sometime soon * Added some backend code for snapping the values of keyframes to a single value. Still need to work out some UI for it though. * Shuffled the code for ACT_OT_new() around, and removed the poll() callback so that it worked in NLA too. * Fixed some more notifier bugs with deleting bones and a few other editmode operations for Armatures.
2009-09-27 04:22:04 +00:00
}
NLA Editor: Show the ID+AnimData block that the AnimData panel is showing the active action for
2013-03-16 02:42:19 +00:00
else {
Cleanup: comment line length (editors) Prevents clang-format wrapping text before comments.
2019-01-15 23:24:20 +11:00
/* ale->data is always the proper ID block we need,
* but ale->id may not be (i.e. for textures) */
NLA Editor: Show the ID+AnimData block that the AnimData panel is showing the active action for
2013-03-16 02:42:19 +00:00
id = (ID *)ale->data;
}
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
NLA Editor: Show the ID+AnimData block that the AnimData panel is showing the active action for
2013-03-16 02:42:19 +00:00
/* AnimData pointer */
WIP: Added dedicated operator for unlinking actions from the Action Editor (NLA buttons support to come) After looking into this more carefully, I've found that we do in fact need a dedicate operator to add some custom logic when trying to unlink an action from the editor/datablocks. Specifically, this new operator does the following: 1) When in Tweak Mode, it shouldn't be possible to unlink the active action, or else, everything turns to custard. 2) If the Action doesn't have any other users, the user should at least get a warning that it is going to get lost. 3) We need a convenient way to exit Tweak Mode from the Action Editor 4) If none of the above apply, we can just unlink normally This commit implements this for the Action Editor, with stubs for the NLA Editor too. Those will be fixed next.
2015-04-04 11:36:46 +13:00
if (adt_ptr) {
RNA_pointer_create(id, &RNA_AnimData, ale->adt, adt_ptr);
}
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Cleanup: strip trailing space in editors
2018-06-04 09:31:30 +02:00
/* set found status to -1, since setting to 1 would break the loop
NLA Editor: Show the ID+AnimData block that the AnimData panel is showing the active action for
2013-03-16 02:42:19 +00:00
* and potentially skip an active NLA-Track in some cases...
*/
found = -1;
2.5 - Assorted Animation UI/Editing Tweaks Main Feature: * It is now possible to choose which AnimData block is the 'active' one for editing, and/or select them too. AnimData blocks are generally the dark blue and lighter-blue expanders (i.e. Scene, Object, Camera, Lamp, Curve, Armature, etc.) * Objects are no longer selected/deselected when AKEY is used to toggle selection of channels. This was getting a bit annoying. * Following on from selection of AnimData blocks, it is now possible to select/make active an AnimData block in the animation editors, and change the active action for that block via the 'Animation Data' panel in NLA Editor's properties region. --> Be aware that user-counts are not totally handled correctly there yet, so some funky behaviour might be seen... --> It is possible to assign a new action, or to assign an existing one, allowing to switch between actions as in the past with Actions/IPO Editors... Other tweaks: * Some code tweaks towards making the 'Euler Filter' feature for Graph Editor working sometime soon * Added some backend code for snapping the values of keyframes to a single value. Still need to work out some UI for it though. * Shuffled the code for ACT_OT_new() around, and removed the poll() callback so that it worked in NLA too. * Fixed some more notifier bugs with deleting bones and a few other editmode operations for Armatures.
2009-09-27 04:22:04 +00:00
}
style cleanup: switch statements, include break statements within braces & indent. also indent case's within the switch (we already did both of these almost everywhere)
2013-07-19 15:23:42 +00:00
break;
style cleanup: trailing tabs & expand some non prefix tabs into spaces.
2012-10-21 05:46:41 +00:00
}
NLA SoC: Added buttons in NKEY region for NLA Editor - Most of the settings wrapped in RNA have been exposed here using the new layout engine stuff from Brecht (C-API). I've tried to maintain a hierarchy of high-level (owner, generic-settings) to low-level (children, specialised-settings) here, which seems to be the prevailing guidelines? (It took a while to try to understand how this all fitted together, since there were no clear examples on how to use this anywhere) - NLA-Strip Modifiers have not been exposed yet. They still use the old-style drawing, which may/may not be compatible here. - Fixed a bug with how the notifiers from this panel get sent. I really don't know how the compiler would have missed the undeclared pointer that was being used ('ob').
2009-06-09 04:39:33 +00:00
}
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Cleanup: style, use braces for editors
2019-04-22 09:19:45 +10:00
if (found > 0) {
2.5 - Assorted Animation UI/Editing Tweaks Main Feature: * It is now possible to choose which AnimData block is the 'active' one for editing, and/or select them too. AnimData blocks are generally the dark blue and lighter-blue expanders (i.e. Scene, Object, Camera, Lamp, Curve, Armature, etc.) * Objects are no longer selected/deselected when AKEY is used to toggle selection of channels. This was getting a bit annoying. * Following on from selection of AnimData blocks, it is now possible to select/make active an AnimData block in the animation editors, and change the active action for that block via the 'Animation Data' panel in NLA Editor's properties region. --> Be aware that user-counts are not totally handled correctly there yet, so some funky behaviour might be seen... --> It is possible to assign a new action, or to assign an existing one, allowing to switch between actions as in the past with Actions/IPO Editors... Other tweaks: * Some code tweaks towards making the 'Euler Filter' feature for Graph Editor working sometime soon * Added some backend code for snapping the values of keyframes to a single value. Still need to work out some UI for it though. * Shuffled the code for ACT_OT_new() around, and removed the poll() callback so that it worked in NLA too. * Fixed some more notifier bugs with deleting bones and a few other editmode operations for Armatures.
2009-09-27 04:22:04 +00:00
break;
Cleanup: style, use braces for editors
2019-04-22 09:19:45 +10:00
}
NLA SoC: Added buttons in NKEY region for NLA Editor - Most of the settings wrapped in RNA have been exposed here using the new layout engine stuff from Brecht (C-API). I've tried to maintain a hierarchy of high-level (owner, generic-settings) to low-level (children, specialised-settings) here, which seems to be the prevailing guidelines? (It took a while to try to understand how this all fitted together, since there were no clear examples on how to use this anywhere) - NLA-Strip Modifiers have not been exposed yet. They still use the old-style drawing, which may/may not be compatible here. - Fixed a bug with how the notifiers from this panel get sent. I really don't know how the compiler would have missed the undeclared pointer that was being used ('ob').
2009-06-09 04:39:33 +00:00
}
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
NLA SoC: Added buttons in NKEY region for NLA Editor - Most of the settings wrapped in RNA have been exposed here using the new layout engine stuff from Brecht (C-API). I've tried to maintain a hierarchy of high-level (owner, generic-settings) to low-level (children, specialised-settings) here, which seems to be the prevailing guidelines? (It took a while to try to understand how this all fitted together, since there were no clear examples on how to use this anywhere) - NLA-Strip Modifiers have not been exposed yet. They still use the old-style drawing, which may/may not be compatible here. - Fixed a bug with how the notifiers from this panel get sent. I really don't know how the compiler would have missed the undeclared pointer that was being used ('ob').
2009-06-09 04:39:33 +00:00
/* free temp data */
Fix T40201: Keyframe edits fail to update the viewport
2014-05-19 00:24:45 +10:00
ANIM_animdata_freelist(&anim_data);
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
NLA Pushdown Operator: Active animdata option + More error handling * If channel_index = -1, the pushdown operator will try to use the active AnimData block. To see which one this will be, check the properties (NKEY) region in NLA Editor. * Added more detailed error handling for the various cases where things are not in a valid state for pushing down an action. This is notably to stop scripters from putting the NLA into an inconsistent state.
2014-05-05 14:15:28 +12:00
return (found != 0);
NLA SoC: Adding skeleton code for a buttons region in NLA If anyone's doing any testing at this point, please check if this works ok for files with new/old NLA Editors, as I was having some problems with one of my testing (saved from this branch) files with this.
2009-06-07 11:37:15 +00:00
}
NLA SoC: Transition Strips + Strip Adding Operators + Bugfixes == Transitions == Transition strips are now able to be created + evaluated. Transitions allow for interpolation between the endpoints of two adjacent strips in the same track (i.e. two strips which occur in the same track one after the other, but with a gap between them). - The current behaviour when only one endpoint affects some setting is non-optimal, since it appears somewhat inconsistently extend/replace values... - Transform code needs a few fixes still to deal with these == Strip Adding Operators == * New strips referencing Actions can be added using the Shift-A hotkey while in the strips-area. You must have a track selected first though. The new strip will get added, starting from the current frame, in the selected track(s) only if there is enough space to do so. Otherwise, the new strip gets added at the top of the stack in a new track. * New transition strips can be added with the Shift-T hotkey while in the strips area. You must have two adjacent strips selected for this to work. == New Backend Methods == * Recoded the strip/track adding API to be more flexible * Added a new method for testing whether F-Curve has any modifiers of with certain attributes. Will be used in a later bugfix... == Bugfixes == - Fixed bug with strip-blending which caused the blending modes to be useless. - NLA buttons now use proper poll callbacks instead of defining checks - Commented out missing operator in menus, silencing warnings in console - Removed obsolete/incorrect comments
2009-06-19 04:45:56 +00:00
#if 0
Cleanup: use bool for poll functions
2018-07-02 11:47:00 +02:00
static bool nla_panel_poll(const bContext *C, PanelType *pt)
NLA SoC: Adding skeleton code for a buttons region in NLA If anyone's doing any testing at this point, please check if this works ok for files with new/old NLA Editors, as I was having some problems with one of my testing (saved from this branch) files with this.
2009-06-07 11:37:15 +00:00
{
return nla_panel_context(C, NULL, NULL);
}
NLA SoC: Transition Strips + Strip Adding Operators + Bugfixes == Transitions == Transition strips are now able to be created + evaluated. Transitions allow for interpolation between the endpoints of two adjacent strips in the same track (i.e. two strips which occur in the same track one after the other, but with a gap between them). - The current behaviour when only one endpoint affects some setting is non-optimal, since it appears somewhat inconsistently extend/replace values... - Transform code needs a few fixes still to deal with these == Strip Adding Operators == * New strips referencing Actions can be added using the Shift-A hotkey while in the strips-area. You must have a track selected first though. The new strip will get added, starting from the current frame, in the selected track(s) only if there is enough space to do so. Otherwise, the new strip gets added at the top of the stack in a new track. * New transition strips can be added with the Shift-T hotkey while in the strips area. You must have two adjacent strips selected for this to work. == New Backend Methods == * Recoded the strip/track adding API to be more flexible * Added a new method for testing whether F-Curve has any modifiers of with certain attributes. Will be used in a later bugfix... == Bugfixes == - Fixed bug with strip-blending which caused the blending modes to be useless. - NLA buttons now use proper poll callbacks instead of defining checks - Commented out missing operator in menus, silencing warnings in console - Removed obsolete/incorrect comments
2009-06-19 04:45:56 +00:00
#endif
NLA SoC: Adding skeleton code for a buttons region in NLA If anyone's doing any testing at this point, please check if this works ok for files with new/old NLA Editors, as I was having some problems with one of my testing (saved from this branch) files with this.
2009-06-07 11:37:15 +00:00
Cleanup: use bool for poll functions
2018-07-02 11:47:00 +02:00
static bool nla_animdata_panel_poll(const bContext *C, PanelType *UNUSED(pt))
Animato - NLA + Realtime Animating Goodies * When doing realtime recording of animation (i.e. transforming objects + bones while animation playback is running, and auto-keying is enabled), animation will be added to a new NLA Track+Strip combo everytime a single 'loop' of the frame range has finished. This will allow 'passes' over the animation to be less destructive. * Made the evaluation of the active action (when NLA data is present), be handled as part of the normal NLA system evaluation code (as if it were just another strip in a track at the end). The immediate benefit is that there are now some settings (available in the "Animation Data" panel in the NLA Editor with a strip selected) which allow for the way the active action is combined with the NLA stack results. For instance, the way that the action extrapolates is used in the recording tweaks above.
2009-07-31 07:43:47 +00:00
{
PointerRNA ptr;
return (nla_panel_context(C, &ptr, NULL, NULL) && (ptr.data != NULL));
}
Cleanup: use bool for poll functions
2018-07-02 11:47:00 +02:00
static bool nla_strip_panel_poll(const bContext *C, PanelType *UNUSED(pt))
NLA SoC: Transition Strips + Strip Adding Operators + Bugfixes == Transitions == Transition strips are now able to be created + evaluated. Transitions allow for interpolation between the endpoints of two adjacent strips in the same track (i.e. two strips which occur in the same track one after the other, but with a gap between them). - The current behaviour when only one endpoint affects some setting is non-optimal, since it appears somewhat inconsistently extend/replace values... - Transform code needs a few fixes still to deal with these == Strip Adding Operators == * New strips referencing Actions can be added using the Shift-A hotkey while in the strips-area. You must have a track selected first though. The new strip will get added, starting from the current frame, in the selected track(s) only if there is enough space to do so. Otherwise, the new strip gets added at the top of the stack in a new track. * New transition strips can be added with the Shift-T hotkey while in the strips area. You must have two adjacent strips selected for this to work. == New Backend Methods == * Recoded the strip/track adding API to be more flexible * Added a new method for testing whether F-Curve has any modifiers of with certain attributes. Will be used in a later bugfix... == Bugfixes == - Fixed bug with strip-blending which caused the blending modes to be useless. - NLA buttons now use proper poll callbacks instead of defining checks - Commented out missing operator in menus, silencing warnings in console - Removed obsolete/incorrect comments
2009-06-19 04:45:56 +00:00
{
PointerRNA ptr;
Animato - NLA + Realtime Animating Goodies * When doing realtime recording of animation (i.e. transforming objects + bones while animation playback is running, and auto-keying is enabled), animation will be added to a new NLA Track+Strip combo everytime a single 'loop' of the frame range has finished. This will allow 'passes' over the animation to be less destructive. * Made the evaluation of the active action (when NLA data is present), be handled as part of the normal NLA system evaluation code (as if it were just another strip in a track at the end). The immediate benefit is that there are now some settings (available in the "Animation Data" panel in the NLA Editor with a strip selected) which allow for the way the active action is combined with the NLA stack results. For instance, the way that the action extrapolates is used in the recording tweaks above.
2009-07-31 07:43:47 +00:00
return (nla_panel_context(C, NULL, NULL, &ptr) && (ptr.data != NULL));
NLA SoC: Transition Strips + Strip Adding Operators + Bugfixes == Transitions == Transition strips are now able to be created + evaluated. Transitions allow for interpolation between the endpoints of two adjacent strips in the same track (i.e. two strips which occur in the same track one after the other, but with a gap between them). - The current behaviour when only one endpoint affects some setting is non-optimal, since it appears somewhat inconsistently extend/replace values... - Transform code needs a few fixes still to deal with these == Strip Adding Operators == * New strips referencing Actions can be added using the Shift-A hotkey while in the strips-area. You must have a track selected first though. The new strip will get added, starting from the current frame, in the selected track(s) only if there is enough space to do so. Otherwise, the new strip gets added at the top of the stack in a new track. * New transition strips can be added with the Shift-T hotkey while in the strips area. You must have two adjacent strips selected for this to work. == New Backend Methods == * Recoded the strip/track adding API to be more flexible * Added a new method for testing whether F-Curve has any modifiers of with certain attributes. Will be used in a later bugfix... == Bugfixes == - Fixed bug with strip-blending which caused the blending modes to be useless. - NLA buttons now use proper poll callbacks instead of defining checks - Commented out missing operator in menus, silencing warnings in console - Removed obsolete/incorrect comments
2009-06-19 04:45:56 +00:00
}
Cleanup: use bool for poll functions
2018-07-02 11:47:00 +02:00
static bool nla_strip_actclip_panel_poll(const bContext *C, PanelType *UNUSED(pt))
NLA SoC: Transition Strips + Strip Adding Operators + Bugfixes == Transitions == Transition strips are now able to be created + evaluated. Transitions allow for interpolation between the endpoints of two adjacent strips in the same track (i.e. two strips which occur in the same track one after the other, but with a gap between them). - The current behaviour when only one endpoint affects some setting is non-optimal, since it appears somewhat inconsistently extend/replace values... - Transform code needs a few fixes still to deal with these == Strip Adding Operators == * New strips referencing Actions can be added using the Shift-A hotkey while in the strips-area. You must have a track selected first though. The new strip will get added, starting from the current frame, in the selected track(s) only if there is enough space to do so. Otherwise, the new strip gets added at the top of the stack in a new track. * New transition strips can be added with the Shift-T hotkey while in the strips area. You must have two adjacent strips selected for this to work. == New Backend Methods == * Recoded the strip/track adding API to be more flexible * Added a new method for testing whether F-Curve has any modifiers of with certain attributes. Will be used in a later bugfix... == Bugfixes == - Fixed bug with strip-blending which caused the blending modes to be useless. - NLA buttons now use proper poll callbacks instead of defining checks - Commented out missing operator in menus, silencing warnings in console - Removed obsolete/incorrect comments
2009-06-19 04:45:56 +00:00
{
PointerRNA ptr;
NlaStrip *strip;
Cleanup: strip trailing space in editors
2018-06-04 09:31:30 +02:00
Cleanup: style, use braces for editors
2019-04-22 09:19:45 +10:00
if (!nla_panel_context(C, NULL, NULL, &ptr)) {
NLA SoC: Transition Strips + Strip Adding Operators + Bugfixes == Transitions == Transition strips are now able to be created + evaluated. Transitions allow for interpolation between the endpoints of two adjacent strips in the same track (i.e. two strips which occur in the same track one after the other, but with a gap between them). - The current behaviour when only one endpoint affects some setting is non-optimal, since it appears somewhat inconsistently extend/replace values... - Transform code needs a few fixes still to deal with these == Strip Adding Operators == * New strips referencing Actions can be added using the Shift-A hotkey while in the strips-area. You must have a track selected first though. The new strip will get added, starting from the current frame, in the selected track(s) only if there is enough space to do so. Otherwise, the new strip gets added at the top of the stack in a new track. * New transition strips can be added with the Shift-T hotkey while in the strips area. You must have two adjacent strips selected for this to work. == New Backend Methods == * Recoded the strip/track adding API to be more flexible * Added a new method for testing whether F-Curve has any modifiers of with certain attributes. Will be used in a later bugfix... == Bugfixes == - Fixed bug with strip-blending which caused the blending modes to be useless. - NLA buttons now use proper poll callbacks instead of defining checks - Commented out missing operator in menus, silencing warnings in console - Removed obsolete/incorrect comments
2009-06-19 04:45:56 +00:00
return 0;
Cleanup: style, use braces for editors
2019-04-22 09:19:45 +10:00
}
if (ptr.data == NULL) {
NLA SoC: Transition Strips + Strip Adding Operators + Bugfixes == Transitions == Transition strips are now able to be created + evaluated. Transitions allow for interpolation between the endpoints of two adjacent strips in the same track (i.e. two strips which occur in the same track one after the other, but with a gap between them). - The current behaviour when only one endpoint affects some setting is non-optimal, since it appears somewhat inconsistently extend/replace values... - Transform code needs a few fixes still to deal with these == Strip Adding Operators == * New strips referencing Actions can be added using the Shift-A hotkey while in the strips-area. You must have a track selected first though. The new strip will get added, starting from the current frame, in the selected track(s) only if there is enough space to do so. Otherwise, the new strip gets added at the top of the stack in a new track. * New transition strips can be added with the Shift-T hotkey while in the strips area. You must have two adjacent strips selected for this to work. == New Backend Methods == * Recoded the strip/track adding API to be more flexible * Added a new method for testing whether F-Curve has any modifiers of with certain attributes. Will be used in a later bugfix... == Bugfixes == - Fixed bug with strip-blending which caused the blending modes to be useless. - NLA buttons now use proper poll callbacks instead of defining checks - Commented out missing operator in menus, silencing warnings in console - Removed obsolete/incorrect comments
2009-06-19 04:45:56 +00:00
return 0;
Cleanup: style, use braces for editors
2019-04-22 09:19:45 +10:00
}
Cleanup: strip trailing space in editors
2018-06-04 09:31:30 +02:00
style cleanup: nla
2012-05-08 18:05:57 +00:00
strip = ptr.data;
NLA SoC: Transition Strips + Strip Adding Operators + Bugfixes == Transitions == Transition strips are now able to be created + evaluated. Transitions allow for interpolation between the endpoints of two adjacent strips in the same track (i.e. two strips which occur in the same track one after the other, but with a gap between them). - The current behaviour when only one endpoint affects some setting is non-optimal, since it appears somewhat inconsistently extend/replace values... - Transform code needs a few fixes still to deal with these == Strip Adding Operators == * New strips referencing Actions can be added using the Shift-A hotkey while in the strips-area. You must have a track selected first though. The new strip will get added, starting from the current frame, in the selected track(s) only if there is enough space to do so. Otherwise, the new strip gets added at the top of the stack in a new track. * New transition strips can be added with the Shift-T hotkey while in the strips area. You must have two adjacent strips selected for this to work. == New Backend Methods == * Recoded the strip/track adding API to be more flexible * Added a new method for testing whether F-Curve has any modifiers of with certain attributes. Will be used in a later bugfix... == Bugfixes == - Fixed bug with strip-blending which caused the blending modes to be useless. - NLA buttons now use proper poll callbacks instead of defining checks - Commented out missing operator in menus, silencing warnings in console - Removed obsolete/incorrect comments
2009-06-19 04:45:56 +00:00
return (strip->type == NLASTRIP_TYPE_CLIP);
}
NLA SoC: Added buttons in NKEY region for NLA Editor - Most of the settings wrapped in RNA have been exposed here using the new layout engine stuff from Brecht (C-API). I've tried to maintain a hierarchy of high-level (owner, generic-settings) to low-level (children, specialised-settings) here, which seems to be the prevailing guidelines? (It took a while to try to understand how this all fitted together, since there were no clear examples on how to use this anywhere) - NLA-Strip Modifiers have not been exposed yet. They still use the old-style drawing, which may/may not be compatible here. - Fixed a bug with how the notifiers from this panel get sent. I really don't know how the compiler would have missed the undeclared pointer that was being used ('ob').
2009-06-09 04:39:33 +00:00
Cleanup: use bool for poll functions
2018-07-02 11:47:00 +02:00
static bool nla_strip_eval_panel_poll(const bContext *C, PanelType *UNUSED(pt))
Sound clip NLA Strips for Nexyon These are basically just for specifying when a speaker should fire off it's soundclip, and as such, many NLA operations are irrelevant for it. They can only be specified on object-level for speaker objects. I've still got some UI tweaks I'll need to work on in order for these to be able to be added even when the speaker doesn't have any NLA tracks yet. (EDIT: while typing this, I had an idea for how to do this, but that'll be for next commit). In the mean time, you'll need to add a single keyframe for the object, snowflake that action and delete the NLA strip before you can start editing.
2011-08-07 12:27:20 +00:00
{
PointerRNA ptr;
NlaStrip *strip;
Cleanup: strip trailing space in editors
2018-06-04 09:31:30 +02:00
Cleanup: style, use braces for editors
2019-04-22 09:19:45 +10:00
if (!nla_panel_context(C, NULL, NULL, &ptr)) {
Sound clip NLA Strips for Nexyon These are basically just for specifying when a speaker should fire off it's soundclip, and as such, many NLA operations are irrelevant for it. They can only be specified on object-level for speaker objects. I've still got some UI tweaks I'll need to work on in order for these to be able to be added even when the speaker doesn't have any NLA tracks yet. (EDIT: while typing this, I had an idea for how to do this, but that'll be for next commit). In the mean time, you'll need to add a single keyframe for the object, snowflake that action and delete the NLA strip before you can start editing.
2011-08-07 12:27:20 +00:00
return 0;
Cleanup: style, use braces for editors
2019-04-22 09:19:45 +10:00
}
if (ptr.data == NULL) {
Sound clip NLA Strips for Nexyon These are basically just for specifying when a speaker should fire off it's soundclip, and as such, many NLA operations are irrelevant for it. They can only be specified on object-level for speaker objects. I've still got some UI tweaks I'll need to work on in order for these to be able to be added even when the speaker doesn't have any NLA tracks yet. (EDIT: while typing this, I had an idea for how to do this, but that'll be for next commit). In the mean time, you'll need to add a single keyframe for the object, snowflake that action and delete the NLA strip before you can start editing.
2011-08-07 12:27:20 +00:00
return 0;
Cleanup: style, use braces for editors
2019-04-22 09:19:45 +10:00
}
Cleanup: strip trailing space in editors
2018-06-04 09:31:30 +02:00
style cleanup: nla
2012-05-08 18:05:57 +00:00
strip = ptr.data;
Cleanup: strip trailing space in editors
2018-06-04 09:31:30 +02:00
Cleanup: style, use braces for editors
2019-04-22 09:19:45 +10:00
if (strip->type == NLASTRIP_TYPE_SOUND) {
Sound clip NLA Strips for Nexyon These are basically just for specifying when a speaker should fire off it's soundclip, and as such, many NLA operations are irrelevant for it. They can only be specified on object-level for speaker objects. I've still got some UI tweaks I'll need to work on in order for these to be able to be added even when the speaker doesn't have any NLA tracks yet. (EDIT: while typing this, I had an idea for how to do this, but that'll be for next commit). In the mean time, you'll need to add a single keyframe for the object, snowflake that action and delete the NLA strip before you can start editing.
2011-08-07 12:27:20 +00:00
return 0;
Cleanup: style, use braces for editors
2019-04-22 09:19:45 +10:00
}
Cleanup: strip trailing space in editors
2018-06-04 09:31:30 +02:00
Sound clip NLA Strips for Nexyon These are basically just for specifying when a speaker should fire off it's soundclip, and as such, many NLA operations are irrelevant for it. They can only be specified on object-level for speaker objects. I've still got some UI tweaks I'll need to work on in order for these to be able to be added even when the speaker doesn't have any NLA tracks yet. (EDIT: while typing this, I had an idea for how to do this, but that'll be for next commit). In the mean time, you'll need to add a single keyframe for the object, snowflake that action and delete the NLA strip before you can start editing.
2011-08-07 12:27:20 +00:00
return 1;
}
NLA SoC: Added buttons in NKEY region for NLA Editor - Most of the settings wrapped in RNA have been exposed here using the new layout engine stuff from Brecht (C-API). I've tried to maintain a hierarchy of high-level (owner, generic-settings) to low-level (children, specialised-settings) here, which seems to be the prevailing guidelines? (It took a while to try to understand how this all fitted together, since there were no clear examples on how to use this anywhere) - NLA-Strip Modifiers have not been exposed yet. They still use the old-style drawing, which may/may not be compatible here. - Fixed a bug with how the notifiers from this panel get sent. I really don't know how the compiler would have missed the undeclared pointer that was being used ('ob').
2009-06-09 04:39:33 +00:00
/* -------------- */
Animato - NLA + Realtime Animating Goodies * When doing realtime recording of animation (i.e. transforming objects + bones while animation playback is running, and auto-keying is enabled), animation will be added to a new NLA Track+Strip combo everytime a single 'loop' of the frame range has finished. This will allow 'passes' over the animation to be less destructive. * Made the evaluation of the active action (when NLA data is present), be handled as part of the normal NLA system evaluation code (as if it were just another strip in a track at the end). The immediate benefit is that there are now some settings (available in the "Animation Data" panel in the NLA Editor with a strip selected) which allow for the way the active action is combined with the NLA stack results. For instance, the way that the action extrapolates is used in the recording tweaks above.
2009-07-31 07:43:47 +00:00
/* active AnimData */
Cleanup: Rename Panel * variables from pa to panel
2020-04-03 22:20:25 -05:00
static void nla_panel_animdata(const bContext *C, Panel *panel)
Animato - NLA + Realtime Animating Goodies * When doing realtime recording of animation (i.e. transforming objects + bones while animation playback is running, and auto-keying is enabled), animation will be added to a new NLA Track+Strip combo everytime a single 'loop' of the frame range has finished. This will allow 'passes' over the animation to be less destructive. * Made the evaluation of the active action (when NLA data is present), be handled as part of the normal NLA system evaluation code (as if it were just another strip in a track at the end). The immediate benefit is that there are now some settings (available in the "Animation Data" panel in the NLA Editor with a strip selected) which allow for the way the active action is combined with the NLA stack results. For instance, the way that the action extrapolates is used in the recording tweaks above.
2009-07-31 07:43:47 +00:00
{
PointerRNA adt_ptr;
remove unused vars, comment some which look like they could be useful still. have makesrna.c omit unused _data definitions for rna funcs with no args.
2011-01-09 01:17:56 +00:00
/* AnimData *adt; */
Cleanup: Rename Panel * variables from pa to panel
2020-04-03 22:20:25 -05:00
uiLayout *layout = panel->layout;
Animato - NLA + Realtime Animating Goodies * When doing realtime recording of animation (i.e. transforming objects + bones while animation playback is running, and auto-keying is enabled), animation will be added to a new NLA Track+Strip combo everytime a single 'loop' of the frame range has finished. This will allow 'passes' over the animation to be less destructive. * Made the evaluation of the active action (when NLA data is present), be handled as part of the normal NLA system evaluation code (as if it were just another strip in a track at the end). The immediate benefit is that there are now some settings (available in the "Animation Data" panel in the NLA Editor with a strip selected) which allow for the way the active action is combined with the NLA stack results. For instance, the way that the action extrapolates is used in the recording tweaks above.
2009-07-31 07:43:47 +00:00
uiLayout *row;
uiBlock *block;
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Animato - NLA + Realtime Animating Goodies * When doing realtime recording of animation (i.e. transforming objects + bones while animation playback is running, and auto-keying is enabled), animation will be added to a new NLA Track+Strip combo everytime a single 'loop' of the frame range has finished. This will allow 'passes' over the animation to be less destructive. * Made the evaluation of the active action (when NLA data is present), be handled as part of the normal NLA system evaluation code (as if it were just another strip in a track at the end). The immediate benefit is that there are now some settings (available in the "Animation Data" panel in the NLA Editor with a strip selected) which allow for the way the active action is combined with the NLA stack results. For instance, the way that the action extrapolates is used in the recording tweaks above.
2009-07-31 07:43:47 +00:00
/* check context and also validity of pointer */
Cleanup: style, use braces for editors
2019-04-22 09:19:45 +10:00
if (!nla_panel_context(C, &adt_ptr, NULL, NULL)) {
Animato - NLA + Realtime Animating Goodies * When doing realtime recording of animation (i.e. transforming objects + bones while animation playback is running, and auto-keying is enabled), animation will be added to a new NLA Track+Strip combo everytime a single 'loop' of the frame range has finished. This will allow 'passes' over the animation to be less destructive. * Made the evaluation of the active action (when NLA data is present), be handled as part of the normal NLA system evaluation code (as if it were just another strip in a track at the end). The immediate benefit is that there are now some settings (available in the "Animation Data" panel in the NLA Editor with a strip selected) which allow for the way the active action is combined with the NLA stack results. For instance, the way that the action extrapolates is used in the recording tweaks above.
2009-07-31 07:43:47 +00:00
return;
Cleanup: style, use braces for editors
2019-04-22 09:19:45 +10:00
}
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
style cleanup
2012-10-26 04:14:10 +00:00
/* adt = adt_ptr.data; */
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
style cleanup: nla
2012-05-08 18:05:57 +00:00
block = uiLayoutGetBlock(layout);
UI Refactor T41640 Make the UI API more consistent and reduce confusion with some naming. mainly: - API function calls - enum values some internal static functions have been left for now
2014-11-09 21:20:40 +01:00
UI_block_func_handle_set(block, do_nla_region_buttons, NULL);
UI: NLA Editor Sidebar overhaul The NLA Editor sidebar is currently out of step with the rest of Blender, and in particular the Sequencer, which offers similar features and functionality. This patch makes a number of UI layout changes to make it fit in. - Remove Active Track panel, since the track names can just be edited in the source list on the left - Rejiggered the categories to be more understandable. 'Strip' includes settings for the current strip, and 'Edited Action' includes settings for the action that is currently being edited - Use single column split layout - Use name + mute toggle configuration like in the Sequencer - Fix an issue with the theme, where the sidebar background was too dark, breaking the bright -> dark hierarchical logic - Use sub-panels for animated strip properties controls Differential Revision: https://developer.blender.org/D6687 Reviewed by Brecht van Lommel
2020-01-28 13:13:45 +01:00
uiLayoutSetPropSep(layout, true);
uiLayoutSetPropDecorate(layout, false);
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
NLA Editor: Show the ID+AnimData block that the AnimData panel is showing the active action for
2013-03-16 02:42:19 +00:00
/* AnimData Source Properties ----------------------------------- */
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Cleanup: strip trailing space in editors
2018-06-04 09:31:30 +02:00
/* icon + id-block name of block where AnimData came from to prevent
NLA Editor: Show the ID+AnimData block that the AnimData panel is showing the active action for
2013-03-16 02:42:19 +00:00
* accidentally changing the properties of the wrong action
*/
RNA: Cleanup PointerRNA struct The old layout of `PointerRNA` was confusing for historic reasons: ``` typedef struct PointerRNA { struct { void *data; } id; struct StructRNA *type; void *data; } PointerRNA; ``` This patch updates it to: ``` typedef struct PointerRNA { struct ID *owner_id; struct StructRNA *type; void *data; } PointerRNA; ``` Throughout the code base `id.data` was replaced with `owner_id`. Furthermore, many explicit pointer type casts were added which were implicit before. Some type casts to `ID *` were removed. Reviewers: brecht, campbellbarton Differential Revision: https://developer.blender.org/D5558
2019-08-23 09:52:12 +02:00
if (adt_ptr.owner_id) {
ID *id = adt_ptr.owner_id;
NLA Editor: Show the ID+AnimData block that the AnimData panel is showing the active action for
2013-03-16 02:42:19 +00:00
PointerRNA id_ptr;
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
NLA Editor: Show the ID+AnimData block that the AnimData panel is showing the active action for
2013-03-16 02:42:19 +00:00
RNA_id_pointer_create(id, &id_ptr);
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
NLA Editor: Show the ID+AnimData block that the AnimData panel is showing the active action for
2013-03-16 02:42:19 +00:00
/* ID-block name > AnimData */
Code cleanup: remove TRUE/FALSE & WITH_BOOL_COMPAT define
2014-04-01 11:34:00 +11:00
row = uiLayoutRow(layout, true);
NLA Editor: Show the ID+AnimData block that the AnimData panel is showing the active action for
2013-03-16 02:42:19 +00:00
uiLayoutSetAlignment(row, UI_LAYOUT_ALIGN_LEFT);
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
NLA Editor: Show the ID+AnimData block that the AnimData panel is showing the active action for
2013-03-16 02:42:19 +00:00
uiItemL(row, id->name + 2, RNA_struct_ui_icon(id_ptr.type)); /* id-block (src) */
UI: add support for defining any icon as a mono icon. Previously it was hardcoded to one row. These icons are colored with the text color. Changes include some refactoring.
2018-09-20 18:07:58 +02:00
uiItemL(row, "", ICON_SMALL_TRI_RIGHT_VEC); /* expander */
NLA Editor: Show the ID+AnimData block that the AnimData panel is showing the active action for
2013-03-16 02:42:19 +00:00
uiItemL(row, IFACE_("Animation Data"), ICON_ANIM_DATA); /* animdata */
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
NLA Editor: Show the ID+AnimData block that the AnimData panel is showing the active action for
2013-03-16 02:42:19 +00:00
uiItemS(layout);
}
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Animato - NLA + Realtime Animating Goodies * When doing realtime recording of animation (i.e. transforming objects + bones while animation playback is running, and auto-keying is enabled), animation will be added to a new NLA Track+Strip combo everytime a single 'loop' of the frame range has finished. This will allow 'passes' over the animation to be less destructive. * Made the evaluation of the active action (when NLA data is present), be handled as part of the normal NLA system evaluation code (as if it were just another strip in a track at the end). The immediate benefit is that there are now some settings (available in the "Animation Data" panel in the NLA Editor with a strip selected) which allow for the way the active action is combined with the NLA stack results. For instance, the way that the action extrapolates is used in the recording tweaks above.
2009-07-31 07:43:47 +00:00
/* Active Action Properties ------------------------------------- */
/* action */
Code cleanup: remove TRUE/FALSE & WITH_BOOL_COMPAT define
2014-04-01 11:34:00 +11:00
row = uiLayoutRow(layout, true);
Fix T53632: Objects outside scene shown in popup Only show objects in current scene when not pinned. This commit adds a filter argument to id-template since we may want to filter by other criteria.
2018-01-03 21:54:02 +11:00
uiTemplateID(row,
(bContext *)C,
&adt_ptr,
"action",
UI: Redesigned data-block selectors The previous design is rather old and has a couple of problems: * Scalability: The current solution of adding little icon buttons next to the data-block name field doesn't scale well. It only works if there's a small number of operations. We need to be able to place more items there for better data-block management. Especially with the introduction of library overrides. * Discoverability: It's not obvious what some of the icons do. They appear and disappear, but it's not obvious why some are available at times and others not. * Unclear Status: Currently their library status (linked, indirectly linked, broken link, library override) isn't really clear. * Unusual behavior: Some of the icon buttons allow Shift or Ctrl clicking to invoke alternative behaviors. This is not a usual pattern in Blender. This patch does the following changes: * Adds a menu to the right of the name button to access all kinds of operations (create, delete, unlink, user management, library overrides, etc). * Make good use of the "disabled hint" for tooltips, to explain why buttons are disabled. The UI team wants to establish this as a good practise. * Use superimposed icons for duplicate and unlink, rather than extra buttons (uses less space, looks less distracting and is a nice + consistent design language). * Remove fake user and user count button, they are available from the menu now. * Support tooltips for superimposed icons (committed mouse hover feedback to master already). * Slightly increase size of the name button - it was already a bit small before, and the move from real buttons to superimposed icons reduces usable space for the name itself. * More clearly differentiate between duplicate and creating a new data-block. The latter is only available in the menu. * Display library status icon on the left (linked, missing library, overridden, asset) * Disables "Make Single User" button - in review we weren't sure if there are good use-cases for it, so better to see if we can remove it. Note that I do expect some aspects of this design to change still. I think some changes are problematic, but others disagreed. I will open a feedback thread on devtalk to see what others think. Differential Revision: https://developer.blender.org/D8554 Reviewed by: Bastien Montagne Design discussed and agreed on with the UI team, also see T79959.
2020-12-18 18:12:11 +01:00
"ACTION_OT_new",
UI: Revert design changes to data-block selector for the 2.92 release Partially reverts 2250b5cefee7. Removing the user count and fake user count icons was controversial (which was expected) and there are a few further changes needed, that won't make it in time for the release, see D9946. While there is a design to bring back the user count and fake user indicators, a new design idea was proposed that the UI team wants to follow. This came too late for the 2.92 release, the new design is targeted at the 2.93 release now. Meanwhile, UI team decision was to simply revert the design changes. The new design is being worked on in https://developer.blender.org/T84669. Note that this commit does not revert some internal changes done in 2250b5cefee7. Namely the introduction of `ed_util_ops.c` and data-block operators in there. These will still be needed in the new design.
2021-01-13 15:08:09 +01:00
NULL,
New Grease Pencil object for 2D animation This commit merge the full development done in greasepencil-object branch and include mainly the following features. - New grease pencil object. - New drawing engine. - New grease pencil modes Draw/Sculpt/Edit and Weight Paint. - New brushes for grease pencil. - New modifiers for grease pencil. - New shaders FX. - New material system (replace old palettes and colors). - Split of annotations (old grease pencil) and new grease pencil object. - UI adapted to blender 2.8. You can get more info here: https://code.blender.org/2017/12/drawing-2d-animation-in-blender-2-8/ https://code.blender.org/2018/07/grease-pencil-status-update/ This is the result of nearly two years of development and I want thanks firstly the other members of the grease pencil team: Daniel M. Lara, Matias Mendiola and Joshua Leung for their support, ideas and to keep working in the project all the time, without them this project had been impossible. Also, I want thanks other Blender developers for their help, advices and to be there always to help me, and specially to Clément Foucault, Dalai Felinto, Pablo Vázquez and Campbell Barton.
2018-07-31 10:22:19 +02:00
"NLA_OT_action_unlink",
UI_TEMPLATE_ID_FILTER_ALL,
UI: Allow label for Template-ID (respecting property split layout) Adds a `text` parameter to `bpy.types.uiLayout.template_ID()` which causes a label to be added, as usual. Adding the label also makes the template respect the `bpy.types.uiLayout.use_property_split` option. Also fixes wrong layout being used in the template-ID, although I think that didn't cause issues in practice. Sergey requested this for usage in the Movie Clip Editor.
2019-11-25 19:41:30 +01:00
false,
NULL);
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Animato - NLA + Realtime Animating Goodies * When doing realtime recording of animation (i.e. transforming objects + bones while animation playback is running, and auto-keying is enabled), animation will be added to a new NLA Track+Strip combo everytime a single 'loop' of the frame range has finished. This will allow 'passes' over the animation to be less destructive. * Made the evaluation of the active action (when NLA data is present), be handled as part of the normal NLA system evaluation code (as if it were just another strip in a track at the end). The immediate benefit is that there are now some settings (available in the "Animation Data" panel in the NLA Editor with a strip selected) which allow for the way the active action is combined with the NLA stack results. For instance, the way that the action extrapolates is used in the recording tweaks above.
2009-07-31 07:43:47 +00:00
/* extrapolation */
Code cleanup: remove TRUE/FALSE & WITH_BOOL_COMPAT define
2014-04-01 11:34:00 +11:00
row = uiLayoutRow(layout, true);
UI: NLA Editor Sidebar overhaul The NLA Editor sidebar is currently out of step with the rest of Blender, and in particular the Sequencer, which offers similar features and functionality. This patch makes a number of UI layout changes to make it fit in. - Remove Active Track panel, since the track names can just be edited in the source list on the left - Rejiggered the categories to be more understandable. 'Strip' includes settings for the current strip, and 'Edited Action' includes settings for the action that is currently being edited - Use single column split layout - Use name + mute toggle configuration like in the Sequencer - Fix an issue with the theme, where the sidebar background was too dark, breaking the bright -> dark hierarchical logic - Use sub-panels for animated strip properties controls Differential Revision: https://developer.blender.org/D6687 Reviewed by Brecht van Lommel
2020-01-28 13:13:45 +01:00
uiItemR(row, &adt_ptr, "action_extrapolation", 0, IFACE_("Extrapolation"), ICON_NONE);
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Animato - NLA + Realtime Animating Goodies * When doing realtime recording of animation (i.e. transforming objects + bones while animation playback is running, and auto-keying is enabled), animation will be added to a new NLA Track+Strip combo everytime a single 'loop' of the frame range has finished. This will allow 'passes' over the animation to be less destructive. * Made the evaluation of the active action (when NLA data is present), be handled as part of the normal NLA system evaluation code (as if it were just another strip in a track at the end). The immediate benefit is that there are now some settings (available in the "Animation Data" panel in the NLA Editor with a strip selected) which allow for the way the active action is combined with the NLA stack results. For instance, the way that the action extrapolates is used in the recording tweaks above.
2009-07-31 07:43:47 +00:00
/* blending */
Code cleanup: remove TRUE/FALSE & WITH_BOOL_COMPAT define
2014-04-01 11:34:00 +11:00
row = uiLayoutRow(layout, true);
UI: NLA Editor Sidebar overhaul The NLA Editor sidebar is currently out of step with the rest of Blender, and in particular the Sequencer, which offers similar features and functionality. This patch makes a number of UI layout changes to make it fit in. - Remove Active Track panel, since the track names can just be edited in the source list on the left - Rejiggered the categories to be more understandable. 'Strip' includes settings for the current strip, and 'Edited Action' includes settings for the action that is currently being edited - Use single column split layout - Use name + mute toggle configuration like in the Sequencer - Fix an issue with the theme, where the sidebar background was too dark, breaking the bright -> dark hierarchical logic - Use sub-panels for animated strip properties controls Differential Revision: https://developer.blender.org/D6687 Reviewed by Brecht van Lommel
2020-01-28 13:13:45 +01:00
uiItemR(row, &adt_ptr, "action_blend_type", 0, IFACE_("Blending"), ICON_NONE);
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Animato - NLA + Realtime Animating Goodies * When doing realtime recording of animation (i.e. transforming objects + bones while animation playback is running, and auto-keying is enabled), animation will be added to a new NLA Track+Strip combo everytime a single 'loop' of the frame range has finished. This will allow 'passes' over the animation to be less destructive. * Made the evaluation of the active action (when NLA data is present), be handled as part of the normal NLA system evaluation code (as if it were just another strip in a track at the end). The immediate benefit is that there are now some settings (available in the "Animation Data" panel in the NLA Editor with a strip selected) which allow for the way the active action is combined with the NLA stack results. For instance, the way that the action extrapolates is used in the recording tweaks above.
2009-07-31 07:43:47 +00:00
/* influence */
Code cleanup: remove TRUE/FALSE & WITH_BOOL_COMPAT define
2014-04-01 11:34:00 +11:00
row = uiLayoutRow(layout, true);
UI: NLA Editor Sidebar overhaul The NLA Editor sidebar is currently out of step with the rest of Blender, and in particular the Sequencer, which offers similar features and functionality. This patch makes a number of UI layout changes to make it fit in. - Remove Active Track panel, since the track names can just be edited in the source list on the left - Rejiggered the categories to be more understandable. 'Strip' includes settings for the current strip, and 'Edited Action' includes settings for the action that is currently being edited - Use single column split layout - Use name + mute toggle configuration like in the Sequencer - Fix an issue with the theme, where the sidebar background was too dark, breaking the bright -> dark hierarchical logic - Use sub-panels for animated strip properties controls Differential Revision: https://developer.blender.org/D6687 Reviewed by Brecht van Lommel
2020-01-28 13:13:45 +01:00
uiItemR(row, &adt_ptr, "action_influence", 0, IFACE_("Influence"), ICON_NONE);
Animato - NLA + Realtime Animating Goodies * When doing realtime recording of animation (i.e. transforming objects + bones while animation playback is running, and auto-keying is enabled), animation will be added to a new NLA Track+Strip combo everytime a single 'loop' of the frame range has finished. This will allow 'passes' over the animation to be less destructive. * Made the evaluation of the active action (when NLA data is present), be handled as part of the normal NLA system evaluation code (as if it were just another strip in a track at the end). The immediate benefit is that there are now some settings (available in the "Animation Data" panel in the NLA Editor with a strip selected) which allow for the way the active action is combined with the NLA stack results. For instance, the way that the action extrapolates is used in the recording tweaks above.
2009-07-31 07:43:47 +00:00
}
UI: NLA Editor Sidebar overhaul The NLA Editor sidebar is currently out of step with the rest of Blender, and in particular the Sequencer, which offers similar features and functionality. This patch makes a number of UI layout changes to make it fit in. - Remove Active Track panel, since the track names can just be edited in the source list on the left - Rejiggered the categories to be more understandable. 'Strip' includes settings for the current strip, and 'Edited Action' includes settings for the action that is currently being edited - Use single column split layout - Use name + mute toggle configuration like in the Sequencer - Fix an issue with the theme, where the sidebar background was too dark, breaking the bright -> dark hierarchical logic - Use sub-panels for animated strip properties controls Differential Revision: https://developer.blender.org/D6687 Reviewed by Brecht van Lommel
2020-01-28 13:13:45 +01:00
/* generic settings for active NLA-Strip */
Cleanup: Rename Panel * variables from pa to panel
2020-04-03 22:20:25 -05:00
static void nla_panel_stripname(const bContext *C, Panel *panel)
NLA SoC: Added buttons in NKEY region for NLA Editor - Most of the settings wrapped in RNA have been exposed here using the new layout engine stuff from Brecht (C-API). I've tried to maintain a hierarchy of high-level (owner, generic-settings) to low-level (children, specialised-settings) here, which seems to be the prevailing guidelines? (It took a while to try to understand how this all fitted together, since there were no clear examples on how to use this anywhere) - NLA-Strip Modifiers have not been exposed yet. They still use the old-style drawing, which may/may not be compatible here. - Fixed a bug with how the notifiers from this panel get sent. I really don't know how the compiler would have missed the undeclared pointer that was being used ('ob').
2009-06-09 04:39:33 +00:00
{
UI: NLA Editor Sidebar overhaul The NLA Editor sidebar is currently out of step with the rest of Blender, and in particular the Sequencer, which offers similar features and functionality. This patch makes a number of UI layout changes to make it fit in. - Remove Active Track panel, since the track names can just be edited in the source list on the left - Rejiggered the categories to be more understandable. 'Strip' includes settings for the current strip, and 'Edited Action' includes settings for the action that is currently being edited - Use single column split layout - Use name + mute toggle configuration like in the Sequencer - Fix an issue with the theme, where the sidebar background was too dark, breaking the bright -> dark hierarchical logic - Use sub-panels for animated strip properties controls Differential Revision: https://developer.blender.org/D6687 Reviewed by Brecht van Lommel
2020-01-28 13:13:45 +01:00
PointerRNA strip_ptr;
Cleanup: Rename Panel * variables from pa to panel
2020-04-03 22:20:25 -05:00
uiLayout *layout = panel->layout;
NLA SoC: Added buttons in NKEY region for NLA Editor - Most of the settings wrapped in RNA have been exposed here using the new layout engine stuff from Brecht (C-API). I've tried to maintain a hierarchy of high-level (owner, generic-settings) to low-level (children, specialised-settings) here, which seems to be the prevailing guidelines? (It took a while to try to understand how this all fitted together, since there were no clear examples on how to use this anywhere) - NLA-Strip Modifiers have not been exposed yet. They still use the old-style drawing, which may/may not be compatible here. - Fixed a bug with how the notifiers from this panel get sent. I really don't know how the compiler would have missed the undeclared pointer that was being used ('ob').
2009-06-09 04:39:33 +00:00
uiLayout *row;
uiBlock *block;
Cleanup: strip trailing space in editors
2018-06-04 09:31:30 +02:00
UI: NLA Editor Sidebar overhaul The NLA Editor sidebar is currently out of step with the rest of Blender, and in particular the Sequencer, which offers similar features and functionality. This patch makes a number of UI layout changes to make it fit in. - Remove Active Track panel, since the track names can just be edited in the source list on the left - Rejiggered the categories to be more understandable. 'Strip' includes settings for the current strip, and 'Edited Action' includes settings for the action that is currently being edited - Use single column split layout - Use name + mute toggle configuration like in the Sequencer - Fix an issue with the theme, where the sidebar background was too dark, breaking the bright -> dark hierarchical logic - Use sub-panels for animated strip properties controls Differential Revision: https://developer.blender.org/D6687 Reviewed by Brecht van Lommel
2020-01-28 13:13:45 +01:00
if (!nla_panel_context(C, NULL, NULL, &strip_ptr)) {
NLA SoC: Added buttons in NKEY region for NLA Editor - Most of the settings wrapped in RNA have been exposed here using the new layout engine stuff from Brecht (C-API). I've tried to maintain a hierarchy of high-level (owner, generic-settings) to low-level (children, specialised-settings) here, which seems to be the prevailing guidelines? (It took a while to try to understand how this all fitted together, since there were no clear examples on how to use this anywhere) - NLA-Strip Modifiers have not been exposed yet. They still use the old-style drawing, which may/may not be compatible here. - Fixed a bug with how the notifiers from this panel get sent. I really don't know how the compiler would have missed the undeclared pointer that was being used ('ob').
2009-06-09 04:39:33 +00:00
return;
Cleanup: style, use braces for editors
2019-04-22 09:19:45 +10:00
}
Cleanup: strip trailing space in editors
2018-06-04 09:31:30 +02:00
style cleanup: nla
2012-05-08 18:05:57 +00:00
block = uiLayoutGetBlock(layout);
UI Refactor T41640 Make the UI API more consistent and reduce confusion with some naming. mainly: - API function calls - enum values some internal static functions have been left for now
2014-11-09 21:20:40 +01:00
UI_block_func_handle_set(block, do_nla_region_buttons, NULL);
Cleanup: strip trailing space in editors
2018-06-04 09:31:30 +02:00
UI: NLA Editor Sidebar overhaul The NLA Editor sidebar is currently out of step with the rest of Blender, and in particular the Sequencer, which offers similar features and functionality. This patch makes a number of UI layout changes to make it fit in. - Remove Active Track panel, since the track names can just be edited in the source list on the left - Rejiggered the categories to be more understandable. 'Strip' includes settings for the current strip, and 'Edited Action' includes settings for the action that is currently being edited - Use single column split layout - Use name + mute toggle configuration like in the Sequencer - Fix an issue with the theme, where the sidebar background was too dark, breaking the bright -> dark hierarchical logic - Use sub-panels for animated strip properties controls Differential Revision: https://developer.blender.org/D6687 Reviewed by Brecht van Lommel
2020-01-28 13:13:45 +01:00
/* Strip Properties ------------------------------------- */
/* strip type */
row = uiLayoutRow(layout, false);
if (RNA_enum_get(&strip_ptr, "type") == NLASTRIP_TYPE_CLIP) {
uiItemL(row, "", ICON_ANIM);
}
else if (RNA_enum_get(&strip_ptr, "type") == NLASTRIP_TYPE_TRANSITION) {
uiItemL(row, "", ICON_ARROW_LEFTRIGHT);
}
else if (RNA_enum_get(&strip_ptr, "type") == NLASTRIP_TYPE_META) {
uiItemL(row, "", ICON_SEQ_STRIP_META);
}
else if (RNA_enum_get(&strip_ptr, "type") == NLASTRIP_TYPE_SOUND) {
uiItemL(row, "", ICON_SOUND);
}
uiItemR(row, &strip_ptr, "name", 0, "", ICON_NLA);
Fix T83868: Button animation states no longer visible without emboss This bug was caused by making it so that non-embossed modifier icon buttons could become an operator button and retain their red highlight for disabled modifiers. The icon button needs emboss turned off, but in earlier versions of Blender, `UI_EMBOSS_NONE` would be overridden by animation or red alert states. Instead of abusing "NONE" to mean "none unless there is animation or red alert", this commit adds a new emboss flag for that situation, `UI_EMBOSS_NONE_OR_STATUS`, which uses no emboss unless there is an animation state, or another status. There are only a few situations where this is necessary, so the change isn't too big. Differential Revision: https://developer.blender.org/D9902
2020-12-18 17:13:15 -06:00
UI_block_emboss_set(block, UI_EMBOSS_NONE_OR_STATUS);
UI: NLA Editor Sidebar overhaul The NLA Editor sidebar is currently out of step with the rest of Blender, and in particular the Sequencer, which offers similar features and functionality. This patch makes a number of UI layout changes to make it fit in. - Remove Active Track panel, since the track names can just be edited in the source list on the left - Rejiggered the categories to be more understandable. 'Strip' includes settings for the current strip, and 'Edited Action' includes settings for the action that is currently being edited - Use single column split layout - Use name + mute toggle configuration like in the Sequencer - Fix an issue with the theme, where the sidebar background was too dark, breaking the bright -> dark hierarchical logic - Use sub-panels for animated strip properties controls Differential Revision: https://developer.blender.org/D6687 Reviewed by Brecht van Lommel
2020-01-28 13:13:45 +01:00
uiItemR(row, &strip_ptr, "mute", 0, "", ICON_NONE);
UI_block_emboss_set(block, UI_EMBOSS);
NLA SoC: Added buttons in NKEY region for NLA Editor - Most of the settings wrapped in RNA have been exposed here using the new layout engine stuff from Brecht (C-API). I've tried to maintain a hierarchy of high-level (owner, generic-settings) to low-level (children, specialised-settings) here, which seems to be the prevailing guidelines? (It took a while to try to understand how this all fitted together, since there were no clear examples on how to use this anywhere) - NLA-Strip Modifiers have not been exposed yet. They still use the old-style drawing, which may/may not be compatible here. - Fixed a bug with how the notifiers from this panel get sent. I really don't know how the compiler would have missed the undeclared pointer that was being used ('ob').
2009-06-09 04:39:33 +00:00
}
/* generic settings for active NLA-Strip */
Cleanup: Rename Panel * variables from pa to panel
2020-04-03 22:20:25 -05:00
static void nla_panel_properties(const bContext *C, Panel *panel)
NLA SoC: Adding skeleton code for a buttons region in NLA If anyone's doing any testing at this point, please check if this works ok for files with new/old NLA Editors, as I was having some problems with one of my testing (saved from this branch) files with this.
2009-06-07 11:37:15 +00:00
{
NLA SoC: Added buttons in NKEY region for NLA Editor - Most of the settings wrapped in RNA have been exposed here using the new layout engine stuff from Brecht (C-API). I've tried to maintain a hierarchy of high-level (owner, generic-settings) to low-level (children, specialised-settings) here, which seems to be the prevailing guidelines? (It took a while to try to understand how this all fitted together, since there were no clear examples on how to use this anywhere) - NLA-Strip Modifiers have not been exposed yet. They still use the old-style drawing, which may/may not be compatible here. - Fixed a bug with how the notifiers from this panel get sent. I really don't know how the compiler would have missed the undeclared pointer that was being used ('ob').
2009-06-09 04:39:33 +00:00
PointerRNA strip_ptr;
Cleanup: Rename Panel * variables from pa to panel
2020-04-03 22:20:25 -05:00
uiLayout *layout = panel->layout;
UI: Use new layout features for the NLA sidebar Improves alignment.
2020-04-18 08:32:21 +02:00
uiLayout *column, *row;
NLA SoC: Adding skeleton code for a buttons region in NLA If anyone's doing any testing at this point, please check if this works ok for files with new/old NLA Editors, as I was having some problems with one of my testing (saved from this branch) files with this.
2009-06-07 11:37:15 +00:00
uiBlock *block;
Sound clip NLA Strips for Nexyon These are basically just for specifying when a speaker should fire off it's soundclip, and as such, many NLA operations are irrelevant for it. They can only be specified on object-level for speaker objects. I've still got some UI tweaks I'll need to work on in order for these to be able to be added even when the speaker doesn't have any NLA tracks yet. (EDIT: while typing this, I had an idea for how to do this, but that'll be for next commit). In the mean time, you'll need to add a single keyframe for the object, snowflake that action and delete the NLA strip before you can start editing.
2011-08-07 12:27:20 +00:00
short showEvalProps = 1;
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Cleanup: style, use braces for editors
2019-04-22 09:19:45 +10:00
if (!nla_panel_context(C, NULL, NULL, &strip_ptr)) {
NLA SoC: Quick crash fix Pointer for accessing settings of active NLA-strip was not getting set. The code for this was accidentally removed during an earlier commit to clean up the poll callbacks here.
2009-06-25 05:05:35 +00:00
return;
Cleanup: style, use braces for editors
2019-04-22 09:19:45 +10:00
}
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
style cleanup: nla
2012-05-08 18:05:57 +00:00
block = uiLayoutGetBlock(layout);
UI Refactor T41640 Make the UI API more consistent and reduce confusion with some naming. mainly: - API function calls - enum values some internal static functions have been left for now
2014-11-09 21:20:40 +01:00
UI_block_func_handle_set(block, do_nla_region_buttons, NULL);
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
NLA SoC: Added buttons in NKEY region for NLA Editor - Most of the settings wrapped in RNA have been exposed here using the new layout engine stuff from Brecht (C-API). I've tried to maintain a hierarchy of high-level (owner, generic-settings) to low-level (children, specialised-settings) here, which seems to be the prevailing guidelines? (It took a while to try to understand how this all fitted together, since there were no clear examples on how to use this anywhere) - NLA-Strip Modifiers have not been exposed yet. They still use the old-style drawing, which may/may not be compatible here. - Fixed a bug with how the notifiers from this panel get sent. I really don't know how the compiler would have missed the undeclared pointer that was being used ('ob').
2009-06-09 04:39:33 +00:00
/* Strip Properties ------------------------------------- */
/* strip type */
UI: NLA Editor Sidebar overhaul The NLA Editor sidebar is currently out of step with the rest of Blender, and in particular the Sequencer, which offers similar features and functionality. This patch makes a number of UI layout changes to make it fit in. - Remove Active Track panel, since the track names can just be edited in the source list on the left - Rejiggered the categories to be more understandable. 'Strip' includes settings for the current strip, and 'Edited Action' includes settings for the action that is currently being edited - Use single column split layout - Use name + mute toggle configuration like in the Sequencer - Fix an issue with the theme, where the sidebar background was too dark, breaking the bright -> dark hierarchical logic - Use sub-panels for animated strip properties controls Differential Revision: https://developer.blender.org/D6687 Reviewed by Brecht van Lommel
2020-01-28 13:13:45 +01:00
uiLayoutSetPropSep(layout, true);
uiLayoutSetPropDecorate(layout, false);
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
NLA SoC: Added buttons in NKEY region for NLA Editor - Most of the settings wrapped in RNA have been exposed here using the new layout engine stuff from Brecht (C-API). I've tried to maintain a hierarchy of high-level (owner, generic-settings) to low-level (children, specialised-settings) here, which seems to be the prevailing guidelines? (It took a while to try to understand how this all fitted together, since there were no clear examples on how to use this anywhere) - NLA-Strip Modifiers have not been exposed yet. They still use the old-style drawing, which may/may not be compatible here. - Fixed a bug with how the notifiers from this panel get sent. I really don't know how the compiler would have missed the undeclared pointer that was being used ('ob').
2009-06-09 04:39:33 +00:00
/* strip extents */
Code cleanup: remove TRUE/FALSE & WITH_BOOL_COMPAT define
2014-04-01 11:34:00 +11:00
column = uiLayoutColumn(layout, true);
UI: NLA Editor Sidebar overhaul The NLA Editor sidebar is currently out of step with the rest of Blender, and in particular the Sequencer, which offers similar features and functionality. This patch makes a number of UI layout changes to make it fit in. - Remove Active Track panel, since the track names can just be edited in the source list on the left - Rejiggered the categories to be more understandable. 'Strip' includes settings for the current strip, and 'Edited Action' includes settings for the action that is currently being edited - Use single column split layout - Use name + mute toggle configuration like in the Sequencer - Fix an issue with the theme, where the sidebar background was too dark, breaking the bright -> dark hierarchical logic - Use sub-panels for animated strip properties controls Differential Revision: https://developer.blender.org/D6687 Reviewed by Brecht van Lommel
2020-01-28 13:13:45 +01:00
uiItemR(column, &strip_ptr, "frame_start", 0, IFACE_("Frame Start"), ICON_NONE);
uiItemR(column, &strip_ptr, "frame_end", 0, IFACE_("End"), ICON_NONE);
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Sound clip NLA Strips for Nexyon These are basically just for specifying when a speaker should fire off it's soundclip, and as such, many NLA operations are irrelevant for it. They can only be specified on object-level for speaker objects. I've still got some UI tweaks I'll need to work on in order for these to be able to be added even when the speaker doesn't have any NLA tracks yet. (EDIT: while typing this, I had an idea for how to do this, but that'll be for next commit). In the mean time, you'll need to add a single keyframe for the object, snowflake that action and delete the NLA strip before you can start editing.
2011-08-07 12:27:20 +00:00
/* Evaluation-Related Strip Properties ------------------ */
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Sound clip NLA Strips for Nexyon These are basically just for specifying when a speaker should fire off it's soundclip, and as such, many NLA operations are irrelevant for it. They can only be specified on object-level for speaker objects. I've still got some UI tweaks I'll need to work on in order for these to be able to be added even when the speaker doesn't have any NLA tracks yet. (EDIT: while typing this, I had an idea for how to do this, but that'll be for next commit). In the mean time, you'll need to add a single keyframe for the object, snowflake that action and delete the NLA strip before you can start editing.
2011-08-07 12:27:20 +00:00
/* sound properties strips don't have these settings */
Cleanup: style, use braces for editors
2019-04-22 09:19:45 +10:00
if (RNA_enum_get(&strip_ptr, "type") == NLASTRIP_TYPE_SOUND) {
Sound clip NLA Strips for Nexyon These are basically just for specifying when a speaker should fire off it's soundclip, and as such, many NLA operations are irrelevant for it. They can only be specified on object-level for speaker objects. I've still got some UI tweaks I'll need to work on in order for these to be able to be added even when the speaker doesn't have any NLA tracks yet. (EDIT: while typing this, I had an idea for how to do this, but that'll be for next commit). In the mean time, you'll need to add a single keyframe for the object, snowflake that action and delete the NLA strip before you can start editing.
2011-08-07 12:27:20 +00:00
showEvalProps = 0;
Cleanup: style, use braces for editors
2019-04-22 09:19:45 +10:00
}
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Sound clip NLA Strips for Nexyon These are basically just for specifying when a speaker should fire off it's soundclip, and as such, many NLA operations are irrelevant for it. They can only be specified on object-level for speaker objects. I've still got some UI tweaks I'll need to work on in order for these to be able to be added even when the speaker doesn't have any NLA tracks yet. (EDIT: while typing this, I had an idea for how to do this, but that'll be for next commit). In the mean time, you'll need to add a single keyframe for the object, snowflake that action and delete the NLA strip before you can start editing.
2011-08-07 12:27:20 +00:00
/* only show if allowed to... */
if (showEvalProps) {
/* extrapolation */
UI: NLA Editor Sidebar overhaul The NLA Editor sidebar is currently out of step with the rest of Blender, and in particular the Sequencer, which offers similar features and functionality. This patch makes a number of UI layout changes to make it fit in. - Remove Active Track panel, since the track names can just be edited in the source list on the left - Rejiggered the categories to be more understandable. 'Strip' includes settings for the current strip, and 'Edited Action' includes settings for the action that is currently being edited - Use single column split layout - Use name + mute toggle configuration like in the Sequencer - Fix an issue with the theme, where the sidebar background was too dark, breaking the bright -> dark hierarchical logic - Use sub-panels for animated strip properties controls Differential Revision: https://developer.blender.org/D6687 Reviewed by Brecht van Lommel
2020-01-28 13:13:45 +01:00
column = uiLayoutColumn(layout, false);
uiItemR(column, &strip_ptr, "extrapolation", 0, NULL, ICON_NONE);
uiItemR(column, &strip_ptr, "blend_type", 0, NULL, ICON_NONE);
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Cleanup: spelling
2019-04-10 08:40:49 +02:00
/* Blend in/out + auto-blending:
Cleanup: spelling
2020-07-07 12:44:47 +10:00
* - blend in/out can only be set when auto-blending is off.
Sound clip NLA Strips for Nexyon These are basically just for specifying when a speaker should fire off it's soundclip, and as such, many NLA operations are irrelevant for it. They can only be specified on object-level for speaker objects. I've still got some UI tweaks I'll need to work on in order for these to be able to be added even when the speaker doesn't have any NLA tracks yet. (EDIT: while typing this, I had an idea for how to do this, but that'll be for next commit). In the mean time, you'll need to add a single keyframe for the object, snowflake that action and delete the NLA strip before you can start editing.
2011-08-07 12:27:20 +00:00
*/
UI: NLA Editor Sidebar overhaul The NLA Editor sidebar is currently out of step with the rest of Blender, and in particular the Sequencer, which offers similar features and functionality. This patch makes a number of UI layout changes to make it fit in. - Remove Active Track panel, since the track names can just be edited in the source list on the left - Rejiggered the categories to be more understandable. 'Strip' includes settings for the current strip, and 'Edited Action' includes settings for the action that is currently being edited - Use single column split layout - Use name + mute toggle configuration like in the Sequencer - Fix an issue with the theme, where the sidebar background was too dark, breaking the bright -> dark hierarchical logic - Use sub-panels for animated strip properties controls Differential Revision: https://developer.blender.org/D6687 Reviewed by Brecht van Lommel
2020-01-28 13:13:45 +01:00
uiItemS(layout);
column = uiLayoutColumn(layout, true);
uiLayoutSetActive(column, RNA_boolean_get(&strip_ptr, "use_auto_blend") == false);
uiItemR(column, &strip_ptr, "blend_in", 0, IFACE_("Blend In"), ICON_NONE);
uiItemR(column, &strip_ptr, "blend_out", 0, IFACE_("Out"), ICON_NONE);
UI: Use new layout features for the NLA sidebar Improves alignment.
2020-04-18 08:32:21 +02:00
row = uiLayoutRow(column, true);
uiLayoutSetActive(row, RNA_boolean_get(&strip_ptr, "use_animated_influence") == false);
uiItemR(row, &strip_ptr, "use_auto_blend", 0, NULL, ICON_NONE); /* XXX as toggle? */
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Sound clip NLA Strips for Nexyon These are basically just for specifying when a speaker should fire off it's soundclip, and as such, many NLA operations are irrelevant for it. They can only be specified on object-level for speaker objects. I've still got some UI tweaks I'll need to work on in order for these to be able to be added even when the speaker doesn't have any NLA tracks yet. (EDIT: while typing this, I had an idea for how to do this, but that'll be for next commit). In the mean time, you'll need to add a single keyframe for the object, snowflake that action and delete the NLA strip before you can start editing.
2011-08-07 12:27:20 +00:00
/* settings */
UI: Fix untranslated layout headings
2020-06-22 15:06:13 +02:00
column = uiLayoutColumnWithHeading(layout, true, IFACE_("Playback"));
UI: Use new layout features for the NLA sidebar Improves alignment.
2020-04-18 08:32:21 +02:00
row = uiLayoutRow(column, true);
uiLayoutSetActive(row,
style cleanup: nla
2012-05-08 18:05:57 +00:00
!(RNA_boolean_get(&strip_ptr, "use_animated_influence") ||
RNA_boolean_get(&strip_ptr, "use_animated_time")));
UI: Use new layout features for the NLA sidebar Improves alignment.
2020-04-18 08:32:21 +02:00
uiItemR(row, &strip_ptr, "use_reverse", 0, NULL, ICON_NONE);
UI: NLA Editor Sidebar overhaul The NLA Editor sidebar is currently out of step with the rest of Blender, and in particular the Sequencer, which offers similar features and functionality. This patch makes a number of UI layout changes to make it fit in. - Remove Active Track panel, since the track names can just be edited in the source list on the left - Rejiggered the categories to be more understandable. 'Strip' includes settings for the current strip, and 'Edited Action' includes settings for the action that is currently being edited - Use single column split layout - Use name + mute toggle configuration like in the Sequencer - Fix an issue with the theme, where the sidebar background was too dark, breaking the bright -> dark hierarchical logic - Use sub-panels for animated strip properties controls Differential Revision: https://developer.blender.org/D6687 Reviewed by Brecht van Lommel
2020-01-28 13:13:45 +01:00
UI: Use new layout features for the NLA sidebar Improves alignment.
2020-04-18 08:32:21 +02:00
uiItemR(column, &strip_ptr, "use_animated_time_cyclic", 0, NULL, ICON_NONE);
Sound clip NLA Strips for Nexyon These are basically just for specifying when a speaker should fire off it's soundclip, and as such, many NLA operations are irrelevant for it. They can only be specified on object-level for speaker objects. I've still got some UI tweaks I'll need to work on in order for these to be able to be added even when the speaker doesn't have any NLA tracks yet. (EDIT: while typing this, I had an idea for how to do this, but that'll be for next commit). In the mean time, you'll need to add a single keyframe for the object, snowflake that action and delete the NLA strip before you can start editing.
2011-08-07 12:27:20 +00:00
}
NLA SoC: Added buttons in NKEY region for NLA Editor - Most of the settings wrapped in RNA have been exposed here using the new layout engine stuff from Brecht (C-API). I've tried to maintain a hierarchy of high-level (owner, generic-settings) to low-level (children, specialised-settings) here, which seems to be the prevailing guidelines? (It took a while to try to understand how this all fitted together, since there were no clear examples on how to use this anywhere) - NLA-Strip Modifiers have not been exposed yet. They still use the old-style drawing, which may/may not be compatible here. - Fixed a bug with how the notifiers from this panel get sent. I really don't know how the compiler would have missed the undeclared pointer that was being used ('ob').
2009-06-09 04:39:33 +00:00
}
/* action-clip only settings for active NLA-Strip */
Cleanup: Rename Panel * variables from pa to panel
2020-04-03 22:20:25 -05:00
static void nla_panel_actclip(const bContext *C, Panel *panel)
NLA SoC: Added buttons in NKEY region for NLA Editor - Most of the settings wrapped in RNA have been exposed here using the new layout engine stuff from Brecht (C-API). I've tried to maintain a hierarchy of high-level (owner, generic-settings) to low-level (children, specialised-settings) here, which seems to be the prevailing guidelines? (It took a while to try to understand how this all fitted together, since there were no clear examples on how to use this anywhere) - NLA-Strip Modifiers have not been exposed yet. They still use the old-style drawing, which may/may not be compatible here. - Fixed a bug with how the notifiers from this panel get sent. I really don't know how the compiler would have missed the undeclared pointer that was being used ('ob').
2009-06-09 04:39:33 +00:00
{
PointerRNA strip_ptr;
Cleanup: Rename Panel * variables from pa to panel
2020-04-03 22:20:25 -05:00
uiLayout *layout = panel->layout;
NLA SoC: Added buttons in NKEY region for NLA Editor - Most of the settings wrapped in RNA have been exposed here using the new layout engine stuff from Brecht (C-API). I've tried to maintain a hierarchy of high-level (owner, generic-settings) to low-level (children, specialised-settings) here, which seems to be the prevailing guidelines? (It took a while to try to understand how this all fitted together, since there were no clear examples on how to use this anywhere) - NLA-Strip Modifiers have not been exposed yet. They still use the old-style drawing, which may/may not be compatible here. - Fixed a bug with how the notifiers from this panel get sent. I really don't know how the compiler would have missed the undeclared pointer that was being used ('ob').
2009-06-09 04:39:33 +00:00
uiLayout *column, *row;
uiBlock *block;
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
NLA SoC: Added buttons in NKEY region for NLA Editor - Most of the settings wrapped in RNA have been exposed here using the new layout engine stuff from Brecht (C-API). I've tried to maintain a hierarchy of high-level (owner, generic-settings) to low-level (children, specialised-settings) here, which seems to be the prevailing guidelines? (It took a while to try to understand how this all fitted together, since there were no clear examples on how to use this anywhere) - NLA-Strip Modifiers have not been exposed yet. They still use the old-style drawing, which may/may not be compatible here. - Fixed a bug with how the notifiers from this panel get sent. I really don't know how the compiler would have missed the undeclared pointer that was being used ('ob').
2009-06-09 04:39:33 +00:00
/* check context and also validity of pointer */
Cleanup: style, use braces for editors
2019-04-22 09:19:45 +10:00
if (!nla_panel_context(C, NULL, NULL, &strip_ptr)) {
NLA SoC: Added buttons in NKEY region for NLA Editor - Most of the settings wrapped in RNA have been exposed here using the new layout engine stuff from Brecht (C-API). I've tried to maintain a hierarchy of high-level (owner, generic-settings) to low-level (children, specialised-settings) here, which seems to be the prevailing guidelines? (It took a while to try to understand how this all fitted together, since there were no clear examples on how to use this anywhere) - NLA-Strip Modifiers have not been exposed yet. They still use the old-style drawing, which may/may not be compatible here. - Fixed a bug with how the notifiers from this panel get sent. I really don't know how the compiler would have missed the undeclared pointer that was being used ('ob').
2009-06-09 04:39:33 +00:00
return;
Cleanup: style, use braces for editors
2019-04-22 09:19:45 +10:00
}
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
style cleanup: nla
2012-05-08 18:05:57 +00:00
block = uiLayoutGetBlock(layout);
UI Refactor T41640 Make the UI API more consistent and reduce confusion with some naming. mainly: - API function calls - enum values some internal static functions have been left for now
2014-11-09 21:20:40 +01:00
UI_block_func_handle_set(block, do_nla_region_buttons, NULL);
UI: NLA Editor Sidebar overhaul The NLA Editor sidebar is currently out of step with the rest of Blender, and in particular the Sequencer, which offers similar features and functionality. This patch makes a number of UI layout changes to make it fit in. - Remove Active Track panel, since the track names can just be edited in the source list on the left - Rejiggered the categories to be more understandable. 'Strip' includes settings for the current strip, and 'Edited Action' includes settings for the action that is currently being edited - Use single column split layout - Use name + mute toggle configuration like in the Sequencer - Fix an issue with the theme, where the sidebar background was too dark, breaking the bright -> dark hierarchical logic - Use sub-panels for animated strip properties controls Differential Revision: https://developer.blender.org/D6687 Reviewed by Brecht van Lommel
2020-01-28 13:13:45 +01:00
uiLayoutSetPropSep(layout, true);
uiLayoutSetPropDecorate(layout, false);
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
NLA SoC: Added buttons in NKEY region for NLA Editor - Most of the settings wrapped in RNA have been exposed here using the new layout engine stuff from Brecht (C-API). I've tried to maintain a hierarchy of high-level (owner, generic-settings) to low-level (children, specialised-settings) here, which seems to be the prevailing guidelines? (It took a while to try to understand how this all fitted together, since there were no clear examples on how to use this anywhere) - NLA-Strip Modifiers have not been exposed yet. They still use the old-style drawing, which may/may not be compatible here. - Fixed a bug with how the notifiers from this panel get sent. I really don't know how the compiler would have missed the undeclared pointer that was being used ('ob').
2009-06-09 04:39:33 +00:00
/* Strip Properties ------------------------------------- */
/* action pointer */
Code cleanup: remove TRUE/FALSE & WITH_BOOL_COMPAT define
2014-04-01 11:34:00 +11:00
row = uiLayoutRow(layout, true);
style cleanup: nla
2012-05-08 18:05:57 +00:00
uiItemR(row, &strip_ptr, "action", 0, NULL, ICON_ACTION);
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
NLA SoC: Added buttons in NKEY region for NLA Editor - Most of the settings wrapped in RNA have been exposed here using the new layout engine stuff from Brecht (C-API). I've tried to maintain a hierarchy of high-level (owner, generic-settings) to low-level (children, specialised-settings) here, which seems to be the prevailing guidelines? (It took a while to try to understand how this all fitted together, since there were no clear examples on how to use this anywhere) - NLA-Strip Modifiers have not been exposed yet. They still use the old-style drawing, which may/may not be compatible here. - Fixed a bug with how the notifiers from this panel get sent. I really don't know how the compiler would have missed the undeclared pointer that was being used ('ob').
2009-06-09 04:39:33 +00:00
/* action extents */
Code cleanup: remove TRUE/FALSE & WITH_BOOL_COMPAT define
2014-04-01 11:34:00 +11:00
column = uiLayoutColumn(layout, true);
UI: NLA Editor Sidebar overhaul The NLA Editor sidebar is currently out of step with the rest of Blender, and in particular the Sequencer, which offers similar features and functionality. This patch makes a number of UI layout changes to make it fit in. - Remove Active Track panel, since the track names can just be edited in the source list on the left - Rejiggered the categories to be more understandable. 'Strip' includes settings for the current strip, and 'Edited Action' includes settings for the action that is currently being edited - Use single column split layout - Use name + mute toggle configuration like in the Sequencer - Fix an issue with the theme, where the sidebar background was too dark, breaking the bright -> dark hierarchical logic - Use sub-panels for animated strip properties controls Differential Revision: https://developer.blender.org/D6687 Reviewed by Brecht van Lommel
2020-01-28 13:13:45 +01:00
uiItemR(column, &strip_ptr, "action_frame_start", 0, IFACE_("Frame Start"), ICON_NONE);
uiItemR(column, &strip_ptr, "action_frame_end", 0, IFACE_("End"), ICON_NONE);
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
UI: Fix untranslated layout headings
2020-06-22 15:06:13 +02:00
row = uiLayoutRowWithHeading(layout, false, IFACE_("Sync Length"));
UI: Use new layout features for the NLA sidebar Improves alignment.
2020-04-18 08:32:21 +02:00
uiItemR(row, &strip_ptr, "use_sync_length", 0, "", ICON_NONE);
Bugfix [#34645] NlaStrip Tweak Mode - No automatic action length sync on exit Originally I was thinking of not restoring this functionality (see report for further details). However, upon rechecking the code, it seems that there was actually a define set up for this already, but which wasn't actually hooked up yet. So, this commit basically exposes this option ("Sync Length") which ensures that when exiting tweak mode on a NLA Strip, that strip instance (and not other users of the same action) will be updated to include the newly added keyframes. This option is not enabled by default, and shouldn't really be needed in most ("intended") workflows.
2013-04-26 13:42:55 +00:00
uiItemO(row, IFACE_("Now"), ICON_FILE_REFRESH, "NLA_OT_action_sync_length");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
NLA SoC: Added buttons in NKEY region for NLA Editor - Most of the settings wrapped in RNA have been exposed here using the new layout engine stuff from Brecht (C-API). I've tried to maintain a hierarchy of high-level (owner, generic-settings) to low-level (children, specialised-settings) here, which seems to be the prevailing guidelines? (It took a while to try to understand how this all fitted together, since there were no clear examples on how to use this anywhere) - NLA-Strip Modifiers have not been exposed yet. They still use the old-style drawing, which may/may not be compatible here. - Fixed a bug with how the notifiers from this panel get sent. I really don't know how the compiler would have missed the undeclared pointer that was being used ('ob').
2009-06-09 04:39:33 +00:00
/* action usage */
Code cleanup: remove TRUE/FALSE & WITH_BOOL_COMPAT define
2014-04-01 11:34:00 +11:00
column = uiLayoutColumn(layout, true);
uiLayoutSetActive(column, RNA_boolean_get(&strip_ptr, "use_animated_time") == false);
UI: NLA Editor Sidebar overhaul The NLA Editor sidebar is currently out of step with the rest of Blender, and in particular the Sequencer, which offers similar features and functionality. This patch makes a number of UI layout changes to make it fit in. - Remove Active Track panel, since the track names can just be edited in the source list on the left - Rejiggered the categories to be more understandable. 'Strip' includes settings for the current strip, and 'Edited Action' includes settings for the action that is currently being edited - Use single column split layout - Use name + mute toggle configuration like in the Sequencer - Fix an issue with the theme, where the sidebar background was too dark, breaking the bright -> dark hierarchical logic - Use sub-panels for animated strip properties controls Differential Revision: https://developer.blender.org/D6687 Reviewed by Brecht van Lommel
2020-01-28 13:13:45 +01:00
uiItemR(column, &strip_ptr, "scale", 0, IFACE_("Playback Scale"), ICON_NONE);
style cleanup: nla
2012-05-08 18:05:57 +00:00
uiItemR(column, &strip_ptr, "repeat", 0, NULL, ICON_NONE);
NLA SoC: Adding skeleton code for a buttons region in NLA If anyone's doing any testing at this point, please check if this works ok for files with new/old NLA Editors, as I was having some problems with one of my testing (saved from this branch) files with this.
2009-06-07 11:37:15 +00:00
}
NLA SoC: Added buttons in NKEY region for NLA Editor - Most of the settings wrapped in RNA have been exposed here using the new layout engine stuff from Brecht (C-API). I've tried to maintain a hierarchy of high-level (owner, generic-settings) to low-level (children, specialised-settings) here, which seems to be the prevailing guidelines? (It took a while to try to understand how this all fitted together, since there were no clear examples on how to use this anywhere) - NLA-Strip Modifiers have not been exposed yet. They still use the old-style drawing, which may/may not be compatible here. - Fixed a bug with how the notifiers from this panel get sent. I really don't know how the compiler would have missed the undeclared pointer that was being used ('ob').
2009-06-09 04:39:33 +00:00
/* evaluation settings for active NLA-Strip */
Cleanup: Rename Panel * variables from pa to panel
2020-04-03 22:20:25 -05:00
static void nla_panel_animated_influence_header(const bContext *C, Panel *panel)
NLA SoC: Added buttons in NKEY region for NLA Editor - Most of the settings wrapped in RNA have been exposed here using the new layout engine stuff from Brecht (C-API). I've tried to maintain a hierarchy of high-level (owner, generic-settings) to low-level (children, specialised-settings) here, which seems to be the prevailing guidelines? (It took a while to try to understand how this all fitted together, since there were no clear examples on how to use this anywhere) - NLA-Strip Modifiers have not been exposed yet. They still use the old-style drawing, which may/may not be compatible here. - Fixed a bug with how the notifiers from this panel get sent. I really don't know how the compiler would have missed the undeclared pointer that was being used ('ob').
2009-06-09 04:39:33 +00:00
{
PointerRNA strip_ptr;
Cleanup: Rename Panel * variables from pa to panel
2020-04-03 22:20:25 -05:00
uiLayout *layout = panel->layout;
UI: NLA Editor Sidebar overhaul The NLA Editor sidebar is currently out of step with the rest of Blender, and in particular the Sequencer, which offers similar features and functionality. This patch makes a number of UI layout changes to make it fit in. - Remove Active Track panel, since the track names can just be edited in the source list on the left - Rejiggered the categories to be more understandable. 'Strip' includes settings for the current strip, and 'Edited Action' includes settings for the action that is currently being edited - Use single column split layout - Use name + mute toggle configuration like in the Sequencer - Fix an issue with the theme, where the sidebar background was too dark, breaking the bright -> dark hierarchical logic - Use sub-panels for animated strip properties controls Differential Revision: https://developer.blender.org/D6687 Reviewed by Brecht van Lommel
2020-01-28 13:13:45 +01:00
uiLayout *col;
NLA SoC: Added buttons in NKEY region for NLA Editor - Most of the settings wrapped in RNA have been exposed here using the new layout engine stuff from Brecht (C-API). I've tried to maintain a hierarchy of high-level (owner, generic-settings) to low-level (children, specialised-settings) here, which seems to be the prevailing guidelines? (It took a while to try to understand how this all fitted together, since there were no clear examples on how to use this anywhere) - NLA-Strip Modifiers have not been exposed yet. They still use the old-style drawing, which may/may not be compatible here. - Fixed a bug with how the notifiers from this panel get sent. I really don't know how the compiler would have missed the undeclared pointer that was being used ('ob').
2009-06-09 04:39:33 +00:00
uiBlock *block;
/* check context and also validity of pointer */
Cleanup: style, use braces for editors
2019-04-22 09:19:45 +10:00
if (!nla_panel_context(C, NULL, NULL, &strip_ptr)) {
NLA SoC: Added buttons in NKEY region for NLA Editor - Most of the settings wrapped in RNA have been exposed here using the new layout engine stuff from Brecht (C-API). I've tried to maintain a hierarchy of high-level (owner, generic-settings) to low-level (children, specialised-settings) here, which seems to be the prevailing guidelines? (It took a while to try to understand how this all fitted together, since there were no clear examples on how to use this anywhere) - NLA-Strip Modifiers have not been exposed yet. They still use the old-style drawing, which may/may not be compatible here. - Fixed a bug with how the notifiers from this panel get sent. I really don't know how the compiler would have missed the undeclared pointer that was being used ('ob').
2009-06-09 04:39:33 +00:00
return;
Cleanup: style, use braces for editors
2019-04-22 09:19:45 +10:00
}
Cleanup: strip trailing space in editors
2018-06-04 09:31:30 +02:00
style cleanup: nla
2012-05-08 18:05:57 +00:00
block = uiLayoutGetBlock(layout);
UI Refactor T41640 Make the UI API more consistent and reduce confusion with some naming. mainly: - API function calls - enum values some internal static functions have been left for now
2014-11-09 21:20:40 +01:00
UI_block_func_handle_set(block, do_nla_region_buttons, NULL);
Cleanup: strip trailing space in editors
2018-06-04 09:31:30 +02:00
Code cleanup: remove TRUE/FALSE & WITH_BOOL_COMPAT define
2014-04-01 11:34:00 +11:00
col = uiLayoutColumn(layout, true);
UI: NLA Editor Sidebar overhaul The NLA Editor sidebar is currently out of step with the rest of Blender, and in particular the Sequencer, which offers similar features and functionality. This patch makes a number of UI layout changes to make it fit in. - Remove Active Track panel, since the track names can just be edited in the source list on the left - Rejiggered the categories to be more understandable. 'Strip' includes settings for the current strip, and 'Edited Action' includes settings for the action that is currently being edited - Use single column split layout - Use name + mute toggle configuration like in the Sequencer - Fix an issue with the theme, where the sidebar background was too dark, breaking the bright -> dark hierarchical logic - Use sub-panels for animated strip properties controls Differential Revision: https://developer.blender.org/D6687 Reviewed by Brecht van Lommel
2020-01-28 13:13:45 +01:00
uiItemR(col, &strip_ptr, "use_animated_influence", 0, "", ICON_NONE);
}
/* evaluation settings for active NLA-Strip */
Cleanup: Rename Panel * variables from pa to panel
2020-04-03 22:20:25 -05:00
static void nla_panel_evaluation(const bContext *C, Panel *panel)
UI: NLA Editor Sidebar overhaul The NLA Editor sidebar is currently out of step with the rest of Blender, and in particular the Sequencer, which offers similar features and functionality. This patch makes a number of UI layout changes to make it fit in. - Remove Active Track panel, since the track names can just be edited in the source list on the left - Rejiggered the categories to be more understandable. 'Strip' includes settings for the current strip, and 'Edited Action' includes settings for the action that is currently being edited - Use single column split layout - Use name + mute toggle configuration like in the Sequencer - Fix an issue with the theme, where the sidebar background was too dark, breaking the bright -> dark hierarchical logic - Use sub-panels for animated strip properties controls Differential Revision: https://developer.blender.org/D6687 Reviewed by Brecht van Lommel
2020-01-28 13:13:45 +01:00
{
PointerRNA strip_ptr;
Cleanup: Rename Panel * variables from pa to panel
2020-04-03 22:20:25 -05:00
uiLayout *layout = panel->layout;
UI: NLA Editor Sidebar overhaul The NLA Editor sidebar is currently out of step with the rest of Blender, and in particular the Sequencer, which offers similar features and functionality. This patch makes a number of UI layout changes to make it fit in. - Remove Active Track panel, since the track names can just be edited in the source list on the left - Rejiggered the categories to be more understandable. 'Strip' includes settings for the current strip, and 'Edited Action' includes settings for the action that is currently being edited - Use single column split layout - Use name + mute toggle configuration like in the Sequencer - Fix an issue with the theme, where the sidebar background was too dark, breaking the bright -> dark hierarchical logic - Use sub-panels for animated strip properties controls Differential Revision: https://developer.blender.org/D6687 Reviewed by Brecht van Lommel
2020-01-28 13:13:45 +01:00
uiBlock *block;
/* check context and also validity of pointer */
if (!nla_panel_context(C, NULL, NULL, &strip_ptr)) {
return;
}
Cleanup: strip trailing space in editors
2018-06-04 09:31:30 +02:00
UI: NLA Editor Sidebar overhaul The NLA Editor sidebar is currently out of step with the rest of Blender, and in particular the Sequencer, which offers similar features and functionality. This patch makes a number of UI layout changes to make it fit in. - Remove Active Track panel, since the track names can just be edited in the source list on the left - Rejiggered the categories to be more understandable. 'Strip' includes settings for the current strip, and 'Edited Action' includes settings for the action that is currently being edited - Use single column split layout - Use name + mute toggle configuration like in the Sequencer - Fix an issue with the theme, where the sidebar background was too dark, breaking the bright -> dark hierarchical logic - Use sub-panels for animated strip properties controls Differential Revision: https://developer.blender.org/D6687 Reviewed by Brecht van Lommel
2020-01-28 13:13:45 +01:00
block = uiLayoutGetBlock(layout);
UI_block_func_handle_set(block, do_nla_region_buttons, NULL);
uiLayoutSetPropSep(layout, true);
uiLayoutSetEnabled(layout, RNA_boolean_get(&strip_ptr, "use_animated_influence"));
uiItemR(layout, &strip_ptr, "influence", 0, NULL, ICON_NONE);
}
Cleanup: Rename Panel * variables from pa to panel
2020-04-03 22:20:25 -05:00
static void nla_panel_animated_strip_time_header(const bContext *C, Panel *panel)
UI: NLA Editor Sidebar overhaul The NLA Editor sidebar is currently out of step with the rest of Blender, and in particular the Sequencer, which offers similar features and functionality. This patch makes a number of UI layout changes to make it fit in. - Remove Active Track panel, since the track names can just be edited in the source list on the left - Rejiggered the categories to be more understandable. 'Strip' includes settings for the current strip, and 'Edited Action' includes settings for the action that is currently being edited - Use single column split layout - Use name + mute toggle configuration like in the Sequencer - Fix an issue with the theme, where the sidebar background was too dark, breaking the bright -> dark hierarchical logic - Use sub-panels for animated strip properties controls Differential Revision: https://developer.blender.org/D6687 Reviewed by Brecht van Lommel
2020-01-28 13:13:45 +01:00
{
PointerRNA strip_ptr;
Cleanup: Rename Panel * variables from pa to panel
2020-04-03 22:20:25 -05:00
uiLayout *layout = panel->layout;
UI: NLA Editor Sidebar overhaul The NLA Editor sidebar is currently out of step with the rest of Blender, and in particular the Sequencer, which offers similar features and functionality. This patch makes a number of UI layout changes to make it fit in. - Remove Active Track panel, since the track names can just be edited in the source list on the left - Rejiggered the categories to be more understandable. 'Strip' includes settings for the current strip, and 'Edited Action' includes settings for the action that is currently being edited - Use single column split layout - Use name + mute toggle configuration like in the Sequencer - Fix an issue with the theme, where the sidebar background was too dark, breaking the bright -> dark hierarchical logic - Use sub-panels for animated strip properties controls Differential Revision: https://developer.blender.org/D6687 Reviewed by Brecht van Lommel
2020-01-28 13:13:45 +01:00
uiLayout *col;
uiBlock *block;
/* check context and also validity of pointer */
if (!nla_panel_context(C, NULL, NULL, &strip_ptr)) {
return;
}
block = uiLayoutGetBlock(layout);
UI_block_func_handle_set(block, do_nla_region_buttons, NULL);
2.6 UI code: * Get rid of subrow/subcol variable names in the C UI code as well, use sub instead. This is shorter and sufficient. * Minor layout alignment fixes. * Greying out in NLA editor was doing nothing for "strip_time" property.
2011-11-23 19:05:52 +00:00
Code cleanup: remove TRUE/FALSE & WITH_BOOL_COMPAT define
2014-04-01 11:34:00 +11:00
col = uiLayoutColumn(layout, true);
UI: NLA Editor Sidebar overhaul The NLA Editor sidebar is currently out of step with the rest of Blender, and in particular the Sequencer, which offers similar features and functionality. This patch makes a number of UI layout changes to make it fit in. - Remove Active Track panel, since the track names can just be edited in the source list on the left - Rejiggered the categories to be more understandable. 'Strip' includes settings for the current strip, and 'Edited Action' includes settings for the action that is currently being edited - Use single column split layout - Use name + mute toggle configuration like in the Sequencer - Fix an issue with the theme, where the sidebar background was too dark, breaking the bright -> dark hierarchical logic - Use sub-panels for animated strip properties controls Differential Revision: https://developer.blender.org/D6687 Reviewed by Brecht van Lommel
2020-01-28 13:13:45 +01:00
uiItemR(col, &strip_ptr, "use_animated_time", 0, "", ICON_NONE);
}
2.6 UI code: * Get rid of subrow/subcol variable names in the C UI code as well, use sub instead. This is shorter and sufficient. * Minor layout alignment fixes. * Greying out in NLA editor was doing nothing for "strip_time" property.
2011-11-23 19:05:52 +00:00
Cleanup: Rename Panel * variables from pa to panel
2020-04-03 22:20:25 -05:00
static void nla_panel_animated_strip_time(const bContext *C, Panel *panel)
UI: NLA Editor Sidebar overhaul The NLA Editor sidebar is currently out of step with the rest of Blender, and in particular the Sequencer, which offers similar features and functionality. This patch makes a number of UI layout changes to make it fit in. - Remove Active Track panel, since the track names can just be edited in the source list on the left - Rejiggered the categories to be more understandable. 'Strip' includes settings for the current strip, and 'Edited Action' includes settings for the action that is currently being edited - Use single column split layout - Use name + mute toggle configuration like in the Sequencer - Fix an issue with the theme, where the sidebar background was too dark, breaking the bright -> dark hierarchical logic - Use sub-panels for animated strip properties controls Differential Revision: https://developer.blender.org/D6687 Reviewed by Brecht van Lommel
2020-01-28 13:13:45 +01:00
{
PointerRNA strip_ptr;
Cleanup: Rename Panel * variables from pa to panel
2020-04-03 22:20:25 -05:00
uiLayout *layout = panel->layout;
UI: NLA Editor Sidebar overhaul The NLA Editor sidebar is currently out of step with the rest of Blender, and in particular the Sequencer, which offers similar features and functionality. This patch makes a number of UI layout changes to make it fit in. - Remove Active Track panel, since the track names can just be edited in the source list on the left - Rejiggered the categories to be more understandable. 'Strip' includes settings for the current strip, and 'Edited Action' includes settings for the action that is currently being edited - Use single column split layout - Use name + mute toggle configuration like in the Sequencer - Fix an issue with the theme, where the sidebar background was too dark, breaking the bright -> dark hierarchical logic - Use sub-panels for animated strip properties controls Differential Revision: https://developer.blender.org/D6687 Reviewed by Brecht van Lommel
2020-01-28 13:13:45 +01:00
uiBlock *block;
/* check context and also validity of pointer */
if (!nla_panel_context(C, NULL, NULL, &strip_ptr)) {
return;
}
block = uiLayoutGetBlock(layout);
UI_block_func_handle_set(block, do_nla_region_buttons, NULL);
uiLayoutSetPropSep(layout, true);
uiLayoutSetEnabled(layout, RNA_boolean_get(&strip_ptr, "use_animated_time"));
uiItemR(layout, &strip_ptr, "strip_time", 0, NULL, ICON_NONE);
NLA SoC: Added buttons in NKEY region for NLA Editor - Most of the settings wrapped in RNA have been exposed here using the new layout engine stuff from Brecht (C-API). I've tried to maintain a hierarchy of high-level (owner, generic-settings) to low-level (children, specialised-settings) here, which seems to be the prevailing guidelines? (It took a while to try to understand how this all fitted together, since there were no clear examples on how to use this anywhere) - NLA-Strip Modifiers have not been exposed yet. They still use the old-style drawing, which may/may not be compatible here. - Fixed a bug with how the notifiers from this panel get sent. I really don't know how the compiler would have missed the undeclared pointer that was being used ('ob').
2009-06-09 04:39:33 +00:00
}
NLA SoC: Adding skeleton code for a buttons region in NLA If anyone's doing any testing at this point, please check if this works ok for files with new/old NLA Editors, as I was having some problems with one of my testing (saved from this branch) files with this.
2009-06-07 11:37:15 +00:00
NLA SoC: Transition Strips + Strip Adding Operators + Bugfixes == Transitions == Transition strips are now able to be created + evaluated. Transitions allow for interpolation between the endpoints of two adjacent strips in the same track (i.e. two strips which occur in the same track one after the other, but with a gap between them). - The current behaviour when only one endpoint affects some setting is non-optimal, since it appears somewhat inconsistently extend/replace values... - Transform code needs a few fixes still to deal with these == Strip Adding Operators == * New strips referencing Actions can be added using the Shift-A hotkey while in the strips-area. You must have a track selected first though. The new strip will get added, starting from the current frame, in the selected track(s) only if there is enough space to do so. Otherwise, the new strip gets added at the top of the stack in a new track. * New transition strips can be added with the Shift-T hotkey while in the strips area. You must have two adjacent strips selected for this to work. == New Backend Methods == * Recoded the strip/track adding API to be more flexible * Added a new method for testing whether F-Curve has any modifiers of with certain attributes. Will be used in a later bugfix... == Bugfixes == - Fixed bug with strip-blending which caused the blending modes to be useless. - NLA buttons now use proper poll callbacks instead of defining checks - Commented out missing operator in menus, silencing warnings in console - Removed obsolete/incorrect comments
2009-06-19 04:45:56 +00:00
/* F-Modifiers for active NLA-Strip */
Cleanup: Rename Panel * variables from pa to panel
2020-04-03 22:20:25 -05:00
static void nla_panel_modifiers(const bContext *C, Panel *panel)
NLA SoC: Transition Strips + Strip Adding Operators + Bugfixes == Transitions == Transition strips are now able to be created + evaluated. Transitions allow for interpolation between the endpoints of two adjacent strips in the same track (i.e. two strips which occur in the same track one after the other, but with a gap between them). - The current behaviour when only one endpoint affects some setting is non-optimal, since it appears somewhat inconsistently extend/replace values... - Transform code needs a few fixes still to deal with these == Strip Adding Operators == * New strips referencing Actions can be added using the Shift-A hotkey while in the strips-area. You must have a track selected first though. The new strip will get added, starting from the current frame, in the selected track(s) only if there is enough space to do so. Otherwise, the new strip gets added at the top of the stack in a new track. * New transition strips can be added with the Shift-T hotkey while in the strips area. You must have two adjacent strips selected for this to work. == New Backend Methods == * Recoded the strip/track adding API to be more flexible * Added a new method for testing whether F-Curve has any modifiers of with certain attributes. Will be used in a later bugfix... == Bugfixes == - Fixed bug with strip-blending which caused the blending modes to be useless. - NLA buttons now use proper poll callbacks instead of defining checks - Commented out missing operator in menus, silencing warnings in console - Removed obsolete/incorrect comments
2009-06-19 04:45:56 +00:00
{
PointerRNA strip_ptr;
NLA SoC: F-Modifiers working on NLA Strips * Using the Ctrl-Shift-M hotkey, F-Modifiers can be added to all the selected strips. * F-Modifiers can also be added/tweaked from the NLA N-Key properties. The UI now uses the same code as for the graph editor ones. The UI drawing here is currently messed up from the NLA side, since it seems combining normal layout stuff and old-style uiBlocks doesn't seem to work too well (BUT! the buttons are at least functional). Next up, I'll need to recode the buttons panel for the Graph Editor so that all of the drawing can be migrated over to use the new layout engine.
2009-07-02 06:41:10 +00:00
NlaStrip *strip;
FModifier *fcm;
NLA SoC: FModifier drawing converted to use Layout Engine * Most of the F-Modifiers have been ported to use the layout engine + RNA for drawing their buttons now. This plays much nicer with various button-layouts. --> As a nice demo, try adding a Noise Modifier to a NLA-strip, and change the 'size' setting to about 2 to see some effects. * Generator and Envelope modifiers haven't been ported yet since they're quite complex (requiring more time + energy), and as such, have been made to have some temporary error prints instead. Will check on this tomorrow. * Finished/cleaned up the RNA-wrapping of most FModifiers. TODO's (help requested... Brecht?): Generator modifier's UI cannot be wrapped yet using the layout engine (though I might try using the old system only), as I'm having some trouble wrapping the coefficients array for this (see rna_fcurve.c - rna_def_fmodifier_generator())
2009-07-02 12:41:03 +00:00
uiLayout *col, *row;
NLA SoC: Transition Strips + Strip Adding Operators + Bugfixes == Transitions == Transition strips are now able to be created + evaluated. Transitions allow for interpolation between the endpoints of two adjacent strips in the same track (i.e. two strips which occur in the same track one after the other, but with a gap between them). - The current behaviour when only one endpoint affects some setting is non-optimal, since it appears somewhat inconsistently extend/replace values... - Transform code needs a few fixes still to deal with these == Strip Adding Operators == * New strips referencing Actions can be added using the Shift-A hotkey while in the strips-area. You must have a track selected first though. The new strip will get added, starting from the current frame, in the selected track(s) only if there is enough space to do so. Otherwise, the new strip gets added at the top of the stack in a new track. * New transition strips can be added with the Shift-T hotkey while in the strips area. You must have two adjacent strips selected for this to work. == New Backend Methods == * Recoded the strip/track adding API to be more flexible * Added a new method for testing whether F-Curve has any modifiers of with certain attributes. Will be used in a later bugfix... == Bugfixes == - Fixed bug with strip-blending which caused the blending modes to be useless. - NLA buttons now use proper poll callbacks instead of defining checks - Commented out missing operator in menus, silencing warnings in console - Removed obsolete/incorrect comments
2009-06-19 04:45:56 +00:00
uiBlock *block;
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
NLA SoC: Transition Strips + Strip Adding Operators + Bugfixes == Transitions == Transition strips are now able to be created + evaluated. Transitions allow for interpolation between the endpoints of two adjacent strips in the same track (i.e. two strips which occur in the same track one after the other, but with a gap between them). - The current behaviour when only one endpoint affects some setting is non-optimal, since it appears somewhat inconsistently extend/replace values... - Transform code needs a few fixes still to deal with these == Strip Adding Operators == * New strips referencing Actions can be added using the Shift-A hotkey while in the strips-area. You must have a track selected first though. The new strip will get added, starting from the current frame, in the selected track(s) only if there is enough space to do so. Otherwise, the new strip gets added at the top of the stack in a new track. * New transition strips can be added with the Shift-T hotkey while in the strips area. You must have two adjacent strips selected for this to work. == New Backend Methods == * Recoded the strip/track adding API to be more flexible * Added a new method for testing whether F-Curve has any modifiers of with certain attributes. Will be used in a later bugfix... == Bugfixes == - Fixed bug with strip-blending which caused the blending modes to be useless. - NLA buttons now use proper poll callbacks instead of defining checks - Commented out missing operator in menus, silencing warnings in console - Removed obsolete/incorrect comments
2009-06-19 04:45:56 +00:00
/* check context and also validity of pointer */
Cleanup: style, use braces for editors
2019-04-22 09:19:45 +10:00
if (!nla_panel_context(C, NULL, NULL, &strip_ptr)) {
NLA SoC: Transition Strips + Strip Adding Operators + Bugfixes == Transitions == Transition strips are now able to be created + evaluated. Transitions allow for interpolation between the endpoints of two adjacent strips in the same track (i.e. two strips which occur in the same track one after the other, but with a gap between them). - The current behaviour when only one endpoint affects some setting is non-optimal, since it appears somewhat inconsistently extend/replace values... - Transform code needs a few fixes still to deal with these == Strip Adding Operators == * New strips referencing Actions can be added using the Shift-A hotkey while in the strips-area. You must have a track selected first though. The new strip will get added, starting from the current frame, in the selected track(s) only if there is enough space to do so. Otherwise, the new strip gets added at the top of the stack in a new track. * New transition strips can be added with the Shift-T hotkey while in the strips area. You must have two adjacent strips selected for this to work. == New Backend Methods == * Recoded the strip/track adding API to be more flexible * Added a new method for testing whether F-Curve has any modifiers of with certain attributes. Will be used in a later bugfix... == Bugfixes == - Fixed bug with strip-blending which caused the blending modes to be useless. - NLA buttons now use proper poll callbacks instead of defining checks - Commented out missing operator in menus, silencing warnings in console - Removed obsolete/incorrect comments
2009-06-19 04:45:56 +00:00
return;
Cleanup: style, use braces for editors
2019-04-22 09:19:45 +10:00
}
style cleanup: nla
2012-05-08 18:05:57 +00:00
strip = strip_ptr.data;
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Cleanup: Rename Panel * variables from pa to panel
2020-04-03 22:20:25 -05:00
block = uiLayoutGetBlock(panel->layout);
UI Refactor T41640 Make the UI API more consistent and reduce confusion with some naming. mainly: - API function calls - enum values some internal static functions have been left for now
2014-11-09 21:20:40 +01:00
UI_block_func_handle_set(block, do_nla_region_buttons, NULL);
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
NLA SoC: F-Modifiers working on NLA Strips * Using the Ctrl-Shift-M hotkey, F-Modifiers can be added to all the selected strips. * F-Modifiers can also be added/tweaked from the NLA N-Key properties. The UI now uses the same code as for the graph editor ones. The UI drawing here is currently messed up from the NLA side, since it seems combining normal layout stuff and old-style uiBlocks doesn't seem to work too well (BUT! the buttons are at least functional). Next up, I'll need to recode the buttons panel for the Graph Editor so that all of the drawing can be migrated over to use the new layout engine.
2009-07-02 06:41:10 +00:00
/* 'add modifier' button at top of panel */
NLA SoC: FModifier drawing converted to use Layout Engine * Most of the F-Modifiers have been ported to use the layout engine + RNA for drawing their buttons now. This plays much nicer with various button-layouts. --> As a nice demo, try adding a Noise Modifier to a NLA-strip, and change the 'size' setting to about 2 to see some effects. * Generator and Envelope modifiers haven't been ported yet since they're quite complex (requiring more time + energy), and as such, have been made to have some temporary error prints instead. Will check on this tomorrow. * Finished/cleaned up the RNA-wrapping of most FModifiers. TODO's (help requested... Brecht?): Generator modifier's UI cannot be wrapped yet using the layout engine (though I might try using the old system only), as I'm having some trouble wrapping the coefficients array for this (see rna_fcurve.c - rna_def_fmodifier_generator())
2009-07-02 12:41:03 +00:00
{
Cleanup: Rename Panel * variables from pa to panel
2020-04-03 22:20:25 -05:00
row = uiLayoutRow(panel->layout, false);
style cleanup: nla
2012-05-08 18:05:57 +00:00
block = uiLayoutGetBlock(row);
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Cleanup: comments (long lines) in editors
2019-04-22 00:18:34 +10:00
/* FIXME: we need to set the only-active property so that this
* will only add modifiers for the active strip (not all selected). */
FModifiers: "Add Modifiers" in Graph/NLA Editor buttons now uses a dropdown instead of a button This brings the UI here more in line with the Constraints and Modifiers UI's. TODO: * The tooltips/descriptions on the operators now need fixing, as we can no longer use custom tooltips when defining these buttons. * The operators need to be fixed to only operate on the active data
2016-04-04 00:30:59 +12:00
uiItemMenuEnumO(
row, (bContext *)C, "NLA_OT_fmodifier_add", "type", IFACE_("Add Modifier"), ICON_NONE);
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
FModifiers: "Add Modifiers" in Graph/NLA Editor buttons now uses a dropdown instead of a button This brings the UI here more in line with the Constraints and Modifiers UI's. TODO: * The tooltips/descriptions on the operators now need fixing, as we can no longer use custom tooltips when defining these buttons. * The operators need to be fixed to only operate on the active data
2016-04-04 00:30:59 +12:00
/* copy/paste (as sub-row) */
Code cleanup: remove TRUE/FALSE & WITH_BOOL_COMPAT define
2014-04-01 11:34:00 +11:00
row = uiLayoutRow(row, true);
style cleanup: nla
2012-05-08 18:05:57 +00:00
uiItemO(row, "", ICON_COPYDOWN, "NLA_OT_fmodifier_copy");
uiItemO(row, "", ICON_PASTEDOWN, "NLA_OT_fmodifier_paste");
NLA SoC: FModifier drawing converted to use Layout Engine * Most of the F-Modifiers have been ported to use the layout engine + RNA for drawing their buttons now. This plays much nicer with various button-layouts. --> As a nice demo, try adding a Noise Modifier to a NLA-strip, and change the 'size' setting to about 2 to see some effects. * Generator and Envelope modifiers haven't been ported yet since they're quite complex (requiring more time + energy), and as such, have been made to have some temporary error prints instead. Will check on this tomorrow. * Finished/cleaned up the RNA-wrapping of most FModifiers. TODO's (help requested... Brecht?): Generator modifier's UI cannot be wrapped yet using the layout engine (though I might try using the old system only), as I'm having some trouble wrapping the coefficients array for this (see rna_fcurve.c - rna_def_fmodifier_generator())
2009-07-02 12:41:03 +00:00
}
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
NLA SoC: F-Modifiers working on NLA Strips * Using the Ctrl-Shift-M hotkey, F-Modifiers can be added to all the selected strips. * F-Modifiers can also be added/tweaked from the NLA N-Key properties. The UI now uses the same code as for the graph editor ones. The UI drawing here is currently messed up from the NLA side, since it seems combining normal layout stuff and old-style uiBlocks doesn't seem to work too well (BUT! the buttons are at least functional). Next up, I'll need to recode the buttons panel for the Graph Editor so that all of the drawing can be migrated over to use the new layout engine.
2009-07-02 06:41:10 +00:00
/* draw each modifier */
style cleanup: nla
2012-05-08 18:05:57 +00:00
for (fcm = strip->modifiers.first; fcm; fcm = fcm->next) {
Cleanup: Rename Panel * variables from pa to panel
2020-04-03 22:20:25 -05:00
col = uiLayoutColumn(panel->layout, true);
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
RNA: Cleanup PointerRNA struct The old layout of `PointerRNA` was confusing for historic reasons: ``` typedef struct PointerRNA { struct { void *data; } id; struct StructRNA *type; void *data; } PointerRNA; ``` This patch updates it to: ``` typedef struct PointerRNA { struct ID *owner_id; struct StructRNA *type; void *data; } PointerRNA; ``` Throughout the code base `id.data` was replaced with `owner_id`. Furthermore, many explicit pointer type casts were added which were implicit before. Some type casts to `ID *` were removed. Reviewers: brecht, campbellbarton Differential Revision: https://developer.blender.org/D5558
2019-08-23 09:52:12 +02:00
ANIM_uiTemplate_fmodifier_draw(col, strip_ptr.owner_id, &strip->modifiers, fcm);
NLA SoC: FModifier drawing converted to use Layout Engine * Most of the F-Modifiers have been ported to use the layout engine + RNA for drawing their buttons now. This plays much nicer with various button-layouts. --> As a nice demo, try adding a Noise Modifier to a NLA-strip, and change the 'size' setting to about 2 to see some effects. * Generator and Envelope modifiers haven't been ported yet since they're quite complex (requiring more time + energy), and as such, have been made to have some temporary error prints instead. Will check on this tomorrow. * Finished/cleaned up the RNA-wrapping of most FModifiers. TODO's (help requested... Brecht?): Generator modifier's UI cannot be wrapped yet using the layout engine (though I might try using the old system only), as I'm having some trouble wrapping the coefficients array for this (see rna_fcurve.c - rna_def_fmodifier_generator())
2009-07-02 12:41:03 +00:00
}
NLA SoC: Transition Strips + Strip Adding Operators + Bugfixes == Transitions == Transition strips are now able to be created + evaluated. Transitions allow for interpolation between the endpoints of two adjacent strips in the same track (i.e. two strips which occur in the same track one after the other, but with a gap between them). - The current behaviour when only one endpoint affects some setting is non-optimal, since it appears somewhat inconsistently extend/replace values... - Transform code needs a few fixes still to deal with these == Strip Adding Operators == * New strips referencing Actions can be added using the Shift-A hotkey while in the strips-area. You must have a track selected first though. The new strip will get added, starting from the current frame, in the selected track(s) only if there is enough space to do so. Otherwise, the new strip gets added at the top of the stack in a new track. * New transition strips can be added with the Shift-T hotkey while in the strips area. You must have two adjacent strips selected for this to work. == New Backend Methods == * Recoded the strip/track adding API to be more flexible * Added a new method for testing whether F-Curve has any modifiers of with certain attributes. Will be used in a later bugfix... == Bugfixes == - Fixed bug with strip-blending which caused the blending modes to be useless. - NLA buttons now use proper poll callbacks instead of defining checks - Commented out missing operator in menus, silencing warnings in console - Removed obsolete/incorrect comments
2009-06-19 04:45:56 +00:00
}
NLA SoC: Adding skeleton code for a buttons region in NLA If anyone's doing any testing at this point, please check if this works ok for files with new/old NLA Editors, as I was having some problems with one of my testing (saved from this branch) files with this.
2009-06-07 11:37:15 +00:00
/* ******************* general ******************************** */
void nla_buttons_register(ARegionType *art)
{
PanelType *pt;
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
style cleanup: nla
2012-05-08 18:05:57 +00:00
pt = MEM_callocN(sizeof(PanelType), "spacetype nla panel animdata");
Animato - NLA + Realtime Animating Goodies * When doing realtime recording of animation (i.e. transforming objects + bones while animation playback is running, and auto-keying is enabled), animation will be added to a new NLA Track+Strip combo everytime a single 'loop' of the frame range has finished. This will allow 'passes' over the animation to be less destructive. * Made the evaluation of the active action (when NLA data is present), be handled as part of the normal NLA system evaluation code (as if it were just another strip in a track at the end). The immediate benefit is that there are now some settings (available in the "Animation Data" panel in the NLA Editor with a strip selected) which allow for the way the active action is combined with the NLA stack results. For instance, the way that the action extrapolates is used in the recording tweaks above.
2009-07-31 07:43:47 +00:00
strcpy(pt->idname, "NLA_PT_animdata");
I18n fixes for C panels & menus (we have to specify the default bpyrna context here, else we get the horrible "empty" string (as translation_context of panels is an array, not a pointer, so it's never NULL).
2013-03-27 19:09:50 +00:00
strcpy(pt->label, N_("Animation Data"));
UI: NLA Editor Sidebar overhaul The NLA Editor sidebar is currently out of step with the rest of Blender, and in particular the Sequencer, which offers similar features and functionality. This patch makes a number of UI layout changes to make it fit in. - Remove Active Track panel, since the track names can just be edited in the source list on the left - Rejiggered the categories to be more understandable. 'Strip' includes settings for the current strip, and 'Edited Action' includes settings for the action that is currently being edited - Use single column split layout - Use name + mute toggle configuration like in the Sequencer - Fix an issue with the theme, where the sidebar background was too dark, breaking the bright -> dark hierarchical logic - Use sub-panels for animated strip properties controls Differential Revision: https://developer.blender.org/D6687 Reviewed by Brecht van Lommel
2020-01-28 13:13:45 +01:00
strcpy(pt->category, "Edited Action");
Refactor translation code out of blenfont - Add blentranslation `BLT_*` module. - moved & split `BLF_translation.h` into (`BLT_translation.h`, `BLT_lang.h`). - moved `BLF_*_unifont` functions from `blf_translation.c` to new source file `blf_font_i18n.c`.
2015-08-16 17:32:01 +10:00
strcpy(pt->translation_context, BLT_I18NCONTEXT_DEFAULT_BPYRNA);
UI: NLA Editor Sidebar overhaul The NLA Editor sidebar is currently out of step with the rest of Blender, and in particular the Sequencer, which offers similar features and functionality. This patch makes a number of UI layout changes to make it fit in. - Remove Active Track panel, since the track names can just be edited in the source list on the left - Rejiggered the categories to be more understandable. 'Strip' includes settings for the current strip, and 'Edited Action' includes settings for the action that is currently being edited - Use single column split layout - Use name + mute toggle configuration like in the Sequencer - Fix an issue with the theme, where the sidebar background was too dark, breaking the bright -> dark hierarchical logic - Use sub-panels for animated strip properties controls Differential Revision: https://developer.blender.org/D6687 Reviewed by Brecht van Lommel
2020-01-28 13:13:45 +01:00
pt->flag = PANEL_TYPE_NO_HEADER;
style cleanup: nla
2012-05-08 18:05:57 +00:00
pt->draw = nla_panel_animdata;
pt->poll = nla_animdata_panel_poll;
Animato - NLA + Realtime Animating Goodies * When doing realtime recording of animation (i.e. transforming objects + bones while animation playback is running, and auto-keying is enabled), animation will be added to a new NLA Track+Strip combo everytime a single 'loop' of the frame range has finished. This will allow 'passes' over the animation to be less destructive. * Made the evaluation of the active action (when NLA data is present), be handled as part of the normal NLA system evaluation code (as if it were just another strip in a track at the end). The immediate benefit is that there are now some settings (available in the "Animation Data" panel in the NLA Editor with a strip selected) which allow for the way the active action is combined with the NLA stack results. For instance, the way that the action extrapolates is used in the recording tweaks above.
2009-07-31 07:43:47 +00:00
BLI_addtail(&art->paneltypes, pt);
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
UI: NLA Editor Sidebar overhaul The NLA Editor sidebar is currently out of step with the rest of Blender, and in particular the Sequencer, which offers similar features and functionality. This patch makes a number of UI layout changes to make it fit in. - Remove Active Track panel, since the track names can just be edited in the source list on the left - Rejiggered the categories to be more understandable. 'Strip' includes settings for the current strip, and 'Edited Action' includes settings for the action that is currently being edited - Use single column split layout - Use name + mute toggle configuration like in the Sequencer - Fix an issue with the theme, where the sidebar background was too dark, breaking the bright -> dark hierarchical logic - Use sub-panels for animated strip properties controls Differential Revision: https://developer.blender.org/D6687 Reviewed by Brecht van Lommel
2020-01-28 13:13:45 +01:00
pt = MEM_callocN(sizeof(PanelType), "spacetype nla panel properties");
strcpy(pt->idname, "NLA_PT_stripname");
strcpy(pt->label, N_("Active Strip Name"));
strcpy(pt->category, "Strip");
Refactor translation code out of blenfont - Add blentranslation `BLT_*` module. - moved & split `BLF_translation.h` into (`BLT_translation.h`, `BLT_lang.h`). - moved `BLF_*_unifont` functions from `blf_translation.c` to new source file `blf_font_i18n.c`.
2015-08-16 17:32:01 +10:00
strcpy(pt->translation_context, BLT_I18NCONTEXT_DEFAULT_BPYRNA);
UI: NLA Editor Sidebar overhaul The NLA Editor sidebar is currently out of step with the rest of Blender, and in particular the Sequencer, which offers similar features and functionality. This patch makes a number of UI layout changes to make it fit in. - Remove Active Track panel, since the track names can just be edited in the source list on the left - Rejiggered the categories to be more understandable. 'Strip' includes settings for the current strip, and 'Edited Action' includes settings for the action that is currently being edited - Use single column split layout - Use name + mute toggle configuration like in the Sequencer - Fix an issue with the theme, where the sidebar background was too dark, breaking the bright -> dark hierarchical logic - Use sub-panels for animated strip properties controls Differential Revision: https://developer.blender.org/D6687 Reviewed by Brecht van Lommel
2020-01-28 13:13:45 +01:00
pt->flag = PANEL_TYPE_NO_HEADER;
pt->draw = nla_panel_stripname;
pt->poll = nla_strip_panel_poll;
NLA SoC: Added buttons in NKEY region for NLA Editor - Most of the settings wrapped in RNA have been exposed here using the new layout engine stuff from Brecht (C-API). I've tried to maintain a hierarchy of high-level (owner, generic-settings) to low-level (children, specialised-settings) here, which seems to be the prevailing guidelines? (It took a while to try to understand how this all fitted together, since there were no clear examples on how to use this anywhere) - NLA-Strip Modifiers have not been exposed yet. They still use the old-style drawing, which may/may not be compatible here. - Fixed a bug with how the notifiers from this panel get sent. I really don't know how the compiler would have missed the undeclared pointer that was being used ('ob').
2009-06-09 04:39:33 +00:00
BLI_addtail(&art->paneltypes, pt);
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
UI: NLA Editor Sidebar overhaul The NLA Editor sidebar is currently out of step with the rest of Blender, and in particular the Sequencer, which offers similar features and functionality. This patch makes a number of UI layout changes to make it fit in. - Remove Active Track panel, since the track names can just be edited in the source list on the left - Rejiggered the categories to be more understandable. 'Strip' includes settings for the current strip, and 'Edited Action' includes settings for the action that is currently being edited - Use single column split layout - Use name + mute toggle configuration like in the Sequencer - Fix an issue with the theme, where the sidebar background was too dark, breaking the bright -> dark hierarchical logic - Use sub-panels for animated strip properties controls Differential Revision: https://developer.blender.org/D6687 Reviewed by Brecht van Lommel
2020-01-28 13:13:45 +01:00
PanelType *pt_properties = pt = MEM_callocN(sizeof(PanelType), "spacetype nla panel properties");
NLA SoC: Adding skeleton code for a buttons region in NLA If anyone's doing any testing at this point, please check if this works ok for files with new/old NLA Editors, as I was having some problems with one of my testing (saved from this branch) files with this.
2009-06-07 11:37:15 +00:00
strcpy(pt->idname, "NLA_PT_properties");
I18n fixes for C panels & menus (we have to specify the default bpyrna context here, else we get the horrible "empty" string (as translation_context of panels is an array, not a pointer, so it's never NULL).
2013-03-27 19:09:50 +00:00
strcpy(pt->label, N_("Active Strip"));
UI: NLA Editor Sidebar overhaul The NLA Editor sidebar is currently out of step with the rest of Blender, and in particular the Sequencer, which offers similar features and functionality. This patch makes a number of UI layout changes to make it fit in. - Remove Active Track panel, since the track names can just be edited in the source list on the left - Rejiggered the categories to be more understandable. 'Strip' includes settings for the current strip, and 'Edited Action' includes settings for the action that is currently being edited - Use single column split layout - Use name + mute toggle configuration like in the Sequencer - Fix an issue with the theme, where the sidebar background was too dark, breaking the bright -> dark hierarchical logic - Use sub-panels for animated strip properties controls Differential Revision: https://developer.blender.org/D6687 Reviewed by Brecht van Lommel
2020-01-28 13:13:45 +01:00
strcpy(pt->category, "Strip");
Refactor translation code out of blenfont - Add blentranslation `BLT_*` module. - moved & split `BLF_translation.h` into (`BLT_translation.h`, `BLT_lang.h`). - moved `BLF_*_unifont` functions from `blf_translation.c` to new source file `blf_font_i18n.c`.
2015-08-16 17:32:01 +10:00
strcpy(pt->translation_context, BLT_I18NCONTEXT_DEFAULT_BPYRNA);
style cleanup: nla
2012-05-08 18:05:57 +00:00
pt->draw = nla_panel_properties;
pt->poll = nla_strip_panel_poll;
NLA SoC: Adding skeleton code for a buttons region in NLA If anyone's doing any testing at this point, please check if this works ok for files with new/old NLA Editors, as I was having some problems with one of my testing (saved from this branch) files with this.
2009-06-07 11:37:15 +00:00
BLI_addtail(&art->paneltypes, pt);
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
style cleanup: nla
2012-05-08 18:05:57 +00:00
pt = MEM_callocN(sizeof(PanelType), "spacetype nla panel properties");
NLA SoC: Added buttons in NKEY region for NLA Editor - Most of the settings wrapped in RNA have been exposed here using the new layout engine stuff from Brecht (C-API). I've tried to maintain a hierarchy of high-level (owner, generic-settings) to low-level (children, specialised-settings) here, which seems to be the prevailing guidelines? (It took a while to try to understand how this all fitted together, since there were no clear examples on how to use this anywhere) - NLA-Strip Modifiers have not been exposed yet. They still use the old-style drawing, which may/may not be compatible here. - Fixed a bug with how the notifiers from this panel get sent. I really don't know how the compiler would have missed the undeclared pointer that was being used ('ob').
2009-06-09 04:39:33 +00:00
strcpy(pt->idname, "NLA_PT_actionclip");
I18n fixes for C panels & menus (we have to specify the default bpyrna context here, else we get the horrible "empty" string (as translation_context of panels is an array, not a pointer, so it's never NULL).
2013-03-27 19:09:50 +00:00
strcpy(pt->label, N_("Action Clip"));
UI: NLA Editor Sidebar overhaul The NLA Editor sidebar is currently out of step with the rest of Blender, and in particular the Sequencer, which offers similar features and functionality. This patch makes a number of UI layout changes to make it fit in. - Remove Active Track panel, since the track names can just be edited in the source list on the left - Rejiggered the categories to be more understandable. 'Strip' includes settings for the current strip, and 'Edited Action' includes settings for the action that is currently being edited - Use single column split layout - Use name + mute toggle configuration like in the Sequencer - Fix an issue with the theme, where the sidebar background was too dark, breaking the bright -> dark hierarchical logic - Use sub-panels for animated strip properties controls Differential Revision: https://developer.blender.org/D6687 Reviewed by Brecht van Lommel
2020-01-28 13:13:45 +01:00
strcpy(pt->category, "Strip");
Refactor translation code out of blenfont - Add blentranslation `BLT_*` module. - moved & split `BLF_translation.h` into (`BLT_translation.h`, `BLT_lang.h`). - moved `BLF_*_unifont` functions from `blf_translation.c` to new source file `blf_font_i18n.c`.
2015-08-16 17:32:01 +10:00
strcpy(pt->translation_context, BLT_I18NCONTEXT_DEFAULT_BPYRNA);
style cleanup: nla
2012-05-08 18:05:57 +00:00
pt->draw = nla_panel_actclip;
UI: NLA Editor Sidebar overhaul The NLA Editor sidebar is currently out of step with the rest of Blender, and in particular the Sequencer, which offers similar features and functionality. This patch makes a number of UI layout changes to make it fit in. - Remove Active Track panel, since the track names can just be edited in the source list on the left - Rejiggered the categories to be more understandable. 'Strip' includes settings for the current strip, and 'Edited Action' includes settings for the action that is currently being edited - Use single column split layout - Use name + mute toggle configuration like in the Sequencer - Fix an issue with the theme, where the sidebar background was too dark, breaking the bright -> dark hierarchical logic - Use sub-panels for animated strip properties controls Differential Revision: https://developer.blender.org/D6687 Reviewed by Brecht van Lommel
2020-01-28 13:13:45 +01:00
pt->flag = PANEL_TYPE_DEFAULT_CLOSED;
style cleanup: nla
2012-05-08 18:05:57 +00:00
pt->poll = nla_strip_actclip_panel_poll;
NLA SoC: Added buttons in NKEY region for NLA Editor - Most of the settings wrapped in RNA have been exposed here using the new layout engine stuff from Brecht (C-API). I've tried to maintain a hierarchy of high-level (owner, generic-settings) to low-level (children, specialised-settings) here, which seems to be the prevailing guidelines? (It took a while to try to understand how this all fitted together, since there were no clear examples on how to use this anywhere) - NLA-Strip Modifiers have not been exposed yet. They still use the old-style drawing, which may/may not be compatible here. - Fixed a bug with how the notifiers from this panel get sent. I really don't know how the compiler would have missed the undeclared pointer that was being used ('ob').
2009-06-09 04:39:33 +00:00
BLI_addtail(&art->paneltypes, pt);
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
style cleanup: nla
2012-05-08 18:05:57 +00:00
pt = MEM_callocN(sizeof(PanelType), "spacetype nla panel evaluation");
NLA SoC: Added buttons in NKEY region for NLA Editor - Most of the settings wrapped in RNA have been exposed here using the new layout engine stuff from Brecht (C-API). I've tried to maintain a hierarchy of high-level (owner, generic-settings) to low-level (children, specialised-settings) here, which seems to be the prevailing guidelines? (It took a while to try to understand how this all fitted together, since there were no clear examples on how to use this anywhere) - NLA-Strip Modifiers have not been exposed yet. They still use the old-style drawing, which may/may not be compatible here. - Fixed a bug with how the notifiers from this panel get sent. I really don't know how the compiler would have missed the undeclared pointer that was being used ('ob').
2009-06-09 04:39:33 +00:00
strcpy(pt->idname, "NLA_PT_evaluation");
UI: NLA Editor Sidebar overhaul The NLA Editor sidebar is currently out of step with the rest of Blender, and in particular the Sequencer, which offers similar features and functionality. This patch makes a number of UI layout changes to make it fit in. - Remove Active Track panel, since the track names can just be edited in the source list on the left - Rejiggered the categories to be more understandable. 'Strip' includes settings for the current strip, and 'Edited Action' includes settings for the action that is currently being edited - Use single column split layout - Use name + mute toggle configuration like in the Sequencer - Fix an issue with the theme, where the sidebar background was too dark, breaking the bright -> dark hierarchical logic - Use sub-panels for animated strip properties controls Differential Revision: https://developer.blender.org/D6687 Reviewed by Brecht van Lommel
2020-01-28 13:13:45 +01:00
strcpy(pt->parent_id, "NLA_PT_properties");
strcpy(pt->label, N_("Animated Influence"));
strcpy(pt->category, "Strip");
Refactor translation code out of blenfont - Add blentranslation `BLT_*` module. - moved & split `BLF_translation.h` into (`BLT_translation.h`, `BLT_lang.h`). - moved `BLF_*_unifont` functions from `blf_translation.c` to new source file `blf_font_i18n.c`.
2015-08-16 17:32:01 +10:00
strcpy(pt->translation_context, BLT_I18NCONTEXT_DEFAULT_BPYRNA);
style cleanup: nla
2012-05-08 18:05:57 +00:00
pt->draw = nla_panel_evaluation;
UI: NLA Editor Sidebar overhaul The NLA Editor sidebar is currently out of step with the rest of Blender, and in particular the Sequencer, which offers similar features and functionality. This patch makes a number of UI layout changes to make it fit in. - Remove Active Track panel, since the track names can just be edited in the source list on the left - Rejiggered the categories to be more understandable. 'Strip' includes settings for the current strip, and 'Edited Action' includes settings for the action that is currently being edited - Use single column split layout - Use name + mute toggle configuration like in the Sequencer - Fix an issue with the theme, where the sidebar background was too dark, breaking the bright -> dark hierarchical logic - Use sub-panels for animated strip properties controls Differential Revision: https://developer.blender.org/D6687 Reviewed by Brecht van Lommel
2020-01-28 13:13:45 +01:00
pt->draw_header = nla_panel_animated_influence_header;
pt->parent = pt_properties;
pt->flag = PANEL_TYPE_DEFAULT_CLOSED;
style cleanup: nla
2012-05-08 18:05:57 +00:00
pt->poll = nla_strip_eval_panel_poll;
UI: NLA Editor Sidebar overhaul The NLA Editor sidebar is currently out of step with the rest of Blender, and in particular the Sequencer, which offers similar features and functionality. This patch makes a number of UI layout changes to make it fit in. - Remove Active Track panel, since the track names can just be edited in the source list on the left - Rejiggered the categories to be more understandable. 'Strip' includes settings for the current strip, and 'Edited Action' includes settings for the action that is currently being edited - Use single column split layout - Use name + mute toggle configuration like in the Sequencer - Fix an issue with the theme, where the sidebar background was too dark, breaking the bright -> dark hierarchical logic - Use sub-panels for animated strip properties controls Differential Revision: https://developer.blender.org/D6687 Reviewed by Brecht van Lommel
2020-01-28 13:13:45 +01:00
BLI_addtail(&pt_properties->children, BLI_genericNodeN(pt));
Fix memory leak of NLA child panel-types Panel types always need to be registered in the region-panel-types list, or they won't get free'd.
2020-01-28 18:43:41 +01:00
BLI_addtail(&art->paneltypes, pt);
UI: NLA Editor Sidebar overhaul The NLA Editor sidebar is currently out of step with the rest of Blender, and in particular the Sequencer, which offers similar features and functionality. This patch makes a number of UI layout changes to make it fit in. - Remove Active Track panel, since the track names can just be edited in the source list on the left - Rejiggered the categories to be more understandable. 'Strip' includes settings for the current strip, and 'Edited Action' includes settings for the action that is currently being edited - Use single column split layout - Use name + mute toggle configuration like in the Sequencer - Fix an issue with the theme, where the sidebar background was too dark, breaking the bright -> dark hierarchical logic - Use sub-panels for animated strip properties controls Differential Revision: https://developer.blender.org/D6687 Reviewed by Brecht van Lommel
2020-01-28 13:13:45 +01:00
Fix memory leak of NLA child panel-types Panel types always need to be registered in the region-panel-types list, or they won't get free'd.
2020-01-28 18:43:41 +01:00
pt = MEM_callocN(sizeof(PanelType), "spacetype nla panel animated strip time");
UI: NLA Editor Sidebar overhaul The NLA Editor sidebar is currently out of step with the rest of Blender, and in particular the Sequencer, which offers similar features and functionality. This patch makes a number of UI layout changes to make it fit in. - Remove Active Track panel, since the track names can just be edited in the source list on the left - Rejiggered the categories to be more understandable. 'Strip' includes settings for the current strip, and 'Edited Action' includes settings for the action that is currently being edited - Use single column split layout - Use name + mute toggle configuration like in the Sequencer - Fix an issue with the theme, where the sidebar background was too dark, breaking the bright -> dark hierarchical logic - Use sub-panels for animated strip properties controls Differential Revision: https://developer.blender.org/D6687 Reviewed by Brecht van Lommel
2020-01-28 13:13:45 +01:00
strcpy(pt->idname, "NLA_PT_animated_strip_time");
strcpy(pt->parent_id, "NLA_PT_properties");
strcpy(pt->label, N_("Animated Strip Time"));
strcpy(pt->category, "Strip");
strcpy(pt->translation_context, BLT_I18NCONTEXT_DEFAULT_BPYRNA);
pt->draw = nla_panel_animated_strip_time;
pt->draw_header = nla_panel_animated_strip_time_header;
pt->parent = pt_properties;
pt->flag = PANEL_TYPE_DEFAULT_CLOSED;
pt->poll = nla_strip_eval_panel_poll;
BLI_addtail(&pt_properties->children, BLI_genericNodeN(pt));
Fix memory leak of NLA child panel-types Panel types always need to be registered in the region-panel-types list, or they won't get free'd.
2020-01-28 18:43:41 +01:00
BLI_addtail(&art->paneltypes, pt);
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
style cleanup: nla
2012-05-08 18:05:57 +00:00
pt = MEM_callocN(sizeof(PanelType), "spacetype nla panel modifiers");
NLA SoC: Added buttons in NKEY region for NLA Editor - Most of the settings wrapped in RNA have been exposed here using the new layout engine stuff from Brecht (C-API). I've tried to maintain a hierarchy of high-level (owner, generic-settings) to low-level (children, specialised-settings) here, which seems to be the prevailing guidelines? (It took a while to try to understand how this all fitted together, since there were no clear examples on how to use this anywhere) - NLA-Strip Modifiers have not been exposed yet. They still use the old-style drawing, which may/may not be compatible here. - Fixed a bug with how the notifiers from this panel get sent. I really don't know how the compiler would have missed the undeclared pointer that was being used ('ob').
2009-06-09 04:39:33 +00:00
strcpy(pt->idname, "NLA_PT_modifiers");
I18n fixes for C panels & menus (we have to specify the default bpyrna context here, else we get the horrible "empty" string (as translation_context of panels is an array, not a pointer, so it's never NULL).
2013-03-27 19:09:50 +00:00
strcpy(pt->label, N_("Modifiers"));
Cleanup: indentation, long lines
2017-06-12 13:35:00 +10:00
strcpy(pt->category, "Modifiers");
Refactor translation code out of blenfont - Add blentranslation `BLT_*` module. - moved & split `BLF_translation.h` into (`BLT_translation.h`, `BLT_lang.h`). - moved `BLF_*_unifont` functions from `blf_translation.c` to new source file `blf_font_i18n.c`.
2015-08-16 17:32:01 +10:00
strcpy(pt->translation_context, BLT_I18NCONTEXT_DEFAULT_BPYRNA);
style cleanup: nla
2012-05-08 18:05:57 +00:00
pt->draw = nla_panel_modifiers;
pt->poll = nla_strip_eval_panel_poll;
NLA SoC: Added buttons in NKEY region for NLA Editor - Most of the settings wrapped in RNA have been exposed here using the new layout engine stuff from Brecht (C-API). I've tried to maintain a hierarchy of high-level (owner, generic-settings) to low-level (children, specialised-settings) here, which seems to be the prevailing guidelines? (It took a while to try to understand how this all fitted together, since there were no clear examples on how to use this anywhere) - NLA-Strip Modifiers have not been exposed yet. They still use the old-style drawing, which may/may not be compatible here. - Fixed a bug with how the notifiers from this panel get sent. I really don't know how the compiler would have missed the undeclared pointer that was being used ('ob').
2009-06-09 04:39:33 +00:00
BLI_addtail(&art->paneltypes, pt);
NLA SoC: Adding skeleton code for a buttons region in NLA If anyone's doing any testing at this point, please check if this works ok for files with new/old NLA Editors, as I was having some problems with one of my testing (saved from this branch) files with this.
2009-06-07 11:37:15 +00:00
}
Copy Permalink