Franklin Sobrinho
f9aeb91850
Implemented UndoRedo mergeable modes
...
(cherry picked from commit debf574df3
)
2016-09-01 08:41:04 +02:00
Franklin Sobrinho
5f9e6d2b48
Added add_property_info function to Globals and EditorSettings classes
...
(cherry picked from commit 9f242ed6e5
)
2016-09-01 08:40:49 +02:00
Franklin Sobrinho
6327fc47c8
Better editor settings for the FileSystem dock
...
* Save the current display mode when changing it from the dock
(cherry picked from commit f6b39827b1
)
2016-09-01 08:40:23 +02:00
Franklin Sobrinho
3cbd6b8701
Fix editor glitches when the mesh/material preview is shown
...
(cherry picked from commit a4c3d2dc89
)
2016-09-01 08:40:16 +02:00
Franklin Sobrinho
4890db7fef
Small usability improvements on the TileMap editor tile palette.
...
* The column width changes with the zoom, now the icons don't overlap.
* Added a tile hsepation setting.
* Added a setting to show/hide tile names.
(cherry picked from commit 0fa26cd850
)
2016-09-01 08:40:08 +02:00
Franklin Sobrinho
743c63670e
Expose additional functions for the EditorPlugin class
...
(cherry picked from commit 104653f9eb
)
2016-09-01 08:39:52 +02:00
Daniel J. Ramirez
e26acc39da
2d collision shape icons now uses the color for shape icons
...
(cherry picked from commit cbad6b3fae
)
2016-09-01 08:39:09 +02:00
Daniel J. Ramirez
16fc229e5d
Zoom texture region via mouse wheel
...
(cherry picked from commit 1e7d0c6ac1
)
2016-09-01 08:37:55 +02:00
Ignacio Etcheverry
4f07998552
Device Input dialog now uses containers
...
(cherry picked from commit 9483d3cbf9
)
2016-09-01 08:34:05 +02:00
Rémi Verschelde
3b7ab73cab
i18n: Merge PO files with current template
2016-08-10 21:31:06 +02:00
Rémi Verschelde
bbb543735c
i18n: Sync template with current source
2016-08-10 21:30:57 +02:00
Rémi Verschelde
ed931d3b59
i18n: Sync translations from Weblate
...
Translator credits added manually based on Weblate git log.
(cherry picked from commit 221d81a26d
)
2016-08-10 21:28:05 +02:00
Rémi Verschelde
676b60a8b5
i18n: Add a README file to point to the Weblate repo
...
(cherry picked from commit 807c615148
)
2016-08-10 21:27:45 +02:00
Rémi Verschelde
9cc700a0ab
OSX Info.plist: no longer dev version
...
This should really be dehardcoded somehow.
2016-08-09 09:51:58 +02:00
Ignacio Etcheverry
d853eb2fb7
Project Manager: Fix and improve unhandled input
...
(cherry picked from commit f3a75a42dd
)
2016-08-08 18:15:03 +02:00
Andreas Haas
36eeedb357
Remove unused function in Project Manager.
...
This has been deprecated by #5993
(cherry picked from commit 0df40cc29b
)
2016-08-08 18:14:57 +02:00
Saracen
dd97502788
TextureRegionEditor snap_mode fix.
...
(cherry picked from commit b578cf4da8
)
2016-08-08 18:14:29 +02:00
Rémi Verschelde
3eb3752a59
Merge pull request #5993 from profelis/PR-scan-dragged-folder-2
...
Improved drad&drop files on project manager
2016-08-01 23:41:02 +02:00
Dima Granetchi
bee2091056
Auto import project folder, confirm scan multiple folders or non-project folder
2016-08-01 22:59:12 +03:00
Paulb23
d7910f44d8
Added Scene tree dock shortcuts
2016-08-01 17:02:40 +01:00
Rémi Verschelde
87e8444499
Merge pull request #5996 from hurikhan/editor_help_indentation
...
Fix help page title indentation
2016-08-01 10:56:56 +02:00
Mario Schlack
ae1267d41c
Fix help page title indentation
2016-08-01 16:30:09 +08:00
Rémi Verschelde
0b595f94c4
Improve dialog title when scanning for projects
2016-07-31 20:46:00 +02:00
Rémi Verschelde
c788284b5c
Merge pull request #5981 from profelis/PR-scan-dragged-folder
...
Drag open scan window if engine.cfg not found
2016-07-31 20:16:12 +02:00
Dima Granetchi
5e011dcd0e
dnd folder open scan window if engine.cfg not found
2016-07-31 01:10:13 +03:00
Dima Granetchi
a1c0fdac9a
fix run button availability check
2016-07-31 01:06:12 +03:00
Rémi Verschelde
38286670ac
Merge pull request #5966 from neikeq/pr-issue-5935
...
Fix infinite loop when replacing text
2016-07-30 09:11:59 +02:00
Ignacio Etcheverry
6e137c02d2
Fix infinite loop when replacing text
2016-07-30 01:11:02 +02:00
Andreas Haas
9720e73e04
Project Manager: Import projects using filesystem drag'n'drop.
...
Can drop an engine.cfg file over the window to import it ;)
2016-07-29 17:07:05 +02:00
Saracen
5035edb7fd
Explicitly initialize 'pending_auto_reload' to false.
2016-07-29 13:51:26 +01:00
Rémi Verschelde
2dd83e28b9
Merge pull request #5957 from djrm/new_icons
...
New http request and tutorials icon
2016-07-29 07:27:54 +02:00
Rémi Verschelde
829d89631e
Merge pull request #5955 from profelis/PR-update-selected-list
...
Keep ProjectManager.selected_list up to date
2016-07-29 07:24:01 +02:00
Daniel J. Ramirez
12ddc87032
New http request and tutorials icon
...
Remove garbage in group icon
2016-07-28 21:09:10 -05:00
Dima Granetchi
283530a70b
keep selected_list up to date
2016-07-29 03:41:21 +03:00
George Marques
3cdb5e0d1f
Fix editor icons source file generation
...
Also removes the unused make_icons.py file.
2016-07-28 21:26:21 -03:00
Rémi Verschelde
1dae31f554
Merge pull request #5925 from profelis/shortcut-filter-project
...
Command-f focus filter input field in project manager
2016-07-28 08:38:23 +02:00
Rémi Verschelde
ea17094c4f
Merge pull request #5939 from neikeq/pr-imp-about
...
AboutDialog: Popup respecting its minimum size
2016-07-27 18:44:20 +02:00
Ignacio Etcheverry
cf851f7ed4
AboutDialog: Popup respecting its minimum size
2016-07-27 18:11:55 +02:00
Ignacio Etcheverry
9df192d8ec
Project Settings: Use containers for the Input Map tab content
2016-07-27 17:32:24 +02:00
Dima Granetchi
759e20aac6
Command-F focus filter input field in project manager
2016-07-27 00:48:00 +03:00
Daniel J. Ramirez
213a57ccaf
Stop baking process if there is no geometry in the BakedLightInstance.
...
moved missing baked light warning to BakedLightInstance configuration warning
2016-07-25 21:45:20 -05:00
Rémi Verschelde
6273ec901f
Merge pull request #5902 from 29jm/fix-warnings
...
Fix some warnings
2016-07-25 18:41:25 +02:00
Johan Manuel
a2b8ef6d51
Fix some warnings
2016-07-25 16:46:26 +02:00
Rémi Verschelde
f86176d20b
Merge pull request #5900 from bojidar-bg/fix-integer-ranges
...
Fix default ranges of the inspector, as well as Range.
2016-07-25 12:46:10 +02:00
Bojidar Marinov
7dbdfe8dbd
Fix default ranges of the inspector
...
Probably closes #3091
(Should apply to Variant::REAL and Variant::INT)
2016-07-25 12:41:17 +03:00
Rémi Verschelde
29c1a6eb23
Merge pull request #5898 from MarianoGnu/master
...
expose bottom panel button to EditorPlugin scripts
2016-07-25 08:58:58 +02:00
MarianoGNU
23a20791d1
Update documentation.
2016-07-24 18:09:56 -03:00
MarianoGNU
ed094d52a9
expose bottom panel button to EditorPlugin scripts
2016-07-24 16:42:40 -03:00
Juan Linietsky
ab93fd1af9
Add thread support to HTTPRequest, changed assetlib to use it.
2016-07-24 16:09:43 -03:00
Juan Linietsky
85f365bbff
shows progress (bytes) on download even if getting chunked content
2016-07-24 14:37:52 -03:00
Rémi Verschelde
60d9373547
Fix non-visible col number in text editor
...
The issue itself cannot be fully fixed due to the changes in 864c0e8
,
but this solution makes the bug less likely to happen (it would only
happen with > 5 digits for line or column, and/or a much bigger font.
Could be further refined by taking the configured font into account...
Fixed #5890 .
2016-07-24 17:12:11 +02:00
Rémi Verschelde
308d405c31
Turn some prints to error logs, remove others
...
Fixes #5876 in passing.
2016-07-24 00:02:19 +02:00
Rémi Verschelde
ebefdaa598
Merge pull request #5737 from neikeq/pr-issue-5269
...
TextEdit: Scroll search results to the center
2016-07-23 22:54:32 +02:00
Rémi Verschelde
990a23e48e
Merge pull request #5821 from TheHX/issue-5795
...
Improved FileSystem dock "Instance" option
2016-07-23 22:53:41 +02:00
Rémi Verschelde
d248a7d78b
Merge pull request #5882 from neikeq/pr-issue-1481
...
Project Manager: Added project list scrolling with keyboard
2016-07-23 22:32:57 +02:00
Ignacio Etcheverry
761193ecd9
Project Manager: Added project list scrolling with keyboard
2016-07-23 21:37:25 +02:00
Rémi Verschelde
abee84fe21
Merge pull request #5864 from djrm/new_icons
...
Modified some icons
2016-07-23 10:25:36 +02:00
MarianoGNU
6622a3d110
Prevent crash in TextureRegionEditor. Fixes #5862
2016-07-22 21:11:12 -03:00
Daniel J. Ramirez
d49600f4a2
Modified some icons
2016-07-22 18:43:35 -05:00
Juan Linietsky
3aeafcae04
Removed support for saving paths as relative, closes #5728
...
Editor now has good refactoring tools, so this function is mostly obsolete
2016-07-22 10:39:46 -03:00
Juan Linietsky
12472534ec
Show a warning that an animation must be selected in order to edit it. Avoid copying/pasting if no anim selected. Closes #5799
2016-07-22 09:42:12 -03:00
Juan Linietsky
925e5e9f2a
Update profiler curves on item toggled, closes #5680
2016-07-21 18:02:43 -03:00
Franklin Sobrinho
53beeb774b
"FileSystem" dock now instance all selected scenes in one action
2016-07-21 11:10:44 -03:00
Juan Linietsky
4abc945466
Instance only selected scenes in FS dock, closes #5795
2016-07-21 10:36:47 -03:00
Juan Linietsky
ff8f4cb409
Renamed scenes_dock to filesystem_dock (makes more sense, it has not been a scenes dock since a long time).
2016-07-21 10:34:57 -03:00
Juan Linietsky
e75bad41f7
Hide editor types from create node dialog, closes #3263
2016-07-21 10:16:30 -03:00
Juan Linietsky
124e3591a5
Some optimizations and limits for extreme zoom in and out in editor, fixes #5820
2016-07-21 10:11:53 -03:00
Rémi Verschelde
750b973ee4
Merge pull request #5200 from neikeq/sc-CanvasItemEditor
...
Implement ShortCuts in CanvasItemEditor
2016-07-21 09:02:01 +02:00
Ignacio Etcheverry
fc16954fa2
TextEdit: Center search results
2016-07-21 03:40:08 +02:00
Ignacio Etcheverry
4e82f9ffcf
Implement missing ShortCuts in CanvasItemEditor
2016-07-21 03:28:41 +02:00
Rémi Verschelde
87d0515d09
Fix main scene not being saved when set via Play button
...
Fixes #1134 for real. Also tweaked the engine.cfg template
and the preference order when browsing for the main scene.
2016-07-19 21:35:14 +02:00
Rémi Verschelde
c83aa5f863
Merge pull request #5794 from TheHX/editor-settings-dialog
...
Keep selected section in Editor Settings when reopening the dialog
2016-07-19 07:41:24 +02:00
Rémi Verschelde
919e9dd358
Merge pull request #5793 from TheHX/issue-5722
...
Fix Editor Settings dialog range editing by dragging and using the slider
2016-07-19 07:39:32 +02:00
Rémi Verschelde
6626ac463e
Merge pull request #5783 from TheHX/issue-5782
...
Fix crash when dropping scene as a sibling of the root node
2016-07-19 07:35:50 +02:00
Rémi Verschelde
13fe615ea3
Merge pull request #5760 from r1cebank/issue-5636__add-close-docs-option
...
Script Editor: adding close all docs menu option
2016-07-19 07:35:20 +02:00
Juan Linietsky
3e3108abe2
Always soft reload editor plugins. Closes #5273
2016-07-18 19:24:38 -03:00
Franklin Sobrinho
ea77553416
Keep selected section in Editor Settings when reopening the dialog
2016-07-18 19:21:20 -03:00
Franklin Sobrinho
eeb8987276
Fix Editor Settings dialog range editing by dragging and using the slider
2016-07-18 18:46:16 -03:00
Juan Linietsky
7a4d67ae71
Property convert images to RGBA before applying hq2x, fixes #5168
2016-07-18 18:30:30 -03:00
Rémi Verschelde
4f9dea3aed
Revert "Change default extension to .tscn when import 3d scene"
...
Also adds a comment as to why this extension should not be changed.
This commit reverts edf7082326
.
2016-07-18 21:32:10 +02:00
Franklin Sobrinho
2a97d79a64
Fix crash when dropping scene as a sibling of the root node
2016-07-18 15:00:14 -03:00
Siyuan Gao
0c3b1b51b8
Script Editor: adding close all docs menu option
2016-07-18 10:09:42 -07:00
Rémi Verschelde
b0c2801458
Merge pull request #5780 from TheHX/script-editor-layout
...
Fix ScriptEditor don't saving the layout when opening a help page
2016-07-18 17:52:24 +02:00
George Marques
0610c77e43
Add icon for root node in Create Dialog
...
Close #5766
2016-07-18 12:39:59 -03:00
Franklin Sobrinho
3ca6e584e5
Fix ScriptEditor don't saving the layout when opening a help page
...
- Use ScriptEditor::_update_script_names just once when re-creating the layout
2016-07-18 12:30:43 -03:00
volzhs
edf7082326
Change default extension to .tscn when import 3d scene
2016-07-18 23:28:13 +09:00
Rémi Verschelde
d6f2e41e6f
Merge pull request #5750 from TheHX/issue-5681
...
Keep debugger selected tab open when pressing the pause button
2016-07-18 00:54:32 +02:00
Rémi Verschelde
62eae7cbe2
Merge pull request #5723 from Paulb23/toggle_breakpoint_gutter_issue_5712
...
Fixed toggle breakpoint gutter not updating when the game is running, issue 5712
2016-07-18 00:52:36 +02:00
Rémi Verschelde
3183834c5d
Merge pull request #5657 from Paulb23/block_caret
...
Added block caret to TextEdit
2016-07-18 00:44:45 +02:00
Rémi Verschelde
e6cf0d444b
Merge pull request #5758 from TheHX/issue-5756
...
Fix editor states saving, and remove related error messages
2016-07-17 23:44:16 +02:00
Franklin Sobrinho
7767aa2722
Fix editor states saving, and remove related error messages
2016-07-17 16:59:15 -03:00
Rémi Verschelde
22419082d9
Remove some noisy debug prints
...
Part of #5031
2016-07-17 18:25:21 +02:00
Franklin Sobrinho
f20680947b
Keep debugger selected tab open when pressing the pause button
2016-07-17 09:27:36 -03:00
Rémi Verschelde
b23889eb41
Merge pull request #5743 from TheHX/issue-5740
...
Fix signals/group button on Scene dock
2016-07-16 23:43:24 +02:00
Franklin Sobrinho
60f1656fff
Fix signals/group button on Scene dock
2016-07-16 18:22:44 -03:00
Juan Linietsky
24d86e33a6
Merge pull request #5467 from RandomShaper/enhance-tidy-extensions
...
Enhance/tidy file extensions management
2016-07-16 09:28:49 -03:00
Rémi Verschelde
966eabb07b
Fonts: add missing license information
...
Droid Sans is under Apache 2.0, Source Code Pro under SIL OFL 1.1.
2016-07-16 11:53:57 +02:00
Ignacio Etcheverry
2bba1bf770
CanvasItemEditor: Changed Frame Selection shortcut
2016-07-15 21:38:43 +02:00
Paulb23
b550471a14
Fixed breakpoint gutter toggle not updating when game is running, issue 5712
2016-07-15 15:02:55 +01:00
Rémi Verschelde
4c4ab140b4
Merge pull request #5702 from Paulb23/zoom_shortcuts
...
Added code editor zoom shortcuts
2016-07-15 13:28:20 +02:00
Rémi Verschelde
b781dcdb1a
i18n: Merge translations with synced template
2016-07-15 08:58:49 +02:00
Rémi Verschelde
cfaad1ebe7
i18n: Sync template with current source
...
Also fix a space after : in a translated string.
2016-07-15 08:57:53 +02:00
Rémi Verschelde
fd5fdaba68
i18n: Pull translations from Weblate
...
Adds Bengali and Urdu (Pakistan) WIP translations.
2016-07-15 08:52:31 +02:00
volzhs
9ff7c5524f
Perform connect when double click a node on connecting signal window
2016-07-15 14:29:14 +09:00
Paulb23
e6eae244d3
Added code editor zoom shortcuts
2016-07-14 20:03:40 +01:00
Franklin Sobrinho
8772b8ea85
Fix Orphan StringName on EditorAutoloadSettings class
2016-07-14 12:08:40 -03:00
vamsi
b3cf4c73fc
Fixed a crash in scenario where SSL is not available.
2016-07-13 18:25:05 +02:00
Saracen
ca866803be
Removes AnimationPlayer renaming on import.
2016-07-13 16:45:53 +01:00
Paulb23
54f720ac06
Added block caret to TextEdit
2016-07-12 16:07:17 +01:00
Rémi Verschelde
b8c506be1c
Merge pull request #5615 from Paulb23/shortcut_save_print
...
Removed shortcut saving print
2016-07-12 07:28:08 +02:00
Rémi Verschelde
480ac2bcfb
Merge pull request #5648 from Paulb23/completion_box_colors
...
Added Completion box colors. Exposed show line numbers, highlight all occurrences, and updated theme.
2016-07-12 07:26:35 +02:00
Juan Linietsky
31ebac2bfb
Downloaded templates from project manager can now be installed.
2016-07-11 21:34:50 -03:00
Franklin Sobrinho
aed2f5f938
Fix "Play custom scene" keyboard shortcut
2016-07-11 14:46:41 -03:00
Paulb23
a9956be63d
Added completion font colors
2016-07-11 14:25:56 +01:00
Paulb23
8e5c40b364
Added completion scroll color
2016-07-11 14:11:34 +01:00
Rémi Verschelde
9397458cc0
Merge pull request #5634 from vnen/assetlib-map-crash
...
Fix crash on asset lib install
2016-07-11 00:17:54 +02:00
George Marques
1a1b62748a
Fix crash on asset lib install
...
This is not the perfect solution, but fixes the crash and avoid a
dependency on EditorNode.
2016-07-10 17:19:29 -03:00
Juan Linietsky
83ab4445f2
As volzhs mentioned in #5385 , changes to save to FILE_SAVE_ALL_SCENES
2016-07-10 14:37:48 -03:00
Juan Linietsky
8d9b73171e
Merge pull request #5385 from volzhs/autosave-android
...
Fix autosave when run on remote device
2016-07-10 14:34:30 -03:00
Juan Linietsky
e525a0387b
Merge pull request #5421 from MarianoGnu/issues
...
Save all edited scenes when Runing (and auto-save is enabled). Fixes #4410
2016-07-10 14:33:48 -03:00
Rémi Verschelde
da3ad66825
Remove Better Collada Exporter, now in its own repo
...
See https://github.com/godotengine/collada-exporter for the new upstream location.
2016-07-10 19:15:35 +02:00
Juan Linietsky
8462127aa9
Merge pull request #5287 from marcelofg55/master
...
Added popup menu for animation key right-click
2016-07-10 13:42:49 -03:00
Juan Linietsky
46bb02991f
Merge pull request #5270 from lonesurvivor/master
...
Added Tile Origin = Bottom Left option to the TileMap
2016-07-10 13:41:33 -03:00
Juan Linietsky
bcf6491a86
Merge pull request #5621 from TheHX/issue-5616
...
Fix custom types showing on wrong dialogs
2016-07-10 13:30:06 -03:00
Juan Linietsky
7bfb84af08
Merge pull request #5611 from TheHX/spatial-gizmo
...
Fix EditorSpatialGizmo virtual functions not being called
2016-07-10 13:08:13 -03:00
Juan Linietsky
06eef730c0
Merge pull request #5584 from TheHX/project-settings
...
Implement undo/redo for adding and deleting global properties
2016-07-10 13:04:08 -03:00
Juan Linietsky
5dd6530acf
Merge pull request #5563 from opmana/fix-convert-tileset
...
Respect frame property when converting to TileSet.
2016-07-10 13:02:55 -03:00
Juan Linietsky
eff44f0321
Merge pull request #5554 from TheHX/issue-3543
...
Added drag and drop to rearrange the autoload order
2016-07-10 12:42:47 -03:00
Franklin Sobrinho
c6a0b0dab3
Fix custom types showing on wrong dialogs
...
* The custom types are visible when the dialog is shown
2016-07-10 08:19:15 -03:00
Paulb23
5f41ea6bf8
Removed shortcut saving print
2016-07-09 19:57:38 +01:00
Juan Linietsky
864c0e84de
line/col label was changing size with each cursor move, forcing the GUI to resize upwards and costing considerably CPU usage.
...
It has been changed so it won't resize the UI when modified.
This will make the code editor feel a lot smoother.
2016-07-09 14:56:08 -03:00
Rémi Verschelde
d23d40cfbd
Merge pull request #5612 from TheHX/collision-polygon-plugin
...
Fix CollisionPolygon gizmo showing error icons instead of the 3d handles
2016-07-09 18:27:29 +02:00
Franklin Sobrinho
7cad11e108
Fix CollisionPolygon gizmo showing error icons instead of the 3d handles
2016-07-09 13:18:16 -03:00
Rémi Verschelde
48bdaaa560
Merge pull request #5609 from eska014/help-search-titles
...
Fix help search dialog titles
2016-07-09 18:15:02 +02:00
Franklin Sobrinho
914d670a71
Fix EditorSpatialGizmo virtual functions not being called
...
* Bind EditorSpatialGizmo::clear method
2016-07-09 13:10:13 -03:00
Juan Linietsky
b0f0ae0723
Finally fixes the infamous bug #4444 , hoping to never see you again.
...
Closes #4444 .
2016-07-09 12:12:03 -03:00
Juan Linietsky
90f8a3bd29
properly generate tangents only upon request, closes #5580
2016-07-09 11:53:27 -03:00
Juan Linietsky
2980b27bef
do not show help on multi node selection, array editing, etc, closes #5550
2016-07-09 11:46:59 -03:00
Juan Linietsky
15d52d6c95
Cleaned up preview generation thread, fixes #5499
2016-07-09 11:20:40 -03:00
eska
af395cea42
Fix help search dialog titles
2016-07-09 16:12:15 +02:00
Rémi Verschelde
3a70d4a072
Merge pull request #5589 from akien-mga/pr-unused-var
...
Removing some more unused vars and dead code
2016-07-09 14:33:30 +02:00
Rémi Verschelde
0e119a9164
Merge pull request #5480 from paper-pauper/blender-flake8
...
Made Better Collada Exporter flake8-compliant
2016-07-09 12:35:34 +02:00
Nobody Really
c973f3a1da
Flake8 compliance (except for unused variables)
2016-07-09 12:25:21 +02:00
Nobody Really
52fdc65a5d
Comma fix
2016-07-09 12:10:36 +02:00
Nobody Really
7de55b86c1
Whitespace fix
2016-07-09 12:00:32 +02:00
Rémi Verschelde
5a8335436f
Merge pull request #5588 from J08nY/doctool-indentation
...
Doctool: change content indentation
2016-07-08 19:11:21 +02:00
MarianoGNU
158585b21c
save the editor state of the right scene instead of current
2016-07-08 13:54:44 -03:00
MarianoGNU
2924536e90
Save all edited scenes when Runing (and auto-save is enabled). Fixes #4410
2016-07-08 13:27:52 -03:00
Rémi Verschelde
d7dd10a1a2
Cleanup: drop ImportSettingsDialog, replaced by contextual actions
...
Note that it was already commented out.
2016-07-08 17:09:36 +02:00
Rémi Verschelde
f40f360a2c
Remove unused variables (fourth pass) + dead code
...
Also fix a potential regression from 3fcb9b1ec1
.
2016-07-08 16:47:55 +02:00