538475dec7
# Conflicts: # source/blender/editors/transform/transform_snap_object.c
# Conflicts: # source/blender/editors/transform/transform_snap_object.c