Browse Source

bug with unlock assertion

David Rose 16 years ago
parent
commit
ff8d5eaf77
1 changed files with 2 additions and 0 deletions
  1. 2 0
      panda/src/gobj/texture.cxx

+ 2 - 0
panda/src/gobj/texture.cxx

@@ -6131,6 +6131,8 @@ fillin(DatagramIterator &scan, BamReader *manager, bool has_rawdata) {
 ////////////////////////////////////////////////////////////////////
 ////////////////////////////////////////////////////////////////////
 void Texture::
 void Texture::
 fillin_from(Texture *dummy) {
 fillin_from(Texture *dummy) {
+  MutexHolder holder(_lock);
+
   // Use the setters instead of setting these directly, so we can
   // Use the setters instead of setting these directly, so we can
   // correctly avoid incrementing _properties_modified if none of
   // correctly avoid incrementing _properties_modified if none of
   // these actually change.  (Otherwise, we'd have to reload the
   // these actually change.  (Otherwise, we'd have to reload the