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

..

addon

Merge branch 'master' into blender2.8

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

blender_camera.cpp

Code refactor: nodify Cycles camera and fix some mistakes in XML node read.

2016-05-28 14:07:19 +02:00

blender_curves.cpp

Merge branch 'master' into blender2.8

2016-06-01 14:34:11 +02:00

blender_logging.cpp

Cycles: Fully support WITH_CYCLES_LOGGING option

2015-01-01 01:31:07 +05:00

blender_mesh.cpp

Fix T49245: Adaptive Subdivision with Auto Smooth causes weird mesh appearance

2016-09-18 13:22:54 -04:00

blender_object.cpp

Merge branch 'master' into blender2.8

2016-09-16 17:09:28 +02:00

blender_python.cpp

Cycles: Make CUDA adaptive feature compile a Debug flag.

2016-05-06 23:13:33 +02:00

blender_session.cpp

Cycles: Replace object index hack with actual checks for SD_TRANSFORM_APPLIED

2016-09-11 13:49:05 -04:00

blender_session.h

Cycles: Resumable render implementation for Cycles

2016-03-30 16:02:27 +02:00

blender_shader.cpp

Cycles microdisplacement: Move displacement options from mesh to material settings

2016-08-07 14:15:20 -04:00

blender_sync.cpp

Merge branch 'master' into blender2.8

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

blender_sync.h

Merge branch 'master' into blender2.8

2016-07-25 15:07:17 +02:00

blender_texture.cpp

Cycles: Pass Blender's C++ RNA structures by reference

2016-01-30 15:08:57 +01:00

blender_texture.h

Cycles: Pass Blender's C++ RNA structures by reference

2016-01-30 15:08:57 +01:00

blender_util.h

Merge branch 'master' into blender2.8

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

CCL_api.h

Cleanup: Fix Cycles Apache header.

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

CMakeLists.txt

Merge branch 'master' into blender2.8

2016-05-24 16:48:10 +02:00