diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-03-10 08:55:39 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-03-10 08:55:39 +0300 |
| commit | d27158aae9bc48b2a07760a2dbe8e642fcecbe57 (patch) | |
| tree | 7ecfe898e53f07e589ee4be0ea5b297153d7dfcf /release | |
| parent | f3161bd2abe4bcc41f0e9169275be315ecc6b054 (diff) | |
| parent | 8a76f8dac3475b1d24956e0d384d65295f15c76a (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'release')
| m--------- | release/datafiles/locale | 0 | ||||
| m--------- | release/scripts/addons | 0 | ||||
| m--------- | release/scripts/addons_contrib | 0 | ||||
| -rw-r--r-- | release/scripts/startup/bl_ui/space_userpref.py | 15 |
4 files changed, 9 insertions, 6 deletions
diff --git a/release/datafiles/locale b/release/datafiles/locale -Subproject c93ed11a47b3016cf59711ec16de2e2e94c30e9 +Subproject 469c949d1ca882be19daa128842f813b72a944d diff --git a/release/scripts/addons b/release/scripts/addons -Subproject 371960484a38fc64e0a2635170a41a0d8ab2f6b +Subproject c88411ff7776a2db5d6ef6117a1b2faa42a9561 diff --git a/release/scripts/addons_contrib b/release/scripts/addons_contrib -Subproject a8515cfdfe9a98127b592f36fcbe51b7e23b969 +Subproject 310578043dec1aae382eb6a447ae1d103792d7e diff --git a/release/scripts/startup/bl_ui/space_userpref.py b/release/scripts/startup/bl_ui/space_userpref.py index 6db538eacef..5ee722f58ed 100644 --- a/release/scripts/startup/bl_ui/space_userpref.py +++ b/release/scripts/startup/bl_ui/space_userpref.py @@ -1521,12 +1521,15 @@ class USERPREF_PT_addons(Panel): split.operator( "wm.url_open", text="Documentation", icon='HELP', ).url = info["wiki_url"] - split.operator( - "wm.url_open", text="Report a Bug", icon='URL', - ).url = info.get( - "tracker_url", - "https://developer.blender.org/maniphest/task/edit/form/2", - ) + # Only add "Report a Bug" button if tracker_url is set + # or the add-on is bundled (use official tracker then). + if info.get("tracker_url") or not user_addon: + split.operator( + "wm.url_open", text="Report a Bug", icon='URL', + ).url = info.get( + "tracker_url", + "https://developer.blender.org/maniphest/task/edit/form/2", + ) if user_addon: split.operator( "wm.addon_remove", text="Remove", icon='CANCEL', |