Merge remote-tracking branch 'origin/master' into blender2.8
authorRay Molenkamp <github@lazydodo.com>
Fri, 19 Oct 2018 15:16:26 +0000 (09:16 -0600)
committerRay Molenkamp <github@lazydodo.com>
Fri, 19 Oct 2018 15:16:26 +0000 (09:16 -0600)
1  2 
source/blender/editors/uvedit/uvedit_unwrap_ops.c

index 538ca9afafa2fa092cb751c3c788a5bea8646cf4,088ed42b0c032a89ffadb946712aef88035e66db..b344bb423186283ab05942fa1ad9749f4ab151ec
@@@ -262,14 -254,12 +262,14 @@@ static void construct_param_handle_face
                select[i] = uvedit_uv_select_test(scene, l, cd_loop_uv_offset);
        }
  
-       param_face_add(handle, key, i, vkeys, co, uv, pin, select, efa->no);
+       param_face_add(handle, key, i, vkeys, co, uv, pin, select);
  }
  
 -static ParamHandle *construct_param_handle(Scene *scene, Object *ob, BMesh *bm,
 -                                           const bool implicit, const bool fill, const bool sel,
 -                                           const bool correct_aspect)
 +/* See: construct_param_handle_multi to handle multiple objects at once. */
 +static ParamHandle *construct_param_handle(
 +        Scene *scene, Object *ob, BMesh *bm,
 +        const bool implicit, const bool fill, const bool sel,
 +        const bool correct_aspect)
  {
        ParamHandle *handle;
        BMFace *efa;