[Bf-blender-cvs] [92d7b4b1c2] uv_unwrapping_slim_algorithm: merging in master

[Aurel Gruber]

Commit: 92d7b4b1c2b4e5bd62aec48339a218cae330faf7
Author: Aurel Gruber
Date:   Wed Mar 15 16:39:37 2017 +0100
Branches: uv_unwrapping_slim_algorithm
https://developer.blender.org/rB92d7b4b1c2b4e5bd62aec48339a218cae330faf7

merging in master

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



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

diff --cc source/blender/editors/uvedit/uvedit_unwrap_ops.c
index 3fab2a3110,3c00c0da56..b530e554fd
--- a/source/blender/editors/uvedit/uvedit_unwrap_ops.c
+++ b/source/blender/editors/uvedit/uvedit_unwrap_ops.c
@@@ -822,12 -814,6 +822,8 @@@ void UV_OT_minimize_stretch(wmOperatorT
  	ot->modal = minimize_stretch_modal;
  	ot->cancel = minimize_stretch_cancel;
  	ot->poll = ED_operator_uvedit;
 +
- 	/* properties */
- 	RNA_def_boolean(ot->srna, "fill_holes_slim", 1, "Fill Holes", "Virtual fill holes in mesh before unwrapping, to better avoid overlaps and preserve symmetry");
- 	RNA_def_float_factor(ot->srna, "blend_slim", 0.0f, 0.0f, 1.0f, "Blend", "Blend factor between stretch minimized and original", 0.0f, 1.0f);
 +	RNA_def_boolean(ot->srna, "fix_boundary", 1, "Fix Boundary", "Wether the vertices on the border may move or not.");
- 
  }
  
  /* ******************** Pack Islands operator **************** */