Sybren A. Stüvel 063bae4fcc Merge branch 'master' into blender2.8 ...

# Conflicts:
#	source/blender/alembic/intern/abc_exporter.h
#	source/blender/alembic/intern/abc_util.cc

2017-04-07 17:28:22 +02:00

..

addon

Merge branch 'master' into blender2.8

2017-03-29 20:20:53 +11:00

blender_camera.cpp

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

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

blender_curves.cpp

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

2017-03-29 13:41:11 +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

Cycles: Fix access of NULL pointer as array

2017-04-07 15:08:00 +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

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

2017-03-29 13:41:11 +02: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

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

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

blender_session.cpp

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

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

blender_session.h

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

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

blender_shader.cpp

Cycles: Tag shaders for update after the threading part is over

2017-04-04 15:43:12 +02:00

blender_sync.cpp

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

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

blender_sync.h

Cycles: Tag shaders for update after the threading part is over

2017-04-04 15:43:12 +02:00

blender_texture.cpp

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

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

blender_texture.h

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

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

blender_util.h

Cycles: Fix uninitialized memory access when comparing curve mapping nodes

2017-04-04 15:43:12 +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