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

..

intern

Merge branch 'master' into blender2.8

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

rna_cleanup

Cleanup: trailing space in RNA

2018-06-09 14:40:09 +02:00

CMakeLists.txt

remove $Id: tags after discussion on the mailign list: http://markmail.org/message/fp7ozcywxum3ar7n

2011-10-23 17:52:20 +00:00

RNA_access.h

RNA/Override: Move override-related property flags to own variable.

2018-06-05 11:11:43 +02:00

RNA_define.h

RNA/Override: Move override-related property flags to own variable.

2018-06-05 11:11:43 +02:00

RNA_documentation.h

…

RNA_enum_types.h

UI: remove tools space type, use properties context

2018-06-08 16:35:05 +02:00

RNA_types.h

Cleanup: trailing space in RNA

2018-06-09 14:40:09 +02:00