added all local changes

rjmoggach · Oct 25, 2011 · ba2b43a · ba2b43a
1 parent 8222f07
commit ba2b43a
Show file tree

Hide file tree

Showing 75 changed files with 31 additions and 44 deletions.
diff --git a/.gitignore b/.gitignore
diff --git a/.gitmodules b/.gitmodules
diff --git a/AUTHORS.rst b/AUTHORS.rst
diff --git a/LICENSE.rst b/LICENSE.rst
diff --git a/MANIFEST b/MANIFEST
diff --git a/MANIFEST.in b/MANIFEST.in
diff --git a/README.rst b/README.rst
diff --git a/dirtt/__init__.py b/dirtt/__init__.py
diff --git a/dirtt/data/dtds/dirtt-0_1_1.dtd b/dirtt/data/dtds/dirtt-0_1_1.dtd
diff --git a/dirtt/data/dtds/dirtt-0_1_3.dtd b/dirtt/data/dtds/dirtt-0_1_3.dtd
diff --git a/dirtt/data/dtds/dirtt-0_1_4.dtd b/dirtt/data/dtds/dirtt-0_1_4.dtd
diff --git a/dirtt/data/dtds/dirtt.dtd b/dirtt/data/dtds/dirtt.dtd
diff --git a/dirtt/data/templates/default/project.xml b/dirtt/data/templates/default/project.xml
diff --git a/dirtt/data/templates/default/sequence.xml b/dirtt/data/templates/default/sequence.xml
diff --git a/dirtt/data/templates/default/shot.xml b/dirtt/data/templates/default/shot.xml
@@ -49,20 +49,19 @@
 		<dir basename="vray" username="pipeline" group="artist" perms="02775"/>
 	</dir><!-- etc -->
 
-<!-- I M G / I M A G E S   F O L D E R -->
-	<dir name="Shot Image Folder" basename="images" username="pipeline" group="artist" perms="02755">
-		<dir basename="2d" username="pipeline" group="artist" perms="02755">
-			<dir basename="comp" username="pipeline" group="artist" perms="02775"/>
-			<dir basename="paint" username="pipeline" group="artist" perms="02775"/>
-			<dir basename="roto" username="pipeline" group="artist" perms="02775"/>
-		</dir><!-- 2d -->
+<!-- I M A G E S   F O L D E R -->
+	<dir name="Shot Images Folder" basename="images" username="pipeline" group="artist" perms="02755">
 		<dir basename="cg" username="pipeline" group="artist" perms="02775"/>
+		<dir basename="comp" username="pipeline" group="artist" perms="02775"/>
+		<dir basename="cuts" username="pipeline" group="artist" perms="02775"/>
 		<dir basename="design" username="pipeline" group="artist" perms="02775"/>
-		<dir basename="footage" username="pipeline" group="artist" perms="02755">
-			<dir basename="elements" username="pipeline" group="artist" perms="02775"/>
-			<dir basename="plates" username="pipeline" group="artist" perms="02775"/>
-		</dir><!-- footage -->
-	</dir><!-- img -->
+		<dir basename="elements" username="pipeline" group="artist" perms="02775"/>
+		<dir basename="paint" username="pipeline" group="artist" perms="02775"/>
+		<dir basename="plates" username="pipeline" group="artist" perms="02775"/>
+		<dir basename="reference" username="pipeline" group="artist" perms="02775"/>
+		<dir basename="roto" username="pipeline" group="artist" perms="02775"/>
+		<dir basename="textures" username="pipeline" group="artist" perms="02775"/>
+	</dir><!-- images -->
 
 <!-- L I B / L I B R A R Y   F O L D E R -->
 	<dir name="Shot Library Folder" basename="library" username="pipeline" group="supervisor" perms="02755">
@@ -80,10 +79,9 @@
 
 <!-- U S R / W O R K   F O L D E R -->
 	<dir name="Shot Work Folder" basename="work" username="pipeline" group="artist" perms="02755">
-		<dir basename="2d" username="pipeline" group="artist" perms="02775">
-		</dir><!-- 2d -->
-		<dir basename="cg" username="pipeline" group="artist" perms="02775">
-		</dir><!-- cg -->
+		<dir basename="nuke" username="pipeline" group="artist" perms="02775"/>
+		<dir basename="maya" username="pipeline" group="artist" perms="02775"/>
+		<dir basename="houdini" username="pipeline" group="artist" perms="02775"/>
 	</dir><!-- usr -->
 
 </dirtt>
diff --git a/dirtt/data/templates/default/symlinks.xml b/dirtt/data/templates/default/symlinks.xml
@@ -3,34 +3,6 @@
       "http://opensource.dashing.tv/dtds/dirtt-0_1_4.dtd">
 <dirtt name="Project Tree" version="0.1.4" dirname="{{projects_root}}" basename="{{project_path}}" username="pipeline" group="artist" perms="02755">
 
-<!-- A S S E T S   F O L D E R -->
-	<dir name="Project Assets Folder" basename="assets" username="pipeline" group="artist" perms="02755" id="assets-id">
-		<dir basename="data" username="pipeline" group="supervisor" perms="02755">
-			<dir basename="chan" username="pipeline" group="supervisor" perms="02775"/>
-			<dir basename="db" username="pipeline" group="supervisor" perms="02775"/>
-			<dir basename="lut" username="pipeline" group="supervisor" perms="02775"/>
-			<dir basename="mocap" username="pipeline" group="supervisor" perms="02775"/>
-			<dir basename="moco" username="pipeline" group="supervisor" perms="02775"/>
-		</dir><!-- data -->
-		<dir basename="img">
-			<dir basename="calibration" username="pipeline" group="supervisor" perms="02775"/>
-			<dir basename="elements" username="pipeline" group="supervisor" perms="02775"/>
-			<dir basename="grain" username="pipeline" group="supervisor" perms="02775"/>
-			<dir basename="hdri" username="pipeline" group="supervisor" perms="02775"/>
-			<dir basename="lens" username="pipeline" group="supervisor" perms="02775"/>
-			<dir basename="paint" username="pipeline" group="supervisor" perms="02775"/>
-			<dir basename="textures" username="pipeline" group="supervisor" perms="02775"/>
-			<dir basename="stock" username="pipeline" group="supervisor" perms="02775"/>
-		</dir><!-- img -->
-		<dir basename="models" username="pipeline" group="supervisor" perms="02775"/>
-		<dir basename="shaders" username="pipeline" group="supervisor" perms="02755">
-			<dir basename="vray" username="pipeline" group="supervisor" perms="02775"/>
-			<dir basename="rman" username="pipeline" group="supervisor" perms="02775"/>
-			<dir basename="mray" username="pipeline" group="supervisor" perms="02775"/>
-		</dir><!-- shaders -->
-		<dir basename="tools" username="pipeline" group="supervisor" perms="02775"/>
-	</dir><!-- assets -->
-
 <!-- C O N F I G   F O L D E R -->
 	<dir name="Project Config Folder" basename="etc" username="pipeline" group="supervisor" perms="02755" id="config-id">
 		<dir basename="houdini" username="pipeline" group="supervisor" perms="02755">
@@ -70,6 +42,16 @@
 			<dir basename="mocap" username="pipeline" group="artist" perms="02775"/>
 			<dir basename="moco" username="pipeline" group="artist" perms="02775"/>
 		</dir><!-- data -->
+		<dir basename="img">
+			<dir basename="calibration" username="pipeline" group="supervisor" perms="02775"/>
+			<dir basename="elements" username="pipeline" group="supervisor" perms="02775"/>
+			<dir basename="grain" username="pipeline" group="supervisor" perms="02775"/>
+			<dir basename="hdri" username="pipeline" group="supervisor" perms="02775"/>
+			<dir basename="lens" username="pipeline" group="supervisor" perms="02775"/>
+			<dir basename="paint" username="pipeline" group="supervisor" perms="02775"/>
+			<dir basename="textures" username="pipeline" group="supervisor" perms="02775"/>
+			<dir basename="stock" username="pipeline" group="supervisor" perms="02775"/>
+		</dir><!-- img -->
 		<dir basename="edits" username="pipeline" group="supervisor" perms="02755">
 			<dir basename="_YYYY_MM_DD_name" username="pipeline" group="artist" perms="02755">
 				<dir basename="edl" username="pipeline" group="artist" perms="02775"/>
@@ -78,6 +60,7 @@
 		</dir><!-- edits -->
 		<dir basename="fonts" username="pipeline" group="supervisor" perms="02775"/>
 		<dir basename="graphics" username="pipeline" group="supervisor" perms="02775"/>
+		<dir basename="models" username="pipeline" group="supervisor" perms="02775"/>
 		<dir basename="reference" username="pipeline" group="supervisor" perms="02755">
 			<dir basename="misc" username="pipeline" group="supervisor" perms="02775"/>
 			<dir basename="on_set" username="pipeline" group="supervisor" perms="02755">
@@ -87,6 +70,12 @@
 				</dir>
 			</dir><!-- on_set -->
 		</dir><!-- reference -->
+		<dir basename="shaders" username="pipeline" group="supervisor" perms="02755">
+			<dir basename="vray" username="pipeline" group="supervisor" perms="02775"/>
+			<dir basename="rman" username="pipeline" group="supervisor" perms="02775"/>
+			<dir basename="mray" username="pipeline" group="supervisor" perms="02775"/>
+		</dir><!-- shaders -->
+		<dir basename="tools" username="pipeline" group="supervisor" perms="02775"/>
 	</dir><!-- library -->
 
 <!-- P R O D U C T I O N   F O L D E R -->

diff --git a/dirtt/util/__init__.py b/dirtt/util/__init__.py
diff --git a/dirtt/util/general.py b/dirtt/util/general.py
diff --git a/dirtt/util/io.py b/dirtt/util/io.py
diff --git a/dirtt/util/looper.py b/dirtt/util/looper.py
diff --git a/dirtt/util/template.py b/dirtt/util/template.py
diff --git a/docs/Makefile b/docs/Makefile
diff --git a/docs/_build/doctrees/environment.pickle b/docs/_build/doctrees/environment.pickle
diff --git a/docs/_build/doctrees/index.doctree b/docs/_build/doctrees/index.doctree
diff --git a/docs/_build/doctrees/news.doctree b/docs/_build/doctrees/news.doctree
diff --git a/docs/_build/html/.buildinfo b/docs/_build/html/.buildinfo
diff --git a/docs/_build/html/basic.css b/docs/_build/html/basic.css
diff --git a/docs/_build/html/doctools.js b/docs/_build/html/doctools.js
diff --git a/docs/_build/html/file.png b/docs/_build/html/file.png
diff --git a/docs/_build/html/genindex.html b/docs/_build/html/genindex.html
diff --git a/docs/_build/html/index.html b/docs/_build/html/index.html
diff --git a/docs/_build/html/index.txt b/docs/_build/html/index.txt
diff --git a/docs/_build/html/jquery.js b/docs/_build/html/jquery.js
diff --git a/docs/_build/html/minus.png b/docs/_build/html/minus.png
diff --git a/docs/_build/html/nature.css b/docs/_build/html/nature.css
diff --git a/docs/_build/html/news.html b/docs/_build/html/news.html
diff --git a/docs/_build/html/news.txt b/docs/_build/html/news.txt
diff --git a/docs/_build/html/objects.inv b/docs/_build/html/objects.inv
diff --git a/docs/_build/html/plus.png b/docs/_build/html/plus.png
diff --git a/docs/_build/html/pygments.css b/docs/_build/html/pygments.css
diff --git a/docs/_build/html/search.html b/docs/_build/html/search.html
diff --git a/docs/_build/html/searchindex.js b/docs/_build/html/searchindex.js
diff --git a/docs/_build/html/searchtools.js b/docs/_build/html/searchtools.js
diff --git a/docs/_build/html/underscore.js b/docs/_build/html/underscore.js
diff --git a/docs/_templates/changes/frameset.html b/docs/_templates/changes/frameset.html
diff --git a/docs/_templates/changes/rstsource.html b/docs/_templates/changes/rstsource.html
diff --git a/docs/_templates/changes/versionchanges.html b/docs/_templates/changes/versionchanges.html
diff --git a/docs/_templates/defindex.html b/docs/_templates/defindex.html
diff --git a/docs/_templates/genindex-single.html b/docs/_templates/genindex-single.html
diff --git a/docs/_templates/genindex-split.html b/docs/_templates/genindex-split.html
diff --git a/docs/_templates/genindex.html b/docs/_templates/genindex.html
diff --git a/docs/_templates/layout.html b/docs/_templates/layout.html
diff --git a/docs/_templates/modindex.html b/docs/_templates/modindex.html
diff --git a/docs/_templates/opensearch.xml b/docs/_templates/opensearch.xml
diff --git a/docs/_templates/page.html b/docs/_templates/page.html
diff --git a/docs/_templates/search.html b/docs/_templates/search.html
diff --git a/docs/_templates/static/basic.css b/docs/_templates/static/basic.css
diff --git a/docs/_templates/static/doctools.js b/docs/_templates/static/doctools.js
diff --git a/docs/_templates/static/file.png b/docs/_templates/static/file.png
diff --git a/docs/_templates/static/jquery.js b/docs/_templates/static/jquery.js
diff --git a/docs/_templates/static/minus.png b/docs/_templates/static/minus.png
diff --git a/docs/_templates/static/plus.png b/docs/_templates/static/plus.png
diff --git a/docs/_templates/static/searchtools.js b/docs/_templates/static/searchtools.js
diff --git a/docs/_templates/theme.conf b/docs/_templates/theme.conf
diff --git a/docs/_theme/nature/static/nature.css_t b/docs/_theme/nature/static/nature.css_t
diff --git a/docs/_theme/nature/static/pygments.css b/docs/_theme/nature/static/pygments.css
diff --git a/docs/_theme/nature/theme.conf b/docs/_theme/nature/theme.conf
diff --git a/docs/conf.py b/docs/conf.py
diff --git a/docs/index.rst b/docs/index.rst
diff --git a/docs/news.rst b/docs/news.rst
diff --git a/setup.cfg b/setup.cfg
diff --git a/setup.py b/setup.py
diff --git a/tests/__init__.py b/tests/__init__.py
diff --git a/tests/run_all.py b/tests/run_all.py
diff --git a/tests/test0.py b/tests/test0.py