Merge commit '020d0244e4239b21dc804d630edff926386ea34f' into master-merge

[xonotic/netradiant.git] / radiant / renderer.h

diff --git a/radiant/renderer.h b/radiant/renderer.h
index 62674d4624c739ac5a8d53b53d91c835b317443c..d94afcadd3d28716ee75e686d193d5b3e3234c4d 100644 (file)
--- a/radiant/renderer.h
+++ b/radiant/renderer.h
@@ -130,7 +130,7 @@ void render( const Renderable& renderable ) const {
                break;
        }
 }
-typedef ConstMemberCaller1<RenderHighlighted, const Renderable&, &RenderHighlighted::render> RenderCaller;
+typedef ConstMemberCaller<RenderHighlighted, void(const Renderable&), &RenderHighlighted::render> RenderCaller;
 
 bool pre( const scene::Path& path, scene::Instance& instance, VolumeIntersectionValue parentVisible ) const {
        m_renderer.PushState();
@@ -149,7 +149,10 @@ bool pre( const scene::Path& path, scene::Instance& instance, VolumeIntersection
                        else if ( renderable ) {
                                renderable->renderComponents( m_renderer, m_volume );
                        }
-                       m_renderer.Highlight( Renderer::ePrimitive );
+                       //if( !(GlobalSelectionSystem().Mode() == SelectionSystem::eComponent && path.size() == 2) )
+                       //if( !( GlobalSelectionSystem().Mode() == SelectionSystem::eComponent && node_is_group( path.top() ) ) )
+                       if( !( GlobalSelectionSystem().Mode() == SelectionSystem::eComponent && Node_isEntity( path.top() ) ) )
+                               m_renderer.Highlight( Renderer::ePrimitive );
                }
 
                if ( renderable ) {