Blender Git Commits

Merge branch 'master' into userpref_redesign

Fix merge errors and whitespace cleanup

Fix "Show Preferences" shortcut not working

Was broken in 2.7 keymap.

Also whitespace cleanup.

Avoid panel content margins in small regions

Don't see a need for changes in the layout system here, a simple trick
like I've done here is sufficient.
Also: Some refactoring of the `PreferencePanel` class.

Fixed hidden multi-thread error.

Another round of tweaks to new Preferences

- Removed doubled Cycles Compute Device text
- Moved header placement into menus panel
- Moved Text panel & rna to Interface
- Moved OpenGL Texture panel inside OpenGL panel
- Moved Color Picker Type to from System>Misc to Interface>Menus (eventually it'd be nice to include this option inside the color pickers themselves to make it more useful and discoverable)
- Combined all memory-related preferences (Undo + Console Scrollback + Sequencer Cache) in a Memory panel in System section (avoids needing previous Misc panel)
- Added correct greying out to Files > Auto Run Python Scripts panel
- Added flow layout to Save & Load checkboxes
- Rejiggered some of the Texture preferences to make more logical sense together
- A few other minor adjustments

Merge branch 'master' into userpref_redesign

Fix triangle-point test function for a stupid condition. See comment.

make rendering into a loop to avoid callback stack overflow.

remove INVOKE_DEFAULT for rendering, otherwise still cause trouble on windows.

Fix scripts from external editings.

Added one click composition to LANPR.

GP: fix error after merge

Merge branch 'master' into greasepencil-object

GP: Fix error when merge 1 stroke only

Merge branch 'master' into soc-2018-npr

GP: More cleanup and renames

GP: Remove unused variable

GP: Mew Merge Strokes operator

This operator allows to create a new stroke joining several stroke selected points of different strokes.

The new stroke will use the current material.

To use, first select the points to be merged. Optionally can remove the old points and strokes.

The operator is available in Edit mode in the Specials menu and Stroke menu.

Merge branch 'master' into greasepencil-object