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.

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

..

bpy_app_alembic.c

PyAPI: replace PyC_FromArray with typed functions

2017-08-22 18:10:57 +10:00

bpy_app_alembic.h

…

bpy_app_build_options.c

Remove Frame Server

2018-05-09 12:50:26 +02:00

bpy_app_build_options.h

…

bpy_app_ffmpeg.c

PyAPI: replace PyC_FromArray with typed functions

2017-08-22 18:10:57 +10:00

bpy_app_ffmpeg.h

…

bpy_app_handlers.c

Removing Blender Game Engine from Blender 2.8

2018-04-17 17:51:28 +02:00

bpy_app_handlers.h

…

bpy_app_icons.c

Icons: correct arg parsing

2018-04-26 15:18:00 +02:00

bpy_app_icons.h

UI: Python API defining dynamic icons

2018-04-20 15:33:09 +02:00

bpy_app_ocio.c

PyAPI: replace PyC_FromArray with typed functions

2017-08-22 18:10:57 +10:00

bpy_app_ocio.h

…

bpy_app_oiio.c

PyAPI: replace PyC_FromArray with typed functions

2017-08-22 18:10:57 +10:00

bpy_app_oiio.h

…

bpy_app_opensubdiv.c

PyAPI: replace PyC_FromArray with typed functions

2017-08-22 18:10:57 +10:00

bpy_app_opensubdiv.h

Report OpenSubdiv version Blender is compiled against

2017-06-07 12:16:48 +02:00

bpy_app_openvdb.c

PyAPI: replace PyC_FromArray with typed functions

2017-08-22 18:10:57 +10:00

bpy_app_openvdb.h

…

bpy_app_sdl.c

PyAPI: replace PyC_FromArray with typed functions

2017-08-22 18:10:57 +10:00

bpy_app_sdl.h

…

bpy_app_translations.c

…

bpy_app_translations.h

…

bpy_app.c

Merge branch 'master' into blender2.8

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

bpy_app.h

…

bpy_capi_utils.c

Cleanup: strip trailing space in Python module

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

bpy_capi_utils.h

Cleanup: style

2017-12-04 16:37:31 +11:00

bpy_driver.c

Fix merge error in bpy_driver.c

2018-06-18 15:09:55 +02:00

bpy_driver.h

Drivers: ensure Python expressions are cached with copy-on-write.

2018-06-11 21:34:21 +02:00

bpy_interface_atexit.c

Cleanup: rename bpy_util -> bpy_capi_utils

2017-11-29 21:11:29 +11:00

bpy_interface.c

Merge branch 'master' into blender2.8

2018-06-17 16:18:15 +02:00

bpy_intern_string.c

Manipulator: Python API

2017-06-26 16:38:04 +10:00

bpy_intern_string.h

Manipulator: Python API

2017-06-26 16:38:04 +10:00

bpy_library_load.c

Merge branch 'master' into blender2.8

2018-06-05 17:02:50 +02:00

bpy_library_write.c

Cleanup: get rid of last G.main's in bpy area.

2018-06-22 11:37:47 +02:00

bpy_library.h

…

bpy_manipulator_wrap.c

Cleanup: remove Py3.5 compatible code

2017-10-07 15:14:36 +11:00

bpy_manipulator_wrap.h

Manipulator: Python API

2017-06-26 16:38:04 +10:00

bpy_msgbus.c

Code cleanup: fix a few harmless warnings.

2018-02-28 03:10:38 +01:00

bpy_msgbus.h

WM: message bus replacement for property notifiers

2017-12-04 20:42:34 +11:00

bpy_operator_wrap.c

RNA/PyAPI: Expose Py classes in bpy.types

2017-09-04 14:49:27 +10:00

bpy_operator_wrap.h

RNA: remove static strings from registration

2017-06-09 07:20:25 +10:00

bpy_operator.c

Cleanup: strip trailing space in Python module

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

bpy_operator.h

…

bpy_path.c

…

bpy_path.h

…

bpy_props.c

Cleanup: strip trailing space in Python module

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

bpy_props.h

Define RNA_STACK_ARRAY (usable everywhere in RNA), and make PYRNA_STACK_ARRAY use it.

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

bpy_rna_anim.c

Merge branch 'master' into blender2.8

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

bpy_rna_anim.h

…

bpy_rna_array.c

Cleanup: strip trailing space in Python module

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

bpy_rna_callback.c

Merge branch 'master' into blender2.8

2018-06-12 17:36:24 +02:00

bpy_rna_callback.h

…

bpy_rna_driver.c

Fix T52213: Enum drivers no longer work

2017-07-29 02:39:16 +10:00

bpy_rna_driver.h

…

bpy_rna_id_collection.c

Cleanup: get rid of last G.main's in bpy area.

2018-06-22 11:37:47 +02:00

bpy_rna_id_collection.h

…

bpy_rna_manipulator.c

Merge branch 'master' into blender2.8

2017-11-29 21:32:16 +11:00

bpy_rna_manipulator.h

Manipulator: Python API

2017-06-26 16:38:04 +10:00

bpy_rna.c

Merge branch 'master' into blender2.8

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

bpy_rna.h

WorkSpace: UI filtering for add-ons

2018-03-01 01:31:07 +11:00

bpy_traceback.c

…

bpy_traceback.h

…

bpy_utils_previews.c

…

bpy_utils_previews.h

…

bpy_utils_units.c

PyAPI: fast keyword parsing for bpy modules

2017-10-05 10:52:18 +11:00

bpy_utils_units.h

…

bpy.c

Merge branch 'master' into blender2.8

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

bpy.h

…

CMakeLists.txt

Remove Frame Server

2018-05-09 12:50:26 +02:00

gpu_offscreen.c

Merge branch 'master' into blender2.8

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

gpu_py_matrix.c

PyAPI: gpu.matrix.push_pop context manager

2017-08-20 19:42:31 +10:00

gpu_py_select.c

PyAPI: add gpu.select (initial module)

2017-08-20 23:13:42 +10:00

gpu.c

Merge branch 'master' into blender2.8

2018-06-01 18:26:42 +02:00

gpu.h

PyAPI: add gpu.select (initial module)

2017-08-20 23:13:42 +10:00

stubs.c

Cleanup: trailing whitespace (comment blocks)

2018-06-01 18:19:39 +02:00