Bastien Montagne 1f46da922a Merge branch 'master' into blender2.8 ...

Conflicts:
	source/blender/blenloader/intern/versioning_270.c
	source/blender/depsgraph/intern/depsgraph_tag.cc
	source/blender/editors/mask/mask_draw.c

2017-05-19 09:36:14 +02:00

..

bake_api.c

Fix T49393: Baking ignores backfaces

2016-09-21 10:39:54 +00:00

bake.c

Cleanup: use bool

2016-04-12 11:26:06 +10:00

convertblender.c

Depsgraph: Remove old depsgraph header from blender internal

2017-04-06 16:38:43 +02:00

envmap.c

Merge branch 'master' into blender2.8

2017-05-19 09:36:14 +02:00

external_engine.c

Merge branch 'master' into 28

2017-05-11 07:42:35 +10:00

imagetexture.c

Simplify checker mapping in BI when both Odd and Even are disabled

2016-01-08 13:20:34 +05:00

initrender.c

Cycles: Use depsgraph instead of layers

2017-04-25 18:03:13 +02:00

multires_bake.c

Depsgraph: Remove old depsgraph header from blender internal

2017-04-06 16:38:43 +02:00

occlusion.c

Split interp_weights_face_v3 into specific functions for tris and quads

2017-01-11 17:55:13 -02:00

pipeline.c

Merge branch 'master' into blender2.8

2017-05-03 18:33:02 +02:00

pixelblending.c

Render border: make it work together with with cache result / save buffers / full sample.

2016-07-05 21:59:02 +02:00

pixelshading.c

Fix T47753: World equirectangular regression

2016-03-11 20:36:59 +11:00

pointdensity.c

Fix T49936: Cycles point density get's it's bounding box from basis shape key

2017-02-28 12:41:56 +01:00

rayshade.c

Bump maximum threads number to 1024

2016-07-15 16:47:30 +02:00

render_result.c

Render API/Cycles: Identify Render Passes by their name instead of a type flag

2017-05-03 16:44:52 +02:00

render_texture.c

Fix threading conflicts in multitex_ext_safe()

2017-03-31 17:08:18 +02:00

rendercore.c

Render API/Cycles: Identify Render Passes by their name instead of a type flag

2017-05-03 16:44:52 +02:00

renderdatabase.c

Revert "Object Info node support for GLSL mode and the internal render"

2017-04-18 16:29:42 +02:00

shadbuf.c

Cleanup: shadowing (render)

2015-11-23 17:40:10 +11:00

shadeinput.c

Revert particle system and point cache removal in blender2.8 branch.

2016-12-28 17:30:58 +01:00

shadeoutput.c

Revert "Object Info node support for GLSL mode and the internal render"

2017-04-18 16:29:42 +02:00

sss.c

Cleanup: comment blocks

2016-07-15 02:39:45 +10:00

strand.c

Cleanup: unused headers

2014-11-28 22:16:14 +01:00

sunsky.c

Compiler warning: double-promotion

2015-02-01 01:17:21 +11:00

texture_ocean.c

Cleanup: use bool /w flag checks

2015-04-21 01:50:20 +10:00

volume_precache.c

Task scheduler: Remove counter of done tasks

2017-03-01 12:45:51 +01:00

volumetric.c

Cleanup: unnecessary comma use

2016-03-05 09:12:07 +11:00

voxeldata.c

Cleanup: warnings

2017-02-09 02:39:31 +11:00

zbuf.c

Render API/Cycles: Identify Render Passes by their name instead of a type flag

2017-05-03 16:44:52 +02:00