Merge /u/fgarlin/flightgear-src/ branch next into next

https://sourceforge.net/p/flightgear/flightgear/merge-requests/153/

src/Viewer/CameraGroup_compositor.cxx

@@ -802,12 +802,6 @@ CameraGroup* CameraGroup::buildCameraGroup(osgViewer::Viewer* viewer,
     return cgroup;
 }
 
-void CameraGroup::setCameraCullMasks(Node::NodeMask nm)
-{
-    for (const auto &info : _cameras)
-        info->compositor->setCameraCullMasks(nm);
-}
-
 void CameraGroup::resized()
 {
     for (const auto &info : _cameras)

src/Viewer/CameraGroup_compositor.hxx

@@ -111,7 +111,7 @@ struct CameraInfo : public osg::Referenced
      * so they can avoid recalculating them.
      */
     osg::Matrix viewMatrix, projMatrix;
-    /** The Compositor used to manage the pipeline of this camera
+    /** The Compositor used to manage the pipeline of this camera.
      */
     osg::ref_ptr<simgear::compositor::Compositor> compositor;
 };
@@ -170,9 +170,6 @@ public:
      * current viewport.
      */
     void setCameraParameters(float vfov, float aspectRatio);
-    /** Set the cull mask on all non-GUI cameras
-     */
-    void setCameraCullMasks(osg::Node::NodeMask nm);
     /** Update camera properties after a resize event.
      */
     void resized();

src/Viewer/renderer_compositor.cxx

@@ -730,7 +730,9 @@ FGRenderer::update( ) {
         ->getLightNodeMask(_updateVisitor.get());
     if (_panel_hotspots->getBoolValue())
         cullMask |= simgear::PICK_BIT;
-    CameraGroup::getDefault()->setCameraCullMasks(cullMask);
+    camera->setCullMask(cullMask);
+    camera->setCullMaskLeft(cullMask);
+    camera->setCullMaskRight(cullMask);
 }
 
 void