[Bf-blender-cvs] [90d9819de9] uv_unwrapping_slim_and_ceres: Category: UV Unwrapping SLIM Algorithm Integration
Aurel Gruber
noreply at git.blender.org
Mon Feb 27 11:27:27 CET 2017
Commit: 90d9819de9c4e6c3a0db6818d5bab70dc122f3f7
Author: Aurel Gruber
Date: Thu Feb 23 13:22:30 2017 +0100
Branches: uv_unwrapping_slim_and_ceres
https://developer.blender.org/rB90d9819de9c4e6c3a0db6818d5bab70dc122f3f7
Category: UV Unwrapping SLIM Algorithm Integration
correcting wrong comment on SLIM phases
===================================================================
M intern/SLIM
M source/blender/editors/uvedit/uvedit_parametrizer.h
===================================================================
diff --git a/intern/SLIM b/intern/SLIM
index cffc347ba2..8bdd2ea2de 160000
--- a/intern/SLIM
+++ b/intern/SLIM
@@ -1 +1 @@
-Subproject commit cffc347ba26c31b04f9080916b99b1e603d4ee5c
+Subproject commit 8bdd2ea2ded2dffa5b02ba51cd00e46af19af87d
diff --git a/source/blender/editors/uvedit/uvedit_parametrizer.h b/source/blender/editors/uvedit/uvedit_parametrizer.h
index 8dcaf952ed..abfc4a0162 100644
--- a/source/blender/editors/uvedit/uvedit_parametrizer.h
+++ b/source/blender/editors/uvedit/uvedit_parametrizer.h
@@ -112,16 +112,12 @@ void param_begin(ParamHandle *handle, ParamBool abf, bool useSlim);
void param_solve(ParamHandle *handle, bool useSlim);
void param_end(ParamHandle *handle, bool useSlim);
-/* Least Squares Conformal Maps:
+/* SLIM:
* -----------------------------
- * - charts with less than two pinned vertices are assigned 2 pins
- * - lscm is divided in three steps:
- * - begin: compute matrix and it's factorization (expensive)
- * - solve using pinned coordinates (cheap)
+ * - begin: Data is gathered into matrices and transferred to SLIM
+ * - solve: compute cheap initialization (if necessary) and refine iteratively
* - end: clean up
- * - uv coordinates are allowed to change within begin/end, for
- * quick re-solving
- */
+*/
void param_slim_begin(ParamHandle *handle);
void param_slim_solve(ParamHandle *handle);
More information about the Bf-blender-cvs
mailing list