Merge "Disable Image Visual Pixel alignment when using Layer3D" into devel/master

diff --git a/plugins/dali-swig/examples/dali-test.cs b/plugins/dali-swig/examples/dali-test.cs
old mode 100644 (file)
new mode 100755 (executable)
index 6e106ae..2dbe547
--- a/plugins/dali-swig/examples/dali-test.cs
+++ b/plugins/dali-swig/examples/dali-test.cs
@@ -128,7 +128,7 @@ namespace MyCSharpExample
             Actor actor = new Actor();
             actor.Size = new Position(200.0f, 200.0f, 0.0f);
             actor.Name = "MyActor";
-            actor.Color = new Color(1.0f, 0.0f, 1.0f, 0.8f);
+
             Console.WriteLine("Actor id: {0}", actor.GetId());
             Console.WriteLine("Actor size: " + actor.Size.X + ", " + actor.Size.Y);
             Console.WriteLine("Actor name: " + actor.Name);

diff --git a/plugins/dali-swig/property-wrapper.rb b/plugins/dali-swig/property-wrapper.rb
index 78cb1f2..179ada4 100755 (executable)
--- a/plugins/dali-swig/property-wrapper.rb
+++ b/plugins/dali-swig/property-wrapper.rb
@@ -314,7 +314,7 @@ def writeCSharpData
 
             #exception case <<<
             #Tooltip gives swig build error
-            if( property.name == "Tooltip" )
+            if( property.name == "Tooltip" || property.name == "Color")
                 next
             end
             #exception case >>>