Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2016-03-04 00:40:22 +0300
committerCampbell Barton <ideasman42@gmail.com>2016-03-04 00:40:22 +0300
commit9c8b6cc3fd81722d0d714df89b29463c27b20f14 (patch)
treefb6db1202c82604cd56c3b66cac107844d905f93
parentf38c175fc8e86e728bdb69d6c2570a0bb80ca010 (diff)
Docs: include mathutils.interpolate
-rw-r--r--doc/python_api/sphinx_doc_gen.py10
-rw-r--r--source/blender/makesrna/intern/rna_curve.c4
2 files changed, 10 insertions, 4 deletions
diff --git a/doc/python_api/sphinx_doc_gen.py b/doc/python_api/sphinx_doc_gen.py
index 1da33e1a55f..9d0d358305b 100644
--- a/doc/python_api/sphinx_doc_gen.py
+++ b/doc/python_api/sphinx_doc_gen.py
@@ -263,8 +263,9 @@ else:
"gpu",
"gpu.offscreen",
"mathutils",
- "mathutils.geometry",
"mathutils.bvhtree",
+ "mathutils.geometry",
+ "mathutils.interpolate",
"mathutils.kdtree",
"mathutils.noise",
"freestyle",
@@ -1663,7 +1664,11 @@ def write_rst_contents(basepath):
standalone_modules = (
# mathutils
- "mathutils", "mathutils.geometry", "mathutils.bvhtree", "mathutils.kdtree", "mathutils.noise",
+ "mathutils",
+ "mathutils.geometry",
+ "mathutils.bvhtree", "mathutils.kdtree",
+ "mathutils.interpolate",
+ "mathutils.noise",
# misc
"freestyle", "bgl", "blf",
"gpu", "gpu.offscreen",
@@ -1820,6 +1825,7 @@ def write_rst_importable_modules(basepath):
"mathutils.geometry" : "Geometry Utilities",
"mathutils.bvhtree" : "BVHTree Utilities",
"mathutils.kdtree" : "KDTree Utilities",
+ "mathutils.interpolate": "Interpolation Utilities",
"mathutils.noise" : "Noise Utilities",
"freestyle" : "Freestyle Module",
"freestyle.types" : "Freestyle Types",
diff --git a/source/blender/makesrna/intern/rna_curve.c b/source/blender/makesrna/intern/rna_curve.c
index 3fbc7899ed4..d28dd8f7607 100644
--- a/source/blender/makesrna/intern/rna_curve.c
+++ b/source/blender/makesrna/intern/rna_curve.c
@@ -1046,8 +1046,8 @@ static void rna_def_font(BlenderRNA *UNUSED(brna), StructRNA *srna)
RNA_def_property_string_maxlength(prop, MAX_ID_NAME - 2);
RNA_def_property_ui_text(prop, "Object Font",
"Use Objects as font characters (give font objects a common name "
- "followed by the character they represent, eg. 'family_a', 'family_b', etc, "
- "set this setting to 'family_', and turn on Vertex Duplication)");
+ "followed by the character they represent, eg. 'family-a', 'family-b', etc, "
+ "set this setting to 'family-', and turn on Vertex Duplication)");
RNA_def_property_update(prop, 0, "rna_Curve_update_data");
prop = RNA_def_property(srna, "body", PROP_STRING, PROP_NONE);