sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

2.5: code consistency

Browse Source 
* Rename BIF_transform/retopo.h to ED_transform/retopo.h
  for consistency.
* Move MESH_OT_duplicate_add to editmesh_add.c.
* Remove some code from BIF_gl.h which is not needed there
  anymore.
This commit is contained in:
Brecht Van Lommel 2009-07-08 16:17:47 +00:00
parent 5e749af429
commit eacb31dbb2
40 changed files with 236 additions and 295 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
source/blender/blenkernel/intern/subsurf_ccg.c
View File

@ -60,6 +60,7 @@
#include "BLI_edgehash.h"
#include "BIF_gl.h"
#include "BIF_glutil.h"
#include "GPU_draw.h"
#include "GPU_extensions.h"

2
source/blender/editors/armature/editarmature.c
View File

@ -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"

2
source/blender/editors/armature/editarmature_sketch.c
View File

@ -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"

2
source/blender/editors/armature/poseobject.c
View File

@ -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"

5
source/blender/editors/curve/curve_ops.c
View File

@ -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"

3
source/blender/editors/curve/editcurve.c
View File

@ -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"

27
source/blender/editors/include/BIF_gl.h
View File

@ -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 */

4
source/blender/editors/include/BIF_glutil.h
View File

@ -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);

165
source/blender/editors/include/BIF_transform.h
View File

@ -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

5
source/blender/editors/include/BIF_retopo.h → source/blender/editors/include/ED_retopo.h
View File

@ -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

144
source/blender/editors/include/ED_transform.h
View File

@ -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 ********************** */
#endif /* ED_TRANSFORM_H */
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

4
source/blender/editors/mesh/editmesh.c
View File

@ -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"

53
source/blender/editors/mesh/editmesh_add.c
View File

@ -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);
}

6
source/blender/editors/mesh/editmesh_tools.c
View File

@ -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"

4
source/blender/editors/mesh/mesh_intern.h
View File

@ -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);

45
source/blender/editors/mesh/mesh_ops.c
View File

@ -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 **********************************/

3
source/blender/editors/object/object_edit.c
View File

@ -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"

3
source/blender/editors/space_action/action_edit.c
View File

@ -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"

2
source/blender/editors/space_action/action_ops.c
View File

@ -46,7 +46,7 @@
#include "UI_interface.h"
#include "UI_view2d.h"
#include "BIF_transform.h"
#include "ED_transform.h"
#include "action_intern.h"

3
source/blender/editors/space_graph/graph_edit.c
View File

@ -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"

3
source/blender/editors/space_graph/graph_ops.c
View File

@ -47,8 +47,7 @@
#include "UI_view2d.h"
#include "ED_screen.h"
#include "BIF_transform.h"
#include "ED_transform.h"
#include "graph_intern.h"

2
source/blender/editors/space_image/image_header.c
View File

@ -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"

1
source/blender/editors/space_image/space_image.c
View File

@ -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;

2
source/blender/editors/space_node/node_edit.c
View File

@ -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"

3
source/blender/editors/space_node/node_ops.c
View File

@ -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"

3
source/blender/editors/space_sequencer/sequencer_edit.c
View File

@ -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"

3
source/blender/editors/space_sequencer/sequencer_ops.c
View File

@ -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"

2
source/blender/editors/space_view3d/view3d_buttons.c
View File

@ -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"

2
source/blender/editors/space_view3d/view3d_draw.c
View File

@ -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"

4
source/blender/editors/space_view3d/view3d_edit.c
View File

@ -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"

2
source/blender/editors/space_view3d/view3d_header.c
View File

@ -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"

3
source/blender/editors/space_view3d/view3d_ops.c
View File

@ -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"

2
source/blender/editors/space_view3d/view3d_select.c
View File

@ -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"

2
source/blender/editors/space_view3d/view3d_toolbar.c
View File

@ -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"

2
source/blender/editors/transform/transform.h
View File

@ -30,7 +30,7 @@
#ifndef TRANSFORM_H
#define TRANSFORM_H
#include "BIF_transform.h"
#include "ED_transform.h"
/* ************************** Types ***************************** */

2
source/blender/editors/transform/transform_conversions.c
View File

@ -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"

2
source/blender/editors/transform/transform_generics.c
View File

@ -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"

2
source/blender/editors/transform/transform_manipulator.c
View File

@ -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"

3
source/blender/editors/transform/transform_snap.c
View File

@ -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"

3
source/blender/editors/uvedit/uvedit_ops.c
View File

@ -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"