Merge branch 'master' into shader_pipeline

AUTHORS.txt

@@ -8,11 +8,11 @@ Robert Osfield
 Stephan Huber
 Paul Martz
 Farshid Lashkari
-Mathias Frhlich
+Mathias Fröhlich
 Laurens Voerman
 Marco Jez
 Wang Rui
-Jean-Sbastien Guay
+Jean-Sébastien Guay
 Ulrich Hertlein
 Mike Weiblen
 Sukender
@@ -66,11 +66,11 @@ Norman Vine
 Chris Denham
 Sherman Wilcox
 Serge Lages
-Romano Jos Magacho da Silva
+Romano José Magacho da Silva
 Mourad Boufarguine
 Alberto Farre
 Glenn Waldron
-Andr Garneau
+André Garneau
 Adrian Egli
 Sebastian Messerschmidt
 Randall Hopper
@@ -85,7 +85,7 @@ Michael Gronager
 Martin Naylor
 Joakim Simonsson
 David Spilling
-Daniel Sjlie
+Daniel Sjölie
 Bryan Thrall
 Andreas Ekstrand
 Rafa Gaitan
@@ -122,7 +122,7 @@ Gordon Tomlinson
 Frederic Marmond
 Frederic Bouvier
 Carlo Camporesi
-Bjrn Blissing
+Björn Blissing
 Alexander Sinditskiy
 Vladimir Chebaev
 Thibault Genessay
@@ -141,7 +141,7 @@ Uwe Woessner
 Tony Horrobin
 Thom DeCarlo
 Tatsuhiro Nishioka
-Tanguy Fautr
+Tanguy Fautré
 Sean Spicer
 Ryan Kawicki
 Richard Schmidt
@@ -202,7 +202,7 @@ Phil Atkin
 Pawel Ksiezopolski
 Patrick Neary
 Nathan Monteleone
-Miha Ravelj
+Miha Rav¨elj
 Miguel Escriva
 Mattias Linde
 Mark Sciabica
@@ -234,8 +234,8 @@ Christian Ruzicka
 Christian Buchner
 Charles Cole
 Blake Williams
-Bjrn Hein
-Aurlien Chatelain
+Björn Hein
+Aurélien Chatelain
 Antoine Hue
 Andrew Bettison
 Andreas Henne
@@ -264,7 +264,7 @@ Paul Obermeier
 Nguyen Van Truong
 Nathan Cournia
 Morten Haukness
-Morn Pistorius
+Morné Pistorius
 Michael Mc Donnell
 Michael Henheffer
 Michael Guerrero
@@ -297,7 +297,7 @@ Guillaume Taze
 Guillaume Chouvenc
 Giuseppe Donvito
 Gill Peacegood
-Giampaolo Vigan
+Giampaolo Viganò
 Gerrick Bivins
 George Tarantilis
 Ferdi Smit
@@ -305,7 +305,7 @@ Eduardo Poyart
 Edgar Ellis
 Dmitry Marakasov
 Dimi Christopoulos
-Diane Delalle
+Diane Delallée
 David Longest
 David Ergo
 Daniel Trstenjak
@@ -337,7 +337,7 @@ Vasily Radostev
 Valery Bickov
 Valeriy Dubov
 Vaclav Bilek
-Tyge Lvset
+Tyge Løvset
 Troy Yee
 Torben Dannahauer
 Tony Vasile
@@ -387,7 +387,7 @@ Piotr Rak
 Pierre Bourdin
 Philipp Svehla
 Philipp Siemoleit
-Philipp Mchler
+Philipp Mächler
 Philip Lamb
 Petr Salinger
 Peter Bear
@@ -412,7 +412,7 @@ Nick Thu
 Nick Black
 Mojtaba Fathi
 Mirko Viviani
-Mikkel Gjl
+Mikkel Gjøl
 Mike Krus
 Mike Garrity
 Mick Thu
@@ -465,7 +465,7 @@ Juan Hernando
 Josh Portway
 Jonathan Greig
 John Tan
-John Hedstrm
+John Hedström
 John Grant
 John Farrier
 John Donovan
@@ -524,11 +524,11 @@ David Jung
 Danny Valente
 Daniel Stien
 Dan Minor
-Csar L. B. Silveira
+César L. B. Silveira
 Cyril Brulebois
 Curtis Rubel
 Cory Slep
-Clment Bsch
+Clément B½sch
 Clay Fowler
 Claus Steuer
 Chuck Sembroski

applications/present3D/ReadShowFile.cpp

@@ -256,7 +256,7 @@ osg::ref_ptr<osg::Node> p3d::readShowFiles(osg::ArgumentParser& arguments,const
                 nodeList.push_back(node);
 
                 // make sure that this presentation isn't cached
-                osgDB::Registry::instance()->removeFromObjectCache( arguments[pos] );
+                osgDB::Registry::instance()->removeFromObjectCache( arguments[pos], local_options.get());
             }
         }
     }

src/osgPresentation/SlideEventHandler.cpp

@@ -1240,7 +1240,7 @@ bool SlideEventHandler::handle(const osgGA::GUIEventAdapter& ea,osgGA::GUIAction
                 _hold = false;
                 return true;
             }
-            else if (ea.getKey()=='e')
+            else if (ea.getKey()=='R')
             {
                 // reload presentation to reflect changes from editor
                 setRequestReload(true);

src/osgViewer/GraphicsWindowWin32.cpp

@@ -96,9 +96,9 @@ enum tagPOINTER_INPUT_TYPE {
    PT_TOUCH = 0x00000002,   // Touch
    PT_PEN = 0x00000003,   // Pen
    PT_MOUSE = 0x00000004,   // Mouse
-#if(WINVER >= 0x0603)
+//#if(WINVER >= 0x0603)
    PT_TOUCHPAD = 0x00000005,   // Touchpad
-#endif /* WINVER >= 0x0603 */
+//#endif /* WINVER >= 0x0603 */
 };
 typedef DWORD POINTER_INPUT_TYPE;
 
@@ -145,7 +145,7 @@ static GetTouchInputInfoFunc *getTouchInputInfoFunc = NULL;
 static GetPointerTypeFunc *getPointerTypeFunc = NULL;
 
 // DPI Awareness
-#if(WINVER >= 0x0603)
+// #if(WINVER >= 0x0603)
 
 #ifndef DPI_ENUMS_DECLARED
 
@@ -163,7 +163,7 @@ BOOL
 	PROCESS_DPI_AWARENESS dpi_awareness));
 
 static SetProcessDpiAwarenessFunc *setProcessDpiAwareness = NULL;
-#endif
+// #endif
 
 
 
@@ -787,10 +787,10 @@ Win32WindowingSystem::Win32WindowingSystem()
     }
 
 
-#if(WINVER >= 0x0603)
-	// For Windows 8.1 and higher 
+// #if(WINVER >= 0x0603)
+	// For Windows 8.1 and higher
 	//
-	// Per monitor DPI aware.This app checks for the DPI when it is created and adjusts the scale factor 
+	// Per monitor DPI aware.This app checks for the DPI when it is created and adjusts the scale factor
 	// whenever the DPI changes.These applications are not automatically scaled by the system.
 	HMODULE hModuleShore = LoadLibrary("Shcore");
 	if (hModuleShore) {
@@ -799,7 +799,7 @@ Win32WindowingSystem::Win32WindowingSystem()
 			(*setProcessDpiAwareness)(PROCESS_DPI_AWARENESS::PROCESS_PER_MONITOR_DPI_AWARE);
 		}
 	}
-#endif
+// #endif
 }
 
 Win32WindowingSystem::~Win32WindowingSystem()