[Aqsis-commits] [SCM] RIBMosaic Experimental branch master updated. 31265e32887900b347797f19dce7a59694a42111

[<gi...@aq...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "RIBMosaic Experimental".

The branch, master has been updated
       via  31265e32887900b347797f19dce7a59694a42111 (commit)
      from  32f6102a76b9227e7a91746e980054db89344838 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 31265e32887900b347797f19dce7a59694a42111
Author: Jeff Doyle (nfz) <she...@ea...>
Date:   Fri Apr 22 03:23:19 2011 -0300

    Archive search paths are now exported to RIB.

diff --git a/render_ribmosaic/rm_export.py b/render_ribmosaic/rm_export.py
index d23c6c1..61d4388 100644
--- a/render_ribmosaic/rm_export.py
+++ b/render_ribmosaic/rm_export.py
@@ -419,6 +419,13 @@ class ExporterManager():
         """
         return os.sep.join(self.export_paths[exp_key])
 
+    def get_archive_paths(self):
+        """
+        Returns a list of the archive paths
+        """
+        return ([self.make_export_path(k) for k in ['FRA', 'WLD', 'LAM',
+                'OBJ', 'GEO', 'MAT']])
+
 
     def prepare_export(self, active_scene=None,
                        clean_paths=['DIR'],
@@ -998,8 +1005,6 @@ class ExporterArchive(rm_context.ExportContext):
             self._archive_regexes = list(self._archive_regexes)
             self._target_regexes = list(self._target_regexes)
 
-        # If archive path specified use it
-        #if archive_path:
         self.archive_path = rm.export_manager.make_export_path(
                             self._archive_key) + os.sep
 
@@ -1658,29 +1663,32 @@ class ExportPass(ExporterArchive):
         scene = self.get_scene()
 
         # TODO add archive searchpath
+        self.write_text('Option "searchpath" "string archive" '
+                        '[ "@:.:%s" ]\n' %
+                        ( ":".join(rm.export_manager.get_archive_paths())))
 
         if scene.ribmosaic_shader_searchpath != '':
-            self.write_text('Option "searchpath" "string shader"'
+            self.write_text('Option "searchpath" "string shader" '
                             '[ "@:.:%s" ]\n' %
                             scene.ribmosaic_shader_searchpath)
 
         if scene.ribmosaic_texture_searchpath != '':
-            self.write_text('Option "searchpath" "string texture"'
+            self.write_text('Option "searchpath" "string texture" '
                             '[ "@:.:%s" ]\n' %
                             scene.ribmosaic_texture_searchpath)
 
         if scene.ribmosaic_display_searchpath != '':
-            self.write_text('Option "searchpath" "string display"'
+            self.write_text('Option "searchpath" "string display" '
                             '[ "@:.:%s" ]\n' %
                             scene.ribmosaic_display_searchpath)
 
         if scene.ribmosaic_procedural_searchpath != '':
-            self.write_text('Option "searchpath" "string procedural"'
+            self.write_text('Option "searchpath" "string procedural" '
                             '[ "@:.:%s" ]\n' %
                             scene.ribmosaic_procedural_searchpath)
 
         if scene.ribmosaic_resource_searchpath != '':
-            self.write_text('Option "searchpath" "string resource"'
+            self.write_text('Option "searchpath" "string resource" '
                             '[ "@:.:%s" ]\n' %
                             scene.ribmosaic_resource_searchpath)
 

-----------------------------------------------------------------------

Summary of changes:
 render_ribmosaic/rm_export.py |   22 +++++++++++++++-------
 1 files changed, 15 insertions(+), 7 deletions(-)


hooks/post-receive
-- 
RIBMosaic Experimental