Properties Window UI:

* Some tweaks to the stamp panel to make it more compact.
* Remove "Stamp" Prefix for the color values, redundant info.

diff --git a/release/scripts/startup/bl_ui/properties_render.py b/release/scripts/startup/bl_ui/properties_render.py
index 7887998b90f460d43b7b3e390b44e4680910ab93..84bf00f38ec84ca5bf20e5a182244921f7772659 100644 (file)
--- a/release/scripts/startup/bl_ui/properties_render.py
+++ b/release/scripts/startup/bl_ui/properties_render.py
@@ -418,6 +418,12 @@ class RENDER_PT_stamp(RenderButtonsPanel, Panel):
         rd = context.scene.render
 
         layout.active = rd.use_stamp
+        
+        layout.prop(rd, "stamp_font_size", text="Font Size")
+        
+        row = layout.row()
+        row.column().prop(rd, "stamp_foreground", slider=True)
+        row.column().prop(rd, "stamp_background", slider=True)
 
         split = layout.split()
 
@@ -427,19 +433,14 @@ class RENDER_PT_stamp(RenderButtonsPanel, Panel):
         col.prop(rd, "use_stamp_render_time", text="RenderTime")
         col.prop(rd, "use_stamp_frame", text="Frame")
         col.prop(rd, "use_stamp_scene", text="Scene")
+        
+        col = split.column()
         col.prop(rd, "use_stamp_camera", text="Camera")
         col.prop(rd, "use_stamp_lens", text="Lens")
         col.prop(rd, "use_stamp_filename", text="Filename")
         col.prop(rd, "use_stamp_marker", text="Marker")
         col.prop(rd, "use_stamp_sequencer_strip", text="Seq. Strip")
 
-        col = split.column()
-        col.active = rd.use_stamp
-        col.prop(rd, "stamp_foreground", slider=True)
-        col.prop(rd, "stamp_background", slider=True)
-        col.separator()
-        col.prop(rd, "stamp_font_size", text="Font Size")
-
         row = layout.split(percentage=0.2)
         row.prop(rd, "use_stamp_note", text="Note")
         sub = row.row()

diff --git a/source/blender/makesrna/intern/rna_scene.c b/source/blender/makesrna/intern/rna_scene.c
index b69ca64773c47b33cb4e59050aea1a4c6b2a23ed..feb8d0cb549310fb58f8f37031c0b0e9cd70321d 100644 (file)
--- a/source/blender/makesrna/intern/rna_scene.c
+++ b/source/blender/makesrna/intern/rna_scene.c
@@ -3440,14 +3440,14 @@ static void rna_def_scene_render_data(BlenderRNA *brna)
        RNA_def_property_float_sdna(prop, NULL, "fg_stamp");
        RNA_def_property_array(prop, 4);
        RNA_def_property_range(prop,0.0,1.0);
-       RNA_def_property_ui_text(prop, "Stamp Text Color", "Color to use for stamp text");
+       RNA_def_property_ui_text(prop, "Text Color", "Color to use for stamp text");
        RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, NULL);
        
        prop= RNA_def_property(srna, "stamp_background", PROP_FLOAT, PROP_COLOR);
        RNA_def_property_float_sdna(prop, NULL, "bg_stamp");
        RNA_def_property_array(prop, 4);
        RNA_def_property_range(prop,0.0,1.0);
-       RNA_def_property_ui_text(prop, "Stamp Background", "Color to use behind stamp text");
+       RNA_def_property_ui_text(prop, "Background", "Color to use behind stamp text");
        RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, NULL);
 
        /* sequencer draw options */