Sybren A. Stüvel 3bca9f5fed Merge branch 'master' into blender2.8 ...

# Conflicts:
#	source/blender/makesrna/intern/rna_render.c

2017-08-15 13:02:45 +02:00

..

addon

Merge branch 'master' into blender2.8

2017-08-15 13:02:45 +02:00

blender_camera.cpp

Cycles: Fixed broken camera motion blur when motion was not set to center on frame

2017-08-14 20:24:30 +02:00

blender_curves.cpp

Pass EvaluationContext argument everywhere

2017-07-21 14:47:26 +02:00

blender_logging.cpp

Cycles: Make all #include statements relative to cycles source directory

2017-03-29 13:41:11 +02:00

blender_mesh.cpp

Pass EvaluationContext argument everywhere

2017-07-21 14:47:26 +02:00

blender_object_cull.cpp

Cycles: Make all #include statements relative to cycles source directory

2017-03-29 13:41:11 +02:00

blender_object_cull.h

Cycles: Make all #include statements relative to cycles source directory

2017-03-29 13:41:11 +02:00

blender_object.cpp

Merge branch 'master' into blender2.8

2017-08-11 10:33:39 +10:00

blender_particles.cpp

Cycles: Make all #include statements relative to cycles source directory

2017-03-29 13:41:11 +02:00

blender_python.cpp

Merge branch 'master' into blender2.8

2017-07-06 12:21:21 +02:00

blender_session.cpp

Pass EvaluationContext argument everywhere

2017-07-21 14:47:26 +02:00

blender_session.h

Pass EvaluationContext argument everywhere

2017-07-21 14:47:26 +02:00

blender_shader.cpp

Render: make Cycles and Evee support each other's output material nodes.

2017-08-01 19:13:41 +02:00

blender_sync.cpp

Merge branch 'master' into blender2.8

2017-08-15 13:02:45 +02:00

blender_sync.h

Pass EvaluationContext argument everywhere

2017-07-21 14:47:26 +02:00

blender_texture.cpp

Pass EvaluationContext argument everywhere

2017-07-21 14:47:26 +02:00

blender_texture.h

Pass EvaluationContext argument everywhere

2017-07-21 14:47:26 +02:00

blender_util.h

Pass EvaluationContext argument everywhere

2017-07-21 14:47:26 +02:00

CCL_api.h

Cycles: Refactor Device selection to allow individual GPU compute device selection

2016-11-07 03:19:29 +01:00

CMakeLists.txt

Cycles: Make all #include statements relative to cycles source directory

2017-03-29 13:41:11 +02:00