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 24d29f2e50 Merge branch 'master' into blender2.8 ...

Conflicts:
	source/blender/blenkernel/intern/particle.c
	source/blender/editors/transform/transform_snap_object.c

2016-06-07 09:59:26 +02:00

..

include

Fix T48550: Imperfections when Bake displacement map to plane if camera is not in front

2016-06-06 13:55:04 +02:00

raytrace

Fix T48550: Imperfections when Bake displacement map to plane if camera is not in front

2016-06-06 13:55:04 +02:00

source

Merge branch 'master' into blender2.8

2016-06-07 09:59:26 +02:00