Bastien Montagne 204c167c72 Merge branch 'master' into blender2.8 ...

Conflicts:
	source/blender/blenkernel/BKE_mesh.h
	source/blender/blenkernel/intern/mesh_convert.c
	source/blender/editors/interface/interface_eyedropper_color.c
	source/blender/editors/object/object_add.c
	source/blender/editors/space_image/image_ops.c
	source/blender/makesrna/intern/rna_image.c
	source/blender/windowmanager/intern/wm_draw.c

2018-06-11 16:02:46 +02:00

..

CMakeLists.txt

Modifiers: ported Surface Deform to Mesh

2018-05-09 12:17:24 +02:00

object_add.c

Merge branch 'master' into blender2.8

2018-06-11 16:02:46 +02:00

object_bake_api.c

Merge branch 'master' into blender2.8

2018-06-05 17:02:50 +02:00

object_bake.c

Cleanup: strip trailing space in editors

2018-06-04 09:31:30 +02:00

object_constraint.c

Merge branch 'master' into blender2.8

2018-06-07 13:04:16 +02:00

object_data_transfer.c

Moved function declarations from BKE_DerivedMesh.h to BKE_mesh_runtime.h

2018-06-05 16:59:25 +02:00

object_edit.c

Merge branch 'master' into blender2.8

2018-06-11 14:39:38 +02:00

object_facemap_ops.c

Cleanup: trailing spaces

2018-04-22 08:45:52 +02:00

object_group.c

Fix T55344: linked collection instance has user count 0.

2018-06-06 11:22:17 +02:00

object_hook.c

Cleanup: Nuke moar G.main usages...

2018-06-07 11:11:46 +02:00

object_intern.h

Merge branch 'master' into blender2.8

2018-06-01 18:26:42 +02:00

object_modes.c

Merge branch 'master' into blender2.8

2018-06-06 16:25:28 +02:00

object_modifier.c

Cleanup: Moar G.main removal of Hell.

2018-06-11 12:15:14 +02:00

object_ops.c

Keymap: continued testing/development

2018-06-07 20:46:12 +02:00

object_random.c

Fix T44821: Making warp shortcut fails

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

object_relations.c

Merge branch 'master' into blender2.8

2018-06-07 13:04:16 +02:00

object_select.c

Merge branch 'master' into blender2.8

2018-06-04 09:39:04 +02:00

object_shapekey.c

Merge branch 'master' into blender2.8

2018-06-04 09:39:04 +02:00

object_transform.c

Cleanup: Nuke moar G.main usages...

2018-06-07 11:11:46 +02:00

object_vgroup.c

Moved function declarations from BKE_DerivedMesh.h to BKE_mesh_runtime.h

2018-06-05 16:59:25 +02:00

object_warp.c

Orientation for 3D cursor

2018-05-08 15:35:04 +02:00