Julian Eisel 42ed1f0e3c Merge branch 'master' into blender2.8 ...

Conflicts:
	source/blender/blenloader/intern/writefile.c

2016-09-30 01:18:41 +02:00

..

CMakeLists.txt

Viewport smoke: fix a couple of issues in the new display settings.

2016-09-25 17:02:46 +02:00

drawanimviz.c

Flat shading for basic shader

2016-06-10 05:38:17 +10:00

drawarmature.c

Flat shading for basic shader

2016-06-10 05:38:17 +10:00

drawmesh.c

Fix T48788: Diffuse color in BI Textured Solid mode is not updating properly in Sculpting mode

2016-08-25 13:48:23 +02:00

drawobject.c

OpenGL: draw nurbs control verts with new imm mode

2016-09-29 15:23:13 -04:00

drawsimdebug.c

OpenGL: fixes related to GL_POINTS

2016-01-15 23:51:29 -05:00

drawvolume.c

Merge branch 'master' into blender2.8

2016-09-26 17:19:03 +02:00

space_view3d.c

Merge branch 'master' into blender2.8

2016-07-28 12:00:58 +10:00

view3d_buttons.c

UI: Correct tooltips for properties region toggle OP

2016-08-04 00:26:49 +02:00

view3d_camera_control.c

Docs: doxy corrections

2015-07-31 23:44:37 +10:00

view3d_draw.c

OpenGL: draw_view_axis with new immediate mode

2016-09-17 15:52:32 +02:00

view3d_edit.c

Merge branch 'master' into blender2.8

2016-08-21 13:18:26 +02:00

view3d_fly.c

immediate mode refactor: fly navigation square

2016-09-20 14:47:14 +00:00

view3d_header.c

Removed remaining uses of the particle edit mode flag.

2016-04-16 12:39:41 +02:00

view3d_intern.h

Merge branch 'master' into blender2.8

2016-09-26 17:19:03 +02:00

view3d_iterators.c

Code cleanup: remove unused includes

2014-05-01 04:47:51 +10:00

view3d_ops.c

NDOF: compile 3D mouse code only if WITH_INPUT_NDOF

2016-08-18 00:22:18 -04:00

view3d_project.c

Cleanup: comment blocks

2016-07-15 02:39:45 +10:00

view3d_ruler.c

GPencil: Replace strcpy by BLI_strncpy

2016-08-29 21:57:08 +02:00

view3d_select.c

Merge branch 'master' into blender2.8

2016-09-04 16:41:06 +02:00

view3d_snap.c

Correct error in snap commit

2016-07-15 18:40:16 +10:00

view3d_toolbar.c

UI: Add search-create callback

2016-03-02 13:57:16 +11:00

view3d_view.c

Fix missing properties editor update when changing 3D View camera

2016-09-28 00:53:59 +02:00

view3d_walk.c

immediate mode refactor: walk navigation cross

2016-09-20 14:50:24 +00:00