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.

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

..

__init__.py

Multi-View: Cycles - Spherical Stereo support (VR Panoramas)

2016-03-10 09:28:29 -03:00

engine.py

Cleanup: unused vars, imports, pep8

2016-08-01 11:55:06 +10:00

osl.py

Fix python error when OSL file has wrong extension.

2016-08-05 01:00:41 +02:00

presets.py

Cleanup: Fix Cycles Apache header.

2014-12-25 02:50:24 +01:00

properties.py

Merge branch 'master' into blender2.8

2016-09-23 01:40:19 +02:00

ui.py

Merge branch 'master' into blender2.8

2016-08-10 15:06:40 +02:00

version_update.py

Cleanup: unused vars, imports, pep8

2016-08-01 11:55:06 +10:00