test/space_text at fb4cd136a7cf94f2fda2d3a2c8fb01d73eb878cb - test

Files

Bastien Montagne 91af8f2ae2 Merge branch 'master' into blender2.8

Conflicts:
	intern/cycles/device/device.cpp
	source/blender/blenkernel/intern/library.c
	source/blender/blenkernel/intern/material.c
	source/blender/editors/object/object_add.c
	source/blender/editors/object/object_relations.c
	source/blender/editors/space_outliner/outliner_draw.c
	source/blender/editors/space_outliner/outliner_edit.c
	source/blender/editors/space_view3d/drawobject.c
	source/blender/editors/util/ed_util.c
	source/blender/windowmanager/intern/wm_files_link.c

2017-11-06 18:02:46 +01:00

CMakeLists.txt

Add PovRay syntax hilghting.

2017-05-22 22:08:02 +02:00

space_text.c

Workspace: Move engines to workspace and Properties Editor cleanup

2017-10-16 17:29:04 -02:00

text_autocomplete.c

Cleanup: style

2017-06-02 15:38:04 +10:00

text_draw.c

Cleanup/rename etc. dashed line shaders.