diff --git a/src/libRender/RadiumNBR/Passes/CustomAttribToColorPass.cpp b/src/libRender/RadiumNBR/Passes/CustomAttribToColorPass.cpp
index 911902a28296ec6a748cce4a44df8dfd8799f686..c4d29a20274ef77967706af54efa419ed9b8d263 100644
--- a/src/libRender/RadiumNBR/Passes/CustomAttribToColorPass.cpp
+++ b/src/libRender/RadiumNBR/Passes/CustomAttribToColorPass.cpp
@@ -143,26 +143,24 @@ void CustomAttribToColorPass::execute(
 
     glClearBufferfv( GL_DEPTH, 0, &clearDepth );
 
-
     if ( m_envmap ) {
         m_passParams.addParameter( "envStrength", m_envmap->getEnvStrength() );
-    }
-
-    // TODO : if an envmap is set, render with the envmap only ?
-    if ( m_lightmanager->count() > 0 )
-    {
-        // for ( const auto& l : m_lights )
-        for ( size_t i = 0; i < m_lightmanager->count(); ++i )
+        for ( const auto& ro : *m_objectsToRender )
         {
-            Ra::Engine::Data::RenderParameters passParams;
-            const auto l = m_lightmanager->getLight( i );
-            l->getRenderParameters( passParams );
-            if (m_envmap) {
-                passParams.concatParameters( m_passParams );
-            }
-            for ( const auto& ro : *m_objectsToRender )
+            ro->render( m_passParams, viewParams, passIndex() );
+        }
+    } else {
+        if ( m_lightmanager->count() > 0 )
+        {
+            for ( size_t i = 0; i < m_lightmanager->count(); ++i )
             {
-                ro->render( passParams, viewParams, passIndex() );
+                Ra::Engine::Data::RenderParameters passParams;
+                const auto l = m_lightmanager->getLight( i );
+                l->getRenderParameters( passParams );
+                for ( const auto& ro : *m_objectsToRender )
+                {
+                    ro->render( passParams, viewParams, passIndex() );
+                }
             }
         }
     }