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
path: root/intern
diff options
context:
space:
mode:
Diffstat (limited to 'intern')
-rw-r--r--intern/ghost/intern/GHOST_SystemCocoa.mm2
-rw-r--r--intern/ghost/intern/GHOST_WindowCocoa.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/intern/ghost/intern/GHOST_SystemCocoa.mm b/intern/ghost/intern/GHOST_SystemCocoa.mm
index 684d4e1b832..013d1e09066 100644
--- a/intern/ghost/intern/GHOST_SystemCocoa.mm
+++ b/intern/ghost/intern/GHOST_SystemCocoa.mm
@@ -1026,7 +1026,7 @@ GHOST_TSuccess GHOST_SystemCocoa::handleWindowEvent(GHOST_TEventType eventType,
switch (eventType) {
case GHOST_kEventWindowClose:
// check for index 1 and discard close for mainwindow as it would quit blender without dialog
- if ([windowsList count] > 1 && (window->get_m_window() != [windowsList objectAtIndex:1])) {
+ if ([windowsList count] > 1 && (window->getCocoaWindow() != [windowsList objectAtIndex:1])) {
pushEvent( new GHOST_Event(getMilliSeconds(), GHOST_kEventWindowClose, window) );
}
else {
diff --git a/intern/ghost/intern/GHOST_WindowCocoa.h b/intern/ghost/intern/GHOST_WindowCocoa.h
index 6787d007ac7..28a463c47f4 100644
--- a/intern/ghost/intern/GHOST_WindowCocoa.h
+++ b/intern/ghost/intern/GHOST_WindowCocoa.h
@@ -271,7 +271,7 @@ public:
GHOST_TSuccess endFullScreen() const {return GHOST_kFailure;}
/** public function to get the window containing the OpenGL view */
- CocoaWindow *get_m_window() const {return m_window;};
+ CocoaWindow *getCocoaWindow() const {return m_window;};
protected:
/**