[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [43343] trunk/blender: rename 'MultiLayer' to 'OpenEXR MultiLayer'

Campbell Barton ideasman42 at gmail.com
Fri Jan 13 07:58:24 CET 2012


Revision: 43343
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=43343
Author:   campbellbarton
Date:     2012-01-13 06:58:15 +0000 (Fri, 13 Jan 2012)
Log Message:
-----------
rename 'MultiLayer' to 'OpenEXR MultiLayer'

Modified Paths:
--------------
    trunk/blender/release/scripts/startup/bl_ui/space_image.py
    trunk/blender/source/blender/makesrna/intern/rna_scene.c

Modified: trunk/blender/release/scripts/startup/bl_ui/space_image.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_ui/space_image.py	2012-01-13 05:52:34 UTC (rev 43342)
+++ trunk/blender/release/scripts/startup/bl_ui/space_image.py	2012-01-13 06:58:15 UTC (rev 43343)
@@ -143,7 +143,7 @@
                 # only for dirty && specific image types, perhaps
                 # this could be done in operator poll too
                 if ima.is_dirty:
-                    if ima.source in {'FILE', 'GENERATED'} and ima.type != 'MULTILAYER':
+                    if ima.source in {'FILE', 'GENERATED'} and ima.type != 'OPEN_EXR_MULTILAYER':
                         layout.operator("image.pack", text="Pack As PNG").as_png = True
 
             layout.separator()

Modified: trunk/blender/source/blender/makesrna/intern/rna_scene.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_scene.c	2012-01-13 05:52:34 UTC (rev 43342)
+++ trunk/blender/source/blender/makesrna/intern/rna_scene.c	2012-01-13 06:58:15 UTC (rev 43343)
@@ -137,7 +137,7 @@
 #endif
 
 #ifdef WITH_OPENEXR
-#  define R_IMF_ENUM_EXR_MULTI  {R_IMF_IMTYPE_MULTILAYER, "MULTILAYER", ICON_FILE_IMAGE, "MultiLayer", "Output image in multilayer OpenEXR format"},
+#  define R_IMF_ENUM_EXR_MULTI  {R_IMF_IMTYPE_MULTILAYER, "OPEN_EXR_MULTILAYER", ICON_FILE_IMAGE, "OpenEXR MultiLayer", "Output image in multilayer OpenEXR format"},
 #  define R_IMF_ENUM_EXR        {R_IMF_IMTYPE_OPENEXR, "OPEN_EXR", ICON_FILE_IMAGE, "OpenEXR", "Output image in OpenEXR format"},
 #else
 #  define R_IMF_ENUM_EXR_MULTI



More information about the Bf-blender-cvs mailing list