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

..

camera

Adding presets for Blackmagic Pocket Cinema Camera and Blackmagic Production Camera 4K

2014-08-20 00:55:57 -06:00

cloth

…

cycles

Cycles: Several fixes for Presets.

2014-09-07 04:03:23 +02:00

ffmpeg

…

fluid

…

framerate

…

interaction

…

interface_theme

Theme: 2.4x, correct graph region color

2016-06-03 01:59:53 +10:00

keyconfig

Fix T48527: Maya keymap fails w/ knife snap

2016-05-30 22:45:46 +10:00

operator/wm.collada_export

…

render

…

safe_areas

Viewport: Add adjustable safe areas, 3d-view & VSE

2015-01-19 16:47:57 +11:00

sss

…

sunsky

Fix T41081: Presets not working on pinned properties panels.

2014-07-18 11:37:57 +02:00

tracking_camera

Adding presets for Blackmagic Pocket Cinema Camera and Blackmagic Production Camera 4K

2014-08-20 00:55:57 -06:00

tracking_settings

…

tracking_track_color

…

units_length

UI: Presets for scene units

2016-03-25 05:03:25 +11:00