Merge pull request #2632 from firefly2442/duplicate-inherited-vars
remove child variable that is duplicated from parent class
This commit is contained in:
commit
e8435cc721
2 changed files with 0 additions and 5 deletions
|
@ -276,7 +276,6 @@ public:
|
|||
};
|
||||
|
||||
struct NewLineNode : public Node {
|
||||
int line;
|
||||
NewLineNode() { type=TYPE_NEWLINE; }
|
||||
};
|
||||
|
||||
|
|
|
@ -162,10 +162,6 @@ class RasterizerDummy : public Rasterizer {
|
|||
uint32_t format;
|
||||
uint32_t morph_format;
|
||||
|
||||
RID material;
|
||||
bool material_owned;
|
||||
|
||||
|
||||
Surface() {
|
||||
|
||||
packed=false;
|
||||
|
|
Loading…
Reference in a new issue