[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [47123] branches/soc-2012-bratwurst/source /blender/editors/transform: UV Transform Correction tool
Antony Riakiotakis
kalast at gmail.com
Mon May 28 18:48:57 CEST 2012
Revision: 47123
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=47123
Author: psy-fi
Date: 2012-05-28 16:48:56 +0000 (Mon, 28 May 2012)
Log Message:
-----------
UV Transform Correction tool
============================
Minor commit to hook up the new correction code to the transformation
code and fixes ensure that no leaks/crashes/hangs occur.
Modified Paths:
--------------
branches/soc-2012-bratwurst/source/blender/editors/transform/transform.c
branches/soc-2012-bratwurst/source/blender/editors/transform/transform_generics.c
Modified: branches/soc-2012-bratwurst/source/blender/editors/transform/transform.c
===================================================================
--- branches/soc-2012-bratwurst/source/blender/editors/transform/transform.c 2012-05-28 16:48:30 UTC (rev 47122)
+++ branches/soc-2012-bratwurst/source/blender/editors/transform/transform.c 2012-05-28 16:48:56 UTC (rev 47123)
@@ -1815,6 +1815,12 @@
viewRedrawForce(C, t);
}
+ /* stay here for now, maybe will find some other way to aviod duplicating in every transform
+ * apply funtion */
+ if(t->flag & T_IMAGE_PRESERVE_CALC) {
+ calculateImageMaintainBounds(t);
+ }
+
/* If auto confirm is on, break after one pass */
if (t->options & CTX_AUTOCONFIRM) {
t->state = TRANS_CONFIRM;
Modified: branches/soc-2012-bratwurst/source/blender/editors/transform/transform_generics.c
===================================================================
--- branches/soc-2012-bratwurst/source/blender/editors/transform/transform_generics.c 2012-05-28 16:48:30 UTC (rev 47122)
+++ branches/soc-2012-bratwurst/source/blender/editors/transform/transform_generics.c 2012-05-28 16:48:56 UTC (rev 47123)
@@ -1629,7 +1629,7 @@
ghiter = BLI_ghashIterator_new(face_hash);
/* count edges */
- for(; BLI_ghashIterator_isDone(ghiter); BLI_ghashIterator_step(ghiter)) {
+ for(; !BLI_ghashIterator_isDone(ghiter); BLI_ghashIterator_step(ghiter)) {
f = BLI_ghashIterator_getKey(ghiter);
BM_ITER_ELEM(e, &iter, f, BM_EDGES_OF_FACE) {
@@ -1645,7 +1645,7 @@
BLI_ghashIterator_init(ghiter, edge_hash);
/* fill with count values */
- for(i = 0; BLI_ghashIterator_isDone(ghiter); BLI_ghashIterator_step(ghiter)) {
+ for(i = 0; !BLI_ghashIterator_isDone(ghiter); BLI_ghashIterator_step(ghiter)) {
edge_list[i++] = BLI_ghashIterator_getKey(ghiter);
}
More information about the Bf-blender-cvs
mailing list