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

Silence unused variable warning in Outliner code

Browse Source 
Also add type forward declarations to avoid breaking IDE features
(because type name is not known from the header only).
This commit is contained in:
Julian Eisel
2023-07-11 14:39:50 +02:00
parent 4525527852
commit 3757ec7ee8
4 changed files with 18 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
source/blender/editors/space_outliner/tree/tree_element_bone.cc
View File

@@ -15,12 +15,12 @@
namespace blender::ed::outliner {
TreeElementBone::TreeElementBone(TreeElement &legacy_te, ID &armature_id, Bone &bone)
: AbstractTreeElement(legacy_te), armature_id_(armature_id), bone_(bone)
TreeElementBone::TreeElementBone(TreeElement &legacy_te, ID & /*armature_id*/, Bone &bone)
: AbstractTreeElement(legacy_te) /*, armature_id_(armature_id)*/, bone_(bone)
{
BLI_assert(legacy_te.store_elem->type == TSE_BONE);
legacy_te.name = bone.name;
legacy_te.directdata = &bone;
legacy_te.name = bone_.name;
legacy_te.directdata = &bone_;
}
} // namespace blender::ed::outliner

6
source/blender/editors/space_outliner/tree/tree_element_bone.hh
View File

@@ -10,10 +10,14 @@
#include "tree_element.hh"
struct ID;
struct Bone;
namespace blender::ed::outliner {
class TreeElementBone final : public AbstractTreeElement {
ID &armature_id_;
/* Not needed right now, avoid unused member variable warning. */
// ID &armature_id_;
Bone &bone_;
public:

10
source/blender/editors/space_outliner/tree/tree_element_edit_bone.cc
View File

@@ -14,11 +14,13 @@
namespace blender::ed::outliner {
TreeElementEditBone::TreeElementEditBone(TreeElement &legacy_te, ID &armature_id, EditBone &ebone)
: AbstractTreeElement(legacy_te), armature_id_(armature_id), ebone_(ebone)
TreeElementEditBone::TreeElementEditBone(TreeElement &legacy_te,
ID & /*armature_id*/,
EditBone &ebone)
: AbstractTreeElement(legacy_te) /*, armature_id_(armature_id)*/, ebone_(ebone)
{
legacy_te.directdata = &ebone;
legacy_te.name = ebone.name;
legacy_te.directdata = &ebone_;
legacy_te.name = ebone_.name;
}
} // namespace blender::ed::outliner

4
source/blender/editors/space_outliner/tree/tree_element_edit_bone.hh
View File

@@ -10,12 +10,14 @@
#include "tree_element.hh"
struct ID;
struct EditBone;
namespace blender::ed::outliner {
class TreeElementEditBone final : public AbstractTreeElement {
ID &armature_id_;
/* Not needed right now, avoid unused member variable warning. */
// ID &armature_id_;
EditBone &ebone_;
public: