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.

Bastien Montagne cbce7fef16 Merge branch 'master' into blender2.8 ...

Conflicts:
	source/blender/blenkernel/intern/pointcache.c
	source/blender/makesrna/intern/rna_main_api.c
	source/blender/makesrna/intern/rna_particle.c

2016-06-27 15:59:01 +02:00

..

bake_api.c

Support multiple tangents for BI render & viewport

2016-04-26 20:43:29 +10:00

bake.c

Cleanup: use bool

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

convertblender.c

Merge branch 'master' into blender2.8

2016-06-27 15:59:01 +02:00

envmap.c

Fix crash on exit with Blender Internal baking and envmap render.

2016-02-17 22:46:11 +01:00

external_engine.c

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

2016-03-10 09:28:29 -03: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

Multi-View and Stereo 3D

2015-04-06 10:40:12 -03:00

multires_bake.c

Support multiple tangents for BI render & viewport

2016-04-26 20:43:29 +10:00

occlusion.c

Refactor translation code out of blenfont

2015-08-18 07:01:26 +10:00

pipeline.c

Merge branch 'master' into blender2.8

2016-06-23 07:52:58 +10:00

pixelblending.c

Cleanup: unused headers

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

pixelshading.c

Fix T47753: World equirectangular regression

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

pointdensity.c

Fix T48658: Cycles render & render preview corrupts particles

2016-06-23 07:54:35 +10:00

rayshade.c

Cleanup: use bool

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

render_result.c

Fix T48466: Multiple passes starting with 'Diffuse' in EXR file breaks its loading in Blender.

2016-06-01 17:31:42 +02:00

render_texture.c

ID-Remap - Step one: core work (cleanup and rework of generic ID datablock handling).

2016-06-22 17:53:50 +02:00

rendercore.c

Fix T46225: Crash when rendering halo flare

2015-09-23 13:37:01 -03:00

renderdatabase.c

Merge branch 'master' into temp_remove_particles

2016-04-28 17:33:19 +02:00

shadbuf.c

Cleanup: shadowing (render)

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

shadeinput.c

World space switch for BI nodes.

2016-06-07 10:21:55 +02:00

shadeoutput.c

Full Inverse-Quadratic-Equation Lamp Falloff

2016-03-13 02:05:36 +01:00

sss.c

Refactor translation code out of blenfont

2015-08-18 07:01:26 +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

Cleanup: warnings (msvc)

2015-12-21 13:02:38 +11:00

volumetric.c

Cleanup: unnecessary comma use

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

voxeldata.c

Cleanup: warnings

2016-06-07 18:16:03 +10:00

zbuf.c

Cleanup: unnecessary comma use

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