[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [27387] branches/render25/release/scripts: Render Branch: attempt to fix merge problem, addons directory seems to

[Brecht Van Lommel]

Revision: 27387
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=27387
Author:   blendix
Date:     2010-03-10 16:00:11 +0100 (Wed, 10 Mar 2010)

Log Message:
-----------
Render Branch: attempt to fix merge problem, addons directory seems to
still be local and using external repository at the same time? Also fix
two differences in python scripts.

Modified Paths:
--------------
    branches/render25/release/scripts/io/import_shape_mdd.py
    branches/render25/release/scripts/op/image.py

Removed Paths:
-------------
    branches/render25/release/scripts/addons/

Modified: branches/render25/release/scripts/io/import_shape_mdd.py
===================================================================
--- branches/render25/release/scripts/io/import_shape_mdd.py	2010-03-10 14:36:49 UTC (rev 27386)
+++ branches/render25/release/scripts/io/import_shape_mdd.py	2010-03-10 15:00:11 UTC (rev 27387)
@@ -25,7 +25,7 @@
 # origonal model the mdd was Baked out from their will be Strange
 # behavior
 #
-# vertex animation to ShapeKeys with ipo  and gives the frame a value of 1.0 
+# vertex animation to ShapeKeys with ipo  and gives the frame a value of 1.0
 # A modifier to read mdd files would be Ideal but thats for another day :)
 #
 # Please send any fixes,updates,bugs to Slow67_at_Gmail.com
@@ -36,15 +36,15 @@
 
 
 def mdd_import(filepath, ob, scene, PREF_START_FRAME=0, PREF_JUMP=1):
-    
+
     print('\n\nimporting mdd "%s"' % filepath)
-    
+
     bpy.ops.object.mode_set(mode='OBJECT')
 
     file = open(filepath, 'rb')
     frames, points = unpack(">2i", file.read(8))
     time = unpack((">%df" % frames), file.read(frames * 4))
-    
+
     print('\tpoints:%d frames:%d' % (points,frames))
 
     # If target object doesn't have Basis shape key, create it.

Modified: branches/render25/release/scripts/op/image.py
===================================================================
--- branches/render25/release/scripts/op/image.py	2010-03-10 14:36:49 UTC (rev 27386)
+++ branches/render25/release/scripts/op/image.py	2010-03-10 15:00:11 UTC (rev 27387)
@@ -20,6 +20,25 @@
 
 import bpy
 
+
+def image_editor_guess(context):
+    image_editor = context.user_preferences.filepaths.image_editor
+
+    # use image editor in the preferences when available.
+    if not image_editor:
+        import platform
+        system = platform.system()
+
+        if system == 'Windows':
+            image_editor = "start" # not tested!
+        elif system == 'Darwin':
+            image_editor = "open"
+        else:
+            image_editor = "gimp"
+
+    return image_editor
+
+
 class SaveDirty(bpy.types.Operator):
     '''Select object matching a naming pattern'''
     bl_idname = "image.save_dirty"