projects
/
blender.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
a04c29e
717d85f
)
Merge branch 'master' into blender2.8
author
Sergey Sharybin <sergey.vfx@gmail.com>
Mon, 8 May 2017 15:44:17 +0000
(17:44 +0200)
committer
Sergey Sharybin <sergey.vfx@gmail.com>
Mon, 8 May 2017 15:44:17 +0000
(17:44 +0200)
1
2
source/blender/editors/render/render_internal.c
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
source/blender/editors/render/render_internal.c
Simple merge