tmaq
/
tornavis
1
0
Fork 0
Code Issues 2 Pull Requests 29 Packages Projects 24 Releases Wiki Activity
tornavis/source/blender/freestyle
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
CMakeLists.txt Rename any instance of scene layer or render layer in code with view layer 2017-11-23 07:48:23 -02:00
FRS_freestyle.h Rename any instance of scene layer or render layer in code with view layer 2017-11-23 07:48:23 -02:00