(to fix merge)
This commit is contained in:
commit
886ce2b6d6
6
control
6
control
|
|
@ -2,8 +2,12 @@ Package: lightningbeam
|
||||||
Version: 1.0.0-alpha2
|
Version: 1.0.0-alpha2
|
||||||
Section: graphics
|
Section: graphics
|
||||||
Priority: optional
|
Priority: optional
|
||||||
Architecture: any
|
Architecture: all
|
||||||
Installed-size: 27000
|
Installed-size: 27000
|
||||||
|
<<<<<<< HEAD
|
||||||
Depends: bash, python, libc
|
Depends: bash, python, libc
|
||||||
|
=======
|
||||||
|
Depends: bash, python, python-imaging
|
||||||
|
>>>>>>> 783687aeb3bb92c515f31f44b919bb0102d64d2f
|
||||||
Maintainer: skycooler@gmail.com
|
Maintainer: skycooler@gmail.com
|
||||||
Description: Lightningbeam is an open-source animated content creation tool.
|
Description: Lightningbeam is an open-source animated content creation tool.
|
||||||
|
|
|
||||||
|
|
@ -1113,6 +1113,7 @@ class Shape (object):
|
||||||
self.shapedata=[]
|
self.shapedata=[]
|
||||||
self.filled=False
|
self.filled=False
|
||||||
self.type="Shape"
|
self.type="Shape"
|
||||||
|
self.iname = None
|
||||||
####################-----TEMPORARY-----#########################
|
####################-----TEMPORARY-----#########################
|
||||||
self.name = "s"+str(int(random.random()*10000))+str(SITER)
|
self.name = "s"+str(int(random.random()*10000))+str(SITER)
|
||||||
SITER+=1
|
SITER+=1
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue