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. You cannot open issues or pull requests or push a commit.
Files
322b1d3187fc5b3e82ebf8b13a675e3132059ef4
blender-archive/source/blender
History
Bastien Montagne 322b1d3187 Merge branch 'master' into blender2.8 
Conflicts:
	source/blender/editors/animation/anim_draw.c
2017-02-17 20:03:55 +01:00
..
alembic
Merge branch 'master' into blender2.8
2017-02-17 20:03:55 +01:00
avi
Remove SCons building system
2016-01-04 14:20:48 +05:00
blenfont
OpenGL immediate mode: fix Waveform Font color
2017-02-11 00:39:17 +01:00
blenkernel
Merge branch 'master' into blender2.8
2017-02-17 20:03:55 +01:00
blenlib
Merge branch 'master' into blender2.8
2017-02-17 20:03:55 +01:00
blenloader
Merge branch 'master' into blender2.8
2017-02-17 20:03:55 +01: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-02-02 21:50:12 +01:00
collada
Fix broken COLLADA building.
2017-02-07 12:05:23 +01:00
compositor
Silence unused var warnings after rBac58a7fa
2017-01-31 11:00:50 +01:00
datatoc
Fix compilation error on recent Debian desktop
2016-12-05 11:35:26 +01:00
depsgraph
Layer Macros: create the instance as part of the macro
2017-02-14 18:21:46 +01:00
draw
Follow up on mode engine code separation
2017-02-17 17:54:04 +01:00
editors
Merge branch 'master' into blender2.8
2017-02-17 20:03:55 +01:00
freestyle
Render Layers and Collections (merge from render-layers)
2017-02-07 11:11:00 +01:00
gpu
Clay Engine: Separate mode drawing to different files/engines.
2017-02-17 17:30:15 +01:00
ikplugin
Depsgraph: Fix frash with iTaSC solver
2016-11-15 16:18:59 +01:00
imbuf
Cleanup: Use const qualifier in some of color management code
2017-02-07 17:49:54 +01:00
makesdna
Merge branch 'master' into blender2.8
2017-02-17 20:03:55 +01:00
makesrna
Merge branch 'master' into blender2.8
2017-02-17 20:03:55 +01:00
modifiers
Sorted BaseLegacy > Base convertions
2017-02-14 18:21:47 +01:00
nodes
Compositor: Make HSV node inputs a real sockets
2017-01-26 15:20:13 +01:00
physics
API: Fix Links
2016-10-25 17:34:01 +02:00
python
Revert "Collection Editor based on patch by Julian Eisel"
2017-02-15 18:17:34 +01:00
quicktime
Cleanup: comment blocks
2016-07-15 02:39:45 +10:00
render
Bring rendering back (update all references to SETLOPPER)
2017-02-15 14:40:56 +01:00
windowmanager
Revert "Collection Editor based on patch by Julian Eisel"
2017-02-15 18:17:34 +01:00
CMakeLists.txt
Clay-Engine (merge clay-engine)
2017-02-07 11:31:22 +01:00