瀏覽代碼

oops, bad modifyState

David Rose 24 年之前
父節點
當前提交
88963dedb5
共有 1 個文件被更改,包括 1 次插入4 次删除
  1. 1 4
      panda/src/pgraph/renderState.cxx

+ 1 - 4
panda/src/pgraph/renderState.cxx

@@ -670,7 +670,7 @@ issue_delta_modify(const RenderState *other,
     return return_new(new_state);
     return return_new(new_state);
   } else {
   } else {
     delete new_state;
     delete new_state;
-    return other;
+    return this;
   }
   }
 }
 }
 
 
@@ -693,9 +693,6 @@ issue_delta_set(const RenderState *other,
     return other;
     return other;
   }
   }
 
 
-  // We don't need to build a new RenderState, because the return
-  // value will be exactly other.
-
   Attributes::const_iterator ai = _attributes.begin();
   Attributes::const_iterator ai = _attributes.begin();
   Attributes::const_iterator bi = other->_attributes.begin();
   Attributes::const_iterator bi = other->_attributes.begin();