New layout icons

Normand Briere

2019-07-27 1af7d3700724834e40ad8636bc9a56cdc3b19b15

 Composite.java
..
..
@@ -790,6 +790,8 @@
790
790
 
791
791
     void draw(ClickInfo info, int level, boolean select)
792
792
     {
793
+        new Exception().printStackTrace();
794
+        
793
795
         ClickInfo newInfo = new ClickInfo();
794
796
         newInfo.flags = info.flags;
795
797
         newInfo.bounds = info.bounds;
..
..
@@ -867,15 +869,29 @@
867
869
         tex = GetTextures();
868
870
     }
869
871
 
872
+    boolean failedPigment = false;
873
+    boolean failedBump = false;
874
+    
870
875
     try
871
876
     {
872
-        display.BindTextures(tex, texres);
877
+        display.BindPigmentTexture(tex, texres);
873
878
     }
874
879
     catch (Exception e)
875
880
     {
876
881
         System.err.println("FAILED: " + this);
882
+        failedPigment = true;
877
883
     }
878
-    
884
+           
885
+    try
886
+    {
887
+        display.BindBumpTexture(tex, texres);
888
+    }
889
+    catch (Exception e)
890
+    {
891
+        //System.err.println("FAILED: " + this);
892
+        failedBump = true;
893
+    }
894
+               
879
895
         if (//true) // new NORMAND
880
896
             touched || softtouched)
881
897
         {
..
..
@@ -937,7 +953,11 @@
937
953
             }
938
954
         }
939
955
     
940
-    display.ReleaseTextures(tex);
956
+    if (!failedBump)
957
+        display.ReleaseBumpTexture(tex);
958
+    
959
+    if (!failedPigment)
960
+        display.ReleasePigmentTexture(tex);
941
961
     }
942
962
 
943
963
     void Reset0()