archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity
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
45f3150c98443261a1afb6782133053b35a45ce2
blender-archive/source/blender
History
Bastien Montagne 45f3150c98 Merge branch 'master' into blender2.8 
Conflicts:
	source/blender/editors/space_view3d/drawobject.c
2017-04-10 17:34:31 +02:00
..
alembic
Merge branch 'master' into blender2.8
2017-04-07 17:28:22 +02:00
avi
Remove SCons building system
2016-01-04 14:20:48 +05:00
blenfont
Make build with GL 3.3 again
2017-04-10 12:21:13 +02:00
blenkernel
Merge branch 'master' into blender2.8
2017-04-10 16:53:12 +02:00
blenlib
Merge branch 'master' into blender2.8
2017-04-09 16:09:12 +10:00
blenloader
Depsgraph: Remove old depsgraph header from blenloader
2017-04-06 16:13:57 +02:00
blentranslation
Revert particle system and point cache removal in blender2.8 branch.
2016-12-28 17:30:58 +01:00
bmesh
Merge branch 'master' into blender2.8
2017-04-07 17:28:22 +02:00
collada
Depsgraph: Remove old depsgraph header from collada
2017-04-06 16:17:21 +02:00
compositor
Fix T50849: Transparent background produces artifacts in this compositing setup
2017-03-08 15:56:50 +01:00
datatoc
Fix compilation error on recent Debian desktop
2016-12-05 11:35:26 +01:00
depsgraph
Depsgraph: Remove olde depsgraph header from new depsgraph
2017-04-06 16:18:42 +02:00
draw
OpenGL: Fix textureXd deprecated calls.
2017-04-10 16:59:20 +02:00
editors
Merge branch 'master' into blender2.8
2017-04-10 17:34:31 +02:00
freestyle
Depsgraph: Remove old depsgraph header from freestyle
2017-04-06 16:32:59 +02:00
gpu
OpenGL: Fix textureXd deprecated calls.
2017-04-10 16:59:20 +02:00
ikplugin
Depsgraph: Fix frash with iTaSC solver
2016-11-15 16:18:59 +01:00
imbuf
Fix a few compiler warnings with macOS / clang.
2017-02-18 23:59:34 +01:00
makesdna
Changes from custom-manipulators branch
2017-04-06 22:10:09 +10:00
makesrna
Depsgraph: More type definitions to new depsgraph header
2017-04-06 15:37:46 +02:00
modifiers
Merge branch 'master' into blender2.8
2017-04-07 17:28:22 +02:00
nodes
GPULamp: Separate GPULamp from GPUMaterial
2017-04-03 21:52:03 +02:00
physics
Cloth refactor: Remove goal springs and some other cleanup
2017-03-23 03:52:46 -03:00
python
Merge branch 'master' into blender2.8
2017-04-10 16:53:12 +02:00
quicktime
Cleanup: comment blocks
2016-07-15 02:39:45 +10:00
render
Depsgraph: Remove old depsgraph header from blender internal
2017-04-06 16:38:43 +02:00
windowmanager
OpenGL: use PRIM instead of GL enum everywhere else
2017-04-08 01:19:48 -04:00
CMakeLists.txt
Changes from custom-manipulators branch
2017-04-06 22:10:09 +10:00