[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [46861] trunk/blender/source/blender: fix for

[Monique Dewanchand]

Revision: 46861
          
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=46861
Author:   mdewanchand
Date:     2012-05-21 20:36:02 +0000 (Mon, 21 May 2012)
Log Message:
-----------
fix for 
[#31502] Defocus max radius help tekst

Modified Paths:
--------------
    trunk/blender/source/blender/makesrna/intern/rna_nodetree.c
    trunk/blender/source/blender/nodes/composite/nodes/node_composite_defocus.c

Modified: trunk/blender/source/blender/makesrna/intern/rna_nodetree.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_nodetree.c 2012-05-21 
20:28:54 UTC (rev 46860)
+++ trunk/blender/source/blender/makesrna/intern/rna_nodetree.c 2012-05-21 
20:36:02 UTC (rev 46861)
@@ -2427,7 +2427,7 @@
        prop = RNA_def_property(srna, "blur_max", PROP_FLOAT, PROP_NONE);
        RNA_def_property_float_sdna(prop, NULL, "maxblur");
        RNA_def_property_range(prop, 0.0f, 10000.0f);
-       RNA_def_property_ui_text(prop, "Max Blur", "Blur limit, maximum CoC 
radius, 0=no limit");
+       RNA_def_property_ui_text(prop, "Max Blur", "Blur limit, maximum CoC 
radius");
        RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update");
        
        prop = RNA_def_property(srna, "threshold", PROP_FLOAT, PROP_NONE);

Modified: 
trunk/blender/source/blender/nodes/composite/nodes/node_composite_defocus.c
===================================================================
--- trunk/blender/source/blender/nodes/composite/nodes/node_composite_defocus.c 
2012-05-21 20:28:54 UTC (rev 46860)
+++ trunk/blender/source/blender/nodes/composite/nodes/node_composite_defocus.c 
2012-05-21 20:36:02 UTC (rev 46861)
@@ -868,7 +868,7 @@
        nbd->gamco = 0;
        nbd->samples = 16;
        nbd->fstop = 128.f;
-       nbd->maxblur = 0;
+       nbd->maxblur = 16;
        nbd->bthresh = 1.f;
        nbd->scale = 1.f;
        nbd->no_zbuf = 1;

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs