This repository has been archived on 2023-10-09. You can view files and clone it. You cannot open issues or pull requests or push a commit.

Bastien Montagne 646412004b Merge branch 'master' into blender2.8 ...

Conflicts:
	source/blender/makesrna/intern/rna_image.c
	source/blender/makesrna/intern/rna_object.c
	source/blender/makesrna/intern/rna_object_force.c
	source/blender/makesrna/intern/rna_screen.c
	source/blender/makesrna/intern/rna_sculpt_paint.c
	source/blender/makesrna/intern/rna_space.c
	source/blender/python/bmesh/bmesh_py_types.c
	source/blender/python/generic/bpy_internal_import.h
	source/blender/python/intern/bpy_rna_anim.c
	source/blender/python/intern/gpu_offscreen.c

2018-06-22 12:46:16 +02:00

14 KiB

Raw Blame History

View Raw