Bastien Montagne 160e62b88c Merge branch 'master' into blender2.8 ...

Conflicts:
	source/blender/blenkernel/BKE_object.h

2018-04-04 15:03:55 +02:00

..

CMakeLists.txt

Merge branch 'master' into blender2.8

2018-03-19 18:14:05 +01:00

object_add.c

Merge branch 'master' into blender2.8

2018-04-04 15:03:55 +02:00

object_bake_api.c

Refactor depsgraph/render logic to serve evaluated depsgraph to engines

2018-02-27 18:25:54 -03:00

object_bake.c

Refactor depsgraph/render logic to serve evaluated depsgraph to engines

2018-02-27 18:25:54 -03:00

object_constraint.c

Object Mode: use eval_ctx for get_active_constraints

2018-02-06 18:03:29 +11:00

object_data_transfer.c

Merge branch 'master' into blender2.8

2017-11-06 18:02:46 +01:00

object_edit.c

Move to Collection: Reduce memory leakage

2018-04-02 18:52:22 -03:00

object_facemap_ops.c

Cleanup: use workspace for object_mode when possible

2018-02-09 22:14:39 +11:00

object_group.c

Cleanup: Rename ViewLayer *sl > ViewLayer *view_layer

2017-11-23 14:58:01 -02:00

object_hook.c

Merge branch 'master' into blender2.8

2018-03-14 02:15:37 +11:00

object_intern.h

Select Grouped: Collection Part I

2018-03-29 20:03:47 -03:00

object_lod.c

Cleanup: unused headers

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

object_modes.c

Fix mode switching error on undo

2018-04-03 08:05:18 +02:00

object_modifier.c

Object Mode: remove Scene.obedit

2018-02-13 20:55:12 +11:00

object_ops.c

Select Grouped: Collection Part I

2018-03-29 20:03:47 -03:00

object_random.c

Fix T44821: Making warp shortcut fails

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

object_relations.c

Fix make single user crash

2018-03-14 08:13:27 -03:00

object_select.c

Select Grouped: Collection Part II

2018-03-29 20:03:47 -03:00

object_shapekey.c

Cleanup: use workspace for object_mode when possible

2018-02-09 22:14:39 +11:00

object_transform.c

Merge branch 'master' into blender2.8

2018-03-14 18:10:31 +01:00

object_vgroup.c

Merge branch 'master' into blender2.8

2018-03-14 18:10:31 +01:00

object_warp.c

Math Lib: rotate matrix cleanup

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