blender-archive

Archived

This repository has been archived on 2023-10-09. You can view files and clone it, but cannot push or open issues or pull requests.

Files

History

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

intern

Merge branch 'master' into blender2.8

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

shaders

UI: adjust menu triangle

2018-06-20 21:34:27 +02:00

CMakeLists.txt

Cleanup: codestyle

2018-06-17 12:03:22 +02:00

GPU_basic_shader.h

OpenGL: remove non-GLSL option from basic shader