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>2011-04-04 09:47:04 +0400
committerCampbell Barton <ideasman42@gmail.com>2011-04-04 09:47:04 +0400
commit233d8594fc2d18f1598dbc407b82486d165471a4 (patch)
tree1a9f72dec2cc8360fed107fe26e86a72573461c0
parent4ea7e562f8dcf79d22280d8fe83984e8029d2132 (diff)
[#26768] 2.57 - sys.path not initialized properly
we should document this properly (we only have general design docs atm), for now just correct the tooltip. also update api example docs.
-rw-r--r--doc/python_api/examples/mathutils.py4
-rw-r--r--source/blender/makesrna/intern/rna_userdef.c3
2 files changed, 4 insertions, 3 deletions
diff --git a/doc/python_api/examples/mathutils.py b/doc/python_api/examples/mathutils.py
index dcc10c5885c..b65e61a1044 100644
--- a/doc/python_api/examples/mathutils.py
+++ b/doc/python_api/examples/mathutils.py
@@ -13,6 +13,6 @@ mat3 = mat.to_3x3()
quat1 = mat.to_quaternion()
quat2 = mat3.to_quaternion()
-angle = quat1.difference(quat2)
+quat_diff = quat1.rotation_difference(quat2)
-print(angle)
+print(quat_diff.angle)
diff --git a/source/blender/makesrna/intern/rna_userdef.c b/source/blender/makesrna/intern/rna_userdef.c
index c5a1db46e6c..0ae0e74e2cb 100644
--- a/source/blender/makesrna/intern/rna_userdef.c
+++ b/source/blender/makesrna/intern/rna_userdef.c
@@ -2807,7 +2807,8 @@ static void rna_def_userdef_filepaths(BlenderRNA *brna)
prop= RNA_def_property(srna, "script_directory", PROP_STRING, PROP_DIRPATH);
RNA_def_property_string_sdna(prop, NULL, "pythondir");
- RNA_def_property_ui_text(prop, "Python Scripts Directory", "The default directory to search for Python scripts (resets python module search path: sys.path)");
+ RNA_def_property_ui_text(prop, "Python Scripts Directory", "Alternate script path, matching the default layout with subdirs: startup, addons & modules (requires restart)");
+ /* TODO, editing should reset sys.path! */
prop= RNA_def_property(srna, "sound_directory", PROP_STRING, PROP_DIRPATH);
RNA_def_property_string_sdna(prop, NULL, "sounddir");