Revision: 53988
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=53988
Author: campbellbarton
Date: 2013-01-22 11:23:05 +0000 (Tue, 22 Jan 2013)
Log Message:
-----------
comments for RNA_def_property_ui_range() and clamp some out-of-range values.
Modified Paths:
--------------
trunk/blender/source/blender/makesrna/intern/rna_define.c
trunk/blender/source/blender/makesrna/intern/rna_modifier.c
trunk/blender/source/blender/makesrna/intern/rna_scene.c
trunk/blender/source/blender/makesrna/intern/rna_sequencer.c
trunk/blender/source/blender/modifiers/intern/MOD_laplaciansmooth.c
trunk/blender/source/blender/python/intern/bpy_app_translations.c
Modified: trunk/blender/source/blender/makesrna/intern/rna_define.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_define.c 2013-01-22
11:18:41 UTC (rev 53987)
+++ trunk/blender/source/blender/makesrna/intern/rna_define.c 2013-01-22
11:23:05 UTC (rev 53988)
@@ -1210,6 +1210,15 @@
prop->flag |= PROP_ICONS_CONSECUTIVE;
}
+/**
+ * The values hare are a little confusing:
+ *
+ * \param step For floats this is (step / 100), why /100? - nobody knows.
+ * for int's, whole values are used.
+ *
+ * \param precision The number of zeros to show
+ * (as a whole number - common range is 1 - 6), see PRECISION_FLOAT_MAX
+ */
void RNA_def_property_ui_range(PropertyRNA *prop, double min, double max,
double step, int precision)
{
StructRNA *srna = DefRNA.laststruct;
@@ -1230,6 +1239,21 @@
fprop->softmax = (float)max;
fprop->step = (float)step;
fprop->precision = (int)precision;
+#if 0 /* handy but annoying */
+ if (DefRNA.preprocess) {
+ /* check we're not over PRECISION_FLOAT_MAX */
+ if (fprop->precision > 6) {
+ fprintf(stderr, "%s: \"%s.%s\",
precision value over maximum.\n",
+ __func__, srna->identifier,
prop->identifier);
+ DefRNA.error = 1;
+ }
+ else if (fprop->precision < 1) {
+ fprintf(stderr, "%s: \"%s.%s\",
precision value under minimum.\n",
+ __func__, srna->identifier,
prop->identifier);
+ DefRNA.error = 1;
+ }
+ }
+#endif
break;
}
default:
Modified: trunk/blender/source/blender/makesrna/intern/rna_modifier.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_modifier.c 2013-01-22
11:18:41 UTC (rev 53987)
+++ trunk/blender/source/blender/makesrna/intern/rna_modifier.c 2013-01-22
11:23:05 UTC (rev 53988)
@@ -1852,14 +1852,14 @@
prop = RNA_def_property(srna, "lambda_factor", PROP_FLOAT, PROP_NONE);
RNA_def_property_float_sdna(prop, NULL, "lambda");
RNA_def_property_range(prop, -FLT_MAX, FLT_MAX);
- RNA_def_property_ui_range(prop, -1000.0, 1000.0, 0.0000001, 8);
+ RNA_def_property_ui_range(prop, -1000.0, 1000.0, 0.0000001, 6);
RNA_def_property_ui_text(prop, "Lambda Factor", "Smooth factor effect");
RNA_def_property_update(prop, 0, "rna_Modifier_update");
prop = RNA_def_property(srna, "lambda_border", PROP_FLOAT, PROP_NONE);
RNA_def_property_float_sdna(prop, NULL, "lambda_border");
RNA_def_property_range(prop, -FLT_MAX, FLT_MAX);
- RNA_def_property_ui_range(prop, -1000.0, 1000.0, 0.0000001, 8);
+ RNA_def_property_ui_range(prop, -1000.0, 1000.0, 0.0000001, 6);
RNA_def_property_ui_text(prop, "Lambda Border", "Lambda factor in
border");
RNA_def_property_update(prop, 0, "rna_Modifier_update");
Modified: trunk/blender/source/blender/makesrna/intern/rna_scene.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_scene.c 2013-01-22
11:18:41 UTC (rev 53987)
+++ trunk/blender/source/blender/makesrna/intern/rna_scene.c 2013-01-22
11:23:05 UTC (rev 53988)
@@ -3709,7 +3709,7 @@
prop = RNA_def_property(srna, "motion_blur_shutter", PROP_FLOAT,
PROP_UNSIGNED);
RNA_def_property_float_sdna(prop, NULL, "blurfac");
- RNA_def_property_ui_range(prop, 0.01f, 2.0f, 1, 0);
+ RNA_def_property_ui_range(prop, 0.01f, 2.0f, 1, 1);
RNA_def_property_ui_text(prop, "Shutter", "Time taken in frames between
shutter open and close");
RNA_def_property_clear_flag(prop, PROP_ANIMATABLE);
RNA_def_property_update(prop, NC_SCENE | ND_RENDER_OPTIONS,
"rna_Scene_glsl_update");
Modified: trunk/blender/source/blender/makesrna/intern/rna_sequencer.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_sequencer.c
2013-01-22 11:18:41 UTC (rev 53987)
+++ trunk/blender/source/blender/makesrna/intern/rna_sequencer.c
2013-01-22 11:23:05 UTC (rev 53988)
@@ -2058,13 +2058,13 @@
prop = RNA_def_property(srna, "scale_start_x", PROP_FLOAT,
PROP_UNSIGNED);
RNA_def_property_float_sdna(prop, NULL, "ScalexIni");
RNA_def_property_ui_text(prop, "Scale X", "");
- RNA_def_property_ui_range(prop, 0, 10, 3, 10);
+ RNA_def_property_ui_range(prop, 0, 10, 3, 6);
RNA_def_property_update(prop, NC_SCENE | ND_SEQUENCER,
"rna_Sequence_update");
prop = RNA_def_property(srna, "scale_start_y", PROP_FLOAT,
PROP_UNSIGNED);
RNA_def_property_float_sdna(prop, NULL, "ScaleyIni");
RNA_def_property_ui_text(prop, "Scale Y", "");
- RNA_def_property_ui_range(prop, 0, 10, 3, 10);
+ RNA_def_property_ui_range(prop, 0, 10, 3, 6);
RNA_def_property_update(prop, NC_SCENE | ND_SEQUENCER,
"rna_Sequence_update");
prop = RNA_def_property(srna, "use_uniform_scale", PROP_BOOLEAN,
PROP_NONE);
@@ -2075,13 +2075,13 @@
prop = RNA_def_property(srna, "translate_start_x", PROP_FLOAT,
PROP_NONE);
RNA_def_property_float_sdna(prop, NULL, "xIni");
RNA_def_property_ui_text(prop, "Translate X", "");
- RNA_def_property_ui_range(prop, -500.0f, 500.0f, 3, 10);
+ RNA_def_property_ui_range(prop, -500.0f, 500.0f, 3, 6);
RNA_def_property_update(prop, NC_SCENE | ND_SEQUENCER,
"rna_Sequence_update");
prop = RNA_def_property(srna, "translate_start_y", PROP_FLOAT,
PROP_NONE);
RNA_def_property_float_sdna(prop, NULL, "yIni");
RNA_def_property_ui_text(prop, "Translate Y", "");
- RNA_def_property_ui_range(prop, -500.0f, 500.0f, 3, 10);
+ RNA_def_property_ui_range(prop, -500.0f, 500.0f, 3, 6);
RNA_def_property_update(prop, NC_SCENE | ND_SEQUENCER,
"rna_Sequence_update");
prop = RNA_def_property(srna, "rotation_start", PROP_FLOAT, PROP_NONE);
Modified: trunk/blender/source/blender/modifiers/intern/MOD_laplaciansmooth.c
===================================================================
--- trunk/blender/source/blender/modifiers/intern/MOD_laplaciansmooth.c
2013-01-22 11:18:41 UTC (rev 53987)
+++ trunk/blender/source/blender/modifiers/intern/MOD_laplaciansmooth.c
2013-01-22 11:23:05 UTC (rev 53988)
@@ -586,7 +586,7 @@
init_laplacian_matrix(sys);
- for (iter = 0; iter < smd->repeat; iter++) {
+ for (iter = 0; iter < smd->repeat; iter++) {
nlBegin(NL_SYSTEM);
for (i = 0; i < numVerts; i++) {
nlSetVariable(0, i, vertexCos[i][0]);
@@ -648,7 +648,7 @@
}
}
- if (iter == 0){
+ if (iter == 0) {
fill_laplacian_matrix(sys);
}
Modified: trunk/blender/source/blender/python/intern/bpy_app_translations.c
===================================================================
--- trunk/blender/source/blender/python/intern/bpy_app_translations.c
2013-01-22 11:18:41 UTC (rev 53987)
+++ trunk/blender/source/blender/python/intern/bpy_app_translations.c
2013-01-22 11:23:05 UTC (rev 53988)
@@ -549,8 +549,7 @@
const char *locale;
char *language, *country, *variant, *language_country,
*language_variant;
- if (!PyArg_ParseTupleAndKeywords(args, kw,
"s:bpy.app.translations.locale_explode", (char **)kwlist, &locale))
- {
+ if (!PyArg_ParseTupleAndKeywords(args, kw,
"s:bpy.app.translations.locale_explode", (char **)kwlist, &locale)) {
return NULL;
}
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
