Revision: 44247
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=44247
Author: campbellbarton
Date: 2012-02-19 16:54:53 +0000 (Sun, 19 Feb 2012)
Log Message:
-----------
rebane files to match trunk.
Modified Paths:
--------------
branches/bmesh/blender/source/blender/editors/include/ED_mesh.h
branches/bmesh/blender/source/blender/editors/mesh/CMakeLists.txt
Added Paths:
-----------
branches/bmesh/blender/source/blender/editors/mesh/editmesh_add.c
branches/bmesh/blender/source/blender/editors/mesh/editmesh_bvh.c
branches/bmesh/blender/source/blender/editors/mesh/editmesh_bvh.h
Removed Paths:
-------------
branches/bmesh/blender/source/blender/editors/mesh/editbmesh_add.c
branches/bmesh/blender/source/blender/editors/mesh/editbmesh_bvh.c
branches/bmesh/blender/source/blender/editors/mesh/editbmesh_bvh.h
Modified: branches/bmesh/blender/source/blender/editors/include/ED_mesh.h
===================================================================
--- branches/bmesh/blender/source/blender/editors/include/ED_mesh.h
2012-02-19 11:09:44 UTC (rev 44246)
+++ branches/bmesh/blender/source/blender/editors/include/ED_mesh.h
2012-02-19 16:54:53 UTC (rev 44247)
@@ -310,7 +310,7 @@
void EDBM_selectmode_to_scene(struct bContext *C);
void EDBM_ClearMesh(struct BMEditMesh *em);
-#include "../mesh/editbmesh_bvh.h"
+#include "../mesh/editmesh_bvh.h"
/* mirrtopo */
Modified: branches/bmesh/blender/source/blender/editors/mesh/CMakeLists.txt
===================================================================
--- branches/bmesh/blender/source/blender/editors/mesh/CMakeLists.txt
2012-02-19 11:09:44 UTC (rev 44246)
+++ branches/bmesh/blender/source/blender/editors/mesh/CMakeLists.txt
2012-02-19 16:54:53 UTC (rev 44247)
@@ -41,8 +41,8 @@
meshtools.c
loopcut.c
mesh_ops.c
- editbmesh_bvh.c
- editbmesh_add.c
+ editmesh_bvh.c
+ editmesh_add.c
bmeshutils.c
bmesh_selecthistory.c
bmesh_select.c
@@ -51,7 +51,7 @@
knifetool.c
editface.c
- editbmesh_bvh.h
+ editmesh_bvh.h
mesh_intern.h
)
Deleted: branches/bmesh/blender/source/blender/editors/mesh/editbmesh_add.c
===================================================================
--- branches/bmesh/blender/source/blender/editors/mesh/editbmesh_add.c
2012-02-19 11:09:44 UTC (rev 44246)
+++ branches/bmesh/blender/source/blender/editors/mesh/editbmesh_add.c
2012-02-19 16:54:53 UTC (rev 44247)
@@ -1,604 +0,0 @@
-/*
- * ***** 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,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * 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 "DNA_scene_types.h"
-
-#include "RNA_define.h"
-#include "RNA_access.h"
-
-#include "BLI_math.h"
-
-#include "BKE_context.h"
-#include "BKE_depsgraph.h"
-#include "BKE_library.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 */
- copy_v3_v3(primmat[3], loc);
- sub_v3_v3(primmat[3], obedit->obmat[3]);
- invert_m3_m3(imat, mat);
- mul_m3_v3(imat, primmat[3]);
-
- return v3d ? v3d->grid : 1.0f;
-}
-
-/* ********* add primitive operators ************* */
-
-static void make_prim_init(bContext *C, const char *idname,
- float *dia, float mat[][4],
- int *state, float *loc,
float *rot, unsigned int layer)
-{
- Object *obedit= CTX_data_edit_object(C);
-
- *state = 0;
- if(obedit==NULL || obedit->type!=OB_MESH) {
- obedit= ED_object_add_type(C, OB_MESH, loc, rot, FALSE, layer);
-
- rename_id((ID *)obedit, idname);
- rename_id((ID *)obedit->data, idname);
-
- /* create editmode */
- ED_object_enter_editmode(C, EM_DO_UNDO|EM_IGNORE_LAYER); /*
rare cases the active layer is messed up */
- *state = 1;
- }
- else DAG_id_tag_update(&obedit->id, OB_RECALC_DATA);
-
- *dia *= new_primitive_matrix(C, loc, rot, mat);
-}
-
-static void make_prim_finish(bContext *C, int *state, int enter_editmode)
-{
- Object *obedit;
- Mesh *me;
- BMEditMesh *em;
-
- obedit = CTX_data_edit_object(C);
- me = obedit->data;
- em = me->edit_btmesh;
-
- /* Primitive has all verts selected, use vert select flush
- * to push this up to edges & faces. */
- EDBM_selectmode_flush_ex(em, SCE_SELECT_VERTEX);
-
- DAG_id_tag_update(obedit->data, OB_RECALC_DATA);
- 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;
- float loc[3], rot[3], mat[4][4], dia = 1.0f;
- int enter_editmode;
- int state;
- unsigned int layer;
-
- ED_object_add_generic_get_opts(C, op, loc, rot, &enter_editmode,
&layer, NULL);
- make_prim_init(C, "Plane", &dia, mat, &state, loc, rot, layer);
-
- obedit = CTX_data_edit_object(C);
- me = obedit->data;
- em = me->edit_btmesh;
-
- if (!EDBM_CallAndSelectOpf(em, op, "vertout",
- "create_grid xsegments=%i ysegments=%i size=%f
mat=%m4", 1, 1, dia, mat))
- return OPERATOR_CANCELLED;
-
- make_prim_finish(C, &state, enter_editmode);
-
- return OPERATOR_FINISHED;
-}
-
-void MESH_OT_primitive_plane_add(wmOperatorType *ot)
-{
- /* identifiers */
- ot->name= "Add Plane";
- ot->description= "Construct a filled planar mesh with 4 vertices";
- 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;
- unsigned int layer;
-
- ED_object_add_generic_get_opts(C, op, loc, rot, &enter_editmode,
&layer, NULL);
- make_prim_init(C, "Cube", &dia, mat, &state, loc, rot, layer);
-
- 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;
-
- /* BMESH_TODO make plane side this: M_SQRT2 - plane (diameter of 1.41
makes it unit size) */
- make_prim_finish(C, &state, enter_editmode);
-
- return OPERATOR_FINISHED;
-}
-
-void MESH_OT_primitive_cube_add(wmOperatorType *ot)
-{
- /* identifiers */
- ot->name= "Add Cube";
- ot->description= "Construct a cube mesh";
- 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);
-}
-
-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}};
-
-static int add_primitive_circle_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, cap_end, cap_tri;
- unsigned int layer;
-
- 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, "Circle", &dia, mat, &state, loc, rot, layer);
-
- 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;
-}
-
-void MESH_OT_primitive_circle_add(wmOperatorType *ot)
-{
- PropertyRNA *prop;
-
- /* identifiers */
- ot->name= "Add Circle";
- ot->description= "Construct a circle mesh";
- 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);
- 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);
- RNA_def_enum(ot->srna, "fill_type", fill_type_items, 0, "Fill Type",
"");
-
- ED_object_add_generic_props(ot, TRUE);
-}
-
-static int add_primitive_cylinder_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, cap_end, cap_tri;
- unsigned int layer;
-
- 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);
- make_prim_init(C, "Cylinder", &dia, mat, &state, loc, rot, layer);
-
- obedit = CTX_data_edit_object(C);
- me = obedit->data;
- em = me->edit_btmesh;
-
- if (!EDBM_CallAndSelectOpf(em, op, "vertout",
- "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, "radius"),
- RNA_float_get(op->ptr, "radius"), cap_end, cap_tri,
RNA_float_get(op->ptr, "depth"), mat))
- return OPERATOR_CANCELLED;
-
- make_prim_finish(C, &state, enter_editmode);
-
- return OPERATOR_FINISHED;
-}
-
-void MESH_OT_primitive_cylinder_add(wmOperatorType *ot)
-{
- PropertyRNA *prop;
-
- /* identifiers */
- ot->name= "Add Tube";
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
