blender
/
blender
136
406
Fork 589
Code Issues 6.2k Pull Requests 759 Projects 19 Wiki Activity

Depsgraph: Use BLI::Map for constraint_to_pchan_map_ 

Reviewers: sergey

Differential Revision: https://developer.blender.org/D7553
This commit is contained in:
Jacques Lucke 2020-04-28 17:44:36 +02:00
parent 7dfa1b18c1
commit 05283f8c96
1 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
source/blender/depsgraph/intern/builder/deg_builder_rna.cc
View File

@ -57,37 +57,33 @@ namespace DEG {
class RNANodeQueryIDData {
public:
explicit RNANodeQueryIDData(const ID *id) : id_(id), contraint_to_pchan_map_(nullptr)
explicit RNANodeQueryIDData(const ID *id) : id_(id), constraint_to_pchan_map_(nullptr)
{
}
~RNANodeQueryIDData()
{
if (contraint_to_pchan_map_ != nullptr) {
BLI_ghash_free(contraint_to_pchan_map_, nullptr, nullptr);
}
delete constraint_to_pchan_map_;
}
const bPoseChannel *get_pchan_for_constraint(const bConstraint *constraint)
{
ensure_constraint_to_pchan_map();
return static_cast<bPoseChannel *>(BLI_ghash_lookup(contraint_to_pchan_map_, constraint));
return constraint_to_pchan_map_->lookup_default(constraint, nullptr);
}
void ensure_constraint_to_pchan_map()
{
if (contraint_to_pchan_map_ != nullptr) {
if (constraint_to_pchan_map_ != nullptr) {
return;
}
BLI_assert(GS(id_->name) == ID_OB);
const Object *object = reinterpret_cast<const Object *>(id_);
contraint_to_pchan_map_ = BLI_ghash_ptr_new("id data pchan constraint map");
constraint_to_pchan_map_ = new Map<const bConstraint *, const bPoseChannel *>();
if (object->pose != nullptr) {
LISTBASE_FOREACH (const bPoseChannel *, pchan, &object->pose->chanbase) {
LISTBASE_FOREACH (const bConstraint *, constraint, &pchan->constraints) {
BLI_ghash_insert(contraint_to_pchan_map_,
const_cast<bConstraint *>(constraint),
const_cast<bPoseChannel *>(pchan));
constraint_to_pchan_map_->add_new(constraint, pchan);
}
}
}
@ -99,7 +95,7 @@ class RNANodeQueryIDData {
/* indexed by bConstraint*, returns pose channel which contains that
* constraint. */
GHash *contraint_to_pchan_map_;
Map<const bConstraint *, const bPoseChannel *> *constraint_to_pchan_map_;
};
/* ***************************** Node Identifier **************************** */