FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixes for building OSG with OSG_USE_REF_PTR_IMPLICIT_OUTPUT_CONVERSION set to OFF.

Browse Source 
Fixed copy and paste error in Camera::getImplicitBufferAttachmentResolveMask().
This commit is contained in:
Robert Osfield
2010-05-12 11:37:27 +00:00
parent e91557fe1d
commit 68a1ed2dcf
8 changed files with 26 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/osg/Camera
View File

@@ -460,8 +460,7 @@ class OSG_EXPORT Camera : public Transform, public CullSettings
{
if( effectiveMask && _implicitBufferAttachmentRenderMask == USE_DISPLAY_SETTINGS_MASK )
{
const DisplaySettings * ds = getDisplaySettings();
if ( !ds ) ds = DisplaySettings::instance();
const DisplaySettings * ds = _displaySettings.valid() ? _displaySettings.get() : DisplaySettings::instance().get();
return ds->getImplicitBufferAttachmentRenderMask();
}
else
@@ -479,9 +478,8 @@ class OSG_EXPORT Camera : public Transform, public CullSettings
{
if( effectiveMask && _implicitBufferAttachmentResolveMask == USE_DISPLAY_SETTINGS_MASK )
{
const DisplaySettings * ds = getDisplaySettings();
if ( !ds ) ds = DisplaySettings::instance();
return ds->getImplicitBufferAttachmentRenderMask();
const DisplaySettings * ds = _displaySettings.valid() ? _displaySettings.get() : DisplaySettings::instance().get();
return ds->getImplicitBufferAttachmentResolveMask();
}
else
{

2
include/osgShadow/ParallelSplitShadowMap
View File

@@ -97,7 +97,7 @@ class OSGSHADOW_EXPORT ParallelSplitShadowMap : public ShadowTechnique
inline void setUserLight(osg::Light* light) { _userLight = light; }
/** get the user defined light for shadow simulation */
inline const osg::Light* getUserLight() const { return _userLight; }
inline const osg::Light* getUserLight() const { return _userLight.get(); }
/** Set the values for the ambient bias the shader will use.*/
void setAmbientBias(const osg::Vec2& ambientBias );