blender
/
blender
137
404
Fork 586
Code Issues 6.2k Pull Requests 757 Projects 19 Wiki Activity

Cleanup: Remove unused original pointer in Sequence

This commit is contained in:
Sergey Sharybin 2020-07-30 15:39:44 +02:00
parent 1e7afea2bb
commit de68880e79
2 changed files with 0 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
source/blender/depsgraph/intern/eval/deg_eval_copy_on_write.cc
View File

@ -480,25 +480,6 @@ void scene_setup_view_layers_after_remap(const Depsgraph *depsgraph,
* Still not an excuse to have those. */
}
void update_sequence_orig_pointers(const ListBase *sequences_orig, ListBase *sequences_cow)
{
Sequence *sequence_orig = reinterpret_cast<Sequence *>(sequences_orig->first);
Sequence *sequence_cow = reinterpret_cast<Sequence *>(sequences_cow->first);
while (sequence_orig != nullptr) {
update_sequence_orig_pointers(&sequence_orig->seqbase, &sequence_cow->seqbase);
sequence_cow->orig_sequence = sequence_orig;
sequence_cow = sequence_cow->next;
sequence_orig = sequence_orig->next;
}
}
void update_scene_orig_pointers(const Scene *scene_orig, Scene *scene_cow)
{
if (scene_orig->ed != nullptr) {
update_sequence_orig_pointers(&scene_orig->ed->seqbase, &scene_cow->ed->seqbase);
}
}
/* Check whether given ID is expanded or still a shallow copy. */
inline bool check_datablock_expanded(const ID *id_cow)
{
@ -811,7 +792,6 @@ void update_id_after_copy(const Depsgraph *depsgraph,
scene_cow->toolsettings = scene_orig->toolsettings;
scene_cow->eevee.light_cache_data = scene_orig->eevee.light_cache_data;
scene_setup_view_layers_after_remap(depsgraph, id_node, reinterpret_cast<Scene *>(id_cow));
update_scene_orig_pointers(scene_orig, scene_cow);
break;
}
default:

5
source/blender/makesdna/DNA_sequence_types.h
View File

@ -243,11 +243,6 @@ typedef struct Sequence {
int _pad2[3];
SequenceRuntime runtime;
/* NOTE: Technically this is a runtime data as well, but it is aimed to be removed once the
* UUID is in place. */
struct Sequence *orig_sequence;
void *_pad3;
} Sequence;
typedef struct MetaStack {