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
87b2444270403b9a826f564ddf58a310dcab2324
blender-archive/source/blender
History
Bastien Montagne 87b2444270 Merge branch 'master' into blender2.8 
Conflicts:
	source/blender/collada/AnimationExporter.cpp
	source/blender/collada/AnimationExporter.h
	source/blender/collada/ArmatureImporter.cpp
	source/blender/collada/ArmatureImporter.h
	source/blender/collada/ControllerExporter.cpp
	source/blender/collada/ControllerExporter.h
	source/blender/collada/DocumentExporter.cpp
	source/blender/collada/DocumentImporter.cpp
	source/blender/collada/GeometryExporter.cpp
	source/blender/collada/GeometryExporter.h
	source/blender/collada/MeshImporter.cpp
	source/blender/collada/MeshImporter.h
	source/blender/collada/SkinInfo.cpp
	source/blender/collada/SkinInfo.h
	source/blender/collada/collada_utils.cpp
	source/blender/collada/collada_utils.h
2018-06-14 15:55:51 +02:00
..
alembic
Cleanup: Moar G.main removal of Hell.
2018-06-11 12:15:14 +02:00
avi
Fix buffer overflows in TIFF, PNG, IRIS, DPX, HDR and AVI loading.
2018-01-17 19:59:47 +01:00
blenfont
Merge branch 'master' into blender2.8
2018-06-08 08:10:35 +02:00
blenkernel
T55406: Flip Matcap
2018-06-14 11:44:36 +02:00
blenlib
Math: Remove unused functions which are not safe for threading
2018-06-12 15:51:43 +02:00
blenloader
Merge branch 'master' into blender2.8
2018-06-13 16:42:56 +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-13 16:42:56 +02:00
collada
Merge branch 'master' into blender2.8
2018-06-14 15:55:51 +02:00
compositor
Merge branch 'master' into blender2.8
2018-06-11 16:02:46 +02:00
datatoc
Cleanup: trailing space
2018-06-08 08:07:48 +02:00
depsgraph
Depsgraph: Avoid use of 0 tag flag on build finish
2018-06-13 09:49:14 +02:00
draw
GPU: consistenly use mipmap on/off in all draw modes.
2018-06-14 15:50:22 +02:00
editors
T55479: Tag for update when active texture changes
2018-06-14 15:30:06 +02:00
freestyle
Depsgraph iterator: Remove explicit mode
2018-06-06 16:44:51 +02:00
gpu
GPU: consistenly use mipmap on/off in all draw modes.
2018-06-14 15:50:22 +02:00
ikplugin
Merge branch 'master' into blender2.8
2018-06-08 08:10:35 +02:00
imbuf
Merge branch 'master' into blender2.8
2018-06-01 18:26:42 +02:00
makesdna
Merge branch 'master' into blender2.8
2018-06-14 12:39:52 +02:00
makesrna
Merge branch 'master' into blender2.8
2018-06-14 12:39:52 +02:00
modifiers
Merge branch 'master' into blender2.8
2018-06-14 12:39:52 +02:00
nodes
Fix merge error in 908b696, removed files were accidentally added back.
2018-06-11 17:06:28 +02:00
physics
Merge branch 'master' into blender2.8
2018-06-08 08:10:35 +02:00
python
Merge branch 'master' into blender2.8
2018-06-13 16:42:56 +02:00
render
Merge branch 'master' into blender2.8
2018-06-13 11:02:48 +02:00
windowmanager
Fix crash on startup in after recent G.main changes.
2018-06-14 13:45:15 +02:00
CMakeLists.txt
Removing Blender Game Engine from Blender 2.8
2018-04-17 17:51:28 +02:00