projects
/
blender.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
4940712
0a79de5
)
Merge branch 'blender2.8' into tmp-static-override-insertion
author
Bastien Montagne <montagne29@wanadoo.fr>
Fri, 4 May 2018 13:26:02 +0000
(15:26 +0200)
committer
Bastien Montagne <montagne29@wanadoo.fr>
Fri, 4 May 2018 13:26:02 +0000
(15:26 +0200)
1
2
source/blender/blenkernel/intern/constraint.c
patch
|
diff1
|
diff2
|
blob
|
history
source/blender/blenkernel/intern/modifier.c
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
source/blender/blenkernel/intern/constraint.c
Simple merge
diff --cc
source/blender/blenkernel/intern/modifier.c
Simple merge