archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity
This repository has been archived on 2023-10-09. You can view files and clone it, but cannot push or open issues or pull requests.
Files
acd568d751dacd6ad1dbc6bd5a88fb52df783546
blender-archive/source/blender/editors/mesh/editbmesh_add.c

605 lines
16 KiB
C
Raw Normal View History

remove $Id from headers
2011-10-24 23:32:24 +00:00
/*
The Death Of Editmesh - Part 1 I've removed editmesh altogether (other then scanfill, which is seperate code that happens to reuse the editmesh structures). The compatibility layer I had written for old editmesh tools was more trouble then it was worth, though it did help in the early stages of this project. There's a fair amount of breakage, and there's bunches of tools (mostly minor ones) I need to port over still. Biggest ones are join triangles and loop to region, and spin/screw. This probably isn't really testable, I'll hopefully have more work done on this soon, but might not be before next week.
2010-01-28 00:45:30 +00:00
* ***** BEGIN GPL LICENSE BLOCK *****
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software Foundation,
GPL Header Cleanup
2012-02-11 04:16:17 +00:00
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
The Death Of Editmesh - Part 1 I've removed editmesh altogether (other then scanfill, which is seperate code that happens to reuse the editmesh structures). The compatibility layer I had written for old editmesh tools was more trouble then it was worth, though it did help in the early stages of this project. There's a fair amount of breakage, and there's bunches of tools (mostly minor ones) I need to port over still. Biggest ones are join triangles and loop to region, and spin/screw. This probably isn't really testable, I'll hopefully have more work done on this soon, but might not be before next week.
2010-01-28 00:45:30 +00:00
*
* The Original Code is Copyright (C) 2004 by Blender Foundation.
* All rights reserved.
*
* The Original Code is: all of this file.
*
* Contributor(s): Joseph Eagar
*
* ***** END GPL LICENSE BLOCK *****
*/
#include "DNA_mesh_types.h"
#include "DNA_object_types.h"
#include "RNA_define.h"
#include "RNA_access.h"
#include "BLI_math.h"
#include "BKE_context.h"
#include "BKE_depsgraph.h"
#include "BKE_tessmesh.h"
#include "WM_api.h"
#include "WM_types.h"
#include "ED_mesh.h"
#include "ED_screen.h"
#include "ED_object.h"
/* uses context to figure out transform for primitive */
/* returns standard diameter */
static float new_primitive_matrix(bContext *C, float *loc, float *rot, float primmat[][4])
{
Object *obedit= CTX_data_edit_object(C);
View3D *v3d =CTX_wm_view3d(C);
float mat[3][3], rmat[3][3], cmat[3][3], imat[3][3];
unit_m4(primmat);
eul_to_mat3(rmat, rot);
invert_m3(rmat);
/* inverse transform for initial rotation and object */
copy_m3_m4(mat, obedit->obmat);
mul_m3_m3m3(cmat, rmat, mat);
invert_m3_m3(imat, cmat);
copy_m4_m3(primmat, imat);
/* center */
replace bmesh specific macros with math functions, also some pedantic formatting edits.
2011-11-07 09:02:10 +00:00
copy_v3_v3(primmat[3], loc);
sub_v3_v3(primmat[3], obedit->obmat[3]);
The Death Of Editmesh - Part 1 I've removed editmesh altogether (other then scanfill, which is seperate code that happens to reuse the editmesh structures). The compatibility layer I had written for old editmesh tools was more trouble then it was worth, though it did help in the early stages of this project. There's a fair amount of breakage, and there's bunches of tools (mostly minor ones) I need to port over still. Biggest ones are join triangles and loop to region, and spin/screw. This probably isn't really testable, I'll hopefully have more work done on this soon, but might not be before next week.
2010-01-28 00:45:30 +00:00
invert_m3_m3(imat, mat);
mul_m3_v3(imat, primmat[3]);
Style Cleanup
2012-02-10 18:09:19 +00:00
return v3d ? v3d->grid : 1.0f;
The Death Of Editmesh - Part 1 I've removed editmesh altogether (other then scanfill, which is seperate code that happens to reuse the editmesh structures). The compatibility layer I had written for old editmesh tools was more trouble then it was worth, though it did help in the early stages of this project. There's a fair amount of breakage, and there's bunches of tools (mostly minor ones) I need to port over still. Biggest ones are join triangles and loop to region, and spin/screw. This probably isn't really testable, I'll hopefully have more work done on this soon, but might not be before next week.
2010-01-28 00:45:30 +00:00
}
/* ********* add primitive operators ************* */
static void make_prim_init(bContext *C, float *dia, float mat[][4],
=bmesh= Coded a new modifier, "Precision UV Interpolation", that triangulates, subdivides, then uses brecht's mean value interpolation to interpolate face data. Textures on ngon faces get interpolated a bit nicer, in other words (though concave cases, e.g. 'N', don't work very well).
2011-03-25 00:32:38 +00:00
int *state, float *loc, float *rot, unsigned int layer)
The Death Of Editmesh - Part 1 I've removed editmesh altogether (other then scanfill, which is seperate code that happens to reuse the editmesh structures). The compatibility layer I had written for old editmesh tools was more trouble then it was worth, though it did help in the early stages of this project. There's a fair amount of breakage, and there's bunches of tools (mostly minor ones) I need to port over still. Biggest ones are join triangles and loop to region, and spin/screw. This probably isn't really testable, I'll hopefully have more work done on this soon, but might not be before next week.
2010-01-28 00:45:30 +00:00
{
Object *obedit= CTX_data_edit_object(C);
*state = 0;
if(obedit==NULL || obedit->type!=OB_MESH) {
merge with trunk at r27259 and commit of a patch by anthony jones to fix msvc (though further work may be needed because changes made by the merge
2010-03-09 04:32:40 +00:00
obedit= ED_object_add_type(C, OB_MESH, loc, rot, FALSE, layer);
The Death Of Editmesh - Part 1 I've removed editmesh altogether (other then scanfill, which is seperate code that happens to reuse the editmesh structures). The compatibility layer I had written for old editmesh tools was more trouble then it was worth, though it did help in the early stages of this project. There's a fair amount of breakage, and there's bunches of tools (mostly minor ones) I need to port over still. Biggest ones are join triangles and loop to region, and spin/screw. This probably isn't really testable, I'll hopefully have more work done on this soon, but might not be before next week.
2010-01-28 00:45:30 +00:00
/* create editmode */
ED_object_enter_editmode(C, EM_DO_UNDO|EM_IGNORE_LAYER); /* rare cases the active layer is messed up */
*state = 1;
}
merge with/from trunk at r35190
2011-02-27 06:19:40 +00:00
else DAG_id_tag_update(&obedit->id, OB_RECALC_DATA);
The Death Of Editmesh - Part 1 I've removed editmesh altogether (other then scanfill, which is seperate code that happens to reuse the editmesh structures). The compatibility layer I had written for old editmesh tools was more trouble then it was worth, though it did help in the early stages of this project. There's a fair amount of breakage, and there's bunches of tools (mostly minor ones) I need to port over still. Biggest ones are join triangles and loop to region, and spin/screw. This probably isn't really testable, I'll hopefully have more work done on this soon, but might not be before next week.
2010-01-28 00:45:30 +00:00
*dia *= new_primitive_matrix(C, loc, rot, mat);
}
static void make_prim_finish(bContext *C, int *state, int enter_editmode)
{
Fix selection when adding a primitive while already in edge/face-select mode
2011-10-06 02:29:39 +00:00
Object *obedit;
Mesh *me;
BMEditMesh *em;
obedit = CTX_data_edit_object(C);
me = obedit->data;
em = me->edit_btmesh;
The Death Of Editmesh - Part 1 I've removed editmesh altogether (other then scanfill, which is seperate code that happens to reuse the editmesh structures). The compatibility layer I had written for old editmesh tools was more trouble then it was worth, though it did help in the early stages of this project. There's a fair amount of breakage, and there's bunches of tools (mostly minor ones) I need to port over still. Biggest ones are join triangles and loop to region, and spin/screw. This probably isn't really testable, I'll hopefully have more work done on this soon, but might not be before next week.
2010-01-28 00:45:30 +00:00
Fix selection when adding a primitive while already in edge/face-select mode
2011-10-06 02:29:39 +00:00
/* Primitive has all verts selected, use vert select flush
reviewed selection flushing code, some of this was incorrect, checked all uses against trunk. loop select also was incorrectly calling EDBM_select_flush() rather then EDBM_store_selection(), tsk tsk. (and strange nobody noticed this).
2012-02-10 06:16:21 +00:00
* to push this up to edges & faces. */
EDBM_selectmode_flush_ex(em, SCE_SELECT_VERTEX);
Added call to flushing function for primitives: ---------------------------------------------- Editmode selection flushing wasn't getting called on primitive addition. This caused inconsistent selection state.
2011-06-21 00:03:38 +00:00
merge with/from trunk at r35190
2011-02-27 06:19:40 +00:00
DAG_id_tag_update(obedit->data, OB_RECALC_DATA);
The Death Of Editmesh - Part 1 I've removed editmesh altogether (other then scanfill, which is seperate code that happens to reuse the editmesh structures). The compatibility layer I had written for old editmesh tools was more trouble then it was worth, though it did help in the early stages of this project. There's a fair amount of breakage, and there's bunches of tools (mostly minor ones) I need to port over still. Biggest ones are join triangles and loop to region, and spin/screw. This probably isn't really testable, I'll hopefully have more work done on this soon, but might not be before next week.
2010-01-28 00:45:30 +00:00
WM_event_add_notifier(C, NC_GEOM|ND_DATA, obedit->data);
/* userdef */
if (*state && !enter_editmode) {
ED_object_exit_editmode(C, EM_FREEDATA); /* adding EM_DO_UNDO messes up operator redo */
}
WM_event_add_notifier(C, NC_OBJECT|ND_DRAW, obedit);
}
static int add_primitive_plane_exec(bContext *C, wmOperator *op)
{
Object *obedit;
Mesh *me;
BMEditMesh *em;
grid size was being ignored for grid and plane primitives
2012-02-05 22:27:44 +00:00
float loc[3], rot[3], mat[4][4], dia = 1.0f;
The Death Of Editmesh - Part 1 I've removed editmesh altogether (other then scanfill, which is seperate code that happens to reuse the editmesh structures). The compatibility layer I had written for old editmesh tools was more trouble then it was worth, though it did help in the early stages of this project. There's a fair amount of breakage, and there's bunches of tools (mostly minor ones) I need to port over still. Biggest ones are join triangles and loop to region, and spin/screw. This probably isn't really testable, I'll hopefully have more work done on this soon, but might not be before next week.
2010-01-28 00:45:30 +00:00
int enter_editmode;
int state;
=bmesh= Coded a new modifier, "Precision UV Interpolation", that triangulates, subdivides, then uses brecht's mean value interpolation to interpolate face data. Textures on ngon faces get interpolated a bit nicer, in other words (though concave cases, e.g. 'N', don't work very well).
2011-03-25 00:32:38 +00:00
unsigned int layer;
The Death Of Editmesh - Part 1 I've removed editmesh altogether (other then scanfill, which is seperate code that happens to reuse the editmesh structures). The compatibility layer I had written for old editmesh tools was more trouble then it was worth, though it did help in the early stages of this project. There's a fair amount of breakage, and there's bunches of tools (mostly minor ones) I need to port over still. Biggest ones are join triangles and loop to region, and spin/screw. This probably isn't really testable, I'll hopefully have more work done on this soon, but might not be before next week.
2010-01-28 00:45:30 +00:00
=bmesh= Fixed some bugs with mesh primitive add operators. Suzanne now faces forward, instead of down. Cylinder and circle both now work. Cone lets you adjust the diameter at both ends now. I also reorganized the walker code, to be more maintainable and understandable.
2011-05-01 18:53:18 +00:00
ED_object_add_generic_get_opts(C, op, loc, rot, &enter_editmode, &layer, NULL);
merge with trunk at r27259 and commit of a patch by anthony jones to fix msvc (though further work may be needed because changes made by the merge
2010-03-09 04:32:40 +00:00
make_prim_init(C, &dia, mat, &state, loc, rot, layer);
The Death Of Editmesh - Part 1 I've removed editmesh altogether (other then scanfill, which is seperate code that happens to reuse the editmesh structures). The compatibility layer I had written for old editmesh tools was more trouble then it was worth, though it did help in the early stages of this project. There's a fair amount of breakage, and there's bunches of tools (mostly minor ones) I need to port over still. Biggest ones are join triangles and loop to region, and spin/screw. This probably isn't really testable, I'll hopefully have more work done on this soon, but might not be before next week.
2010-01-28 00:45:30 +00:00
obedit = CTX_data_edit_object(C);
me = obedit->data;
em = me->edit_btmesh;
if (!EDBM_CallAndSelectOpf(em, op, "vertout",
grid size was being ignored for grid and plane primitives
2012-02-05 22:27:44 +00:00
"create_grid xsegments=%i ysegments=%i size=%f mat=%m4", 1, 1, dia, mat))
The Death Of Editmesh - Part 1 I've removed editmesh altogether (other then scanfill, which is seperate code that happens to reuse the editmesh structures). The compatibility layer I had written for old editmesh tools was more trouble then it was worth, though it did help in the early stages of this project. There's a fair amount of breakage, and there's bunches of tools (mostly minor ones) I need to port over still. Biggest ones are join triangles and loop to region, and spin/screw. This probably isn't really testable, I'll hopefully have more work done on this soon, but might not be before next week.
2010-01-28 00:45:30 +00:00
return OPERATOR_CANCELLED;
grid size was being ignored for grid and plane primitives
2012-02-05 22:27:44 +00:00
The Death Of Editmesh - Part 1 I've removed editmesh altogether (other then scanfill, which is seperate code that happens to reuse the editmesh structures). The compatibility layer I had written for old editmesh tools was more trouble then it was worth, though it did help in the early stages of this project. There's a fair amount of breakage, and there's bunches of tools (mostly minor ones) I need to port over still. Biggest ones are join triangles and loop to region, and spin/screw. This probably isn't really testable, I'll hopefully have more work done on this soon, but might not be before next week.
2010-01-28 00:45:30 +00:00
make_prim_finish(C, &state, enter_editmode);
return OPERATOR_FINISHED;
}
void MESH_OT_primitive_plane_add(wmOperatorType *ot)
{
/* identifiers */
ot->name= "Add Plane";
fix script error and quiet warnings about "." description ending.
2011-09-23 13:31:48 +00:00
ot->description= "Construct a filled planar mesh with 4 vertices";
The Death Of Editmesh - Part 1 I've removed editmesh altogether (other then scanfill, which is seperate code that happens to reuse the editmesh structures). The compatibility layer I had written for old editmesh tools was more trouble then it was worth, though it did help in the early stages of this project. There's a fair amount of breakage, and there's bunches of tools (mostly minor ones) I need to port over still. Biggest ones are join triangles and loop to region, and spin/screw. This probably isn't really testable, I'll hopefully have more work done on this soon, but might not be before next week.
2010-01-28 00:45:30 +00:00
ot->idname= "MESH_OT_primitive_plane_add";
/* api callbacks */
ot->invoke= ED_object_add_generic_invoke;
ot->exec= add_primitive_plane_exec;
ot->poll= ED_operator_scene_editable;
/* flags */
ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
ED_object_add_generic_props(ot, TRUE);
}
static int add_primitive_cube_exec(bContext *C, wmOperator *op)
{
Object *obedit;
Mesh *me;
BMEditMesh *em;
float loc[3], rot[3], mat[4][4], dia;
int enter_editmode;
int state;
=bmesh= Coded a new modifier, "Precision UV Interpolation", that triangulates, subdivides, then uses brecht's mean value interpolation to interpolate face data. Textures on ngon faces get interpolated a bit nicer, in other words (though concave cases, e.g. 'N', don't work very well).
2011-03-25 00:32:38 +00:00
unsigned int layer;
merge with trunk at r27259 and commit of a patch by anthony jones to fix msvc (though further work may be needed because changes made by the merge
2010-03-09 04:32:40 +00:00
=bmesh= Fixed some bugs with mesh primitive add operators. Suzanne now faces forward, instead of down. Cylinder and circle both now work. Cone lets you adjust the diameter at both ends now. I also reorganized the walker code, to be more maintainable and understandable.
2011-05-01 18:53:18 +00:00
ED_object_add_generic_get_opts(C, op, loc, rot, &enter_editmode, &layer, NULL);
merge with trunk at r27259 and commit of a patch by anthony jones to fix msvc (though further work may be needed because changes made by the merge
2010-03-09 04:32:40 +00:00
make_prim_init(C, &dia, mat, &state, loc, rot, layer);
The Death Of Editmesh - Part 1 I've removed editmesh altogether (other then scanfill, which is seperate code that happens to reuse the editmesh structures). The compatibility layer I had written for old editmesh tools was more trouble then it was worth, though it did help in the early stages of this project. There's a fair amount of breakage, and there's bunches of tools (mostly minor ones) I need to port over still. Biggest ones are join triangles and loop to region, and spin/screw. This probably isn't really testable, I'll hopefully have more work done on this soon, but might not be before next week.
2010-01-28 00:45:30 +00:00
obedit= CTX_data_edit_object(C);
me = obedit->data;
em = me->edit_btmesh;
if (!EDBM_CallAndSelectOpf(em, op, "vertout", "create_cube mat=%m4 size=%f", mat, 2.0f))
return OPERATOR_CANCELLED;
removed some bmesh todo comments which are not needed and minor edits on previous commit.
2011-12-08 00:28:42 +00:00
/* BMESH_TODO make plane side this: M_SQRT2 - plane (diameter of 1.41 makes it unit size) */
The Death Of Editmesh - Part 1 I've removed editmesh altogether (other then scanfill, which is seperate code that happens to reuse the editmesh structures). The compatibility layer I had written for old editmesh tools was more trouble then it was worth, though it did help in the early stages of this project. There's a fair amount of breakage, and there's bunches of tools (mostly minor ones) I need to port over still. Biggest ones are join triangles and loop to region, and spin/screw. This probably isn't really testable, I'll hopefully have more work done on this soon, but might not be before next week.
2010-01-28 00:45:30 +00:00
make_prim_finish(C, &state, enter_editmode);
return OPERATOR_FINISHED;
}
void MESH_OT_primitive_cube_add(wmOperatorType *ot)
{
/* identifiers */
ot->name= "Add Cube";
fix script error and quiet warnings about "." description ending.
2011-09-23 13:31:48 +00:00
ot->description= "Construct a cube mesh";
The Death Of Editmesh - Part 1 I've removed editmesh altogether (other then scanfill, which is seperate code that happens to reuse the editmesh structures). The compatibility layer I had written for old editmesh tools was more trouble then it was worth, though it did help in the early stages of this project. There's a fair amount of breakage, and there's bunches of tools (mostly minor ones) I need to port over still. Biggest ones are join triangles and loop to region, and spin/screw. This probably isn't really testable, I'll hopefully have more work done on this soon, but might not be before next week.
2010-01-28 00:45:30 +00:00
ot->idname= "MESH_OT_primitive_cube_add";
/* api callbacks */
ot->invoke= ED_object_add_generic_invoke;
ot->exec= add_primitive_cube_exec;
ot->poll= ED_operator_scene_editable;
/* flags */
ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
ED_object_add_generic_props(ot, TRUE);
}
=bmesh= Fixed some bugs with mesh primitive add operators. Suzanne now faces forward, instead of down. Cylinder and circle both now work. Cone lets you adjust the diameter at both ends now. I also reorganized the walker code, to be more maintainable and understandable.
2011-05-01 18:53:18 +00:00
static const EnumPropertyItem fill_type_items[]= {
{0, "NOTHING", 0, "Nothing", "Don't fill at all"},
{1, "NGON", 0, "Ngon", "Use ngons"},
{2, "TRIFAN", 0, "Triangle Fan", "Use triangle fans"},
{0, NULL, 0, NULL, NULL}};
The Death Of Editmesh - Part 1 I've removed editmesh altogether (other then scanfill, which is seperate code that happens to reuse the editmesh structures). The compatibility layer I had written for old editmesh tools was more trouble then it was worth, though it did help in the early stages of this project. There's a fair amount of breakage, and there's bunches of tools (mostly minor ones) I need to port over still. Biggest ones are join triangles and loop to region, and spin/screw. This probably isn't really testable, I'll hopefully have more work done on this soon, but might not be before next week.
2010-01-28 00:45:30 +00:00
static int add_primitive_circle_exec(bContext *C, wmOperator *op)
{
=bmesh= Fixed some bugs with mesh primitive add operators. Suzanne now faces forward, instead of down. Cylinder and circle both now work. Cone lets you adjust the diameter at both ends now. I also reorganized the walker code, to be more maintainable and understandable.
2011-05-01 18:53:18 +00:00
Object *obedit;
Mesh *me;
BMEditMesh *em;
float loc[3], rot[3], mat[4][4], dia;
The Death Of Editmesh - Part 1 I've removed editmesh altogether (other then scanfill, which is seperate code that happens to reuse the editmesh structures). The compatibility layer I had written for old editmesh tools was more trouble then it was worth, though it did help in the early stages of this project. There's a fair amount of breakage, and there's bunches of tools (mostly minor ones) I need to port over still. Biggest ones are join triangles and loop to region, and spin/screw. This probably isn't really testable, I'll hopefully have more work done on this soon, but might not be before next week.
2010-01-28 00:45:30 +00:00
int enter_editmode;
=bmesh= Fixed some bugs with mesh primitive add operators. Suzanne now faces forward, instead of down. Cylinder and circle both now work. Cone lets you adjust the diameter at both ends now. I also reorganized the walker code, to be more maintainable and understandable.
2011-05-01 18:53:18 +00:00
int state, cap_end, cap_tri;
unsigned int layer;
The Death Of Editmesh - Part 1 I've removed editmesh altogether (other then scanfill, which is seperate code that happens to reuse the editmesh structures). The compatibility layer I had written for old editmesh tools was more trouble then it was worth, though it did help in the early stages of this project. There's a fair amount of breakage, and there's bunches of tools (mostly minor ones) I need to port over still. Biggest ones are join triangles and loop to region, and spin/screw. This probably isn't really testable, I'll hopefully have more work done on this soon, but might not be before next week.
2010-01-28 00:45:30 +00:00
=bmesh= Fixed some bugs with mesh primitive add operators. Suzanne now faces forward, instead of down. Cylinder and circle both now work. Cone lets you adjust the diameter at both ends now. I also reorganized the walker code, to be more maintainable and understandable.
2011-05-01 18:53:18 +00:00
cap_end = RNA_enum_get(op->ptr, "fill_type");
cap_tri = cap_end==2;
ED_object_add_generic_get_opts(C, op, loc, rot, &enter_editmode, &layer, NULL);
make_prim_init(C, &dia, mat, &state, loc, rot, layer);
The Death Of Editmesh - Part 1 I've removed editmesh altogether (other then scanfill, which is seperate code that happens to reuse the editmesh structures). The compatibility layer I had written for old editmesh tools was more trouble then it was worth, though it did help in the early stages of this project. There's a fair amount of breakage, and there's bunches of tools (mostly minor ones) I need to port over still. Biggest ones are join triangles and loop to region, and spin/screw. This probably isn't really testable, I'll hopefully have more work done on this soon, but might not be before next week.
2010-01-28 00:45:30 +00:00
=bmesh= Fixed some bugs with mesh primitive add operators. Suzanne now faces forward, instead of down. Cylinder and circle both now work. Cone lets you adjust the diameter at both ends now. I also reorganized the walker code, to be more maintainable and understandable.
2011-05-01 18:53:18 +00:00
obedit = CTX_data_edit_object(C);
me = obedit->data;
em = me->edit_btmesh;
if (!EDBM_CallAndSelectOpf(em, op, "vertout",
"create_circle segments=%i diameter=%f cap_ends=%i cap_tris=%i mat=%m4",
RNA_int_get(op->ptr, "vertices"), RNA_float_get(op->ptr, "radius"),
cap_end, cap_tri, mat))
return OPERATOR_CANCELLED;
make_prim_finish(C, &state, enter_editmode);
return OPERATOR_FINISHED;
The Death Of Editmesh - Part 1 I've removed editmesh altogether (other then scanfill, which is seperate code that happens to reuse the editmesh structures). The compatibility layer I had written for old editmesh tools was more trouble then it was worth, though it did help in the early stages of this project. There's a fair amount of breakage, and there's bunches of tools (mostly minor ones) I need to port over still. Biggest ones are join triangles and loop to region, and spin/screw. This probably isn't really testable, I'll hopefully have more work done on this soon, but might not be before next week.
2010-01-28 00:45:30 +00:00
}
void MESH_OT_primitive_circle_add(wmOperatorType *ot)
{
svn merge ^/trunk/blender -r40498:40511
2011-09-24 11:03:52 +00:00
PropertyRNA *prop;
The Death Of Editmesh - Part 1 I've removed editmesh altogether (other then scanfill, which is seperate code that happens to reuse the editmesh structures). The compatibility layer I had written for old editmesh tools was more trouble then it was worth, though it did help in the early stages of this project. There's a fair amount of breakage, and there's bunches of tools (mostly minor ones) I need to port over still. Biggest ones are join triangles and loop to region, and spin/screw. This probably isn't really testable, I'll hopefully have more work done on this soon, but might not be before next week.
2010-01-28 00:45:30 +00:00
/* identifiers */
ot->name= "Add Circle";
fix script error and quiet warnings about "." description ending.
2011-09-23 13:31:48 +00:00
ot->description= "Construct a circle mesh";
The Death Of Editmesh - Part 1 I've removed editmesh altogether (other then scanfill, which is seperate code that happens to reuse the editmesh structures). The compatibility layer I had written for old editmesh tools was more trouble then it was worth, though it did help in the early stages of this project. There's a fair amount of breakage, and there's bunches of tools (mostly minor ones) I need to port over still. Biggest ones are join triangles and loop to region, and spin/screw. This probably isn't really testable, I'll hopefully have more work done on this soon, but might not be before next week.
2010-01-28 00:45:30 +00:00
ot->idname= "MESH_OT_primitive_circle_add";
/* api callbacks */
ot->invoke= ED_object_add_generic_invoke;
ot->exec= add_primitive_circle_exec;
ot->poll= ED_operator_scene_editable;
/* flags */
ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
/* props */
RNA_def_int(ot->srna, "vertices", 32, INT_MIN, INT_MAX, "Vertices", "", 3, 500);
svn merge ^/trunk/blender -r40498:40511
2011-09-24 11:03:52 +00:00
prop = RNA_def_float(ot->srna, "radius", 1.0f, 0.0, FLT_MAX, "Radius", "", 0.001, 100.00);
RNA_def_property_subtype(prop, PROP_DISTANCE);
=bmesh= Cut out some unwanted differences with trunk in preparation for merge. Also fixed some warnings, though many remain.
2011-05-07 02:48:14 +00:00
RNA_def_enum(ot->srna, "fill_type", fill_type_items, 0, "Fill Type", "");
The Death Of Editmesh - Part 1 I've removed editmesh altogether (other then scanfill, which is seperate code that happens to reuse the editmesh structures). The compatibility layer I had written for old editmesh tools was more trouble then it was worth, though it did help in the early stages of this project. There's a fair amount of breakage, and there's bunches of tools (mostly minor ones) I need to port over still. Biggest ones are join triangles and loop to region, and spin/screw. This probably isn't really testable, I'll hopefully have more work done on this soon, but might not be before next week.
2010-01-28 00:45:30 +00:00
ED_object_add_generic_props(ot, TRUE);
}
merge from trunk at r31523
2010-09-07 05:47:34 +00:00
static int add_primitive_cylinder_exec(bContext *C, wmOperator *op)
The Death Of Editmesh - Part 1 I've removed editmesh altogether (other then scanfill, which is seperate code that happens to reuse the editmesh structures). The compatibility layer I had written for old editmesh tools was more trouble then it was worth, though it did help in the early stages of this project. There's a fair amount of breakage, and there's bunches of tools (mostly minor ones) I need to port over still. Biggest ones are join triangles and loop to region, and spin/screw. This probably isn't really testable, I'll hopefully have more work done on this soon, but might not be before next week.
2010-01-28 00:45:30 +00:00
{
ported triangles to quads.
2010-02-18 10:09:52 +00:00
Object *obedit;
Mesh *me;
BMEditMesh *em;
float loc[3], rot[3], mat[4][4], dia;
The Death Of Editmesh - Part 1 I've removed editmesh altogether (other then scanfill, which is seperate code that happens to reuse the editmesh structures). The compatibility layer I had written for old editmesh tools was more trouble then it was worth, though it did help in the early stages of this project. There's a fair amount of breakage, and there's bunches of tools (mostly minor ones) I need to port over still. Biggest ones are join triangles and loop to region, and spin/screw. This probably isn't really testable, I'll hopefully have more work done on this soon, but might not be before next week.
2010-01-28 00:45:30 +00:00
int enter_editmode;
=bmesh= Fixed some bugs with mesh primitive add operators. Suzanne now faces forward, instead of down. Cylinder and circle both now work. Cone lets you adjust the diameter at both ends now. I also reorganized the walker code, to be more maintainable and understandable.
2011-05-01 18:53:18 +00:00
int state, cap_end, cap_tri;
=bmesh= Coded a new modifier, "Precision UV Interpolation", that triangulates, subdivides, then uses brecht's mean value interpolation to interpolate face data. Textures on ngon faces get interpolated a bit nicer, in other words (though concave cases, e.g. 'N', don't work very well).
2011-03-25 00:32:38 +00:00
unsigned int layer;
The Death Of Editmesh - Part 1 I've removed editmesh altogether (other then scanfill, which is seperate code that happens to reuse the editmesh structures). The compatibility layer I had written for old editmesh tools was more trouble then it was worth, though it did help in the early stages of this project. There's a fair amount of breakage, and there's bunches of tools (mostly minor ones) I need to port over still. Biggest ones are join triangles and loop to region, and spin/screw. This probably isn't really testable, I'll hopefully have more work done on this soon, but might not be before next week.
2010-01-28 00:45:30 +00:00
=bmesh= Fixed some bugs with mesh primitive add operators. Suzanne now faces forward, instead of down. Cylinder and circle both now work. Cone lets you adjust the diameter at both ends now. I also reorganized the walker code, to be more maintainable and understandable.
2011-05-01 18:53:18 +00:00
cap_end = RNA_enum_get(op->ptr, "end_fill_type");
cap_tri = cap_end==2;
ED_object_add_generic_get_opts(C, op, loc, rot, &enter_editmode, &layer, NULL);
merge with trunk at r27259 and commit of a patch by anthony jones to fix msvc (though further work may be needed because changes made by the merge
2010-03-09 04:32:40 +00:00
make_prim_init(C, &dia, mat, &state, loc, rot, layer);
The Death Of Editmesh - Part 1 I've removed editmesh altogether (other then scanfill, which is seperate code that happens to reuse the editmesh structures). The compatibility layer I had written for old editmesh tools was more trouble then it was worth, though it did help in the early stages of this project. There's a fair amount of breakage, and there's bunches of tools (mostly minor ones) I need to port over still. Biggest ones are join triangles and loop to region, and spin/screw. This probably isn't really testable, I'll hopefully have more work done on this soon, but might not be before next week.
2010-01-28 00:45:30 +00:00
ported triangles to quads.
2010-02-18 10:09:52 +00:00
obedit = CTX_data_edit_object(C);
me = obedit->data;
em = me->edit_btmesh;
The Death Of Editmesh - Part 1 I've removed editmesh altogether (other then scanfill, which is seperate code that happens to reuse the editmesh structures). The compatibility layer I had written for old editmesh tools was more trouble then it was worth, though it did help in the early stages of this project. There's a fair amount of breakage, and there's bunches of tools (mostly minor ones) I need to port over still. Biggest ones are join triangles and loop to region, and spin/screw. This probably isn't really testable, I'll hopefully have more work done on this soon, but might not be before next week.
2010-01-28 00:45:30 +00:00
ported triangles to quads.
2010-02-18 10:09:52 +00:00
if (!EDBM_CallAndSelectOpf(em, op, "vertout",
=bmesh= Fixed some bugs with mesh primitive add operators. Suzanne now faces forward, instead of down. Cylinder and circle both now work. Cone lets you adjust the diameter at both ends now. I also reorganized the walker code, to be more maintainable and understandable.
2011-05-01 18:53:18 +00:00
"create_cone segments=%i diameter1=%f diameter2=%f cap_ends=%i cap_tris=%i depth=%f mat=%m4",
ported triangles to quads.
2010-02-18 10:09:52 +00:00
RNA_int_get(op->ptr, "vertices"), RNA_float_get(op->ptr, "radius"),
=bmesh= Fixed some bugs with mesh primitive add operators. Suzanne now faces forward, instead of down. Cylinder and circle both now work. Cone lets you adjust the diameter at both ends now. I also reorganized the walker code, to be more maintainable and understandable.
2011-05-01 18:53:18 +00:00
RNA_float_get(op->ptr, "radius"), cap_end, cap_tri, RNA_float_get(op->ptr, "depth"), mat))
ported triangles to quads.
2010-02-18 10:09:52 +00:00
return OPERATOR_CANCELLED;
make_prim_finish(C, &state, enter_editmode);
merge with/from trunk at r35190
2011-02-27 06:19:40 +00:00
return OPERATOR_FINISHED;
The Death Of Editmesh - Part 1 I've removed editmesh altogether (other then scanfill, which is seperate code that happens to reuse the editmesh structures). The compatibility layer I had written for old editmesh tools was more trouble then it was worth, though it did help in the early stages of this project. There's a fair amount of breakage, and there's bunches of tools (mostly minor ones) I need to port over still. Biggest ones are join triangles and loop to region, and spin/screw. This probably isn't really testable, I'll hopefully have more work done on this soon, but might not be before next week.
2010-01-28 00:45:30 +00:00
}
merge from trunk at r31523
2010-09-07 05:47:34 +00:00
void MESH_OT_primitive_cylinder_add(wmOperatorType *ot)
The Death Of Editmesh - Part 1 I've removed editmesh altogether (other then scanfill, which is seperate code that happens to reuse the editmesh structures). The compatibility layer I had written for old editmesh tools was more trouble then it was worth, though it did help in the early stages of this project. There's a fair amount of breakage, and there's bunches of tools (mostly minor ones) I need to port over still. Biggest ones are join triangles and loop to region, and spin/screw. This probably isn't really testable, I'll hopefully have more work done on this soon, but might not be before next week.
2010-01-28 00:45:30 +00:00
{
svn merge ^/trunk/blender -r40498:40511
2011-09-24 11:03:52 +00:00
PropertyRNA *prop;
The Death Of Editmesh - Part 1 I've removed editmesh altogether (other then scanfill, which is seperate code that happens to reuse the editmesh structures). The compatibility layer I had written for old editmesh tools was more trouble then it was worth, though it did help in the early stages of this project. There's a fair amount of breakage, and there's bunches of tools (mostly minor ones) I need to port over still. Biggest ones are join triangles and loop to region, and spin/screw. This probably isn't really testable, I'll hopefully have more work done on this soon, but might not be before next week.
2010-01-28 00:45:30 +00:00
/* identifiers */
ot->name= "Add Tube";
fix script error and quiet warnings about "." description ending.
2011-09-23 13:31:48 +00:00
ot->description= "Construct a tube mesh";
=bmesh= Fixed some bugs with mesh primitive add operators. Suzanne now faces forward, instead of down. Cylinder and circle both now work. Cone lets you adjust the diameter at both ends now. I also reorganized the walker code, to be more maintainable and understandable.
2011-05-01 18:53:18 +00:00
ot->idname= "MESH_OT_primitive_cylinder_add";
The Death Of Editmesh - Part 1 I've removed editmesh altogether (other then scanfill, which is seperate code that happens to reuse the editmesh structures). The compatibility layer I had written for old editmesh tools was more trouble then it was worth, though it did help in the early stages of this project. There's a fair amount of breakage, and there's bunches of tools (mostly minor ones) I need to port over still. Biggest ones are join triangles and loop to region, and spin/screw. This probably isn't really testable, I'll hopefully have more work done on this soon, but might not be before next week.
2010-01-28 00:45:30 +00:00
/* api callbacks */
ot->invoke= ED_object_add_generic_invoke;
merge from trunk at r31523
2010-09-07 05:47:34 +00:00
ot->exec= add_primitive_cylinder_exec;
The Death Of Editmesh - Part 1 I've removed editmesh altogether (other then scanfill, which is seperate code that happens to reuse the editmesh structures). The compatibility layer I had written for old editmesh tools was more trouble then it was worth, though it did help in the early stages of this project. There's a fair amount of breakage, and there's bunches of tools (mostly minor ones) I need to port over still. Biggest ones are join triangles and loop to region, and spin/screw. This probably isn't really testable, I'll hopefully have more work done on this soon, but might not be before next week.
2010-01-28 00:45:30 +00:00
ot->poll= ED_operator_scene_editable;
/* flags */
ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
/* props */
RNA_def_int(ot->srna, "vertices", 32, INT_MIN, INT_MAX, "Vertices", "", 2, 500);
svn merge ^/trunk/blender -r40498:40511
2011-09-24 11:03:52 +00:00
prop = RNA_def_float(ot->srna, "radius", 1.0f, 0.0, FLT_MAX, "Radius", "", 0.001, 100.00);
RNA_def_property_subtype(prop, PROP_DISTANCE);
use same default as trunk for cylinder depth
2012-01-23 14:03:09 +00:00
prop = RNA_def_float(ot->srna, "depth", 2.0f, 0.0, FLT_MAX, "Depth", "", 0.001, 100.00);
svn merge ^/trunk/blender -r40498:40511
2011-09-24 11:03:52 +00:00
RNA_def_property_subtype(prop, PROP_DISTANCE);
=bmesh= Cut out some unwanted differences with trunk in preparation for merge. Also fixed some warnings, though many remain.
2011-05-07 02:48:14 +00:00
RNA_def_enum(ot->srna, "end_fill_type", fill_type_items, 1, "Cap Fill Type", "");
The Death Of Editmesh - Part 1 I've removed editmesh altogether (other then scanfill, which is seperate code that happens to reuse the editmesh structures). The compatibility layer I had written for old editmesh tools was more trouble then it was worth, though it did help in the early stages of this project. There's a fair amount of breakage, and there's bunches of tools (mostly minor ones) I need to port over still. Biggest ones are join triangles and loop to region, and spin/screw. This probably isn't really testable, I'll hopefully have more work done on this soon, but might not be before next week.
2010-01-28 00:45:30 +00:00
ED_object_add_generic_props(ot, TRUE);
}
static int add_primitive_cone_exec(bContext *C, wmOperator *op)
{
ported triangles to quads.
2010-02-18 10:09:52 +00:00
Object *obedit;
Mesh *me;
BMEditMesh *em;
float loc[3], rot[3], mat[4][4], dia;
The Death Of Editmesh - Part 1 I've removed editmesh altogether (other then scanfill, which is seperate code that happens to reuse the editmesh structures). The compatibility layer I had written for old editmesh tools was more trouble then it was worth, though it did help in the early stages of this project. There's a fair amount of breakage, and there's bunches of tools (mostly minor ones) I need to port over still. Biggest ones are join triangles and loop to region, and spin/screw. This probably isn't really testable, I'll hopefully have more work done on this soon, but might not be before next week.
2010-01-28 00:45:30 +00:00
int enter_editmode;
=bmesh= Fixed some bugs with mesh primitive add operators. Suzanne now faces forward, instead of down. Cylinder and circle both now work. Cone lets you adjust the diameter at both ends now. I also reorganized the walker code, to be more maintainable and understandable.
2011-05-01 18:53:18 +00:00
int state, cap_end, cap_tri;
=bmesh= Coded a new modifier, "Precision UV Interpolation", that triangulates, subdivides, then uses brecht's mean value interpolation to interpolate face data. Textures on ngon faces get interpolated a bit nicer, in other words (though concave cases, e.g. 'N', don't work very well).
2011-03-25 00:32:38 +00:00
unsigned int layer;
The Death Of Editmesh - Part 1 I've removed editmesh altogether (other then scanfill, which is seperate code that happens to reuse the editmesh structures). The compatibility layer I had written for old editmesh tools was more trouble then it was worth, though it did help in the early stages of this project. There's a fair amount of breakage, and there's bunches of tools (mostly minor ones) I need to port over still. Biggest ones are join triangles and loop to region, and spin/screw. This probably isn't really testable, I'll hopefully have more work done on this soon, but might not be before next week.
2010-01-28 00:45:30 +00:00
=bmesh= Fixed some bugs with mesh primitive add operators. Suzanne now faces forward, instead of down. Cylinder and circle both now work. Cone lets you adjust the diameter at both ends now. I also reorganized the walker code, to be more maintainable and understandable.
2011-05-01 18:53:18 +00:00
cap_end = RNA_enum_get(op->ptr, "end_fill_type");
cap_tri = cap_end==2;
ED_object_add_generic_get_opts(C, op, loc, rot, &enter_editmode, &layer, NULL);
merge with trunk at r27259 and commit of a patch by anthony jones to fix msvc (though further work may be needed because changes made by the merge
2010-03-09 04:32:40 +00:00
make_prim_init(C, &dia, mat, &state, loc, rot, layer);
The Death Of Editmesh - Part 1 I've removed editmesh altogether (other then scanfill, which is seperate code that happens to reuse the editmesh structures). The compatibility layer I had written for old editmesh tools was more trouble then it was worth, though it did help in the early stages of this project. There's a fair amount of breakage, and there's bunches of tools (mostly minor ones) I need to port over still. Biggest ones are join triangles and loop to region, and spin/screw. This probably isn't really testable, I'll hopefully have more work done on this soon, but might not be before next week.
2010-01-28 00:45:30 +00:00
ported triangles to quads.
2010-02-18 10:09:52 +00:00
obedit = CTX_data_edit_object(C);
me = obedit->data;
em = me->edit_btmesh;
The Death Of Editmesh - Part 1 I've removed editmesh altogether (other then scanfill, which is seperate code that happens to reuse the editmesh structures). The compatibility layer I had written for old editmesh tools was more trouble then it was worth, though it did help in the early stages of this project. There's a fair amount of breakage, and there's bunches of tools (mostly minor ones) I need to port over still. Biggest ones are join triangles and loop to region, and spin/screw. This probably isn't really testable, I'll hopefully have more work done on this soon, but might not be before next week.
2010-01-28 00:45:30 +00:00
ported triangles to quads.
2010-02-18 10:09:52 +00:00
if (!EDBM_CallAndSelectOpf(em, op, "vertout",
=bmesh= Fixed some bugs with mesh primitive add operators. Suzanne now faces forward, instead of down. Cylinder and circle both now work. Cone lets you adjust the diameter at both ends now. I also reorganized the walker code, to be more maintainable and understandable.
2011-05-01 18:53:18 +00:00
"create_cone segments=%i diameter1=%f diameter2=%f cap_ends=%i cap_tris=%i depth=%f mat=%m4",
RNA_int_get(op->ptr, "vertices"), RNA_float_get(op->ptr, "radius1"),
RNA_float_get(op->ptr, "radius2"), cap_end, cap_tri, RNA_float_get(op->ptr, "depth"), mat))
ported triangles to quads.
2010-02-18 10:09:52 +00:00
return OPERATOR_CANCELLED;
make_prim_finish(C, &state, enter_editmode);
return OPERATOR_FINISHED;
The Death Of Editmesh - Part 1 I've removed editmesh altogether (other then scanfill, which is seperate code that happens to reuse the editmesh structures). The compatibility layer I had written for old editmesh tools was more trouble then it was worth, though it did help in the early stages of this project. There's a fair amount of breakage, and there's bunches of tools (mostly minor ones) I need to port over still. Biggest ones are join triangles and loop to region, and spin/screw. This probably isn't really testable, I'll hopefully have more work done on this soon, but might not be before next week.
2010-01-28 00:45:30 +00:00
}
void MESH_OT_primitive_cone_add(wmOperatorType *ot)
{
svn merge ^/trunk/blender -r40498:40511
2011-09-24 11:03:52 +00:00
PropertyRNA *prop;
The Death Of Editmesh - Part 1 I've removed editmesh altogether (other then scanfill, which is seperate code that happens to reuse the editmesh structures). The compatibility layer I had written for old editmesh tools was more trouble then it was worth, though it did help in the early stages of this project. There's a fair amount of breakage, and there's bunches of tools (mostly minor ones) I need to port over still. Biggest ones are join triangles and loop to region, and spin/screw. This probably isn't really testable, I'll hopefully have more work done on this soon, but might not be before next week.
2010-01-28 00:45:30 +00:00
/* identifiers */
ot->name= "Add Cone";
fix script error and quiet warnings about "." description ending.
2011-09-23 13:31:48 +00:00
ot->description= "Construct a conic mesh (ends filled)";
The Death Of Editmesh - Part 1 I've removed editmesh altogether (other then scanfill, which is seperate code that happens to reuse the editmesh structures). The compatibility layer I had written for old editmesh tools was more trouble then it was worth, though it did help in the early stages of this project. There's a fair amount of breakage, and there's bunches of tools (mostly minor ones) I need to port over still. Biggest ones are join triangles and loop to region, and spin/screw. This probably isn't really testable, I'll hopefully have more work done on this soon, but might not be before next week.
2010-01-28 00:45:30 +00:00
ot->idname= "MESH_OT_primitive_cone_add";
/* api callbacks */
ot->invoke= ED_object_add_generic_invoke;
ot->exec= add_primitive_cone_exec;
ot->poll= ED_operator_scene_editable;
/* flags */
ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
/* props */
RNA_def_int(ot->srna, "vertices", 32, INT_MIN, INT_MAX, "Vertices", "", 2, 500);
=bmesh= Fixed some bugs with mesh primitive add operators. Suzanne now faces forward, instead of down. Cylinder and circle both now work. Cone lets you adjust the diameter at both ends now. I also reorganized the walker code, to be more maintainable and understandable.
2011-05-01 18:53:18 +00:00
RNA_def_float(ot->srna, "radius1", 1.0f, 0.0, FLT_MAX, "Radius 1", "", 0.001, 100.00);
RNA_def_float(ot->srna, "radius2", 0.0f, 0.0, FLT_MAX, "Radius 2", "", 0.001, 100.00);
svn merge ^/trunk/blender -r40498:40511
2011-09-24 11:03:52 +00:00
prop = RNA_def_float(ot->srna, "depth", 1.0f, 0.0, FLT_MAX, "Depth", "", 0.001, 100.00);
RNA_def_property_subtype(prop, PROP_DISTANCE);
=bmesh= Cut out some unwanted differences with trunk in preparation for merge. Also fixed some warnings, though many remain.
2011-05-07 02:48:14 +00:00
RNA_def_enum(ot->srna, "end_fill_type", fill_type_items, 1, "Base Fill Type", "");
=bmesh= Fixed some bugs with mesh primitive add operators. Suzanne now faces forward, instead of down. Cylinder and circle both now work. Cone lets you adjust the diameter at both ends now. I also reorganized the walker code, to be more maintainable and understandable.
2011-05-01 18:53:18 +00:00
The Death Of Editmesh - Part 1 I've removed editmesh altogether (other then scanfill, which is seperate code that happens to reuse the editmesh structures). The compatibility layer I had written for old editmesh tools was more trouble then it was worth, though it did help in the early stages of this project. There's a fair amount of breakage, and there's bunches of tools (mostly minor ones) I need to port over still. Biggest ones are join triangles and loop to region, and spin/screw. This probably isn't really testable, I'll hopefully have more work done on this soon, but might not be before next week.
2010-01-28 00:45:30 +00:00
ED_object_add_generic_props(ot, TRUE);
}
static int add_primitive_grid_exec(bContext *C, wmOperator *op)
{
ported triangles to quads.
2010-02-18 10:09:52 +00:00
Object *obedit;
Mesh *me;
BMEditMesh *em;
grid size was being ignored for grid and plane primitives
2012-02-05 22:27:44 +00:00
float loc[3], rot[3], mat[4][4], dia = 1.0f;
The Death Of Editmesh - Part 1 I've removed editmesh altogether (other then scanfill, which is seperate code that happens to reuse the editmesh structures). The compatibility layer I had written for old editmesh tools was more trouble then it was worth, though it did help in the early stages of this project. There's a fair amount of breakage, and there's bunches of tools (mostly minor ones) I need to port over still. Biggest ones are join triangles and loop to region, and spin/screw. This probably isn't really testable, I'll hopefully have more work done on this soon, but might not be before next week.
2010-01-28 00:45:30 +00:00
int enter_editmode;
ported triangles to quads.
2010-02-18 10:09:52 +00:00
int state;
=bmesh= Coded a new modifier, "Precision UV Interpolation", that triangulates, subdivides, then uses brecht's mean value interpolation to interpolate face data. Textures on ngon faces get interpolated a bit nicer, in other words (though concave cases, e.g. 'N', don't work very well).
2011-03-25 00:32:38 +00:00
unsigned int layer;
The Death Of Editmesh - Part 1 I've removed editmesh altogether (other then scanfill, which is seperate code that happens to reuse the editmesh structures). The compatibility layer I had written for old editmesh tools was more trouble then it was worth, though it did help in the early stages of this project. There's a fair amount of breakage, and there's bunches of tools (mostly minor ones) I need to port over still. Biggest ones are join triangles and loop to region, and spin/screw. This probably isn't really testable, I'll hopefully have more work done on this soon, but might not be before next week.
2010-01-28 00:45:30 +00:00
=bmesh= Fixed some bugs with mesh primitive add operators. Suzanne now faces forward, instead of down. Cylinder and circle both now work. Cone lets you adjust the diameter at both ends now. I also reorganized the walker code, to be more maintainable and understandable.
2011-05-01 18:53:18 +00:00
ED_object_add_generic_get_opts(C, op, loc, rot, &enter_editmode, &layer, NULL);
merge with trunk at r27259 and commit of a patch by anthony jones to fix msvc (though further work may be needed because changes made by the merge
2010-03-09 04:32:40 +00:00
make_prim_init(C, &dia, mat, &state, loc, rot, layer);
The Death Of Editmesh - Part 1 I've removed editmesh altogether (other then scanfill, which is seperate code that happens to reuse the editmesh structures). The compatibility layer I had written for old editmesh tools was more trouble then it was worth, though it did help in the early stages of this project. There's a fair amount of breakage, and there's bunches of tools (mostly minor ones) I need to port over still. Biggest ones are join triangles and loop to region, and spin/screw. This probably isn't really testable, I'll hopefully have more work done on this soon, but might not be before next week.
2010-01-28 00:45:30 +00:00
ported triangles to quads.
2010-02-18 10:09:52 +00:00
obedit = CTX_data_edit_object(C);
me = obedit->data;
em = me->edit_btmesh;
The Death Of Editmesh - Part 1 I've removed editmesh altogether (other then scanfill, which is seperate code that happens to reuse the editmesh structures). The compatibility layer I had written for old editmesh tools was more trouble then it was worth, though it did help in the early stages of this project. There's a fair amount of breakage, and there's bunches of tools (mostly minor ones) I need to port over still. Biggest ones are join triangles and loop to region, and spin/screw. This probably isn't really testable, I'll hopefully have more work done on this soon, but might not be before next week.
2010-01-28 00:45:30 +00:00
ported triangles to quads.
2010-02-18 10:09:52 +00:00
if (!EDBM_CallAndSelectOpf(em, op, "vertout",
"create_grid xsegments=%i ysegments=%i size=%f mat=%m4",
RNA_int_get(op->ptr, "x_subdivisions"),
RNA_int_get(op->ptr, "y_subdivisions"),
grid size was being ignored for grid and plane primitives
2012-02-05 22:27:44 +00:00
RNA_float_get(op->ptr, "size") * dia, mat))
ported triangles to quads.
2010-02-18 10:09:52 +00:00
{
return OPERATOR_CANCELLED;
}
make_prim_finish(C, &state, enter_editmode);
The Death Of Editmesh - Part 1 I've removed editmesh altogether (other then scanfill, which is seperate code that happens to reuse the editmesh structures). The compatibility layer I had written for old editmesh tools was more trouble then it was worth, though it did help in the early stages of this project. There's a fair amount of breakage, and there's bunches of tools (mostly minor ones) I need to port over still. Biggest ones are join triangles and loop to region, and spin/screw. This probably isn't really testable, I'll hopefully have more work done on this soon, but might not be before next week.
2010-01-28 00:45:30 +00:00
return OPERATOR_FINISHED;
}
void MESH_OT_primitive_grid_add(wmOperatorType *ot)
{
svn merge ^/trunk/blender -r40498:40511
2011-09-24 11:03:52 +00:00
PropertyRNA *prop;
The Death Of Editmesh - Part 1 I've removed editmesh altogether (other then scanfill, which is seperate code that happens to reuse the editmesh structures). The compatibility layer I had written for old editmesh tools was more trouble then it was worth, though it did help in the early stages of this project. There's a fair amount of breakage, and there's bunches of tools (mostly minor ones) I need to port over still. Biggest ones are join triangles and loop to region, and spin/screw. This probably isn't really testable, I'll hopefully have more work done on this soon, but might not be before next week.
2010-01-28 00:45:30 +00:00
/* identifiers */
ot->name= "Add Grid";
fix script error and quiet warnings about "." description ending.
2011-09-23 13:31:48 +00:00
ot->description= "Construct a grid mesh";
The Death Of Editmesh - Part 1 I've removed editmesh altogether (other then scanfill, which is seperate code that happens to reuse the editmesh structures). The compatibility layer I had written for old editmesh tools was more trouble then it was worth, though it did help in the early stages of this project. There's a fair amount of breakage, and there's bunches of tools (mostly minor ones) I need to port over still. Biggest ones are join triangles and loop to region, and spin/screw. This probably isn't really testable, I'll hopefully have more work done on this soon, but might not be before next week.
2010-01-28 00:45:30 +00:00
ot->idname= "MESH_OT_primitive_grid_add";
/* api callbacks */
ot->invoke= ED_object_add_generic_invoke;
ot->exec= add_primitive_grid_exec;
ot->poll= ED_operator_scene_editable;
/* flags */
ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
/* props */
RNA_def_int(ot->srna, "x_subdivisions", 10, INT_MIN, INT_MAX, "X Subdivisions", "", 3, 1000);
RNA_def_int(ot->srna, "y_subdivisions", 10, INT_MIN, INT_MAX, "Y Subdivisions", "", 3, 1000);
svn merge ^/trunk/blender -r40498:40511
2011-09-24 11:03:52 +00:00
prop = RNA_def_float(ot->srna, "size", 1.0f, 0.0, FLT_MAX, "Size", "", 0.001, FLT_MAX);
RNA_def_property_subtype(prop, PROP_DISTANCE);
The Death Of Editmesh - Part 1 I've removed editmesh altogether (other then scanfill, which is seperate code that happens to reuse the editmesh structures). The compatibility layer I had written for old editmesh tools was more trouble then it was worth, though it did help in the early stages of this project. There's a fair amount of breakage, and there's bunches of tools (mostly minor ones) I need to port over still. Biggest ones are join triangles and loop to region, and spin/screw. This probably isn't really testable, I'll hopefully have more work done on this soon, but might not be before next week.
2010-01-28 00:45:30 +00:00
ED_object_add_generic_props(ot, TRUE);
}
static int add_primitive_monkey_exec(bContext *C, wmOperator *op)
{
ported triangles to quads.
2010-02-18 10:09:52 +00:00
Object *obedit;
Mesh *me;
BMEditMesh *em;
float loc[3], rot[3], mat[4][4], dia;
The Death Of Editmesh - Part 1 I've removed editmesh altogether (other then scanfill, which is seperate code that happens to reuse the editmesh structures). The compatibility layer I had written for old editmesh tools was more trouble then it was worth, though it did help in the early stages of this project. There's a fair amount of breakage, and there's bunches of tools (mostly minor ones) I need to port over still. Biggest ones are join triangles and loop to region, and spin/screw. This probably isn't really testable, I'll hopefully have more work done on this soon, but might not be before next week.
2010-01-28 00:45:30 +00:00
int enter_editmode;
=bmesh= Fixed some bugs with mesh primitive add operators. Suzanne now faces forward, instead of down. Cylinder and circle both now work. Cone lets you adjust the diameter at both ends now. I also reorganized the walker code, to be more maintainable and understandable.
2011-05-01 18:53:18 +00:00
int state, view_aligned;
=bmesh= Coded a new modifier, "Precision UV Interpolation", that triangulates, subdivides, then uses brecht's mean value interpolation to interpolate face data. Textures on ngon faces get interpolated a bit nicer, in other words (though concave cases, e.g. 'N', don't work very well).
2011-03-25 00:32:38 +00:00
unsigned int layer;
The Death Of Editmesh - Part 1 I've removed editmesh altogether (other then scanfill, which is seperate code that happens to reuse the editmesh structures). The compatibility layer I had written for old editmesh tools was more trouble then it was worth, though it did help in the early stages of this project. There's a fair amount of breakage, and there's bunches of tools (mostly minor ones) I need to port over still. Biggest ones are join triangles and loop to region, and spin/screw. This probably isn't really testable, I'll hopefully have more work done on this soon, but might not be before next week.
2010-01-28 00:45:30 +00:00
=bmesh= Fixed some bugs with mesh primitive add operators. Suzanne now faces forward, instead of down. Cylinder and circle both now work. Cone lets you adjust the diameter at both ends now. I also reorganized the walker code, to be more maintainable and understandable.
2011-05-01 18:53:18 +00:00
ED_object_add_generic_get_opts(C, op, loc, rot, &enter_editmode, &layer, &view_aligned);
if (!view_aligned)
rot[0] += M_PI/2.0f;
merge with trunk at r27259 and commit of a patch by anthony jones to fix msvc (though further work may be needed because changes made by the merge
2010-03-09 04:32:40 +00:00
make_prim_init(C, &dia, mat, &state, loc, rot, layer);
The Death Of Editmesh - Part 1 I've removed editmesh altogether (other then scanfill, which is seperate code that happens to reuse the editmesh structures). The compatibility layer I had written for old editmesh tools was more trouble then it was worth, though it did help in the early stages of this project. There's a fair amount of breakage, and there's bunches of tools (mostly minor ones) I need to port over still. Biggest ones are join triangles and loop to region, and spin/screw. This probably isn't really testable, I'll hopefully have more work done on this soon, but might not be before next week.
2010-01-28 00:45:30 +00:00
ported triangles to quads.
2010-02-18 10:09:52 +00:00
obedit = CTX_data_edit_object(C);
me = obedit->data;
em = me->edit_btmesh;
The Death Of Editmesh - Part 1 I've removed editmesh altogether (other then scanfill, which is seperate code that happens to reuse the editmesh structures). The compatibility layer I had written for old editmesh tools was more trouble then it was worth, though it did help in the early stages of this project. There's a fair amount of breakage, and there's bunches of tools (mostly minor ones) I need to port over still. Biggest ones are join triangles and loop to region, and spin/screw. This probably isn't really testable, I'll hopefully have more work done on this soon, but might not be before next week.
2010-01-28 00:45:30 +00:00
ported triangles to quads.
2010-02-18 10:09:52 +00:00
if (!EDBM_CallAndSelectOpf(em, op, "vertout", "create_monkey mat=%m4", mat)) {
return OPERATOR_CANCELLED;
}
make_prim_finish(C, &state, enter_editmode);
The Death Of Editmesh - Part 1 I've removed editmesh altogether (other then scanfill, which is seperate code that happens to reuse the editmesh structures). The compatibility layer I had written for old editmesh tools was more trouble then it was worth, though it did help in the early stages of this project. There's a fair amount of breakage, and there's bunches of tools (mostly minor ones) I need to port over still. Biggest ones are join triangles and loop to region, and spin/screw. This probably isn't really testable, I'll hopefully have more work done on this soon, but might not be before next week.
2010-01-28 00:45:30 +00:00
return OPERATOR_FINISHED;
}
void MESH_OT_primitive_monkey_add(wmOperatorType *ot)
{
/* identifiers */
ot->name= "Add Monkey";
fix script error and quiet warnings about "." description ending.
2011-09-23 13:31:48 +00:00
ot->description= "Construct a Suzanne mesh";
The Death Of Editmesh - Part 1 I've removed editmesh altogether (other then scanfill, which is seperate code that happens to reuse the editmesh structures). The compatibility layer I had written for old editmesh tools was more trouble then it was worth, though it did help in the early stages of this project. There's a fair amount of breakage, and there's bunches of tools (mostly minor ones) I need to port over still. Biggest ones are join triangles and loop to region, and spin/screw. This probably isn't really testable, I'll hopefully have more work done on this soon, but might not be before next week.
2010-01-28 00:45:30 +00:00
ot->idname= "MESH_OT_primitive_monkey_add";
/* api callbacks */
ot->invoke= ED_object_add_generic_invoke;
ot->exec= add_primitive_monkey_exec;
ot->poll= ED_operator_scene_editable;
/* flags */
ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
ED_object_add_generic_props(ot, TRUE);
}
static int add_primitive_uvsphere_exec(bContext *C, wmOperator *op)
{
Object *obedit;
Mesh *me;
BMEditMesh *em;
float loc[3], rot[3], mat[4][4], dia;
int enter_editmode;
int state;
=bmesh= Coded a new modifier, "Precision UV Interpolation", that triangulates, subdivides, then uses brecht's mean value interpolation to interpolate face data. Textures on ngon faces get interpolated a bit nicer, in other words (though concave cases, e.g. 'N', don't work very well).
2011-03-25 00:32:38 +00:00
unsigned int layer;
The Death Of Editmesh - Part 1 I've removed editmesh altogether (other then scanfill, which is seperate code that happens to reuse the editmesh structures). The compatibility layer I had written for old editmesh tools was more trouble then it was worth, though it did help in the early stages of this project. There's a fair amount of breakage, and there's bunches of tools (mostly minor ones) I need to port over still. Biggest ones are join triangles and loop to region, and spin/screw. This probably isn't really testable, I'll hopefully have more work done on this soon, but might not be before next week.
2010-01-28 00:45:30 +00:00
=bmesh= Fixed some bugs with mesh primitive add operators. Suzanne now faces forward, instead of down. Cylinder and circle both now work. Cone lets you adjust the diameter at both ends now. I also reorganized the walker code, to be more maintainable and understandable.
2011-05-01 18:53:18 +00:00
ED_object_add_generic_get_opts(C, op, loc, rot, &enter_editmode, &layer, NULL);
merge with trunk at r27259 and commit of a patch by anthony jones to fix msvc (though further work may be needed because changes made by the merge
2010-03-09 04:32:40 +00:00
make_prim_init(C, &dia, mat, &state, loc, rot, layer);
The Death Of Editmesh - Part 1 I've removed editmesh altogether (other then scanfill, which is seperate code that happens to reuse the editmesh structures). The compatibility layer I had written for old editmesh tools was more trouble then it was worth, though it did help in the early stages of this project. There's a fair amount of breakage, and there's bunches of tools (mostly minor ones) I need to port over still. Biggest ones are join triangles and loop to region, and spin/screw. This probably isn't really testable, I'll hopefully have more work done on this soon, but might not be before next week.
2010-01-28 00:45:30 +00:00
obedit = CTX_data_edit_object(C);
me = obedit->data;
em = me->edit_btmesh;
if (!EDBM_CallAndSelectOpf(em, op, "vertout",
"create_uvsphere segments=%i revolutions=%i diameter=%f mat=%m4",
RNA_int_get(op->ptr, "rings"), RNA_int_get(op->ptr, "segments"),
RNA_float_get(op->ptr,"size"), mat))
return OPERATOR_CANCELLED;
make_prim_finish(C, &state, enter_editmode);
return OPERATOR_FINISHED;
}
void MESH_OT_primitive_uv_sphere_add(wmOperatorType *ot)
{
svn merge ^/trunk/blender -r40498:40511
2011-09-24 11:03:52 +00:00
PropertyRNA *prop;
The Death Of Editmesh - Part 1 I've removed editmesh altogether (other then scanfill, which is seperate code that happens to reuse the editmesh structures). The compatibility layer I had written for old editmesh tools was more trouble then it was worth, though it did help in the early stages of this project. There's a fair amount of breakage, and there's bunches of tools (mostly minor ones) I need to port over still. Biggest ones are join triangles and loop to region, and spin/screw. This probably isn't really testable, I'll hopefully have more work done on this soon, but might not be before next week.
2010-01-28 00:45:30 +00:00
/* identifiers */
ot->name= "Add UV Sphere";
fix script error and quiet warnings about "." description ending.
2011-09-23 13:31:48 +00:00
ot->description= "Construct a UV sphere mesh";
The Death Of Editmesh - Part 1 I've removed editmesh altogether (other then scanfill, which is seperate code that happens to reuse the editmesh structures). The compatibility layer I had written for old editmesh tools was more trouble then it was worth, though it did help in the early stages of this project. There's a fair amount of breakage, and there's bunches of tools (mostly minor ones) I need to port over still. Biggest ones are join triangles and loop to region, and spin/screw. This probably isn't really testable, I'll hopefully have more work done on this soon, but might not be before next week.
2010-01-28 00:45:30 +00:00
ot->idname= "MESH_OT_primitive_uv_sphere_add";
/* api callbacks */
ot->invoke= ED_object_add_generic_invoke;
ot->exec= add_primitive_uvsphere_exec;
ot->poll= ED_operator_scene_editable;
/* flags */
ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
/* props */
RNA_def_int(ot->srna, "segments", 32, INT_MIN, INT_MAX, "Segments", "", 3, 500);
RNA_def_int(ot->srna, "rings", 24, INT_MIN, INT_MAX, "Rings", "", 3, 500);
svn merge ^/trunk/blender -r40498:40511
2011-09-24 11:03:52 +00:00
prop = RNA_def_float(ot->srna, "size", 1.0f, 0.0, FLT_MAX, "Size", "", 0.001, FLT_MAX);
RNA_def_property_subtype(prop, PROP_DISTANCE);
The Death Of Editmesh - Part 1 I've removed editmesh altogether (other then scanfill, which is seperate code that happens to reuse the editmesh structures). The compatibility layer I had written for old editmesh tools was more trouble then it was worth, though it did help in the early stages of this project. There's a fair amount of breakage, and there's bunches of tools (mostly minor ones) I need to port over still. Biggest ones are join triangles and loop to region, and spin/screw. This probably isn't really testable, I'll hopefully have more work done on this soon, but might not be before next week.
2010-01-28 00:45:30 +00:00
ED_object_add_generic_props(ot, TRUE);
}
static int add_primitive_icosphere_exec(bContext *C, wmOperator *op)
{
ported triangles to quads.
2010-02-18 10:09:52 +00:00
Object *obedit;
Mesh *me;
BMEditMesh *em;
float loc[3], rot[3], mat[4][4], dia;
The Death Of Editmesh - Part 1 I've removed editmesh altogether (other then scanfill, which is seperate code that happens to reuse the editmesh structures). The compatibility layer I had written for old editmesh tools was more trouble then it was worth, though it did help in the early stages of this project. There's a fair amount of breakage, and there's bunches of tools (mostly minor ones) I need to port over still. Biggest ones are join triangles and loop to region, and spin/screw. This probably isn't really testable, I'll hopefully have more work done on this soon, but might not be before next week.
2010-01-28 00:45:30 +00:00
int enter_editmode;
ported triangles to quads.
2010-02-18 10:09:52 +00:00
int state;
=bmesh= Coded a new modifier, "Precision UV Interpolation", that triangulates, subdivides, then uses brecht's mean value interpolation to interpolate face data. Textures on ngon faces get interpolated a bit nicer, in other words (though concave cases, e.g. 'N', don't work very well).
2011-03-25 00:32:38 +00:00
unsigned int layer;
The Death Of Editmesh - Part 1 I've removed editmesh altogether (other then scanfill, which is seperate code that happens to reuse the editmesh structures). The compatibility layer I had written for old editmesh tools was more trouble then it was worth, though it did help in the early stages of this project. There's a fair amount of breakage, and there's bunches of tools (mostly minor ones) I need to port over still. Biggest ones are join triangles and loop to region, and spin/screw. This probably isn't really testable, I'll hopefully have more work done on this soon, but might not be before next week.
2010-01-28 00:45:30 +00:00
=bmesh= Fixed some bugs with mesh primitive add operators. Suzanne now faces forward, instead of down. Cylinder and circle both now work. Cone lets you adjust the diameter at both ends now. I also reorganized the walker code, to be more maintainable and understandable.
2011-05-01 18:53:18 +00:00
ED_object_add_generic_get_opts(C, op, loc, rot, &enter_editmode, &layer, NULL);
merge with trunk at r27259 and commit of a patch by anthony jones to fix msvc (though further work may be needed because changes made by the merge
2010-03-09 04:32:40 +00:00
make_prim_init(C, &dia, mat, &state, loc, rot, layer);
The Death Of Editmesh - Part 1 I've removed editmesh altogether (other then scanfill, which is seperate code that happens to reuse the editmesh structures). The compatibility layer I had written for old editmesh tools was more trouble then it was worth, though it did help in the early stages of this project. There's a fair amount of breakage, and there's bunches of tools (mostly minor ones) I need to port over still. Biggest ones are join triangles and loop to region, and spin/screw. This probably isn't really testable, I'll hopefully have more work done on this soon, but might not be before next week.
2010-01-28 00:45:30 +00:00
ported triangles to quads.
2010-02-18 10:09:52 +00:00
obedit = CTX_data_edit_object(C);
me = obedit->data;
em = me->edit_btmesh;
if (!EDBM_CallAndSelectOpf(em, op, "vertout",
"create_icosphere subdivisions=%i diameter=%f mat=%m4",
RNA_int_get(op->ptr, "subdivisions"),
RNA_float_get(op->ptr, "size"), mat)) {
return OPERATOR_CANCELLED;
}
make_prim_finish(C, &state, enter_editmode);
The Death Of Editmesh - Part 1 I've removed editmesh altogether (other then scanfill, which is seperate code that happens to reuse the editmesh structures). The compatibility layer I had written for old editmesh tools was more trouble then it was worth, though it did help in the early stages of this project. There's a fair amount of breakage, and there's bunches of tools (mostly minor ones) I need to port over still. Biggest ones are join triangles and loop to region, and spin/screw. This probably isn't really testable, I'll hopefully have more work done on this soon, but might not be before next week.
2010-01-28 00:45:30 +00:00
return OPERATOR_FINISHED;
}
void MESH_OT_primitive_ico_sphere_add(wmOperatorType *ot)
{
svn merge ^/trunk/blender -r40498:40511
2011-09-24 11:03:52 +00:00
PropertyRNA *prop;
The Death Of Editmesh - Part 1 I've removed editmesh altogether (other then scanfill, which is seperate code that happens to reuse the editmesh structures). The compatibility layer I had written for old editmesh tools was more trouble then it was worth, though it did help in the early stages of this project. There's a fair amount of breakage, and there's bunches of tools (mostly minor ones) I need to port over still. Biggest ones are join triangles and loop to region, and spin/screw. This probably isn't really testable, I'll hopefully have more work done on this soon, but might not be before next week.
2010-01-28 00:45:30 +00:00
/* identifiers */
ot->name= "Add Ico Sphere";
fix script error and quiet warnings about "." description ending.
2011-09-23 13:31:48 +00:00
ot->description= "Construct an Icosphere mesh";
The Death Of Editmesh - Part 1 I've removed editmesh altogether (other then scanfill, which is seperate code that happens to reuse the editmesh structures). The compatibility layer I had written for old editmesh tools was more trouble then it was worth, though it did help in the early stages of this project. There's a fair amount of breakage, and there's bunches of tools (mostly minor ones) I need to port over still. Biggest ones are join triangles and loop to region, and spin/screw. This probably isn't really testable, I'll hopefully have more work done on this soon, but might not be before next week.
2010-01-28 00:45:30 +00:00
ot->idname= "MESH_OT_primitive_ico_sphere_add";
/* api callbacks */
ot->invoke= ED_object_add_generic_invoke;
ot->exec= add_primitive_icosphere_exec;
ot->poll= ED_operator_scene_editable;
/* flags */
ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
/* props */
RNA_def_int(ot->srna, "subdivisions", 2, 0, 6, "Subdivisions", "", 0, 8);
svn merge ^/trunk/blender -r40498:40511
2011-09-24 11:03:52 +00:00
prop = RNA_def_float(ot->srna, "size", 1.0f, 0.0, FLT_MAX, "Size", "", 0.001, FLT_MAX);
RNA_def_property_subtype(prop, PROP_DISTANCE);
The Death Of Editmesh - Part 1 I've removed editmesh altogether (other then scanfill, which is seperate code that happens to reuse the editmesh structures). The compatibility layer I had written for old editmesh tools was more trouble then it was worth, though it did help in the early stages of this project. There's a fair amount of breakage, and there's bunches of tools (mostly minor ones) I need to port over still. Biggest ones are join triangles and loop to region, and spin/screw. This probably isn't really testable, I'll hopefully have more work done on this soon, but might not be before next week.
2010-01-28 00:45:30 +00:00
ED_object_add_generic_props(ot, TRUE);
}
Copy Permalink