diff options
author | Siddhartha Jejurkar <f20180617@goa.bits-pilani.ac.in> | 2021-09-22 20:38:30 +0300 |
---|---|---|
committer | Siddhartha Jejurkar <f20180617@goa.bits-pilani.ac.in> | 2021-09-22 20:38:30 +0300 |
commit | f87ed1547c22c4b120399e29a6729136618b08ae (patch) | |
tree | 5705366c28208e4b0193e0ca4fb5ea968ccd1e8f /source/blender/editors/space_action/action_ops.c | |
parent | 1b9dd08d0281f00ba96b2e6b74c7c9b662663c1b (diff) |
UV grid: Resolve merge conflicts
Resolves merge conflicts that broke the subdividing and dynamic grid
implementations
Diffstat (limited to 'source/blender/editors/space_action/action_ops.c')
0 files changed, 0 insertions, 0 deletions