[ff-cvs] libvob org/nongnu/libvob/gl/Paper.java vob/pape...

[Tuomas J. Lukka]

CVSROOT:        /cvsroot/libvob
Module name:    libvob
Branch:         
Changes by:     Tuomas J. Lukka <address@hidden>        03/08/19 03:57:10

Modified files:
        org/nongnu/libvob/gl: Paper.java 
        vob/paper      : papermill.py 

Log message:
        Vital changes: keep dependencies in paper clones, and do not put in 
only paperhanger but also paper dependency. This allows cloning to not lose 
textures...

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/org/nongnu/libvob/gl/Paper.java.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/vob/paper/papermill.py.diff?tr1=1.9&tr2=1.10&r1=text&r2=text

Patches:
Index: libvob/org/nongnu/libvob/gl/Paper.java
diff -u libvob/org/nongnu/libvob/gl/Paper.java:1.5 
libvob/org/nongnu/libvob/gl/Paper.java:1.6
--- libvob/org/nongnu/libvob/gl/Paper.java:1.5  Wed Jun 25 06:40:26 2003
+++ libvob/org/nongnu/libvob/gl/Paper.java      Tue Aug 19 03:57:10 2003
@@ -99,7 +99,15 @@
        return new Pass(p); 
     }
 
-    public Object clone() { Paper p = new Paper(); impl_clone(c_id, p.c_id); 
return p; }
+    public Object clone() { 
+       Paper p = new Paper(); 
+       impl_clone(c_id, p.c_id); 
+       if(depends != null) { // Clone also the depending objects
+           p.depends = new ArrayList();
+           p.depends.addAll(depends);
+       }
+       return p; 
+    }
 
     public Paper() {
        c_id = impl_create();
Index: libvob/vob/paper/papermill.py
diff -u libvob/vob/paper/papermill.py:1.9 libvob/vob/paper/papermill.py:1.10
--- libvob/vob/paper/papermill.py:1.9   Tue Aug  5 05:54:11 2003
+++ libvob/vob/paper/papermill.py       Tue Aug 19 03:57:10 2003
@@ -221,6 +221,7 @@
        npap = PaperHanger()
        npap.setNPasses(1)
        npap.cachedTexture = tex
+       npap.addDepend(tex) # Need this for clones to survive
 
        ppass = npap.getPass(0)