tornavis/source/blender
Germano 790025c01e Merge branch 'master' into blender2.8
# Conflicts:
#	intern/cycles/blender/blender_mesh.cpp
#	source/blender/editors/screen/screen_ops.c
#	source/blender/editors/space_view3d/drawobject.c
2018-01-21 18:45:47 -02:00
..
alembic Merge branch 'master' into blender2.8 2018-01-16 16:40:05 +01:00
avi Fix buffer overflows in TIFF, PNG, IRIS, DPX, HDR and AVI loading. 2018-01-17 19:59:47 +01:00
blenfont Fix assert failure when trying to draw empty string 2017-11-10 16:29:57 +01:00
blenkernel Merge branch 'master' into blender2.8 2018-01-21 18:45:47 -02:00
blenlib Merge branch 'master' into blender2.8 2018-01-21 18:45:47 -02:00
blenloader Outliner: Remove User Preferences 2018-01-19 16:06:14 -02:00
blentranslation Merge branch 'master' into blender2.8 2017-11-19 13:16:14 +01:00
bmesh Merge branch 'master' into blender2.8 2018-01-19 17:21:15 +11:00
collada Merge branch 'master' into blender2.8 2018-01-16 14:56:03 +11:00
compositor Merge branch 'master' into blender2.8 2018-01-16 14:56:03 +11:00
datatoc Cleanup: use static vars where appropriate 2017-08-01 09:06:34 +10:00
depsgraph Merge branch 'master' into blender2.8 2018-01-19 21:47:57 +11:00
draw Correct view3d_draw_bgpic_test declaration 2018-01-19 23:11:57 +11:00
editors Merge branch 'master' into blender2.8 2018-01-21 18:45:47 -02:00
freestyle Merge branch 'master' into blender2.8 2017-12-07 23:53:03 +11:00
gpu GPU_batch: Add GPU_batch_wire_from_poly_2d_encoded 2018-01-20 18:45:27 +11:00
ikplugin Pass EvaluationContext instead of bContext 2017-08-16 12:46:04 +10:00
imbuf Merge branch 'master' into blender2.8 2018-01-21 18:45:47 -02:00
makesdna Outliner: Remove User Preferences 2018-01-19 16:06:14 -02:00
makesrna Outliner: Remove User Preferences 2018-01-19 16:06:14 -02:00
modifiers Merge branch 'master' into blender2.8 2018-01-18 01:01:17 +01:00
nodes Merge branch 'master' into blender2.8 2018-01-21 18:45:47 -02:00
physics Fix compilation error with clang-5 2017-11-14 17:11:48 +01:00
python Merge branch 'master' into blender2.8 2018-01-19 17:21:15 +11:00
render Merge branch 'master' into blender2.8 2018-01-16 14:56:03 +11:00
windowmanager Merge branch 'master' into blender2.8 2018-01-19 21:47:57 +11:00
CMakeLists.txt Merge branch 'master' into blender2.8 2017-09-25 18:57:43 +05:00