From d76dc5dd2831914731b048e832d518802bee86c4 Mon Sep 17 00:00:00 2001 From: Zachary Pavlov Date: Wed, 20 Jun 2007 21:48:33 +0000 Subject: [PATCH] missed copy updates --- panda/src/chan/partBundle.cxx | 6 ++++-- panda/src/chan/partBundle.h | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/panda/src/chan/partBundle.cxx b/panda/src/chan/partBundle.cxx index 2905b95fec..270c45ea50 100644 --- a/panda/src/chan/partBundle.cxx +++ b/panda/src/chan/partBundle.cxx @@ -51,7 +51,8 @@ static ConfigVariableEnum anim_blend_type //////////////////////////////////////////////////////////////////// PartBundle:: PartBundle(const PartBundle ©) : - PartGroup(copy) + PartGroup(copy), + _modifies_anim_bundles(copy._modifies_anim_bundles) { CDWriter cdata(_cycler, true); CDReader cdata_from(copy._cycler); @@ -70,7 +71,8 @@ PartBundle(const PartBundle ©) : //////////////////////////////////////////////////////////////////// PartBundle:: PartBundle(const string &name) : - PartGroup(name) + PartGroup(name), + _modifies_anim_bundles(false) { } diff --git a/panda/src/chan/partBundle.h b/panda/src/chan/partBundle.h index 188b618b36..6fe1ce949e 100644 --- a/panda/src/chan/partBundle.h +++ b/panda/src/chan/partBundle.h @@ -140,9 +140,9 @@ protected: private: + //this is used to determine when to copy the anim bundle bool _modifies_anim_bundles; - class CData; void do_set_control_effect(AnimControl *control, float effect, CData *cdata);