Bastien Montagne 8f670dd855 Merge branch 'master' into blender2.8 ...

Conflicts:
	source/blender/blenkernel/BKE_material.h
	source/blender/blenkernel/BKE_mesh.h
	source/blender/blenkernel/intern/library_remap.c
	source/blender/blenkernel/intern/material.c
	source/blender/editors/object/object_relations.c
	source/blender/editors/render/render_preview.c
	source/blender/makesrna/intern/rna_object.c

2018-05-29 16:02:53 +02:00

..

intern

Merge branch 'master' into blender2.8

2018-05-29 16:02:53 +02:00

rna_cleanup

switch verious references from py3.2 -> 3.3 or just 3.

2012-11-26 13:58:06 +00:00

CMakeLists.txt

…

RNA_access.h

Merge branch 'master' into blender2.8

2018-05-27 11:06:29 +02:00

RNA_define.h

ID Static Override, part II: RNA changes.

2017-11-29 17:23:25 +01:00

RNA_documentation.h

…

RNA_enum_types.h

UI: Expand space sub-types into the menu

2018-05-29 12:15:26 +02:00

RNA_types.h

Static override: initial work for generating 'insertion' in collections.

2018-05-02 09:54:42 +02:00