projects
/
blender.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
f24103d
f1c78ec
)
Merge branch 'master' into blender2.8
author
Sergey Sharybin <sergey.vfx@gmail.com>
Fri, 3 Nov 2017 15:17:01 +0000
(16:17 +0100)
committer
Sergey Sharybin <sergey.vfx@gmail.com>
Fri, 3 Nov 2017 15:17:01 +0000
(16:17 +0100)
1
2
source/blender/makesrna/intern/rna_scene_api.c
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
source/blender/makesrna/intern/rna_scene_api.c
Simple merge
projects / blender.git / commitdiff