# HG changeset patch # User Santeri Piippo # Date 1372795373 -10800 # Node ID de051d2bd80b37072bde2a290e9a8c0a1c2112a2 # Parent e41ab239ed285de4fd3a265c0664efa1f9455406 simplify a bit diff -r e41ab239ed28 -r de051d2bd80b src/file.cpp --- a/src/file.cpp Tue Jul 02 22:53:20 2013 +0300 +++ b/src/file.cpp Tue Jul 02 23:02:53 2013 +0300 @@ -532,7 +532,6 @@ g_win->updateTitle(); g_win->R()->setFile( file ); g_win->R()->resetAngles(); - g_win->R()->overlaysFromObjects(); // Add it to the recent files list. addRecentFile( path ); diff -r e41ab239ed28 -r de051d2bd80b src/gldraw.cpp --- a/src/gldraw.cpp Tue Jul 02 22:53:20 2013 +0300 +++ b/src/gldraw.cpp Tue Jul 02 23:02:53 2013 +0300 @@ -1195,6 +1195,19 @@ update (); } +READ_ACCESSOR( LDOpenFile*, GLRenderer::file ) +{ + return m_file; +} + +SET_ACCESSOR( LDOpenFile*, GLRenderer::setFile ) +{ + m_file = val; + + if( val != null ) + overlaysFromObjects(); +} + // ============================================================================= void GLRenderer::endDraw (bool accept) { (void) accept; diff -r e41ab239ed28 -r de051d2bd80b src/gldraw.h --- a/src/gldraw.h Tue Jul 02 22:53:20 2013 +0300 +++ b/src/gldraw.h Tue Jul 02 23:02:53 2013 +0300 @@ -57,8 +57,8 @@ PROPERTY (bool, drawOnly, setDrawOnly) PROPERTY (double, zoom, setZoom) - PROPERTY (LDOpenFile*, file, setFile) READ_PROPERTY (bool, picking, setPicking) + DECLARE_PROPERTY (LDOpenFile*, file, setFile) DECLARE_PROPERTY (EditMode, editMode, setEditMode) public: