Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--source/gameengine/BlenderRoutines/KX_BlenderCanvas.cpp10
-rw-r--r--source/gameengine/BlenderRoutines/KX_BlenderCanvas.h4
2 files changed, 4 insertions, 10 deletions
diff --git a/source/gameengine/BlenderRoutines/KX_BlenderCanvas.cpp b/source/gameengine/BlenderRoutines/KX_BlenderCanvas.cpp
index 43d67e111f3..360794ceb33 100644
--- a/source/gameengine/BlenderRoutines/KX_BlenderCanvas.cpp
+++ b/source/gameengine/BlenderRoutines/KX_BlenderCanvas.cpp
@@ -34,17 +34,11 @@
#include <config.h>
#endif
-// temp hack, prevents pointers being offset somehow, will need to look into this later - Campbell
-ARegion *m_ar;
-wmWindow *m_win;
-
KX_BlenderCanvas::KX_BlenderCanvas(struct wmWindow *win, ARegion *ar) :
-__m_win(win),
-__m_ar(ar)
+m_win(win),
+m_ar(ar)
{
- m_ar= ar;
- m_win= win;
}
KX_BlenderCanvas::~KX_BlenderCanvas()
diff --git a/source/gameengine/BlenderRoutines/KX_BlenderCanvas.h b/source/gameengine/BlenderRoutines/KX_BlenderCanvas.h
index 41bbec7770c..fd41fb90f2f 100644
--- a/source/gameengine/BlenderRoutines/KX_BlenderCanvas.h
+++ b/source/gameengine/BlenderRoutines/KX_BlenderCanvas.h
@@ -163,8 +163,8 @@ public:
private:
/** Blender area the game engine is running within */
- struct ARegion* __m_ar;
- struct wmWindow* __m_win;
+ struct ARegion* m_ar;
+ struct wmWindow* m_win;
RAS_Rect m_area_rect;
};