Minor cleanup of commented out headers and @todos

Change-Id: I1f07eb55544df502f74c0063cd1d3be304fc4850

diff --git a/dali/internal/event/rendering/material-impl.cpp b/dali/internal/event/rendering/material-impl.cpp
index 77b7f75..1f4b75b 100644 (file)
--- a/dali/internal/event/rendering/material-impl.cpp
+++ b/dali/internal/event/rendering/material-impl.cpp
@@ -18,6 +18,9 @@
 // CLASS HEADER
 #include <dali/internal/event/rendering/material-impl.h> // Dali::Internal::Material
 
+//EXTERNAL INCLUDES
+#include <string>
+
 // INTERNAL INCLUDES
 #include <dali/public-api/object/type-registry.h>
 #include <dali/devel-api/rendering/material.h> // Dali::Internal::Material
@@ -25,10 +28,6 @@
 #include <dali/internal/event/common/property-helper.h> // DALI_PROPERTY_TABLE_BEGIN, DALI_PROPERTY, DALI_PROPERTY_TABLE_END
 #include <dali/internal/update/manager/update-manager.h>
 #include <dali/internal/update/rendering/scene-graph-material.h>
-//#include <dali/internal/update/rendering/scene-graph-sampler.h>
-
-//EXTERNAL INCLUDES
-#include <string>
 
 namespace Dali
 {
@@ -601,7 +600,6 @@ const PropertyInputImpl* Material::GetSceneObjectInputProperty( Property::Index
 
 int Material::GetPropertyComponentIndex( Property::Index index ) const
 {
-  // @todo MESH_REWORK - Change this if component properties are added for color/blend-color
   return Property::INVALID_COMPONENT_INDEX;
 }
 

diff --git a/dali/internal/event/rendering/shader-impl.h b/dali/internal/event/rendering/shader-impl.h
index 85da4bd..b4d621f 100644 (file)
--- a/dali/internal/event/rendering/shader-impl.h
+++ b/dali/internal/event/rendering/shader-impl.h
@@ -62,7 +62,7 @@ public:
 
   /**
    * Retrieve the scene-graph shader added by this object.
-   * @return A pointer to the shader, or NULL if no shader has been added to the scene-graph.
+   * @return A pointer to the shader.
    */
   SceneGraph::Shader* GetShaderSceneObject();
 

diff --git a/dali/internal/update/rendering/scene-graph-renderer.cpp b/dali/internal/update/rendering/scene-graph-renderer.cpp
index 4815c67..f061514 100644 (file)
--- a/dali/internal/update/rendering/scene-graph-renderer.cpp
+++ b/dali/internal/update/rendering/scene-graph-renderer.cpp
@@ -23,7 +23,6 @@
 #include <dali/internal/update/controllers/render-message-dispatcher.h>
 #include <dali/internal/update/rendering/scene-graph-geometry.h>
 #include <dali/internal/update/rendering/scene-graph-material.h>
-//#include <dali/internal/update/rendering/scene-graph-sampler.h>
 #include <dali/internal/render/shaders/scene-graph-shader.h>
 #include <dali/internal/render/renderers/render-new-renderer.h>
 #include <dali/internal/render/data-providers/node-data-provider.h>