[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [18814] branches/etch-a-ton/source/blender : Rename correlation subdividing method into adaptative subdividing method, since that's what it' s trying to do and much more understandable from a user's pov.
Martin Poirier
theeth at yahoo.com
Wed Feb 4 22:38:04 CET 2009
Revision: 18814
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=18814
Author: theeth
Date: 2009-02-04 22:38:03 +0100 (Wed, 04 Feb 2009)
Log Message:
-----------
Rename correlation subdividing method into adaptative subdividing method, since that's what it's trying to do and much more understandable from a user's pov.
Modified Paths:
--------------
branches/etch-a-ton/source/blender/include/BIF_generate.h
branches/etch-a-ton/source/blender/makesdna/DNA_scene_types.h
branches/etch-a-ton/source/blender/src/drawview.c
branches/etch-a-ton/source/blender/src/editarmature.c
branches/etch-a-ton/source/blender/src/editarmature_generate.c
branches/etch-a-ton/source/blender/src/editarmature_sketch.c
Modified: branches/etch-a-ton/source/blender/include/BIF_generate.h
===================================================================
--- branches/etch-a-ton/source/blender/include/BIF_generate.h 2009-02-04 18:25:41 UTC (rev 18813)
+++ branches/etch-a-ton/source/blender/include/BIF_generate.h 2009-02-04 21:38:03 UTC (rev 18814)
@@ -34,7 +34,7 @@
int nextFixedSubdivision(struct BArcIterator *iter, int start, int end, float head[3], float p[3]);
int nextLengthSubdivision(struct BArcIterator *iter, int start, int end, float head[3], float p[3]);
-int nextCorrelationSubdivision(struct BArcIterator *iter, int start, int end, float head[3], float p[3]);
+int nextAdaptativeSubdivision(struct BArcIterator *iter, int start, int end, float head[3], float p[3]);
struct EditBone * subdivideArcBy(struct bArmature *arm, ListBase *editbones, struct BArcIterator *iter, float invmat[][4], float tmat[][3], NextSubdivisionFunc next_subdividion);
Modified: branches/etch-a-ton/source/blender/makesdna/DNA_scene_types.h
===================================================================
--- branches/etch-a-ton/source/blender/makesdna/DNA_scene_types.h 2009-02-04 18:25:41 UTC (rev 18813)
+++ branches/etch-a-ton/source/blender/makesdna/DNA_scene_types.h 2009-02-04 21:38:03 UTC (rev 18814)
@@ -886,7 +886,7 @@
/* toolsettings->bone_sketching_convert */
#define SK_CONVERT_CUT_FIXED 1
#define SK_CONVERT_CUT_LENGTH 2
-#define SK_CONVERT_CUT_CORRELATION 3
+#define SK_CONVERT_CUT_ADAPTATIVE 3
#define SK_CONVERT_RETARGET 4
/* toolsettings->skgen_retarget_options */
Modified: branches/etch-a-ton/source/blender/src/drawview.c
===================================================================
--- branches/etch-a-ton/source/blender/src/drawview.c 2009-02-04 18:25:41 UTC (rev 18813)
+++ branches/etch-a-ton/source/blender/src/drawview.c 2009-02-04 21:38:03 UTC (rev 18814)
@@ -2336,7 +2336,7 @@
uiBlockBeginAlign(block);
- uiDefButC(block, MENU, B_REDR, "Subdivision Method%t|Length%x2|Correlation%x3|Fixed%x1|Template%x4", 10,yco,60,19, &G.scene->toolsettings->bone_sketching_convert, 0, 0, 0, 0, subdiv_tooltip[(unsigned char)G.scene->toolsettings->bone_sketching_convert]);
+ uiDefButC(block, MENU, B_REDR, "Subdivision Method%t|Length%x2|Adaptative%x3|Fixed%x1|Template%x4", 10,yco,60,19, &G.scene->toolsettings->bone_sketching_convert, 0, 0, 0, 0, subdiv_tooltip[(unsigned char)G.scene->toolsettings->bone_sketching_convert]);
switch(G.scene->toolsettings->bone_sketching_convert)
{
@@ -2344,7 +2344,7 @@
uiDefButF(block, NUM, B_REDR, "Lim:", 70, yco, 140, 19, &G.scene->toolsettings->skgen_length_limit,0.1,50.0, 10, 0, "Maximum length of the subdivided bones");
yco -= 20;
break;
- case SK_CONVERT_CUT_CORRELATION:
+ case SK_CONVERT_CUT_ADAPTATIVE:
uiDefButF(block, NUM, B_REDR, "Thres:", 70, yco, 140, 19, &G.scene->toolsettings->skgen_correlation_limit,0.0, 1.0, 0.01, 0, "Correlation threshold for subdivision");
yco -= 20;
break;
Modified: branches/etch-a-ton/source/blender/src/editarmature.c
===================================================================
--- branches/etch-a-ton/source/blender/src/editarmature.c 2009-02-04 18:25:41 UTC (rev 18813)
+++ branches/etch-a-ton/source/blender/src/editarmature.c 2009-02-04 21:38:03 UTC (rev 18814)
@@ -4737,7 +4737,7 @@
initArcIterator(iter, arc, head);
- lastBone = subdivideArcBy(arm, &G.edbo, iter, invmat, tmat, nextCorrelationSubdivision);
+ lastBone = subdivideArcBy(arm, &G.edbo, iter, invmat, tmat, nextAdaptativeSubdivision);
}
return lastBone;
Modified: branches/etch-a-ton/source/blender/src/editarmature_generate.c
===================================================================
--- branches/etch-a-ton/source/blender/src/editarmature_generate.c 2009-02-04 18:25:41 UTC (rev 18813)
+++ branches/etch-a-ton/source/blender/src/editarmature_generate.c 2009-02-04 21:38:03 UTC (rev 18814)
@@ -177,7 +177,7 @@
return -1;
}
-int nextCorrelationSubdivision(BArcIterator *iter, int start, int end, float head[3], float p[3])
+int nextAdaptativeSubdivision(BArcIterator *iter, int start, int end, float head[3], float p[3])
{
float correlation_threshold = G.scene->toolsettings->skgen_correlation_limit;
float *start_p;
Modified: branches/etch-a-ton/source/blender/src/editarmature_sketch.c
===================================================================
--- branches/etch-a-ton/source/blender/src/editarmature_sketch.c 2009-02-04 18:25:41 UTC (rev 18813)
+++ branches/etch-a-ton/source/blender/src/editarmature_sketch.c 2009-02-04 21:38:03 UTC (rev 18814)
@@ -1316,9 +1316,9 @@
initStrokeIterator(iter, stk, head_index, i);
- if (G.scene->toolsettings->bone_sketching_convert == SK_CONVERT_CUT_CORRELATION)
+ if (G.scene->toolsettings->bone_sketching_convert == SK_CONVERT_CUT_ADAPTATIVE)
{
- drawSubdividedStrokeBy(iter, nextCorrelationSubdivision);
+ drawSubdividedStrokeBy(iter, nextAdaptativeSubdivision);
}
else if (G.scene->toolsettings->bone_sketching_convert == SK_CONVERT_CUT_LENGTH)
{
@@ -2214,9 +2214,9 @@
initStrokeIterator(iter, stk, head_index, i);
- if (G.scene->toolsettings->bone_sketching_convert == SK_CONVERT_CUT_CORRELATION)
+ if (G.scene->toolsettings->bone_sketching_convert == SK_CONVERT_CUT_ADAPTATIVE)
{
- bone = subdivideArcBy(arm, &G.edbo, iter, invmat, tmat, nextCorrelationSubdivision);
+ bone = subdivideArcBy(arm, &G.edbo, iter, invmat, tmat, nextAdaptativeSubdivision);
}
else if (G.scene->toolsettings->bone_sketching_convert == SK_CONVERT_CUT_LENGTH)
{
More information about the Bf-blender-cvs
mailing list