Sybren A. Stüvel dc27d31a21 Merge commit 'master@6ed15c5a41130b55cb57a43a8a9470a91d38c3d5' into blender2.8 ...

# Conflicts:
#	source/blender/alembic/intern/abc_exporter.cc

2017-04-26 16:50:29 +02:00

..

alembic

Merge commit 'master@6ed15c5a41130b55cb57a43a8a9470a91d38c3d5' into blender2.8

2017-04-26 16:50:29 +02:00

avi

Remove SCons building system

2016-01-04 14:20:48 +05:00

blenfont

Cleanup: Use explicit unsigned int type

2017-04-20 10:56:08 +02:00

blenkernel

Merge commit 'master@6ed15c5a41130b55cb57a43a8a9470a91d38c3d5' into blender2.8

2017-04-26 16:50:29 +02:00

blenlib

BLI_math: add helper function to extract XY 2D scale from a 4D matrix.

2017-04-26 12:00:15 +02:00

blenloader

Merge branch 'master' into blender2.8

2017-04-24 22:11:05 +10:00

blentranslation

Add C internal version of msgfmt (similar to makesrna/dna binaries).

2017-04-24 10:49:54 +02:00

bmesh

Merge branch 'master' into blender2.8

2017-04-07 17:28:22 +02:00

collada

Depsgraph: Remove old depsgraph header from collada

2017-04-06 16:17:21 +02:00

compositor

D2607: Switch eye dropper to use linear color space internally

2017-04-20 22:41:26 +02:00

datatoc

Fix compilation error on recent Debian desktop

2016-12-05 11:35:26 +01:00

depsgraph

Depsgraph and selection: Flush selcol on Depsgraph

2017-04-26 10:42:40 +02:00

draw

Last commit broke object-armature select

2017-04-26 22:39:12 +10:00

editors

Getting rid of setlinestyle: 3DView ruler.

2017-04-26 15:19:03 +02:00

freestyle

Depsgraph: Remove old depsgraph header from freestyle

2017-04-06 16:32:59 +02:00

gpu

Getting rid of setlinestyle: non-camera 3DView render border.

2017-04-26 15:19:03 +02:00

ikplugin

Depsgraph: Fix frash with iTaSC solver

2016-11-15 16:18:59 +01:00

imbuf

Color management: Avoid memory copy into same buffer

2017-04-12 10:23:38 +02:00

makesdna

Merge commit 'master@6ed15c5a41130b55cb57a43a8a9470a91d38c3d5' into blender2.8

2017-04-26 16:50:29 +02:00

makesrna

Render API: Rename render > render_to_image; view_draw > render_to_view

2017-04-25 18:03:13 +02:00

modifiers

Convert BaseLegacy to Base (part)

2017-04-24 16:09:04 +02:00

nodes

Merge branch 'master' into blender2.8

2017-04-24 22:11:05 +10:00

physics

Cloth refactor: Remove goal springs and some other cleanup

2017-03-23 03:52:46 -03:00

python

Merge branch 'master' into blender2.8

2017-04-24 22:11:05 +10:00

quicktime

Cleanup: comment blocks

2016-07-15 02:39:45 +10:00

render

Render API: Rename render > render_to_image; view_draw > render_to_view

2017-04-25 18:03:13 +02:00

windowmanager

Move imm_draw_line_box_dashed to GPU_immediate_util.

2017-04-26 12:11:40 +02:00

CMakeLists.txt

Changes from custom-manipulators branch

2017-04-06 22:10:09 +10:00