[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [27777] branches/render25: Render Branch: Add back image pin option in image editor header.

[Brecht Van Lommel]

Revision: 27777
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=27777
Author:   blendix
Date:     2010-03-26 16:46:57 +0100 (Fri, 26 Mar 2010)

Log Message:
-----------
Render Branch: Add back image pin option in image editor header.

Modified Paths:
--------------
    branches/render25/release/scripts/ui/space_image.py
    branches/render25/source/blender/makesrna/intern/rna_space.c

Modified: branches/render25/release/scripts/ui/space_image.py
===================================================================
--- branches/render25/release/scripts/ui/space_image.py	2010-03-26 15:28:43 UTC (rev 27776)
+++ branches/render25/release/scripts/ui/space_image.py	2010-03-26 15:46:57 UTC (rev 27777)
@@ -276,6 +276,7 @@
                 sub.menu("IMAGE_MT_uvs")
 
         layout.template_ID(sima, "image", new="image.new")
+        layout.prop(sima, "image_pin", text="")
 
         # uv editing
         if show_uvedit:

Modified: branches/render25/source/blender/makesrna/intern/rna_space.c
===================================================================
--- branches/render25/source/blender/makesrna/intern/rna_space.c	2010-03-26 15:28:43 UTC (rev 27776)
+++ branches/render25/source/blender/makesrna/intern/rna_space.c	2010-03-26 15:46:57 UTC (rev 27777)
@@ -1186,6 +1186,7 @@
 	prop= RNA_def_property(srna, "image_pin", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "pin", 0);
 	RNA_def_property_ui_text(prop, "Image Pin", "Display current image regardless of object selection");
+	RNA_def_property_ui_icon(prop, ICON_UNPINNED, 1);
 	RNA_def_property_update(prop, NC_SPACE|ND_SPACE_IMAGE, NULL);
 
 	prop= RNA_def_property(srna, "sample_histogram", PROP_POINTER, PROP_NONE);