Merge "Remove C# binding for batching. Batching has been moved in the foloowing patch...

diff --git a/plugins/dali-swig/SWIG/devel-properties.i b/plugins/dali-swig/SWIG/devel-properties.i
old mode 100644 (file)
new mode 100755 (executable)
index 38d4c47..613a656
--- a/plugins/dali-swig/SWIG/devel-properties.i
+++ b/plugins/dali-swig/SWIG/devel-properties.i
@@ -27,30 +27,9 @@
 %}
 
 %typemap(cscode) Dali::Actor::Property %{
-  public static readonly int BATCH_PARENT = NDalicManualPINVOKE.Actor_Property_BATCH_PARENT_get();
   public static readonly int SIBLING_ORDER = NDalicManualPINVOKE.Actor_Property_SIBLING_ORDER_get();
 %}
 
-%typemap(cscode) Dali::Renderer::Property %{
-  public static readonly int BATCHING_ENABLED = NDalicManualPINVOKE.Renderer_Property_BATCHING_ENABLED_get();
-%}
-
-%typemap(cscode) Dali::Renderer %{
-  public bool BatchingEnabled
-  {
-    get
-    {
-      bool temp = false;
-      GetProperty( Renderer.Property.BATCHING_ENABLED).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( Renderer.Property.BATCHING_ENABLED, new Dali.Property.Value( value ) );
-    }
-  }
-%}
-
 %typemap(cscode) Dali::Toolkit::Control::Property %{
   public static readonly int TOOLTIP = NDalicManualPINVOKE.View_Property_TOOLTIP_get();
 %}

diff --git a/plugins/dali-swig/SWIG/events/actor-event.i b/plugins/dali-swig/SWIG/events/actor-event.i
index 93f803c..138120a 100755 (executable)
--- a/plugins/dali-swig/SWIG/events/actor-event.i
+++ b/plugins/dali-swig/SWIG/events/actor-event.i
@@ -85,20 +85,6 @@
       }
     }
 
-    public bool BatchParent
-    {
-      get
-      {
-        bool temp = false;
-        GetProperty( Actor.Property.BATCH_PARENT).Get( ref temp );
-        return temp;
-      }
-      set
-      {
-        SetProperty( Actor.Property.BATCH_PARENT, new Dali.Property.Value( value ) );
-      }
-    }
-
     public int SiblingOrder
     {
       get

diff --git a/plugins/dali-swig/manual/cpp/devel-property-wrap.cpp b/plugins/dali-swig/manual/cpp/devel-property-wrap.cpp
old mode 100644 (file)
new mode 100755 (executable)
index 8f8940d..e8edf38
--- a/plugins/dali-swig/manual/cpp/devel-property-wrap.cpp
+++ b/plugins/dali-swig/manual/cpp/devel-property-wrap.cpp
@@ -33,15 +33,6 @@
 extern "C" {
 #endif
 
-SWIGEXPORT int SWIGSTDCALL CSharp_Actor_Property_BATCH_PARENT_get() {
-  int jresult ;
-  int result;
-
-  result = (int)Dali::DevelActor::Property::BATCH_PARENT;
-  jresult = (int)result;
-  return jresult;
-}
-
 SWIGEXPORT int SWIGSTDCALL CSharp_Actor_Property_SIBLING_ORDER_get() {
   int jresult ;
   int result;
@@ -51,15 +42,6 @@ SWIGEXPORT int SWIGSTDCALL CSharp_Actor_Property_SIBLING_ORDER_get() {
   return jresult;
 }
 
-SWIGEXPORT int SWIGSTDCALL CSharp_Renderer_Property_BATCHING_ENABLED_get() {
-  int jresult ;
-  int result;
-
-  result = (int)Dali::DevelRenderer::Property::BATCHING_ENABLED;
-  jresult = (int)result;
-  return jresult;
-}
-
 SWIGEXPORT int SWIGSTDCALL CSharp_View_Property_TOOLTIP_get() {
   int jresult ;
   int result;

diff --git a/plugins/dali-swig/manual/csharp/DaliEnumConstants.cs b/plugins/dali-swig/manual/csharp/DaliEnumConstants.cs
index 69f6377..4b5d1f5 100755 (executable)
--- a/plugins/dali-swig/manual/csharp/DaliEnumConstants.cs
+++ b/plugins/dali-swig/manual/csharp/DaliEnumConstants.cs
@@ -15,18 +15,18 @@
  */
 using System;
 
-namespace Dali 
+namespace Dali
 {
   namespace Constants
   {
 
-    public enum TextureType 
+    public enum TextureType
     {
       Texture2D     = Dali.TextureType.TEXTURE_2D,   ///< One 2D image                            @SINCE_1_1.43
       TextureCube   = Dali.TextureType.TEXTURE_CUBE  ///< Six 2D images arranged in a cube-shape  @SINCE_1_1.43
     }
 
-    public enum ViewMode 
+    public enum ViewMode
     {
       Mono              = Dali.ViewMode.MONO,                          ///< Monoscopic (single camera). This is the default @SINCE_1_0.0
       StereoHorizontal  = Dali.ViewMode.STEREO_HORIZONTAL, ///< Stereoscopic. Frame buffer is split horizontally with the left and right camera views in their respective sides. @SINCE_1_0.0
@@ -161,7 +161,6 @@ namespace Dali
       public static readonly int DesiredHeight = NDalic.IMAGE_VISUAL_DESIRED_HEIGHT;
       public static readonly int SynchronousLoading = NDalic.IMAGE_VISUAL_SYNCHRONOUS_LOADING;
       public static readonly int BorderOnly = NDalic.IMAGE_VISUAL_BORDER_ONLY;
-      public static readonly int BatchingEnabled = NDalic.IMAGE_VISUAL_BATCHING_ENABLED;
       public static readonly int PixelArea = NDalic.IMAGE_VISUAL_PIXEL_AREA;
       public static readonly int WrapModeU = NDalic.IMAGE_VISUAL_WRAP_MODE_U;
       public static readonly int WrapModeV = NDalic.IMAGE_VISUAL_WRAP_MODE_V;

diff --git a/plugins/dali-swig/manual/csharp/ManualPINVOKE.cs b/plugins/dali-swig/manual/csharp/ManualPINVOKE.cs
index 6d7f471..09330f4 100755 (executable)
--- a/plugins/dali-swig/manual/csharp/ManualPINVOKE.cs
+++ b/plugins/dali-swig/manual/csharp/ManualPINVOKE.cs
@@ -187,15 +187,9 @@ namespace Dali
         [global::System.Runtime.InteropServices.DllImport("NDalic", EntryPoint="CSharp_Dali_MakeCallback")]
         public static extern global::System.IntPtr MakeCallback(global::System.Runtime.InteropServices.HandleRef jarg1);
 
-        [global::System.Runtime.InteropServices.DllImport("NDalic", EntryPoint="CSharp_Actor_Property_BATCH_PARENT_get")]
-        public static extern int Actor_Property_BATCH_PARENT_get();
-
         [global::System.Runtime.InteropServices.DllImport("NDalic", EntryPoint="CSharp_Actor_Property_SIBLING_ORDER_get")]
         public static extern int Actor_Property_SIBLING_ORDER_get();
 
-        [global::System.Runtime.InteropServices.DllImport("NDalic", EntryPoint="CSharp_Renderer_Property_BATCHING_ENABLED_get")]
-        public static extern int Renderer_Property_BATCHING_ENABLED_get();
-
         [global::System.Runtime.InteropServices.DllImport("NDalic", EntryPoint="CSharp_View_Property_TOOLTIP_get")]
         public static extern int View_Property_TOOLTIP_get();