diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2016-12-29 21:57:42 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2016-12-29 22:05:22 +0300 |
| commit | f874aeef70f2f315c3062d9694ae816674d0cdd0 (patch) | |
| tree | e2c8ddb8ecfc415d89225a081ae8755f355993bd /release | |
| parent | 6ecab6dd8e48d564a2b43e0e81e79d079e8b4c77 (diff) | |
| parent | bf7d7bc323d5505b78688af2df1f66e1053f62e1 (diff) | |
Merge branch 'master' into blender2.8
Please **DO NOT** add changes from master when it's totally uneeded!
Changes to BLI_ area most certainly shall *always* be done in master,
there is absolutely no point in adding more diff between the two
branches than needed, will only makes merging more cumbersome!
Conflicts:
CMakeLists.txt
source/blender/blenlib/intern/math_vector_inline.c
Diffstat (limited to 'release')
| -rw-r--r-- | release/scripts/startup/bl_operators/image.py | 4 | ||||
| -rw-r--r-- | release/scripts/startup/bl_ui/space_userpref.py | 13 | ||||
| -rw-r--r-- | release/scripts/templates_py/addon_add_object.py | 4 |
3 files changed, 14 insertions, 7 deletions
diff --git a/release/scripts/startup/bl_operators/image.py b/release/scripts/startup/bl_operators/image.py index f00f5d97c5e..d3460383fe7 100644 --- a/release/scripts/startup/bl_operators/image.py +++ b/release/scripts/startup/bl_operators/image.py @@ -82,8 +82,8 @@ class EditExternally(Operator): import traceback traceback.print_exc() self.report({'ERROR'}, - "Image editor not found, " - "please specify in User Preferences > File") + "Image editor could not be launched, please ensure that " + "the path in User Preferences > File is valid, and Blender has rights to launch it") return {'CANCELLED'} diff --git a/release/scripts/startup/bl_ui/space_userpref.py b/release/scripts/startup/bl_ui/space_userpref.py index e5b6a94c1ab..075a6f870fa 100644 --- a/release/scripts/startup/bl_ui/space_userpref.py +++ b/release/scripts/startup/bl_ui/space_userpref.py @@ -1180,11 +1180,18 @@ class USERPREF_PT_input(Panel): col.separator() col.label(text="NDOF Device:") sub = col.column(align=True) - sub.prop(inputs, "ndof_sensitivity", text="NDOF Sensitivity") - sub.prop(inputs, "ndof_orbit_sensitivity", text="NDOF Orbit Sensitivity") - sub.prop(inputs, "ndof_deadzone", text="NDOF Deadzone") + sub.prop(inputs, "ndof_sensitivity", text="Pan Sensitivity") + sub.prop(inputs, "ndof_orbit_sensitivity", text="Orbit Sensitivity") + sub.prop(inputs, "ndof_deadzone", text="Deadzone") + + sub.separator() + col.label(text="Navigation Style:") sub = col.column(align=True) sub.row().prop(inputs, "ndof_view_navigate_method", expand=True) + + sub.separator() + col.label(text="Rotation Style:") + sub = col.column(align=True) sub.row().prop(inputs, "ndof_view_rotate_method", expand=True) row.separator() diff --git a/release/scripts/templates_py/addon_add_object.py b/release/scripts/templates_py/addon_add_object.py index 8e57d7ef8f8..d294838d3a2 100644 --- a/release/scripts/templates_py/addon_add_object.py +++ b/release/scripts/templates_py/addon_add_object.py @@ -69,9 +69,9 @@ def add_object_button(self, context): # This allows you to right click on a button and link to the manual def add_object_manual_map(): - url_manual_prefix = "http://wiki.blender.org/index.php/Doc:2.6/Manual/" + url_manual_prefix = "https://www.blender.org/manual/" url_manual_mapping = ( - ("bpy.ops.mesh.add_object", "Modeling/Objects"), + ("bpy.ops.mesh.add_object", "editors/3dview/object"), ) return url_manual_prefix, url_manual_mapping |