griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
Files
ccef83b2fb7aeb0653bcc13cfc49dac421ac88c8
test2/source/blender
History
Philipp Oeser ccef83b2fb Merge branch 'master' into blender2.8 
Conflicts:
source/blender/editors/screen/screen_edit.c
2018-07-06 12:30:48 +02:00
..
alembic
Merge branch 'master' into blender2.8
2018-07-01 20:15:21 +02:00
avi
Cleanup: trailing newlines
2018-06-29 09:23:51 +02:00
blenfont
Cleanup: code style
2018-06-25 12:06:51 +02:00
blenkernel
Merge branch 'master' into 28
2018-07-06 10:10:47 +02:00
blenlib
Merge branch 'master' into blender2.8
2018-06-29 08:05:38 +02:00
blenloader
Addons: silence warnings instead of disabling
2018-07-06 11:03:24 +02:00
blentranslation
Merge branch 'master' into blender2.8
2018-06-01 18:26:42 +02:00
bmesh
Merge branch 'master' into blender2.8
2018-06-30 10:32:55 +02:00
collada
Merge branch 'master' into blender2.8
2018-06-29 08:05:38 +02:00
compositor
Merge branch 'master' into blender2.8
2018-07-05 22:50:07 +02:00
datatoc
Cleanup: pep8
2018-07-03 07:13:27 +02:00
depsgraph
Depsgraph: Preserve engine data when doing object copy on write update
2018-07-05 16:56:47 +02:00
draw
Cleanup: flag checks
2018-07-05 22:56:18 +02:00
editors
Merge branch 'master' into blender2.8
2018-07-06 12:30:48 +02:00
freestyle
Merge branch 'master' into blender2.8
2018-06-25 12:50:32 +02:00
gpu
GPU: avoid unnecessary multiple nodetree localize and output finding.
2018-07-05 17:51:58 +02:00
ikplugin
Merge branch 'master' into blender2.8
2018-06-29 08:05:38 +02:00
imbuf
Merge branch 'master' into blender2.8
2018-06-29 09:25:40 +02:00
makesdna
Draw Manager: simplify object mask usage
2018-07-05 20:43:50 +02:00
makesrna
Cleanup: flag checks
2018-07-05 22:56:18 +02:00
modifiers
Cleanup: warning
2018-07-05 12:32:31 +02:00
nodes
Shaders: add target setting to material output node.
2018-07-05 18:43:48 +02:00
physics
Depsgraph: cache collision relations, for performance and stability.
2018-06-25 13:35:41 +02:00
python
Merge branch 'master' into blender2.8
2018-07-03 06:58:34 +02:00
render
GHOST: Fix assert and rebind previous ogl context.
2018-07-03 13:36:04 +02:00
windowmanager
Merge branch 'master' into blender2.8
2018-07-06 12:30:48 +02:00
CMakeLists.txt
Removing Blender Game Engine from Blender 2.8
2018-04-17 17:51:28 +02:00