From 4322523400b8a09c42d986321ac710dacdcbb14b Mon Sep 17 00:00:00 2001 From: rdb Date: Thu, 18 Jul 2019 20:20:41 +0200 Subject: [PATCH] chan: remove unused MovingPartBase::_num_effective_channels member --- panda/src/chan/movingPartBase.I | 1 - panda/src/chan/movingPartBase.cxx | 4 ---- panda/src/chan/movingPartBase.h | 6 +----- 3 files changed, 1 insertion(+), 10 deletions(-) diff --git a/panda/src/chan/movingPartBase.I b/panda/src/chan/movingPartBase.I index 182f597b67..223a92a7ec 100644 --- a/panda/src/chan/movingPartBase.I +++ b/panda/src/chan/movingPartBase.I @@ -17,7 +17,6 @@ INLINE MovingPartBase:: MovingPartBase(const MovingPartBase ©) : PartGroup(copy), - _num_effective_channels(0), _effective_control(nullptr), _forced_channel(copy._forced_channel) { diff --git a/panda/src/chan/movingPartBase.cxx b/panda/src/chan/movingPartBase.cxx index e4016edd2c..563c8aa794 100644 --- a/panda/src/chan/movingPartBase.cxx +++ b/panda/src/chan/movingPartBase.cxx @@ -28,7 +28,6 @@ TypeHandle MovingPartBase::_type_handle; MovingPartBase:: MovingPartBase(PartGroup *parent, const std::string &name) : PartGroup(parent, name), - _num_effective_channels(0), _effective_control(nullptr) { } @@ -38,7 +37,6 @@ MovingPartBase(PartGroup *parent, const std::string &name) : */ MovingPartBase:: MovingPartBase() : - _num_effective_channels(0), _effective_control(nullptr) { } @@ -305,7 +303,6 @@ void MovingPartBase:: determine_effective_channels(const CycleData *root_cdata) { _effective_control = nullptr; _effective_channel = nullptr; - _num_effective_channels = 0; AnimControl *effective_control = nullptr; AnimChannelBase *effective_channel = nullptr; @@ -327,7 +324,6 @@ determine_effective_channels(const CycleData *root_cdata) { } } - _num_effective_channels = num_effective_channels; if (num_effective_channels == 1) { _effective_control = effective_control; _effective_channel = effective_channel; diff --git a/panda/src/chan/movingPartBase.h b/panda/src/chan/movingPartBase.h index c7b09c8acf..7dac536516 100644 --- a/panda/src/chan/movingPartBase.h +++ b/panda/src/chan/movingPartBase.h @@ -78,13 +78,9 @@ protected: typedef pvector< PT(AnimChannelBase) > Channels; Channels _channels; - // This is the number of channels in the above _channels vector that - // actually have an effect on this part. - int _num_effective_channels; - // This is the single channel that has an effect on this part, as determined // by determine_effective_channels(). It is only set if there is exactly - // one channel that affects this part (i.e. _num_effective_channels is 1). + // one channel that affects this part (i.e. num_effective_channels is 1). // If there are multiple channels, or no channels at all, it is NULL. AnimControl *_effective_control; PT(AnimChannelBase) _effective_channel;