aryeramaty/blender
0
0
Fork 1
forked from blender/blender
Code Pull Requests Activity

realize-depth #5

Merged
Arye Ramaty merged 43 commits from David-Haver/blender:realize-depth into WIP-realize-depth 2024-03-31 17:22:49 +02:00
Conversation 0 Commits 43 Files Changed 70 +113 -115
1 changed files with 113 additions and 115 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 5ff8738dce - Show all commits

10
source/blender/editors/animation/anim_filter.cc
View File

@ -3674,11 +3674,11 @@ size_t ANIM_animdata_filter(bAnimContext *ac,
void *data, void *data,
eAnimCont_Types datatype) eAnimCont_Types datatype)
{ {
size_t items = 0; if (!data || !anim_data) {
return 0;
}
/* only filter data if there's somewhere to put it */ size_t items = 0;
if (data && anim_data) {
/* firstly filter the data */
switch (datatype) { switch (datatype) {
/* Action-Editing Modes */ /* Action-Editing Modes */
case ANIMCONT_ACTION: /* 'Action Editor' */ case ANIMCONT_ACTION: /* 'Action Editor' */
@ -3803,9 +3803,7 @@ size_t ANIM_animdata_filter(bAnimContext *ac,
if (filter_mode & ANIMFILTER_NODUPLIS) { if (filter_mode & ANIMFILTER_NODUPLIS) {
items = animdata_filter_remove_duplis(anim_data); items = animdata_filter_remove_duplis(anim_data);
} }
}
/* return the number of items in the list */
return items; return items;
} }