[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [45867] trunk/blender/source/blender: code cleanup: remove editbutflag flag from toolsettings & related defines.
Campbell Barton
ideasman42 at gmail.com
Mon Apr 23 04:48:10 CEST 2012
Revision: 45867
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=45867
Author: campbellbarton
Date: 2012-04-23 02:48:05 +0000 (Mon, 23 Apr 2012)
Log Message:
-----------
code cleanup: remove editbutflag flag from toolsettings & related defines.
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/intern/scene.c
trunk/blender/source/blender/blenloader/intern/readfile.c
trunk/blender/source/blender/editors/include/ED_mesh.h
trunk/blender/source/blender/editors/mesh/editmesh_tools.c
trunk/blender/source/blender/makesdna/DNA_scene_types.h
Modified: trunk/blender/source/blender/blenkernel/intern/scene.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/scene.c 2012-04-23 02:17:57 UTC (rev 45866)
+++ trunk/blender/source/blender/blenkernel/intern/scene.c 2012-04-23 02:48:05 UTC (rev 45867)
@@ -418,7 +418,6 @@
sce->toolsettings->segments = 32;
sce->toolsettings->rings = 32;
sce->toolsettings->vertices = 32;
- sce->toolsettings->editbutflag = 1;
sce->toolsettings->uvcalc_radius = 1.0f;
sce->toolsettings->uvcalc_cubesize = 1.0f;
sce->toolsettings->uvcalc_mapdir = 1;
Modified: trunk/blender/source/blender/blenloader/intern/readfile.c
===================================================================
--- trunk/blender/source/blender/blenloader/intern/readfile.c 2012-04-23 02:17:57 UTC (rev 45866)
+++ trunk/blender/source/blender/blenloader/intern/readfile.c 2012-04-23 02:48:05 UTC (rev 45867)
@@ -9153,7 +9153,6 @@
sce->toolsettings->segments = 32;
sce->toolsettings->rings = 32;
sce->toolsettings->vertices = 32;
- sce->toolsettings->editbutflag =1;
}
sce= sce->id.next;
}
Modified: trunk/blender/source/blender/editors/include/ED_mesh.h
===================================================================
--- trunk/blender/source/blender/editors/include/ED_mesh.h 2012-04-23 02:17:57 UTC (rev 45866)
+++ trunk/blender/source/blender/editors/include/ED_mesh.h 2012-04-23 02:48:05 UTC (rev 45867)
@@ -71,23 +71,8 @@
struct Object;
struct rcti;
-#define EM_FGON_DRAW 1 // face flag
-#define EM_FGON 2 // edge and face flag both
-
/* editbutflag */
-#define B_CLOCKWISE 1
-#define B_KEEPORIG 2
-#define B_BEAUTY 4
#define B_SMOOTH 8
-#define B_BEAUTY_SHORT 0x10
-#define B_AUTOFGON 0x20
-#define B_KNIFE 0x80
-#define B_PERCENTSUBD 0x40
-//#define B_MESH_X_MIRROR 0x100 // deprecated, use mesh
-#define B_JOINTRIA_UV 0x200
-#define B_JOINTRIA_VCOL 0X400
-#define B_JOINTRIA_SHARP 0X800
-#define B_JOINTRIA_MAT 0X1000
#define B_FRACTAL 0x2000
#define B_SPHERE 0x4000
Modified: trunk/blender/source/blender/editors/mesh/editmesh_tools.c
===================================================================
--- trunk/blender/source/blender/editors/mesh/editmesh_tools.c 2012-04-23 02:17:57 UTC (rev 45866)
+++ trunk/blender/source/blender/editors/mesh/editmesh_tools.c 2012-04-23 02:48:05 UTC (rev 45867)
@@ -82,7 +82,6 @@
static int edbm_subdivide_exec(bContext *C, wmOperator *op)
{
- ToolSettings *ts = CTX_data_tool_settings(C);
Object *obedit = CTX_data_edit_object(C);
BMEditMesh *em = BMEdit_FromObject(obedit);
int cuts = RNA_int_get(op->ptr, "number_cuts");
@@ -103,7 +102,7 @@
BM_mesh_esubdivideflag(obedit, em->bm, BM_ELEM_SELECT,
smooth, fractal,
- ts->editbutflag | flag,
+ flag,
cuts, 0, RNA_enum_get(op->ptr, "quadcorner"),
RNA_boolean_get(op->ptr, "quadtri"),
TRUE, RNA_int_get(op->ptr, "seed"));
@@ -2742,7 +2741,7 @@
if (mode == KNIFE_MIDPOINT) numcuts = 1;
BMO_slot_int_set(&bmop, "numcuts", numcuts);
- BMO_slot_int_set(&bmop, "flag", B_KNIFE);
+ BMO_slot_int_set(&bmop, "flag", 0);
BMO_slot_int_set(&bmop, "quadcornertype", SUBD_STRAIGHT_CUT);
BMO_slot_bool_set(&bmop, "singleedge", FALSE);
BMO_slot_bool_set(&bmop, "gridfill", FALSE);
@@ -3280,7 +3279,6 @@
static int edbm_spin_exec(bContext *C, wmOperator *op)
{
Object *obedit = CTX_data_edit_object(C);
- ToolSettings *ts = CTX_data_tool_settings(C);
BMEditMesh *em = BMEdit_FromObject(obedit);
BMesh *bm = em->bm;
BMOperator spinop;
@@ -3288,14 +3286,15 @@
float d[3] = {0.0f, 0.0f, 0.0f};
int steps, dupli;
float degr;
-
+
RNA_float_get_array(op->ptr, "center", cent);
RNA_float_get_array(op->ptr, "axis", axis);
steps = RNA_int_get(op->ptr, "steps");
degr = RNA_float_get(op->ptr, "degrees");
- if (ts->editbutflag & B_CLOCKWISE) degr = -degr;
+ //if (ts->editbutflag & B_CLOCKWISE)
+ degr = -degr;
dupli = RNA_boolean_get(op->ptr, "dupli");
-
+
/* undo object transformation */
copy_m3_m4(imat, obedit->imat);
sub_v3_v3(cent, obedit->obmat[3]);
Modified: trunk/blender/source/blender/makesdna/DNA_scene_types.h
===================================================================
--- trunk/blender/source/blender/makesdna/DNA_scene_types.h 2012-04-23 02:17:57 UTC (rev 45866)
+++ trunk/blender/source/blender/makesdna/DNA_scene_types.h 2012-04-23 02:48:05 UTC (rev 45867)
@@ -885,7 +885,7 @@
/* Subdivide Settings */
short cornertype;
- short editbutflag;
+ short pad3;
/*Triangle to Quad conversion threshold*/
float jointrilimit;
/* Editmode Tools */
@@ -943,11 +943,11 @@
/* Auto-Keying Mode */
short autokey_mode, autokey_flag; /* defines in DNA_userdef_types.h */
-
+
/* Multires */
char multires_subdiv_type;
char pad2[5];
-
+
/* Skeleton generation */
short skgen_resolution;
float skgen_threshold_internal;
@@ -965,7 +965,7 @@
char skgen_postpro_passes;
char skgen_subdivisions[3];
char skgen_multi_level;
-
+
/* Skeleton Sketching */
struct Object *skgen_template;
char bone_sketching;
More information about the Bf-blender-cvs
mailing list