diff options
| author | Juan Linietsky | 2015-11-18 19:16:35 -0300 |
|---|---|---|
| committer | Juan Linietsky | 2015-11-18 19:16:35 -0300 |
| commit | e8435cc721e261caba757dc1537787b7ff389afc (patch) | |
| tree | edee4fda8178aeaacea3838e91d99fde7caff287 | |
| parent | 75922c57d6f2ba00ea5f8456134fffc64868acf1 (diff) | |
| parent | bb68dc5210205da32b721681667360d8f54e2ea9 (diff) | |
| download | godot-e8435cc721e261caba757dc1537787b7ff389afc.tar.gz godot-e8435cc721e261caba757dc1537787b7ff389afc.tar.zst godot-e8435cc721e261caba757dc1537787b7ff389afc.zip | |
Merge pull request #2632 from firefly2442/duplicate-inherited-vars
remove child variable that is duplicated from parent class
| -rw-r--r-- | modules/gdscript/gd_parser.h | 1 | ||||
| -rw-r--r-- | servers/visual/rasterizer_dummy.h | 4 |
2 files changed, 0 insertions, 5 deletions
diff --git a/modules/gdscript/gd_parser.h b/modules/gdscript/gd_parser.h index 134279b6d..04f3dff3d 100644 --- a/modules/gdscript/gd_parser.h +++ b/modules/gdscript/gd_parser.h @@ -276,7 +276,6 @@ public: }; struct NewLineNode : public Node { - int line; NewLineNode() { type=TYPE_NEWLINE; } }; diff --git a/servers/visual/rasterizer_dummy.h b/servers/visual/rasterizer_dummy.h index f582fbd8e..2c503249f 100644 --- a/servers/visual/rasterizer_dummy.h +++ b/servers/visual/rasterizer_dummy.h @@ -162,10 +162,6 @@ class RasterizerDummy : public Rasterizer { uint32_t format; uint32_t morph_format; - RID material; - bool material_owned; - - Surface() { packed=false; |