Julian Eisel 1dfb89d229 Merge branch 'master' into blender2.8 ...

Conflicts:
	intern/ghost/intern/GHOST_ContextCGL.mm
	intern/ghost/intern/GHOST_WindowCocoa.mm
	source/blender/makesrna/intern/rna_main.c

2016-09-23 01:40:19 +02:00

..

CMakeLists.txt

New uialign code, based on 2D positions of widgets.

2015-11-06 18:54:33 +01:00

interface_align.c

cleanup: spelling / typos

2016-01-28 00:30:50 -05:00

interface_anim.c

UI: Make button driver and keying set shortcuts configurable

2016-09-21 20:09:37 +02:00

interface_draw.c

Merge branch 'master' into blender2.8

2016-09-23 01:40:19 +02:00

interface_eyedropper.c

UI: Make eyedropper shortcut configurable

2016-09-21 22:20:24 +02:00

interface_handlers.c

UI: Make eyedropper shortcut configurable

2016-09-21 22:20:24 +02:00

interface_icons.c

OpenGL: don't poll for errors, rely on KHR_debug

2016-08-19 00:52:52 -04:00

interface_intern.h

UI: Make button driver and keying set shortcuts configurable

2016-09-21 20:09:37 +02:00

interface_layout.c

Various cleanups related to button locking

2016-09-19 02:41:10 +02:00

interface_ops.c

UI: Make eyedropper shortcut configurable

2016-09-21 22:20:24 +02:00

interface_panel.c

UI: Ctrl+Tab and Ctrl+Shift+Tab to cycle through space context "tabs"

2016-09-05 17:28:41 +02:00

interface_regions.c

RNA/UI: Allow displaying in tooltip why RNA property isn't editable

2016-09-22 00:10:53 +02:00

interface_style.c

Fix T48753: VSE must restart for international fonts

2016-06-28 16:25:49 +10:00

interface_templates.c

Merge branch 'master' into blender2.8

2016-09-23 01:40:19 +02:00

interface_utils.c

Refactor translation code out of blenfont

2015-08-18 07:01:26 +10:00

interface_widgets.c

Quiet warning with -Wformat-signedness

2016-09-20 14:23:15 +02:00

interface.c

RNA/UI: Allow displaying in tooltip why RNA property isn't editable

2016-09-22 00:10:53 +02:00

resources.c

UI: Theme options for vertex/edge bevel weight colors

2016-09-21 23:16:38 +02:00

view2d_ops.c

Cleanup: ifdef function which is only used from ifdef-ed code

2016-08-18 10:36:06 +02:00

view2d.c

Cleanup: Duplicated function

2016-02-29 15:20:09 +01:00