Merge branch 'master' into MusicalProgrammer

2018-05-30 21:19:46 -04:00
parent cd0f1617cb
commit 828c0dcb41
16 changed files with 599 additions and 483 deletions
--- a/BaseButtonInstance.h
+++ b/BaseButtonInstance.h
@@ -8,6 +8,7 @@ class BaseButtonInstance : public Instance
 public:
 	BaseButtonInstance(void);
 	virtual ~BaseButtonInstance(void);
+	virtual void render(RenderDevice* rd);
 	virtual void drawObj(RenderDevice* rd, Vector2 mousePos, bool mouseDown);
 	virtual bool mouseInButton(float, float, RenderDevice* rd);
 	virtual void onMouseClick();