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

bgl.c

Merge branch 'master' into blender2.8

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

bgl.h

Cleanup: strip trailing space in Python module

2018-06-04 08:54:40 +02:00

blf_py_api.c

Python/BLF: add blf.color(r, g, b, a) method.

2018-06-21 13:37:02 +02:00

blf_py_api.h

correct include guards and add checks in check_style_c.py for them.