[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [12391] trunk/blender/source/blender: == Curve Editing==
Campbell Barton
cbarton at metavr.com
Thu Oct 25 17:23:53 CEST 2007
Revision: 12391
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=12391
Author: campbellbarton
Date: 2007-10-25 17:23:52 +0200 (Thu, 25 Oct 2007)
Log Message:
-----------
==Curve Editing==
Curve select lasso and border didnt work with hide handles enabled.
Hiding handles was using the scene->selectmode variable, but looking at this now, I see there are places where selectmode is compared with
SCE_SELECT_VERTEX, EDGE, FACE etc. as well as being.
Better to use a global flag, same as G_DRAWFACES.
This is not good since anyone using this in the few days will have an invalid selectmode variable. simple way to fix is to change modes, so do_versions shouldnt be needed.
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/BKE_global.h
trunk/blender/source/blender/makesdna/DNA_scene_types.h
trunk/blender/source/blender/src/buttons_editing.c
trunk/blender/source/blender/src/drawobject.c
trunk/blender/source/blender/src/editview.c
Modified: trunk/blender/source/blender/blenkernel/BKE_global.h
===================================================================
--- trunk/blender/source/blender/blenkernel/BKE_global.h 2007-10-25 15:19:06 UTC (rev 12390)
+++ trunk/blender/source/blender/blenkernel/BKE_global.h 2007-10-25 15:23:52 UTC (rev 12391)
@@ -175,6 +175,7 @@
#define G_DRAWCREASES (1 << 19)
#define G_DRAWSEAMS (1 << 20)
#define G_HIDDENEDGES (1 << 21)
+#define G_HIDDENHANDLES (1 << 22) /* used for curves only */
/* Measurement info Drawing */
Modified: trunk/blender/source/blender/makesdna/DNA_scene_types.h
===================================================================
--- trunk/blender/source/blender/makesdna/DNA_scene_types.h 2007-10-25 15:19:06 UTC (rev 12390)
+++ trunk/blender/source/blender/makesdna/DNA_scene_types.h 2007-10-25 15:23:52 UTC (rev 12391)
@@ -427,7 +427,7 @@
/* editmode stuff */
float editbutsize; /* size of normals */
- short selectmode;
+ short selectmode; /* for mesh only! */
short proportional, prop_mode;
short automerge, pad5, pad6, pad7;
@@ -603,8 +603,6 @@
#define SCE_SELECT_EDGE 2
#define SCE_SELECT_FACE 4
-#define SCE_SELECT_CU_HANDLES_HIDE 8 /* for curve, when flagged hide handles */
-
/* sce->recalc (now in use by previewrender) */
#define SCE_PRV_CHANGED 1
Modified: trunk/blender/source/blender/src/buttons_editing.c
===================================================================
--- trunk/blender/source/blender/src/buttons_editing.c 2007-10-25 15:19:06 UTC (rev 12390)
+++ trunk/blender/source/blender/src/buttons_editing.c 2007-10-25 15:23:52 UTC (rev 12391)
@@ -2950,7 +2950,7 @@
uiBlockBeginAlign(block);
uiDefButF(block, NUM, REDRAWVIEW3D, "NSize:", 400, 60, 150, 19, &G.scene->editbutsize, 0.001, 1.0, 10, 0, "Normal size for drawing");
- uiDefButBitI(block, TOGN, SCE_SELECT_CU_HANDLES_HIDE, REDRAWVIEW3D, "Draw Handles", 400, 40, 150, 19, &G.scene->selectmode, 0, 0, 0, 0, "Draw curve handles in 3D view");
+ uiDefButBitI(block, TOGN, G_HIDDENHANDLES, REDRAWVIEW3D, "Draw Handles", 400, 40, 150, 19, &G.f, 0, 0, 0, 0, "Draw curve handles in 3D view");
uiBlockEndAlign(block);
if(G.obedit) {
Modified: trunk/blender/source/blender/src/drawobject.c
===================================================================
--- trunk/blender/source/blender/src/drawobject.c 2007-10-25 15:19:06 UTC (rev 12390)
+++ trunk/blender/source/blender/src/drawobject.c 2007-10-25 15:23:52 UTC (rev 12391)
@@ -1357,7 +1357,7 @@
BezTriple *bezt = &nu->bezt[i];
if(bezt->hide==0) {
- if (G.scene->selectmode & SCE_SELECT_CU_HANDLES_HIDE) {
+ if (G.f & G_HIDDENHANDLES) {
view3d_project_short_clip(curarea, bezt->vec[1], s, pmat, vmat);
func(userData, nu, NULL, bezt, 1, s[0], s[1]);
} else {
@@ -2966,7 +2966,7 @@
unsigned int *col;
int a;
- if(nu->hide || (G.scene->selectmode & SCE_SELECT_CU_HANDLES_HIDE)) return;
+ if(nu->hide || (G.f & G_HIDDENHANDLES)) return;
glBegin(GL_LINES);
@@ -3033,7 +3033,7 @@
a= nu->pntsu;
while(a--) {
if(bezt->hide==0) {
- if (G.scene->selectmode & SCE_SELECT_CU_HANDLES_HIDE) {
+ if (G.f & G_HIDDENHANDLES) {
if((bezt->f2 & 1)==sel) bglVertex3fv(bezt->vec[1]);
} else {
if((bezt->f1 & 1)==sel) bglVertex3fv(bezt->vec[0]);
Modified: trunk/blender/source/blender/src/editview.c
===================================================================
--- trunk/blender/source/blender/src/editview.c 2007-10-25 15:19:06 UTC (rev 12390)
+++ trunk/blender/source/blender/src/editview.c 2007-10-25 15:23:52 UTC (rev 12391)
@@ -533,12 +533,17 @@
if (bp) {
bp->f1 = data->select?(bp->f1|1):(bp->f1&~1);
} else {
- if (beztindex==0) {
- bezt->f1 = data->select?(bezt->f1|1):(bezt->f1&~1);
- } else if (beztindex==1) {
- bezt->f2 = data->select?(bezt->f2|1):(bezt->f2&~1);
+ if (G.f & G_HIDDENHANDLES) {
+ /* can only be beztindex==0 here since handles are hidden */
+ bezt->f1 = bezt->f2 = bezt->f3 = data->select?(bezt->f1|1):(bezt->f1&~1);
} else {
- bezt->f3 = data->select?(bezt->f3|1):(bezt->f3&~1);
+ if (beztindex==0) {
+ bezt->f1 = data->select?(bezt->f1|1):(bezt->f1&~1);
+ } else if (beztindex==1) {
+ bezt->f2 = data->select?(bezt->f2|1):(bezt->f2&~1);
+ } else {
+ bezt->f3 = data->select?(bezt->f3|1):(bezt->f3&~1);
+ }
}
}
}
@@ -1602,12 +1607,17 @@
if (bp) {
bp->f1 = data->select?(bp->f1|1):(bp->f1&~1);
} else {
- if (beztindex==0) {
- bezt->f1 = data->select?(bezt->f1|1):(bezt->f1&~1);
- } else if (beztindex==1) {
- bezt->f2 = data->select?(bezt->f2|1):(bezt->f2&~1);
+ if (G.f & G_HIDDENHANDLES) {
+ /* can only be beztindex==0 here since handles are hidden */
+ bezt->f1 = bezt->f2 = bezt->f3 = data->select?(bezt->f1|1):(bezt->f1&~1);
} else {
- bezt->f3 = data->select?(bezt->f3|1):(bezt->f3&~1);
+ if (beztindex==0) {
+ bezt->f1 = data->select?(bezt->f1|1):(bezt->f1&~1);
+ } else if (beztindex==1) {
+ bezt->f2 = data->select?(bezt->f2|1):(bezt->f2&~1);
+ } else {
+ bezt->f3 = data->select?(bezt->f3|1):(bezt->f3&~1);
+ }
}
}
}
More information about the Bf-blender-cvs
mailing list