diff options
40 files changed, 236 insertions, 295 deletions
diff --git a/source/blender/blenkernel/intern/subsurf_ccg.c b/source/blender/blenkernel/intern/subsurf_ccg.c index 15969fc9ab9..6e95fe7ebc7 100644 --- a/source/blender/blenkernel/intern/subsurf_ccg.c +++ b/source/blender/blenkernel/intern/subsurf_ccg.c @@ -60,6 +60,7 @@ #include "BLI_edgehash.h" #include "BIF_gl.h" +#include "BIF_glutil.h" #include "GPU_draw.h" #include "GPU_extensions.h" diff --git a/source/blender/editors/armature/editarmature.c b/source/blender/editors/armature/editarmature.c index 97bf3492f7c..d7e3f84f0d6 100644 --- a/source/blender/editors/armature/editarmature.c +++ b/source/blender/editors/armature/editarmature.c @@ -72,7 +72,6 @@ #include "PIL_time.h" #include "BIF_gl.h" -#include "BIF_transform.h" #include "BIF_generate.h" #include "RNA_access.h" @@ -85,6 +84,7 @@ #include "ED_mesh.h" #include "ED_object.h" #include "ED_screen.h" +#include "ED_transform.h" #include "ED_util.h" #include "ED_view3d.h" diff --git a/source/blender/editors/armature/editarmature_sketch.c b/source/blender/editors/armature/editarmature_sketch.c index fb030b91ce1..816df0f81c9 100644 --- a/source/blender/editors/armature/editarmature_sketch.c +++ b/source/blender/editors/armature/editarmature_sketch.c @@ -65,7 +65,7 @@ #include "BIF_generate.h" //#include "BIF_interface.h" -#include "BIF_transform.h" +#include "ED_transform.h" #include "WM_api.h" #include "WM_types.h" diff --git a/source/blender/editors/armature/poseobject.c b/source/blender/editors/armature/poseobject.c index 4a7056274c6..2913d1d13d9 100644 --- a/source/blender/editors/armature/poseobject.c +++ b/source/blender/editors/armature/poseobject.c @@ -64,7 +64,6 @@ #include "BKE_object.h" #include "BKE_utildefines.h" -#include "BIF_transform.h" /* for autokey TFM_TRANSLATION, etc */ #include "BIF_gl.h" #include "RNA_access.h" @@ -79,6 +78,7 @@ #include "ED_object.h" #include "ED_mesh.h" #include "ED_screen.h" +#include "ED_transform.h" /* for autokey TFM_TRANSLATION, etc */ #include "ED_view3d.h" #include "armature_intern.h" diff --git a/source/blender/editors/curve/curve_ops.c b/source/blender/editors/curve/curve_ops.c index 66cde772f3e..ed53f8e0194 100644 --- a/source/blender/editors/curve/curve_ops.c +++ b/source/blender/editors/curve/curve_ops.c @@ -53,10 +53,9 @@ #include "WM_api.h" #include "WM_types.h" -#include "ED_screen.h" #include "ED_object.h" - -#include "BIF_transform.h" +#include "ED_screen.h" +#include "ED_transform.h" #include "UI_interface.h" diff --git a/source/blender/editors/curve/editcurve.c b/source/blender/editors/curve/editcurve.c index 64303c149a8..6ae79109445 100644 --- a/source/blender/editors/curve/editcurve.c +++ b/source/blender/editors/curve/editcurve.c @@ -73,14 +73,13 @@ #include "ED_keyframes_edit.h" #include "ED_object.h" #include "ED_screen.h" +#include "ED_transform.h" #include "ED_types.h" #include "ED_util.h" #include "ED_view3d.h" #include "UI_interface.h" -#include "BIF_transform.h" - #include "RNA_access.h" #include "RNA_define.h" diff --git a/source/blender/editors/include/BIF_gl.h b/source/blender/editors/include/BIF_gl.h index c1b3b056d62..3318d869378 100644 --- a/source/blender/editors/include/BIF_gl.h +++ b/source/blender/editors/include/BIF_gl.h @@ -31,30 +31,11 @@ #ifndef BIF_GL_H #define BIF_GL_H - /* Although not really a great idea to copy these defines - * from Windows' winnt.h, this lets us use GL without including - * windows.h everywhere (or BLI_winstuff.h) which is a good thing. - */ -#ifdef WIN32 -#ifndef APIENTRY -#define APIENTRY __stdcall -#endif - -#ifndef CALLBACK -#define CALLBACK __stdcall -#endif - -#ifndef WINGDIAPI -#define WINGDIAPI __declspec(dllimport) -#endif -#endif - #include "GL/glew.h" /* * these should be phased out. cpack should be replaced in - * code with calls to glColor3ub, lrectwrite probably should - * change to a function. - zr + * code with calls to glColor3ub. - zr */ /* * @@ -67,11 +48,5 @@ #define glMultMatrixf(x) glMultMatrixf( (float *)(x)) #define glLoadMatrixf(x) glLoadMatrixf( (float *)(x)) -#define lrectwrite(a, b, c, d, rect) {glRasterPos2i(a, b);glDrawPixels((c)-(a)+1, (d)-(b)+1, GL_RGBA, GL_UNSIGNED_BYTE, rect);} - -/* glStippleDefines, defined in glutil.c */ -extern GLubyte stipple_halftone[128]; -extern GLubyte stipple_quarttone[128]; - #endif /* #ifdef BIF_GL_H */ diff --git a/source/blender/editors/include/BIF_glutil.h b/source/blender/editors/include/BIF_glutil.h index 5c611365a7e..f5769610f50 100644 --- a/source/blender/editors/include/BIF_glutil.h +++ b/source/blender/editors/include/BIF_glutil.h @@ -45,6 +45,9 @@ void sdrawXORline4(int nr, int x0, int y0, int x1, int y1); void fdrawXORellipse(float xofs, float yofs, float hw, float hh); void fdrawXORcirc(float xofs, float yofs, float rad); +/* glStipple defines */ +extern unsigned char stipple_halftone[128]; +extern unsigned char stipple_quarttone[128]; /** * Draw a lined (non-looping) arc with the given @@ -202,7 +205,6 @@ int is_a_really_crappy_intel_card(void); void set_inverted_drawing(int enable); void setlinestyle(int nr); - /* own working polygon offset */ void bglPolygonOffset(float viewdist, float dist); diff --git a/source/blender/editors/include/BIF_transform.h b/source/blender/editors/include/BIF_transform.h deleted file mode 100644 index f65648eb654..00000000000 --- a/source/blender/editors/include/BIF_transform.h +++ /dev/null @@ -1,165 +0,0 @@ -/** - * $Id$ - * - * ***** 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - * - * The Original Code is Copyright (C) 2001-2002 by NaN Holding BV. - * All rights reserved. - * - * The Original Code is: all of this file. - * - * Contributor(s): none yet. - * - * ***** END GPL LICENSE BLOCK ***** - */ - -#ifndef BIF_TRANSFORM_H -#define BIF_TRANSFORM_H - -/* ******************* Registration Function ********************** */ - -struct wmWindowManager; -struct ListBase; -struct wmEvent; -struct bContext; -struct Object; -struct uiLayout; - -void transform_keymap_for_space(struct wmWindowManager *wm, struct ListBase *keymap, int spaceid); -void transform_operatortypes(void); - -/* ******************** Macros & Prototypes *********************** */ - -/* MODE AND NUMINPUT FLAGS */ -enum { - TFM_INIT = -1, - TFM_DUMMY, - TFM_TRANSLATION, - TFM_ROTATION, - TFM_RESIZE, - TFM_TOSPHERE, - TFM_SHEAR, - TFM_WARP, - TFM_SHRINKFATTEN, - TFM_TILT, - TFM_TRACKBALL, - TFM_PUSHPULL, - TFM_CREASE, - TFM_MIRROR, - TFM_BONESIZE, - TFM_BONE_ENVELOPE, - TFM_CURVE_SHRINKFATTEN, - TFM_BONE_ROLL, - TFM_TIME_TRANSLATE, - TFM_TIME_SLIDE, - TFM_TIME_SCALE, - TFM_TIME_EXTEND, - TFM_BAKE_TIME, - TFM_BEVEL, - TFM_BWEIGHT, - TFM_ALIGN -} TfmMode; - -/* TRANSFORM CONTEXTS */ -#define CTX_NONE 0 -#define CTX_TEXTURE 1 -#define CTX_EDGE 2 -#define CTX_NO_PET 4 -#define CTX_TWEAK 8 -#define CTX_NO_MIRROR 16 -#define CTX_AUTOCONFIRM 32 -#define CTX_BMESH 64 -#define CTX_NDOF 128 - -/* Standalone call to get the transformation center corresponding to the current situation - * returns 1 if successful, 0 otherwise (usually means there's no selection) - * (if 0 is returns, *vec is unmodified) - * */ -int calculateTransformCenter(struct bContext *C, struct wmEvent *event, int centerMode, float *vec); - -struct TransInfo; -struct ScrArea; -struct Base; -struct Scene; -struct Object; - -void BIF_setSingleAxisConstraint(float vec[3], char *text); -void BIF_setDualAxisConstraint(float vec1[3], float vec2[3], char *text); -void BIF_setLocalAxisConstraint(char axis, char *text); -void BIF_setLocalLockConstraint(char axis, char *text); - -int BIF_snappingSupported(struct Object *obedit); - -struct TransformOrientation; -struct bContext; - -void BIF_clearTransformOrientation(struct bContext *C); -void BIF_removeTransformOrientation(struct bContext *C, struct TransformOrientation *ts); -void BIF_manageTransformOrientation(struct bContext *C, int confirm, int set); -int BIF_menuselectTransformOrientation(void); -void BIF_selectTransformOrientation(struct bContext *C, struct TransformOrientation *ts); -void BIF_selectTransformOrientationValue(struct bContext *C, int orientation); - -void BIF_menuTransformOrientation(struct bContext *C, struct uiLayout *layout, void *arg); -char * BIF_menustringTransformOrientation(const struct bContext *C, char *title); /* the returned value was allocated and needs to be freed after use */ -int BIF_countTransformOrientation(const struct bContext *C); - -void BIF_getPropCenter(float *center); - -void BIF_TransformSetUndo(char *str); - -void BIF_selectOrientation(void); - -/* view3d manipulators */ -void initManipulator(int mode); -void ManipulatorTransform(); - -int BIF_do_manipulator(struct bContext *C, short mval[2]); -void BIF_draw_manipulator(const struct bContext *C); - -/* Snapping */ - - -typedef struct DepthPeel -{ - struct DepthPeel *next, *prev; - - float depth; - float p[3]; - float no[3]; - struct Object *ob; - int flag; -} DepthPeel; - -struct ListBase; - -typedef enum SnapMode -{ - SNAP_ALL = 0, - SNAP_NOT_SELECTED = 1, - SNAP_NOT_OBEDIT = 2 -} SnapMode; - -#define SNAP_MIN_DISTANCE 30 - -int peelObjectsTransForm(struct TransInfo *t, struct ListBase *depth_peels, short mval[2]); -int peelObjectsContext(struct bContext *C, struct ListBase *depth_peels, short mval[2]); -int snapObjectsTransform(struct TransInfo *t, short mval[2], int *dist, float *loc, float *no, SnapMode mode); -int snapObjectsContext(struct bContext *C, short mval[2], int *dist, float *loc, float *no, SnapMode mode); - -#endif - diff --git a/source/blender/editors/include/BIF_retopo.h b/source/blender/editors/include/ED_retopo.h index cc2fda56b07..3d0b5f57661 100644 --- a/source/blender/editors/include/BIF_retopo.h +++ b/source/blender/editors/include/ED_retopo.h @@ -27,8 +27,8 @@ * ***** END GPL LICENSE BLOCK ***** */ -#ifndef BIF_RETOPO_H -#define BIF_RETOPO_H +#ifndef ED_RETOPO_H +#define ED_RETOPO_H #include "DNA_vec_types.h" @@ -108,3 +108,4 @@ void retopo_matrix_update(struct View3D *v3d); void retopo_free_view_data(struct View3D *v3d); #endif + diff --git a/source/blender/editors/include/ED_transform.h b/source/blender/editors/include/ED_transform.h index 1d47d8ad190..9327301336f 100644 --- a/source/blender/editors/include/ED_transform.h +++ b/source/blender/editors/include/ED_transform.h @@ -1,12 +1,12 @@ /** - * $Id: + * $Id$ * * ***** 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. + * 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 @@ -17,17 +17,149 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - * The Original Code is Copyright (C) 2008 Blender Foundation. + * The Original Code is Copyright (C) 2001-2002 by NaN Holding BV. * All rights reserved. * - * - * Contributor(s): Blender Foundation + * The Original Code is: all of this file. + * + * Contributor(s): none yet. * * ***** END GPL LICENSE BLOCK ***** */ + #ifndef ED_TRANSFORM_H #define ED_TRANSFORM_H +/* ******************* Registration Function ********************** */ + +struct wmWindowManager; +struct ListBase; +struct wmEvent; +struct bContext; +struct Object; +struct uiLayout; + +void transform_keymap_for_space(struct wmWindowManager *wm, struct ListBase *keymap, int spaceid); +void transform_operatortypes(void); + +/* ******************** Macros & Prototypes *********************** */ + +/* MODE AND NUMINPUT FLAGS */ +enum { + TFM_INIT = -1, + TFM_DUMMY, + TFM_TRANSLATION, + TFM_ROTATION, + TFM_RESIZE, + TFM_TOSPHERE, + TFM_SHEAR, + TFM_WARP, + TFM_SHRINKFATTEN, + TFM_TILT, + TFM_TRACKBALL, + TFM_PUSHPULL, + TFM_CREASE, + TFM_MIRROR, + TFM_BONESIZE, + TFM_BONE_ENVELOPE, + TFM_CURVE_SHRINKFATTEN, + TFM_BONE_ROLL, + TFM_TIME_TRANSLATE, + TFM_TIME_SLIDE, + TFM_TIME_SCALE, + TFM_TIME_EXTEND, + TFM_BAKE_TIME, + TFM_BEVEL, + TFM_BWEIGHT, + TFM_ALIGN +} TfmMode; + +/* TRANSFORM CONTEXTS */ +#define CTX_NONE 0 +#define CTX_TEXTURE 1 +#define CTX_EDGE 2 +#define CTX_NO_PET 4 +#define CTX_TWEAK 8 +#define CTX_NO_MIRROR 16 +#define CTX_AUTOCONFIRM 32 +#define CTX_BMESH 64 +#define CTX_NDOF 128 + +/* Standalone call to get the transformation center corresponding to the current situation + * returns 1 if successful, 0 otherwise (usually means there's no selection) + * (if 0 is returns, *vec is unmodified) + * */ +int calculateTransformCenter(struct bContext *C, struct wmEvent *event, int centerMode, float *vec); + +struct TransInfo; +struct ScrArea; +struct Base; +struct Scene; +struct Object; + +void BIF_setSingleAxisConstraint(float vec[3], char *text); +void BIF_setDualAxisConstraint(float vec1[3], float vec2[3], char *text); +void BIF_setLocalAxisConstraint(char axis, char *text); +void BIF_setLocalLockConstraint(char axis, char *text); + +int BIF_snappingSupported(struct Object *obedit); + +struct TransformOrientation; +struct bContext; + +void BIF_clearTransformOrientation(struct bContext *C); +void BIF_removeTransformOrientation(struct bContext *C, struct TransformOrientation *ts); +void BIF_manageTransformOrientation(struct bContext *C, int confirm, int set); +int BIF_menuselectTransformOrientation(void); +void BIF_selectTransformOrientation(struct bContext *C, struct TransformOrientation *ts); +void BIF_selectTransformOrientationValue(struct bContext *C, int orientation); + +void BIF_menuTransformOrientation(struct bContext *C, struct uiLayout *layout, void *arg); +char * BIF_menustringTransformOrientation(const struct bContext *C, char *title); /* the returned value was allocated and needs to be freed after use */ +int BIF_countTransformOrientation(const struct bContext *C); + +void BIF_getPropCenter(float *center); + +void BIF_TransformSetUndo(char *str); + +void BIF_selectOrientation(void); + +/* view3d manipulators */ +void initManipulator(int mode); +void ManipulatorTransform(); + +int BIF_do_manipulator(struct bContext *C, short mval[2]); +void BIF_draw_manipulator(const struct bContext *C); + +/* Snapping */ + + +typedef struct DepthPeel +{ + struct DepthPeel *next, *prev; + + float depth; + float p[3]; + float no[3]; + struct Object *ob; + int flag; +} DepthPeel; + +struct ListBase; + +typedef enum SnapMode +{ + SNAP_ALL = 0, + SNAP_NOT_SELECTED = 1, + SNAP_NOT_OBEDIT = 2 +} SnapMode; + +#define SNAP_MIN_DISTANCE 30 + +int peelObjectsTransForm(struct TransInfo *t, struct ListBase *depth_peels, short mval[2]); +int peelObjectsContext(struct bContext *C, struct ListBase *depth_peels, short mval[2]); +int snapObjectsTransform(struct TransInfo *t, short mval[2], int *dist, float *loc, float *no, SnapMode mode); +int snapObjectsContext(struct bContext *C, short mval[2], int *dist, float *loc, float *no, SnapMode mode); -#endif /* ED_TRANSFORM_H */ +#endif diff --git a/source/blender/editors/mesh/editmesh.c b/source/blender/editors/mesh/editmesh.c index 3ac6a1778db..e2ccd0976d2 100644 --- a/source/blender/editors/mesh/editmesh.c +++ b/source/blender/editors/mesh/editmesh.c @@ -74,12 +74,12 @@ #include "LBM_fluidsim.h" -#include "BIF_retopo.h" #include "ED_mesh.h" #include "ED_object.h" -#include "ED_util.h" +#include "ED_retopo.h" #include "ED_screen.h" +#include "ED_util.h" #include "ED_view3d.h" #include "RNA_access.h" diff --git a/source/blender/editors/mesh/editmesh_add.c b/source/blender/editors/mesh/editmesh_add.c index abbbb5aea3d..942ad657992 100644 --- a/source/blender/editors/mesh/editmesh_add.c +++ b/source/blender/editors/mesh/editmesh_add.c @@ -61,15 +61,15 @@ #include "BKE_utildefines.h" #include "BKE_report.h" -#include "BIF_retopo.h" - #include "WM_api.h" #include "WM_types.h" #include "ED_mesh.h" +#include "ED_retopo.h" +#include "ED_screen.h" +#include "ED_transform.h" #include "ED_util.h" #include "ED_view3d.h" -#include "ED_screen.h" #include "mesh_intern.h" @@ -1659,3 +1659,50 @@ void MESH_OT_primitive_ico_sphere_add(wmOperatorType *ot) RNA_def_float(ot->srna, "size", 1.0f, 0.0f, FLT_MAX, "Size", "", 0.001f, 100.00); } +/****************** add duplicate operator ***************/ + +static int mesh_add_duplicate_exec(bContext *C, wmOperator *op) +{ + Scene *scene= CTX_data_scene(C); + Object *ob= CTX_data_edit_object(C); + EditMesh *em= BKE_mesh_get_editmesh(ob->data); + + adduplicateflag(em, SELECT); + + BKE_mesh_end_editmesh(ob->data, em); + + DAG_object_flush_update(scene, ob, OB_RECALC_DATA); + WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_SELECT, ob); + + return OPERATOR_FINISHED; +} + +static int mesh_add_duplicate_invoke(bContext *C, wmOperator *op, wmEvent *event) +{ + WM_cursor_wait(1); + mesh_add_duplicate_exec(C, op); + WM_cursor_wait(0); + + RNA_int_set(op->ptr, "mode", TFM_TRANSLATION); + WM_operator_name_call(C, "TFM_OT_transform", WM_OP_INVOKE_REGION_WIN, op->ptr); + + return OPERATOR_FINISHED; +} + +void MESH_OT_duplicate_add(wmOperatorType *ot) +{ + + /* identifiers */ + ot->name= "Add Duplicate"; + ot->idname= "MESH_OT_duplicate_add"; + + /* api callbacks */ + ot->invoke= mesh_add_duplicate_invoke; + ot->exec= mesh_add_duplicate_exec; + + ot->poll= ED_operator_editmesh; + + /* to give to transform */ + RNA_def_int(ot->srna, "mode", TFM_TRANSLATION, 0, INT_MAX, "Mode", "", 0, INT_MAX); +} + diff --git a/source/blender/editors/mesh/editmesh_tools.c b/source/blender/editors/mesh/editmesh_tools.c index 2c3007d00ad..00cd187a23c 100644 --- a/source/blender/editors/mesh/editmesh_tools.c +++ b/source/blender/editors/mesh/editmesh_tools.c @@ -83,10 +83,10 @@ editmesh_tool.c: UI called tools for editmesh, geometry changes here, otherwise #include "WM_types.h" #include "ED_mesh.h" -#include "ED_view3d.h" -#include "ED_util.h" #include "ED_screen.h" -#include "BIF_transform.h" +#include "ED_transform.h" +#include "ED_util.h" +#include "ED_view3d.h" #include "UI_interface.h" diff --git a/source/blender/editors/mesh/mesh_intern.h b/source/blender/editors/mesh/mesh_intern.h index ff07d03313b..4d71ddbd647 100644 --- a/source/blender/editors/mesh/mesh_intern.h +++ b/source/blender/editors/mesh/mesh_intern.h @@ -82,8 +82,10 @@ void MESH_OT_primitive_grid_add(struct wmOperatorType *ot); void MESH_OT_primitive_monkey_add(struct wmOperatorType *ot); void MESH_OT_primitive_uv_sphere_add(struct wmOperatorType *ot); void MESH_OT_primitive_ico_sphere_add(struct wmOperatorType *ot); -void MESH_OT_dupli_extrude_cursor(struct wmOperatorType *ot); + void MESH_OT_edge_face_add(struct wmOperatorType *ot); +void MESH_OT_dupli_extrude_cursor(struct wmOperatorType *ot); +void MESH_OT_duplicate_add(struct wmOperatorType *ot); void MESH_OT_fgon_make(struct wmOperatorType *ot); void MESH_OT_fgon_clear(struct wmOperatorType *ot); diff --git a/source/blender/editors/mesh/mesh_ops.c b/source/blender/editors/mesh/mesh_ops.c index 7e59cd684ba..64fcfb681ed 100644 --- a/source/blender/editors/mesh/mesh_ops.c +++ b/source/blender/editors/mesh/mesh_ops.c @@ -54,55 +54,14 @@ #include "WM_api.h" #include "WM_types.h" -#include "ED_screen.h" #include "ED_mesh.h" +#include "ED_screen.h" +#include "ED_transform.h" #include "ED_view3d.h" -#include "BIF_transform.h" - #include "mesh_intern.h" -static int mesh_add_duplicate_exec(bContext *C, wmOperator *op) -{ - Object *ob= CTX_data_edit_object(C); - EditMesh *em= BKE_mesh_get_editmesh(ob->data); - - adduplicateflag(em, SELECT); - - BKE_mesh_end_editmesh(ob->data, em); - return OPERATOR_FINISHED; -} - -static int mesh_add_duplicate_invoke(bContext *C, wmOperator *op, wmEvent *event) -{ - WM_cursor_wait(1); - mesh_add_duplicate_exec(C, op); - WM_cursor_wait(0); - - RNA_int_set(op->ptr, "mode", TFM_TRANSLATION); - WM_operator_name_call(C, "TFM_OT_transform", WM_OP_INVOKE_REGION_WIN, op->ptr); - - return OPERATOR_FINISHED; -} - -static void MESH_OT_duplicate_add(wmOperatorType *ot) -{ - - /* identifiers */ - ot->name= "Add Duplicate"; - ot->idname= "MESH_OT_duplicate_add"; - - /* api callbacks */ - ot->invoke= mesh_add_duplicate_invoke; - ot->exec= mesh_add_duplicate_exec; - - ot->poll= ED_operator_editmesh; - - /* to give to transform */ - RNA_def_int(ot->srna, "mode", TFM_TRANSLATION, 0, INT_MAX, "Mode", "", 0, INT_MAX); -} - /* ************************** registration **********************************/ diff --git a/source/blender/editors/object/object_edit.c b/source/blender/editors/object/object_edit.c index 90f6250cf8c..b2040d328f2 100644 --- a/source/blender/editors/object/object_edit.c +++ b/source/blender/editors/object/object_edit.c @@ -116,12 +116,11 @@ #include "ED_mesh.h" #include "ED_object.h" #include "ED_screen.h" +#include "ED_transform.h" #include "ED_types.h" #include "ED_util.h" #include "ED_view3d.h" -#include "BIF_transform.h" - #include "UI_interface.h" #include "RNA_access.h" diff --git a/source/blender/editors/space_action/action_edit.c b/source/blender/editors/space_action/action_edit.c index 5d262cb03c5..148021a6fa3 100644 --- a/source/blender/editors/space_action/action_edit.c +++ b/source/blender/editors/space_action/action_edit.c @@ -74,14 +74,13 @@ #include "UI_view2d.h" -#include "BIF_transform.h" - #include "ED_anim_api.h" #include "ED_keyframing.h" #include "ED_keyframes_draw.h" #include "ED_keyframes_edit.h" #include "ED_screen.h" #include "ED_space_api.h" +#include "ED_transform.h" #include "WM_api.h" #include "WM_types.h" diff --git a/source/blender/editors/space_action/action_ops.c b/source/blender/editors/space_action/action_ops.c index 49a0befdbe2..8ca2bf40979 100644 --- a/source/blender/editors/space_action/action_ops.c +++ b/source/blender/editors/space_action/action_ops.c @@ -46,7 +46,7 @@ #include "UI_interface.h" #include "UI_view2d.h" -#include "BIF_transform.h" +#include "ED_transform.h" #include "action_intern.h" diff --git a/source/blender/editors/space_graph/graph_edit.c b/source/blender/editors/space_graph/graph_edit.c index 23e8a009274..71f2eb2a8de 100644 --- a/source/blender/editors/space_graph/graph_edit.c +++ b/source/blender/editors/space_graph/graph_edit.c @@ -74,14 +74,13 @@ #include "UI_view2d.h" -#include "BIF_transform.h" - #include "ED_anim_api.h" #include "ED_keyframing.h" #include "ED_keyframes_draw.h" #include "ED_keyframes_edit.h" #include "ED_screen.h" #include "ED_space_api.h" +#include "ED_transform.h" #include "WM_api.h" #include "WM_types.h" diff --git a/source/blender/editors/space_graph/graph_ops.c b/source/blender/editors/space_graph/graph_ops.c index a23f0081c04..d1a678f91d4 100644 --- a/source/blender/editors/space_graph/graph_ops.c +++ b/source/blender/editors/space_graph/graph_ops.c @@ -47,8 +47,7 @@ #include "UI_view2d.h" #include "ED_screen.h" - -#include "BIF_transform.h" +#include "ED_transform.h" #include "graph_intern.h" diff --git a/source/blender/editors/space_image/image_header.c b/source/blender/editors/space_image/image_header.c index 9550c4c3a29..a902ec27a87 100644 --- a/source/blender/editors/space_image/image_header.c +++ b/source/blender/editors/space_image/image_header.c @@ -55,6 +55,7 @@ #include "ED_image.h" #include "ED_mesh.h" #include "ED_screen.h" +#include "ED_transform.h" #include "ED_types.h" #include "ED_util.h" @@ -63,7 +64,6 @@ #include "BIF_gl.h" #include "BIF_glutil.h" -#include "BIF_transform.h" #include "UI_interface.h" #include "UI_resources.h" diff --git a/source/blender/editors/space_image/space_image.c b/source/blender/editors/space_image/space_image.c index a1217f84380..ef472d462c2 100644 --- a/source/blender/editors/space_image/space_image.c +++ b/source/blender/editors/space_image/space_image.c @@ -369,7 +369,6 @@ static void image_main_area_set_view2d(SpaceImage *sima, ARegion *ar, Scene *sce ar->v2d.mask.ymax= winy; /* which part of the image space do we see? */ - /* same calculation as in lrectwrite: area left and down*/ x1= ar->winrct.xmin+(winx-sima->zoom*w)/2; y1= ar->winrct.ymin+(winy-sima->zoom*h)/2; diff --git a/source/blender/editors/space_node/node_edit.c b/source/blender/editors/space_node/node_edit.c index 0d6fc20c248..1ba14bbd10e 100644 --- a/source/blender/editors/space_node/node_edit.c +++ b/source/blender/editors/space_node/node_edit.c @@ -63,7 +63,6 @@ #include "ED_previewrender.h" #include "BIF_gl.h" -#include "BIF_transform.h" #include "BLI_arithb.h" #include "BLI_blenlib.h" @@ -75,6 +74,7 @@ #include "ED_space_api.h" #include "ED_screen.h" +#include "ED_transform.h" #include "ED_types.h" #include "RNA_access.h" diff --git a/source/blender/editors/space_node/node_ops.c b/source/blender/editors/space_node/node_ops.c index 732b45f1f30..6df5dbd71d0 100644 --- a/source/blender/editors/space_node/node_ops.c +++ b/source/blender/editors/space_node/node_ops.c @@ -37,8 +37,7 @@ #include "ED_space_api.h" #include "ED_screen.h" - -#include "BIF_transform.h" +#include "ED_transform.h" #include "RNA_access.h" #include "RNA_define.h" diff --git a/source/blender/editors/space_sequencer/sequencer_edit.c b/source/blender/editors/space_sequencer/sequencer_edit.c index 7cd81faede1..933c50ad20c 100644 --- a/source/blender/editors/space_sequencer/sequencer_edit.c +++ b/source/blender/editors/space_sequencer/sequencer_edit.c @@ -66,8 +66,6 @@ #include "BKE_utildefines.h" #include "BKE_report.h" -#include "BIF_transform.h" - #include "WM_api.h" #include "WM_types.h" @@ -82,6 +80,7 @@ #include "ED_space_api.h" #include "ED_types.h" #include "ED_screen.h" +#include "ED_transform.h" #include "ED_util.h" #include "UI_interface.h" diff --git a/source/blender/editors/space_sequencer/sequencer_ops.c b/source/blender/editors/space_sequencer/sequencer_ops.c index c6e5fbe39a4..d1a2307ca3a 100644 --- a/source/blender/editors/space_sequencer/sequencer_ops.c +++ b/source/blender/editors/space_sequencer/sequencer_ops.c @@ -41,8 +41,6 @@ #include "BLI_arithb.h" #include "BLI_blenlib.h" -#include "BIF_transform.h" /* transform keymap */ - #include "BKE_context.h" #include "BKE_global.h" #include "BKE_utildefines.h" @@ -54,6 +52,7 @@ #include "WM_types.h" #include "ED_screen.h" +#include "ED_transform.h" /* transform keymap */ #include "sequencer_intern.h" diff --git a/source/blender/editors/space_view3d/view3d_buttons.c b/source/blender/editors/space_view3d/view3d_buttons.c index 91565235591..cf197f1d405 100644 --- a/source/blender/editors/space_view3d/view3d_buttons.c +++ b/source/blender/editors/space_view3d/view3d_buttons.c @@ -71,7 +71,6 @@ #include "BKE_utildefines.h" #include "BIF_gl.h" -#include "BIF_transform.h" #include "WM_api.h" #include "WM_types.h" @@ -87,6 +86,7 @@ #include "ED_object.h" #include "ED_particle.h" #include "ED_screen.h" +#include "ED_transform.h" #include "ED_types.h" #include "ED_util.h" diff --git a/source/blender/editors/space_view3d/view3d_draw.c b/source/blender/editors/space_view3d/view3d_draw.c index ec292b6871b..dd4e67e612c 100644 --- a/source/blender/editors/space_view3d/view3d_draw.c +++ b/source/blender/editors/space_view3d/view3d_draw.c @@ -70,7 +70,6 @@ #include "BIF_gl.h" #include "BIF_glutil.h" -#include "BIF_transform.h" #include "WM_api.h" #include "BLF_api.h" @@ -81,6 +80,7 @@ #include "ED_screen.h" #include "ED_space_api.h" #include "ED_util.h" +#include "ED_transform.h" #include "ED_types.h" #include "UI_interface.h" diff --git a/source/blender/editors/space_view3d/view3d_edit.c b/source/blender/editors/space_view3d/view3d_edit.c index 1b9f3285f3d..1206bf72b72 100644 --- a/source/blender/editors/space_view3d/view3d_edit.c +++ b/source/blender/editors/space_view3d/view3d_edit.c @@ -62,8 +62,6 @@ #include "RE_pipeline.h" // make_stars #include "BIF_gl.h" -#include "BIF_retopo.h" -#include "BIF_transform.h" #include "WM_api.h" #include "WM_types.h" @@ -72,8 +70,10 @@ #include "RNA_define.h" #include "ED_particle.h" +#include "ED_retopo.h" #include "ED_space_api.h" #include "ED_screen.h" +#include "ED_transform.h" #include "ED_types.h" #include "UI_interface.h" diff --git a/source/blender/editors/space_view3d/view3d_header.c b/source/blender/editors/space_view3d/view3d_header.c index 5b378f39cd0..daa872defff 100644 --- a/source/blender/editors/space_view3d/view3d_header.c +++ b/source/blender/editors/space_view3d/view3d_header.c @@ -71,6 +71,7 @@ #include "ED_mesh.h" #include "ED_util.h" #include "ED_screen.h" +#include "ED_transform.h" #include "ED_types.h" #include "WM_api.h" @@ -81,7 +82,6 @@ #include "BIF_gl.h" #include "BIF_glutil.h" -#include "BIF_transform.h" #include "BLI_arithb.h" #include "BLI_blenlib.h" diff --git a/source/blender/editors/space_view3d/view3d_ops.c b/source/blender/editors/space_view3d/view3d_ops.c index 32a66254ff4..25405909d0b 100644 --- a/source/blender/editors/space_view3d/view3d_ops.c +++ b/source/blender/editors/space_view3d/view3d_ops.c @@ -46,8 +46,6 @@ #include "BKE_global.h" #include "BKE_utildefines.h" -#include "BIF_transform.h" - #include "RNA_access.h" #include "RNA_define.h" @@ -55,6 +53,7 @@ #include "WM_types.h" #include "ED_screen.h" +#include "ED_transform.h" #include "view3d_intern.h" diff --git a/source/blender/editors/space_view3d/view3d_select.c b/source/blender/editors/space_view3d/view3d_select.c index 74063e0ad56..fedf3a30181 100644 --- a/source/blender/editors/space_view3d/view3d_select.c +++ b/source/blender/editors/space_view3d/view3d_select.c @@ -66,7 +66,6 @@ #include "RE_pipeline.h" // make_stars #include "BIF_gl.h" -#include "BIF_retopo.h" #include "WM_api.h" #include "WM_types.h" @@ -79,6 +78,7 @@ #include "ED_particle.h" #include "ED_mesh.h" #include "ED_object.h" +#include "ED_retopo.h" #include "ED_screen.h" #include "ED_types.h" #include "ED_util.h" diff --git a/source/blender/editors/space_view3d/view3d_toolbar.c b/source/blender/editors/space_view3d/view3d_toolbar.c index 8aba8e11d43..89a6d659d67 100644 --- a/source/blender/editors/space_view3d/view3d_toolbar.c +++ b/source/blender/editors/space_view3d/view3d_toolbar.c @@ -71,7 +71,6 @@ #include "BKE_utildefines.h" #include "BIF_gl.h" -#include "BIF_transform.h" #include "WM_api.h" #include "WM_types.h" @@ -87,6 +86,7 @@ #include "ED_object.h" #include "ED_particle.h" #include "ED_screen.h" +#include "ED_transform.h" #include "ED_types.h" #include "ED_util.h" diff --git a/source/blender/editors/transform/transform.h b/source/blender/editors/transform/transform.h index c270a5d20ea..98719e714ba 100644 --- a/source/blender/editors/transform/transform.h +++ b/source/blender/editors/transform/transform.h @@ -30,7 +30,7 @@ #ifndef TRANSFORM_H #define TRANSFORM_H -#include "BIF_transform.h" +#include "ED_transform.h" /* ************************** Types ***************************** */ diff --git a/source/blender/editors/transform/transform_conversions.c b/source/blender/editors/transform/transform_conversions.c index 5926b95854c..6d2337bbc8c 100644 --- a/source/blender/editors/transform/transform_conversions.c +++ b/source/blender/editors/transform/transform_conversions.c @@ -114,7 +114,6 @@ //#include "BIF_meshtools.h" //#include "BIF_mywindow.h" //#include "BIF_resources.h" -#include "BIF_retopo.h" //#include "BIF_screen.h" //#include "BIF_space.h" //#include "BIF_toolbox.h" @@ -127,6 +126,7 @@ #include "ED_keyframes_edit.h" #include "ED_object.h" #include "ED_mesh.h" +#include "ED_retopo.h" #include "ED_types.h" #include "ED_uvedit.h" #include "ED_view3d.h" diff --git a/source/blender/editors/transform/transform_generics.c b/source/blender/editors/transform/transform_generics.c index c9d5456f59b..5bb1a2e1329 100644 --- a/source/blender/editors/transform/transform_generics.c +++ b/source/blender/editors/transform/transform_generics.c @@ -65,7 +65,6 @@ //#include "BIF_editsima.h" //#include "BIF_editparticle.h" //#include "BIF_meshtools.h" -#include "BIF_retopo.h" #include "BKE_action.h" #include "BKE_anim.h" @@ -91,6 +90,7 @@ #include "ED_image.h" #include "ED_keyframing.h" #include "ED_mesh.h" +#include "ED_retopo.h" #include "ED_space_api.h" #include "ED_uvedit.h" #include "ED_view3d.h" diff --git a/source/blender/editors/transform/transform_manipulator.c b/source/blender/editors/transform/transform_manipulator.c index aecd01dd4f0..3868ac9204b 100644 --- a/source/blender/editors/transform/transform_manipulator.c +++ b/source/blender/editors/transform/transform_manipulator.c @@ -66,7 +66,6 @@ #include "BLI_editVert.h" #include "BIF_gl.h" -#include "BIF_transform.h" #include "WM_api.h" #include "WM_types.h" @@ -75,6 +74,7 @@ #include "ED_mesh.h" #include "ED_particle.h" #include "ED_space_api.h" +#include "ED_transform.h" #include "ED_view3d.h" #include "UI_resources.h" diff --git a/source/blender/editors/transform/transform_snap.c b/source/blender/editors/transform/transform_snap.c index 0b9a176dbdf..9438581409b 100644 --- a/source/blender/editors/transform/transform_snap.c +++ b/source/blender/editors/transform/transform_snap.c @@ -63,8 +63,6 @@ //#include "BIF_drawimage.h" //#include "BIF_editmesh.h" -#include "BIF_transform.h" - #include "BKE_global.h" #include "BKE_utildefines.h" #include "BKE_DerivedMesh.h" @@ -75,6 +73,7 @@ #include "ED_armature.h" #include "ED_image.h" #include "ED_mesh.h" +#include "ED_transform.h" #include "ED_uvedit.h" #include "ED_view3d.h" diff --git a/source/blender/editors/uvedit/uvedit_ops.c b/source/blender/editors/uvedit/uvedit_ops.c index 7582145c63b..4c855315bb3 100644 --- a/source/blender/editors/uvedit/uvedit_ops.c +++ b/source/blender/editors/uvedit/uvedit_ops.c @@ -54,11 +54,10 @@ #include "BKE_report.h" #include "BKE_utildefines.h" -#include "BIF_transform.h" - #include "ED_image.h" #include "ED_mesh.h" #include "ED_screen.h" +#include "ED_transform.h" #include "RNA_access.h" #include "RNA_define.h" |