Commit 01375554 authored by Dirk Wilden's avatar Dirk Wilden

-changed Color Type to RGBA

-added option to ensure recent files are loaded with right options


git-svn-id: http://www.openflipper.org/svnrepo/OpenFlipper/branches/Free@3671 383ad7c9-94d9-4d36-a494-682f7c89f535
parent 9e71ed35
...@@ -690,8 +690,11 @@ Core::slotRecentOpen(QAction* _action) ...@@ -690,8 +690,11 @@ Core::slotRecentOpen(QAction* _action)
if ( recentFiles[i].filename == _action->text() ){ if ( recentFiles[i].filename == _action->text() ){
if (recentFiles[i].type == DATA_NONE) if (recentFiles[i].type == DATA_NONE)
loadSettings( recentFiles[i].filename ); loadSettings( recentFiles[i].filename );
else else{
OpenFlipper::Options::loadingRecentFile(true);
loadObject(recentFiles[i].type, recentFiles[i].filename); loadObject(recentFiles[i].type, recentFiles[i].filename);
OpenFlipper::Options::loadingRecentFile(false);
}
break; break;
} }
} }
......
...@@ -166,6 +166,9 @@ static bool enableBackup_ = true; ...@@ -166,6 +166,9 @@ static bool enableBackup_ = true;
/// Currently loading Settings? /// Currently loading Settings?
static bool loadingSettings_ = false; static bool loadingSettings_ = false;
/// Currently loading recent file?
static bool loadingRecentFile_ = false;
/// Currently saving Settings? /// Currently saving Settings?
static bool savingSettings_ = false; static bool savingSettings_ = false;
...@@ -577,6 +580,14 @@ void savingSettings(bool _savingSettings ) { ...@@ -577,6 +580,14 @@ void savingSettings(bool _savingSettings ) {
savingSettings_ = _savingSettings; savingSettings_ = _savingSettings;
} }
bool loadingRecentFile( ) {
return loadingRecentFile_;
}
void loadingRecentFile(bool _loadingRecentFile ) {
loadingRecentFile_ = _loadingRecentFile;
}
int* argc() { int* argc() {
return argc_; return argc_;
} }
......
...@@ -534,6 +534,14 @@ bool iconDir(QString _dir); ...@@ -534,6 +534,14 @@ bool iconDir(QString _dir);
DLLEXPORT DLLEXPORT
void savingSettings(bool _savingSettings ); void savingSettings(bool _savingSettings );
/// currently loading recent file ?
DLLEXPORT
bool loadingRecentFile( );
/// currently loading recent file ?
DLLEXPORT
void loadingRecentFile(bool _loadingRecentFile );
/** @} */ /** @} */
//=========================================================================== //===========================================================================
......
...@@ -67,6 +67,9 @@ struct TriTraits : public OpenMesh::DefaultTraits ...@@ -67,6 +67,9 @@ struct TriTraits : public OpenMesh::DefaultTraits
/// Use double precision Normals /// Use double precision Normals
typedef OpenMesh::Vec3d Normal; typedef OpenMesh::Vec3d Normal;
/// Use double precision rgba Color
typedef OpenMesh::Vec4f Color;
}; };
/// Simple Name for Mesh /// Simple Name for Mesh
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment