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

[<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  b6d88ba4d8bac15cec19df89b33900edeb833088 (commit)
       via  743dd4585c4991f40f3432a2a1b01224a14b69ca (commit)
      from  df40b7f6fc5d7e0c52efa9dbe1b6319ffe3b0b73 (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 b6d88ba4d8bac15cec19df89b33900edeb833088
Author: Jeff Doyle (nfz) <she...@ea...>
Date:   Tue Apr 12 02:06:30 2011 -0300

    Bug Fix: ExportArchive.list_targets() was not doing proper comparison:
    
    list_targets() was only using the file extension for the comparison instead
    of checking if the match string was in the end of the file name.  If the
    match string was more than just the file extension then no matches would
    be found.
    
    Now use the .endwith() string method to see if the match string is in the
    end of the file name.

diff --git a/render_ribmosaic/rm_export.py b/render_ribmosaic/rm_export.py
index f13e203..85da017 100644
--- a/render_ribmosaic/rm_export.py
+++ b/render_ribmosaic/rm_export.py
@@ -1190,9 +1190,12 @@ class ExporterArchive(rm_context.ExportContext):
 
             if target[1].startswith("*"):
                 if path:
+                    matchstr = target[1][1:]
                     try:
+                        # add file if its end matches what is after the * in
+                        # the target
                         matches = [(path, f) for f in os.listdir(path) \
-                                 if os.path.splitext(f)[1] == target[1][1:]]
+                                 if f.endswith(matchstr)]
                     except:
                         raise rm_error.RibmosaicError(
                                 "Cannot find target directory/file, "

commit 743dd4585c4991f40f3432a2a1b01224a14b69ca
Author: Jeff Doyle (nfz) <she...@ea...>
Date:   Tue Apr 12 01:58:43 2011 -0300

    missed some bpy.data.is_dirty to bpy.data.is_saved changes.

diff --git a/render_ribmosaic/rm_operator.py b/render_ribmosaic/rm_operator.py
index e740aae..512a4a9 100644
--- a/render_ribmosaic/rm_operator.py
+++ b/render_ribmosaic/rm_operator.py
@@ -503,7 +503,7 @@ class WM_OT_ribmosaic_xml_file(rm_context.ExportContext,
             path = self.directory
 
             if self.relativepath:
-                if not bpy.data.is_dirty:
+                if bpy.data.is_saved:
                     rm.export_manager._update_directory()
                     export = rm.export_manager.export_directory
                     path = os.path.relpath(path, export) + os.sep
@@ -850,7 +850,7 @@ class WM_OT_ribmosaic_panel_update(rm_context.ExportContext,
         wm = context.window_manager
 
         try:
-            if not bpy.data.is_dirty:
+            if bpy.data.is_saved:
                 if self.xmlpath:
                     return wm.invoke_props_dialog(self)
                 else:
@@ -927,7 +927,7 @@ class WM_OT_ribmosaic_library_set(rm_context.ExportContext,
         p = self.pipeline
 
         try:
-            if not bpy.data.is_dirty:
+            if bpy.data.is_saved:
                 lib = rm.pipeline_manager.get_attr(self, p, "library", False)
                 compile = rm.pipeline_manager.get_attr(self, p, "compile",
                                                        False)
@@ -1187,7 +1187,7 @@ class WM_OT_ribmosaic_library_addpanel(rm_context.ExportContext,
 
     def invoke(self, context, event):
         try:
-            if not bpy.data.is_dirty:
+            if bpy.data.is_saved:
                 lib = rm.pipeline_manager.get_attr(self, self.pipeline, \
                                                    "library", False)
 
@@ -1519,7 +1519,7 @@ class WM_OT_ribmosaic_pipeline_update(rm_context.ExportContext,
         wm = context.window_manager
 
         try:
-            if not bpy.data.is_dirty:
+            if bpy.data.is_saved:
                 if self.pipeline:
                     return wm.invoke_props_dialog(self)
                 else:

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

Summary of changes:
 render_ribmosaic/rm_export.py   |    5 ++++-
 render_ribmosaic/rm_operator.py |   10 +++++-----
 2 files changed, 9 insertions(+), 6 deletions(-)


hooks/post-receive
-- 
RIBMosaic Experimental