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

..

animation

Merge branch 'master' into blender2.8

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

armature

Cleanup & simplify snapping functions

2016-06-03 16:56:16 +10:00

curve

Curve Fitting: add high-quality flag

2016-06-14 02:27:32 +10:00

datafiles

Remove SCons building system

2016-01-04 14:20:48 +05:00

gpencil

GPencil: Eraser respects "Selection Mask" when in EditMode

2016-06-24 03:33:31 +12:00

include

Merge branch 'master' into blender2.8

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

interface

Merge branch 'master' into blender2.8

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

io

Cleanup: style, whitespace, doxy filepaths

2016-06-19 06:33:29 +10:00

mask

DopeSheet Mask Mode: Circle/Lasso support

2016-06-24 03:18:36 +12:00

mesh

GPU: move select index code out of WM

2016-06-25 21:13:33 +10:00

metaball

Fix T47969: Select Random always uses same seed

2016-03-29 01:24:57 +11:00

object

Merge branch 'master' into blender2.8

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

physics

Fix T48658: Cycles render & render preview corrupts particles

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

render

Merge branch 'master' into blender2.8

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

screen

Merge branch 'master' into blender2.8

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

sculpt_paint

Merge branch 'master' into blender2.8

2016-06-22 13:12:44 +02:00

sound

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

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

space_action

DopeSheet Mask Mode: Circle/Lasso support

2016-06-24 03:18:36 +12:00

space_api

Cleanup: Rename ED_button_operatortypes -> ED_operatortypes_ui

2016-02-29 17:47:36 +01:00

space_buttons

Merge branch 'master' into blender2.8

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

space_clip

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

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

space_console

Cleanup: unused win32 headers

2016-05-12 04:35:40 +10:00

space_file

Merge branch 'master' into blender2.8

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

space_graph

FCurve Auto Colours: "XYZ to RGB" works for Quaternions too now

2016-06-28 00:27:51 +12:00

space_image

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

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

space_info

Merge branch 'master' into temp_remove_particles

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

space_logic

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

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

space_nla

Merge branch 'master' into blender2.8

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

space_node

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

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

space_outliner

Merge branch 'master' into blender2.8

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

space_script

Remove SCons building system

2016-01-04 14:20:48 +05:00

space_sequencer

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

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

space_text

Cleanup: get rid of BKE_text_unlink(), replace by usage of generic BKE_libblock_... API.

2016-06-25 18:12:23 +02:00

space_time

Merge branch 'temp_remove_pointcache' into blender2.8

2016-05-02 11:00:34 +02:00

space_userpref

Remove SCons building system

2016-01-04 14:20:48 +05:00

space_view3d

Merge branch 'master' into blender2.8

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

transform

Merge branch 'master' into blender2.8

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

util

Merge branch 'master' into blender2.8

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

uvedit

Flat shading for basic shader

2016-06-10 05:38:17 +10:00

CMakeLists.txt

Collada: Moved interface definitions from wm_operators.c to blender/editors/io

2012-06-17 23:13:39 +00:00