Merge pull request #2632 from firefly2442/duplicate-inherited-vars

remove child variable that is duplicated from parent class
This commit is contained in:
Juan Linietsky 2015-11-18 19:16:35 -03:00
commit e8435cc721
2 changed files with 0 additions and 5 deletions

View file

@ -276,7 +276,6 @@ public:
}; };
struct NewLineNode : public Node { struct NewLineNode : public Node {
int line;
NewLineNode() { type=TYPE_NEWLINE; } NewLineNode() { type=TYPE_NEWLINE; }
}; };

View file

@ -162,10 +162,6 @@ class RasterizerDummy : public Rasterizer {
uint32_t format; uint32_t format;
uint32_t morph_format; uint32_t morph_format;
RID material;
bool material_owned;
Surface() { Surface() {
packed=false; packed=false;