Merge "Fix the broken build for JavaScript plugin" into devel/master

diff --git a/plugins/dali-script-v8/src/rendering/texture-set-api.h b/plugins/dali-script-v8/src/rendering/texture-set-api.h
index 8b4159d..a834d86 100644 (file)
--- a/plugins/dali-script-v8/src/rendering/texture-set-api.h
+++ b/plugins/dali-script-v8/src/rendering/texture-set-api.h
@@ -57,7 +57,6 @@ namespace TextureSetApi
    /**
     * TextureSet API see texture-set.h for a description
     */
-   void SetImage( const v8::FunctionCallbackInfo< v8::Value >& args );
    void SetSampler( const v8::FunctionCallbackInfo< v8::Value >& args );
 
 }; // namespace TextureSetApi

diff --git a/plugins/dali-script-v8/src/rendering/texture-set-wrapper.cpp b/plugins/dali-script-v8/src/rendering/texture-set-wrapper.cpp
index 5296651..5f503ec 100644 (file)
--- a/plugins/dali-script-v8/src/rendering/texture-set-wrapper.cpp
+++ b/plugins/dali-script-v8/src/rendering/texture-set-wrapper.cpp
@@ -45,7 +45,6 @@ const ApiFunction TextureSetFunctionTable[]=
     * TextureSet API (in order of texture-set.h)
     **************************************/
 
-   { "SetImage"                        , TextureSetApi::SetImage },
    { "SetSampler"                      , TextureSetApi::SetSampler },
 };