[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [56207] trunk/blender: Fix #35054: adjust tooltip for Render Border option in 3D view panel to say

[Brecht Van Lommel]

Revision: 56207
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=56207
Author:   blendix
Date:     2013-04-22 14:26:57 +0000 (Mon, 22 Apr 2013)
Log Message:
-----------
Fix #35054: adjust tooltip for Render Border option in 3D view panel to say
it has an effect outside of the camera view.

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

Modified: trunk/blender/release/scripts/startup/bl_ui/space_view3d.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_ui/space_view3d.py	2013-04-22 13:22:07 UTC (rev 56206)
+++ trunk/blender/release/scripts/startup/bl_ui/space_view3d.py	2013-04-22 14:26:57 UTC (rev 56207)
@@ -2392,6 +2392,7 @@
 
         col = layout.column(align=True)
         col.prop(view, "use_render_border")
+        col.active = view.region_3d.view_perspective != 'CAMERA'
 
 
 class VIEW3D_PT_view3d_cursor(Panel):

Modified: trunk/blender/source/blender/makesrna/intern/rna_space.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_space.c	2013-04-22 13:22:07 UTC (rev 56206)
+++ trunk/blender/source/blender/makesrna/intern/rna_space.c	2013-04-22 14:26:57 UTC (rev 56207)
@@ -1657,7 +1657,7 @@
 	RNA_def_property_boolean_sdna(prop, NULL, "flag2", V3D_RENDER_BORDER);
 	RNA_def_property_clear_flag(prop, PROP_ANIMATABLE);
 	RNA_def_property_ui_text(prop, "Render Border",
-	                         "Use a user-defined border region within the frame size for rendered viewport");
+	                         "Use a region within the frame size for rendered viewport (when not viewing through the camera)");
 	RNA_def_property_update(prop, NC_SPACE | ND_SPACE_VIEW3D, NULL);
 
 	prop = RNA_def_property(srna, "render_border_min_x", PROP_FLOAT, PROP_NONE);