projects
/
blender.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
6ef5b42
6617818
)
Merge branch 'master' into blender2.8
author
Sergey Sharybin <sergey.vfx@gmail.com>
Mon, 16 Apr 2018 08:19:03 +0000
(10:19 +0200)
committer
Sergey Sharybin <sergey.vfx@gmail.com>
Mon, 16 Apr 2018 08:19:03 +0000
(10:19 +0200)
1
2
source/blender/blenkernel/intern/icons.c
patch
|
diff1
|
diff2
|
blob
|
history
source/blender/blenlib/CMakeLists.txt
patch
|
diff1
|
diff2
|
blob
|
history
tests/gtests/blenlib/CMakeLists.txt
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
source/blender/blenkernel/intern/icons.c
Simple merge
diff --cc
source/blender/blenlib/CMakeLists.txt
index 5bcf4303a841563bc1a273f1d108d5b5dcad1ff1,f8fc2bfdcff515be9a3f9f16047861c3e66e1e2a..80a8ef96eb3bb10e0f21ddc188e1c38e5ca0166d
---
1
/
source/blender/blenlib/CMakeLists.txt
---
2
/
source/blender/blenlib/CMakeLists.txt
+++ b/
source/blender/blenlib/CMakeLists.txt
@@@
-50,8
-50,8
+50,9
@@@
set(SR
intern/BLI_kdopbvh.c
intern/BLI_kdtree.c
intern/BLI_linklist.c
+ intern/BLI_linklist_lockfree.c
intern/BLI_memarena.c
+ intern/BLI_memiter.c
intern/BLI_mempool.c
intern/DLRB_tree.c
intern/array_store.c
diff --cc
tests/gtests/blenlib/CMakeLists.txt
Simple merge