archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity
This repository has been archived on 2023-10-09. You can view files and clone it. You cannot open issues or pull requests or push a commit.
Files
c50ccc847613bbe02bea64cee3f744b449da170c
blender-archive/intern/cycles/blender/blender_sync.cpp
Julian Eisel 1dfb89d229 Merge branch 'master' into blender2.8 
Conflicts:
	intern/ghost/intern/GHOST_ContextCGL.mm
	intern/ghost/intern/GHOST_WindowCocoa.mm
	source/blender/makesrna/intern/rna_main.c
2016-09-23 01:40:19 +02:00

20 KiB
Raw Blame History

View Raw
View Git Blame Copy Permalink