projects
/
blender.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
4ed21f1
34ab90f
)
Merge branch 'blender2.8' into blender2.8-workbench
author
Jeroen Bakker <j.bakker@atmind.nl>
Mon, 16 Apr 2018 18:35:59 +0000
(20:35 +0200)
committer
Jeroen Bakker <j.bakker@atmind.nl>
Mon, 16 Apr 2018 18:35:59 +0000
(20:35 +0200)
1
2
source/blender/blenkernel/intern/scene.c
patch
|
diff1
|
diff2
|
blob
|
history
source/blender/draw/CMakeLists.txt
patch
|
diff1
|
diff2
|
blob
|
history
source/blender/draw/intern/draw_manager.c
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
source/blender/blenkernel/intern/scene.c
Simple merge
diff --cc
source/blender/draw/CMakeLists.txt
Simple merge
diff --cc
source/blender/draw/intern/draw_manager.c
Simple merge
projects / blender.git / commitdiff