griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Depsgraph: Use UUID to identify pose channels

Browse Source 
Fixes possible fiasco caused by re-allocation re-using pointers between
pose channels.

Differential Revision: https://developer.blender.org/D8453
This commit is contained in:
Sergey Sharybin
2020-08-03 17:22:34 +02:00
parent 52c2f296bc
commit 8d3b8bc835
2 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
source/blender/depsgraph/intern/eval/deg_eval_runtime_backup_object.cc
View File

@@ -85,11 +85,11 @@ void ObjectRuntimeBackup::backup_pose_channel_runtime_data(Object *object)
{
if (object->pose != nullptr) {
LISTBASE_FOREACH (bPoseChannel *, pchan, &object->pose->chanbase) {
/* This is nullptr in Edit mode. */
if (pchan->orig_pchan != nullptr) {
pose_channel_runtime_data.add(pchan->orig_pchan, pchan->runtime);
BKE_pose_channel_runtime_reset(&pchan->runtime);
}
const SessionUUID &session_uuid = pchan->runtime.session_uuid;
BLI_assert(BLI_session_uuid_is_generated(&session_uuid));
pose_channel_runtime_data.add(session_uuid, pchan->runtime);
BKE_pose_channel_runtime_reset(&pchan->runtime);
}
}
}
@@ -171,13 +171,10 @@ void ObjectRuntimeBackup::restore_pose_channel_runtime_data(Object *object)
{
if (object->pose != nullptr) {
LISTBASE_FOREACH (bPoseChannel *, pchan, &object->pose->chanbase) {
/* This is nullptr in Edit mode. */
if (pchan->orig_pchan != nullptr) {
optional<bPoseChannel_Runtime> runtime = pose_channel_runtime_data.pop_try(
pchan->orig_pchan);
if (runtime.has_value()) {
pchan->runtime = *runtime;
}
const SessionUUID &session_uuid = pchan->runtime.session_uuid;
optional<bPoseChannel_Runtime> runtime = pose_channel_runtime_data.pop_try(session_uuid);
if (runtime.has_value()) {
pchan->runtime = *runtime;
}
}
}

5
source/blender/depsgraph/intern/eval/deg_eval_runtime_backup_object.h
View File

@@ -24,6 +24,9 @@
#pragma once
#include "DNA_object_types.h"
#include "DNA_session_uuid_types.h"
#include "BLI_session_uuid.h"
#include "intern/eval/deg_eval_runtime_backup_modifier.h"
#include "intern/eval/deg_eval_runtime_backup_pose.h"
@@ -54,7 +57,7 @@ class ObjectRuntimeBackup {
short base_flag;
unsigned short base_local_view_bits;
ModifierRuntimeDataBackup modifier_runtime_data;
Map<bPoseChannel *, bPoseChannel_Runtime> pose_channel_runtime_data;
Map<SessionUUID, bPoseChannel_Runtime> pose_channel_runtime_data;
};
} // namespace deg