[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [56078] trunk/blender: update uncrustify config, use floats for FloatProperty() min/max
Campbell Barton
ideasman42 at gmail.com
Tue Apr 16 05:27:58 CEST 2013
Revision: 56078
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=56078
Author: campbellbarton
Date: 2013-04-16 03:27:51 +0000 (Tue, 16 Apr 2013)
Log Message:
-----------
update uncrustify config, use floats for FloatProperty() min/max
Modified Paths:
--------------
trunk/blender/intern/cycles/blender/addon/properties.py
trunk/blender/source/tools/uncrustify.cfg
Modified: trunk/blender/intern/cycles/blender/addon/properties.py
===================================================================
--- trunk/blender/intern/cycles/blender/addon/properties.py 2013-04-16 00:56:24 UTC (rev 56077)
+++ trunk/blender/intern/cycles/blender/addon/properties.py 2013-04-16 03:27:51 UTC (rev 56078)
@@ -448,7 +448,7 @@
cls.fisheye_fov = FloatProperty(
name="Field of View",
description="Field of view for the fisheye lens",
- min=0.1745, soft_max=2 * math.pi, max=10.0 * math.pi,
+ min=0.1745, soft_max=2.0 * math.pi, max=10.0 * math.pi,
subtype='ANGLE',
default=math.pi,
)
@@ -743,19 +743,19 @@
cls.encasing_ratio = FloatProperty(
name="Encasing ratio",
description="Scale factor for encasing strand width",
- min=0, max=100.0,
+ min=0.0, max=100.0,
default=1.01,
)
cls.minimum_width = FloatProperty(
name="Minimal width",
description="Minimal pixel width for strands (0 - deactivated)",
- min=0, max=100,
+ min=0.0, max=100.0,
default=0.0,
)
cls.maximum_width = FloatProperty(
name="Maximal width",
description="Maximum extension that strand radius can be increased by",
- min=0, max=100,
+ min=0.0, max=100.0,
default=0.1,
)
cls.subdivisions = IntProperty(
Modified: trunk/blender/source/tools/uncrustify.cfg
===================================================================
--- trunk/blender/source/tools/uncrustify.cfg 2013-04-16 00:56:24 UTC (rev 56077)
+++ trunk/blender/source/tools/uncrustify.cfg 2013-04-16 03:27:51 UTC (rev 56078)
@@ -1,4 +1,4 @@
-# Uncrustify 0.59
+# Uncrustify 0.60
#
# General options
@@ -24,10 +24,10 @@
# Improvements to template detection may make this option obsolete.
tok_split_gte = false # false/true
-# Control what to do with the UTF-8 BOM (recommed 'remove')
+# Control what to do with the UTF-8 BOM (recommend 'remove')
utf8_bom = ignore # ignore/add/remove/force
-# If the file only contains chars between 128 and 255 and is not UTF-8, then output as UTF-8
+# If the file contains bytes with values between 128 and 255, but is not UTF-8, then output as UTF-8
utf8_byte = false # false/true
# Force the output encoding to UTF-8
@@ -42,7 +42,7 @@
indent_columns = 4 # number
# The continuation indent. If non-zero, this overrides the indent of '(' and '=' continuation indents.
-# For FreeBSD, this is set to 4.
+# For FreeBSD, this is set to 4. Negative value is absolute and not increased for each ( level
indent_continue = 0 # number
# How to use tabs when indenting code
@@ -99,6 +99,9 @@
# Whether to indent the stuff after a leading class colon
indent_class_colon = false # false/true
+# Virtual indent from the ':' for member initializers. Default is 2
+indent_ctor_init_leading = 2 # number
+
# Additional indenting for constructor initializer list
indent_ctor_init = 0 # number
@@ -112,6 +115,10 @@
# Indent continued variable declarations instead of aligning.
indent_var_def_cont = false # false/true
+# True: force indentation of function definition to start in column 1
+# False: use the default behavior
+indent_func_def_force_col1 = false # false/true
+
# True: indent continued function call parameters one indent level
# False: align parameters under the open paren
indent_func_call_param = false # false/true
@@ -207,6 +214,16 @@
# If FALSE or the '=' is followed by a newline, the next line is indent one tab.
indent_align_assign = true # false/true
+# Indent OC blocks at brace level instead of usual rules.
+indent_oc_block = false # false/true
+
+# Indent OC blocks in a message relative to the parameter name.
+# 0=use indent_oc_block rules, 1+=spaces to indent
+indent_oc_block_msg = 0 # number
+
+# Minimum indent for subsequent parameters
+indent_oc_msg_colon = 0 # number
+
#
# Spacing options
#
@@ -217,6 +234,12 @@
# Add or remove space around assignment operator '=', '+=', etc
sp_assign = add # ignore/add/remove/force
+# Add or remove space around '=' in C++11 lambda capture specifications. Overrides sp_assign
+sp_cpp_lambda_assign = ignore # ignore/add/remove/force
+
+# Add or remove space after the capture specification in C++11 lambda.
+sp_cpp_lambda_paren = ignore # ignore/add/remove/force
+
# Add or remove space around assignment operator '=' in a prototype
sp_assign_default = add # ignore/add/remove/force
@@ -238,9 +261,12 @@
# Add or remove space around preprocessor '##' concatenation operator. Default=Add
sp_pp_concat = ignore # ignore/add/remove/force
-# Add or remove space after preprocessor '#' stringify operator. Also affects the '#@' charizing operator. Default=Add
-sp_pp_stringify = ignore # ignore/add/remove/force
+# Add or remove space after preprocessor '#' stringify operator. Also affects the '#@' charizing operator.
+sp_pp_stringify = ignore # ignore/add/remove/force
+# Add or remove space before preprocessor '#' stringify operator as in '#define x(y) L#y'.
+sp_before_pp_stringify = ignore # ignore/add/remove/force
+
# Add or remove space around boolean operators '&&' and '||'
sp_bool = add # ignore/add/remove/force
@@ -297,6 +323,9 @@
# Add or remove space between type and word. Default=Force
sp_after_type = force # ignore/add/remove/force
+# Add or remove space before the paren in the D constructs 'template Foo(' and 'class Foo('.
+sp_before_template_paren = ignore # ignore/add/remove/force
+
# Add or remove space in 'template <' vs 'template<'.
# If set to ignore, sp_before_angle is used.
sp_template_angle = ignore # ignore/add/remove/force
@@ -319,6 +348,10 @@
# Add or remove space between '>' and '>' in '>>' (template stuff C++/C# only). Default=Add
sp_angle_shift = add # ignore/add/remove/force
+# Permit removal of the space between '>>' in 'foo<bar<int> >' (C++11 only). Default=False
+# sp_angle_shift cannot remove the space without this option.
+sp_permit_cpp11_shift = false # false/true
+
# Add or remove space before '(' of 'if', 'for', 'switch', and 'while'
sp_before_sparen = add # ignore/add/remove/force
@@ -328,6 +361,9 @@
# Add or remove space before if-condition ')'. Overrides sp_inside_sparen.
sp_inside_sparen_close = ignore # ignore/add/remove/force
+# Add or remove space before if-condition '('. Overrides sp_inside_sparen.
+sp_inside_sparen_open = ignore # ignore/add/remove/force
+
# Add or remove space after ')' of 'if', 'for', 'switch', and 'while'
sp_after_sparen = add # ignore/add/remove/force
@@ -440,6 +476,12 @@
# Add or remove space inside function '(' and ')'
sp_inside_fparen = remove # ignore/add/remove/force
+# Add or remove space inside the first parens in the function type: 'void (*x)(...)'
+sp_inside_tparen = ignore # ignore/add/remove/force
+
+# Add or remove between the parens in the function type: 'void (*x)(...)'
+sp_after_tparen_close = ignore # ignore/add/remove/force
+
# Add or remove space between ']' and '(' when part of a function call.
sp_square_fparen = ignore # ignore/add/remove/force
@@ -472,6 +514,9 @@
# Add or remove space between 'throw' and '(' in 'throw (something)'
sp_throw_paren = ignore # ignore/add/remove/force
+# Add or remove space between 'throw' and anything other than '(' as in '@throw [...];'
+sp_after_throw = ignore # ignore/add/remove/force
+
# Add or remove space between 'catch' and '(' in 'catch (something) { }'
# If set to ignore, sp_before_sparen is used.
sp_catch_paren = ignore # ignore/add/remove/force
@@ -563,6 +608,14 @@
# '-(int) f: (int) x;' vs '-(int) f : (int) x;'
sp_before_oc_colon = ignore # ignore/add/remove/force
+# Add or remove space after the colon in immutable dictionary expression
+# 'NSDictionary *test = @{@"foo" :@"bar"};'
+sp_after_oc_dict_colon = ignore # ignore/add/remove/force
+
+# Add or remove space before the colon in immutable dictionary expression
+# 'NSDictionary *test = @{@"foo" :@"bar"};'
+sp_before_oc_dict_colon = ignore # ignore/add/remove/force
+
# Add or remove space after the colon in message specs
# '[object setValue:1];' vs '[object setValue: 1];'
sp_after_send_oc_colon = ignore # ignore/add/remove/force
@@ -601,6 +654,13 @@
# '^int (int arg){...}' vs. '^ int (int arg){...}'
sp_after_oc_block_caret = ignore # ignore/add/remove/force
+# Add or remove space between the receiver and selector in a message.
+# '[receiver selector ...]'
+sp_after_oc_msg_receiver = ignore # ignore/add/remove/force
+
+# Add or remove space after @property.
+sp_after_oc_property = ignore # ignore/add/remove/force
+
# Add or remove space around the ':' in 'b ? t : f'
sp_cond_colon = ignore # ignore/add/remove/force
@@ -613,6 +673,15 @@
# Control the space around the D '..' operator.
sp_range = ignore # ignore/add/remove/force
+# Control the spacing after ':' in 'for (TYPE VAR : EXPR)' (Java)
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list