Blender Git Commits

Cleanup: comments (long lines) in editors

Fix error renaming Lamp to Light

Introduced in batch rename 3051e2f4ae8fd3e72a4.

Fix T63698: Eevee crash after recent clang-format changes

Some GLSL compilers seem to not have problems with to break preprocessor
directives. I couldn't find other places with similar code, but fixing this
case by case is not ideal and the same issue may come up again.

Cleanup: comments (mainly long lines)

Comments after code can cause awkward line breaks.

Merge branch 'blender2.7'

Fix T62408: Cycles viewport adaptive subdivision hangs after updates

Backporting fix from the master branch.

Fix T63431: crash adding driver to a keyframed property with Ctrl+D

Fix T63415: no Cycles displacement update when updating OSL code

Fix T63681: bad clipping of very long tooltips

Fix T63686: missing data path for 3D cursor location and rotation.

Fix T63764: error when using library.users_id() function

Fix suggested by Vilem Duha.

make.bat: remove --expand-tabs from "make format" on windows.

following the change on linux.

Correct error in last commit

UI: remove redundant row for header template

If it's members need to be aligned the template can handle it.

Cleanup: add missing macros to clang-format

GNUMakefile: disable tab expansion for 'make format'

This was only needed for initial migration.

UI Overlays: Align checkbox with slider for Wireframes, X-Ray, Shadows.

UI Overlays: One line layout for Mask opacity.

Saves one line of space and matches Wireframe, X-Ray, Shadows.

Fix invalid stack memory use with GPencil drawing

Fix error in recent image preference change