Bastien Montagne e97237892c Merge branch 'master' into blender2.8 ...

Conflicts:
	source/blender/editors/sculpt_paint/paint_image.c
	source/blender/editors/space_view3d/view3d_draw.c
	source/blender/editors/space_view3d/view3d_view.c
	source/blender/gpu/GPU_draw.h
	source/blender/gpu/GPU_material.h
	source/blender/gpu/intern/gpu_draw.c
	source/blender/gpu/intern/gpu_material.c
	source/blender/makesrna/intern/rna_userdef.c
	source/blender/windowmanager/intern/wm_files_link.c
	source/blender/windowmanager/intern/wm_init_exit.c
	source/creator/creator_args.c
	source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
	source/gameengine/Ketsji/KX_PythonInit.cpp
	source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp

2018-06-25 12:50:32 +02:00

..

composite

Merge branch 'master' into blender2.8

2018-06-25 12:50:32 +02:00

intern

Merge branch 'master' into blender2.8

2018-06-25 12:50:32 +02:00

shader

Merge branch 'master' into blender2.8

2018-06-25 07:43:51 +02:00

texture

Merge branch 'master' into blender2.8

2018-06-11 16:02:46 +02:00

CMakeLists.txt

Merge branch 'master' into blender2.8

2018-05-27 11:06:29 +02:00

NOD_common.h

correct include guards and add checks in check_style_c.py for them.

2013-09-19 23:17:52 +00:00

NOD_composite.h

Rename any instance of scene layer or render layer in code with view layer

2017-11-23 07:48:23 -02:00

NOD_shader.h

Merge branch 'master' into blender2.8

2018-05-27 11:06:29 +02:00

NOD_socket.h

Merge branch 'master' into blender2.8

2018-06-01 18:26:42 +02:00

NOD_static_types.h

Merge branch 'master' into blender2.8

2018-06-15 23:16:49 +02:00

NOD_texture.h

Removed some unused old function declarations for loop node register, awkward that this is still there ...

2013-09-02 10:34:27 +00:00