[Bf-blender-cvs] [be52fd0d0fb] blender2.8: Merge remote-tracking branch 'origin/master' into blender2.8

Ray Molenkamp noreply at git.blender.org
Fri Oct 19 17:16:40 CEST 2018


Commit: be52fd0d0fb0add1724600f162cde1219f3bdb7e
Author: Ray Molenkamp
Date:   Fri Oct 19 09:16:26 2018 -0600
Branches: blender2.8
https://developer.blender.org/rBbe52fd0d0fb0add1724600f162cde1219f3bdb7e

Merge remote-tracking branch 'origin/master' into blender2.8

===================================================================



===================================================================

diff --cc source/blender/editors/uvedit/uvedit_unwrap_ops.c
index 538ca9afafa,088ed42b0c0..b344bb42318
--- a/source/blender/editors/uvedit/uvedit_unwrap_ops.c
+++ b/source/blender/editors/uvedit/uvedit_unwrap_ops.c
@@@ -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;



More information about the Bf-blender-cvs mailing list