blender-archive

Archived

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

Files

History

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

bmesh

Merge branch 'master' into blender2.8

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

gawain

Cleanup: trailing spaces

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

generic

Merge branch 'master' into blender2.8

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

intern

Merge branch 'master' into blender2.8