diff options
| author | Miika Hamalainen <blender@miikah.org> | 2012-06-26 23:36:00 +0400 |
|---|---|---|
| committer | Miika Hamalainen <blender@miikah.org> | 2012-06-26 23:36:00 +0400 |
| commit | 63ad7f0b62380dfd96b366729104948c560a63bb (patch) | |
| tree | d769b94626e207565b2b0edeb1dbfe8bf8a8a16f /source/blender/bmesh/operators/bmo_dissolve.c | |
| parent | 40ac94929e5ca70bd11f830d2c5e74600e5e9a48 (diff) | |
Committed out conflicting part from previous merge. It was no longer possible to compile with Cycles.
Philipp Volguine can you check that out?
Diffstat (limited to 'source/blender/bmesh/operators/bmo_dissolve.c')
0 files changed, 0 insertions, 0 deletions