From Andre Garneau:
* Fix for the aspect ratio not being properly set when screens have different aspect ratios. * Minor fix for makeCurrentImplementation being called directly instead of makeCurrent() causing the owning thread pointer not being tracked * Fix for osglauncher so that it sets its update text regions to DYNAMIC to prevent multi-threading issues.
This commit is contained in:
@@ -927,7 +927,7 @@ struct ViewerCompileOperation : public osg::Operation
|
||||
// OpenThreads::ScopedLock<OpenThreads::Mutex> lock(mutex);
|
||||
// osg::notify(osg::NOTICE)<<"Compile "<<context<<" "<<OpenThreads::Thread::CurrentThread()<<std::endl;
|
||||
|
||||
// context->makeCurrentImplementation();
|
||||
// context->makeCurrent();
|
||||
|
||||
osgUtil::GLObjectsVisitor compileVisitor;
|
||||
compileVisitor.setState(context->getState());
|
||||
@@ -990,7 +990,7 @@ Viewer::ThreadingModel Viewer::suggestBestThreadingModel()
|
||||
|
||||
|
||||
int numProcessors = OpenThreads::GetNumberOfProcessors();
|
||||
|
||||
|
||||
if (contexts.size()==1)
|
||||
{
|
||||
if (numProcessors==1) return SingleThreaded;
|
||||
|
||||
Reference in New Issue
Block a user