Bastien Montagne 722451e146 Merge branch 'master' into blender2.8 ...

Conflicts:
	source/blender/blenloader/intern/writefile.c

2017-03-17 11:00:41 +01:00

..

CMakeLists.txt

Refactor translation code out of blenfont

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

object_add.c

Merge branch 'master' into blender2.8

2017-03-17 11:00:41 +01:00

object_bake_api.c

Fix/workaround T48549: Crash baking high-to-low-poly normal map in cycles

2017-02-28 14:08:33 +01:00

object_bake.c

Remove tons of OBACT

2017-03-02 17:09:24 +01:00

object_constraint.c

More housecleaning (BASACT > BASACT_NEW)

2017-02-09 16:34:26 +01:00

object_data_transfer.c

Replace of (id->lib != NULL) check by meaningful macro.

2016-07-06 14:11:01 +02:00

object_edit.c

Remove tons of OBACT

2017-03-02 17:09:24 +01:00

object_group.c

Render Layers and Collections (merge from render-layers)

2017-02-07 11:11:00 +01:00

object_hook.c

Render Layers and Collections (merge from render-layers)

2017-02-07 11:11:00 +01:00

object_intern.h

Merge branch 'master' into blender2.8

2017-02-27 16:08:25 -03:00

object_lattice.c

Fix T47969: Select Random always uses same seed

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

object_lod.c

Cleanup: unused headers

2014-11-28 15:52:30 +01:00

object_modifier.c

Merge branch 'master' into blender2.8

2017-03-02 19:15:32 +01:00

object_ops.c

Merge branch 'master' into blender2.8

2017-02-27 16:08:25 -03:00

object_random.c

Fix T44821: Making warp shortcut fails

2015-05-26 17:55:34 +10:00

object_relations.c

Layer Macros: create the instance as part of the macro

2017-02-14 18:21:46 +01:00

object_select.c

More housecleaning (BASACT > BASACT_NEW)

2017-02-09 16:34:26 +01:00

object_shapekey.c

Replace of (id->lib != NULL) check by meaningful macro.

2016-07-06 14:11:01 +02:00

object_transform.c

Add missing braces

2016-07-11 08:45:16 +10:00

object_vgroup.c

Sorted BaseLegacy > Base convertions

2017-02-14 18:21:47 +01:00

object_warp.c

Math Lib: rotate matrix cleanup

2016-11-25 16:39:34 +11:00