diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2018-12-18 22:33:04 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2018-12-18 22:33:04 +0300 |
| commit | 6e5b573dc8288826f05fd3a0b0b6de2a9753ba8b (patch) | |
| tree | 8c2272bcef3cc6fac01537996deef15fb0a0c973 /source/blender/draw/engines/basic/basic_engine.c | |
| parent | 5638db749529a77ef4bf8421e1a90eeee6994d5c (diff) | |
| parent | 1875f9e7d7bcd157fb1c359be6a41984bd84d4dc (diff) | |
Merge branch 'master' into blender2.8
Conflicts:
source/blender/editors/transform/transform_conversions.c
Diffstat (limited to 'source/blender/draw/engines/basic/basic_engine.c')
0 files changed, 0 insertions, 0 deletions