[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [21432] branches/blender2.5/blender/source /blender: 2.5: code consistency
Brecht Van Lommel
brecht at blender.org
Wed Jul 8 18:17:47 CEST 2009
Revision: 21432
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=21432
Author: blendix
Date: 2009-07-08 18:17:47 +0200 (Wed, 08 Jul 2009)
Log Message:
-----------
2.5: code consistency
* 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.
Modified Paths:
--------------
branches/blender2.5/blender/source/blender/blenkernel/intern/subsurf_ccg.c
branches/blender2.5/blender/source/blender/editors/armature/editarmature.c
branches/blender2.5/blender/source/blender/editors/armature/editarmature_sketch.c
branches/blender2.5/blender/source/blender/editors/armature/poseobject.c
branches/blender2.5/blender/source/blender/editors/curve/curve_ops.c
branches/blender2.5/blender/source/blender/editors/curve/editcurve.c
branches/blender2.5/blender/source/blender/editors/include/BIF_gl.h
branches/blender2.5/blender/source/blender/editors/include/BIF_glutil.h
branches/blender2.5/blender/source/blender/editors/mesh/editmesh.c
branches/blender2.5/blender/source/blender/editors/mesh/editmesh_add.c
branches/blender2.5/blender/source/blender/editors/mesh/editmesh_tools.c
branches/blender2.5/blender/source/blender/editors/mesh/mesh_intern.h
branches/blender2.5/blender/source/blender/editors/mesh/mesh_ops.c
branches/blender2.5/blender/source/blender/editors/object/object_edit.c
branches/blender2.5/blender/source/blender/editors/space_action/action_edit.c
branches/blender2.5/blender/source/blender/editors/space_action/action_ops.c
branches/blender2.5/blender/source/blender/editors/space_graph/graph_edit.c
branches/blender2.5/blender/source/blender/editors/space_graph/graph_ops.c
branches/blender2.5/blender/source/blender/editors/space_image/image_header.c
branches/blender2.5/blender/source/blender/editors/space_image/space_image.c
branches/blender2.5/blender/source/blender/editors/space_node/node_edit.c
branches/blender2.5/blender/source/blender/editors/space_node/node_ops.c
branches/blender2.5/blender/source/blender/editors/space_sequencer/sequencer_edit.c
branches/blender2.5/blender/source/blender/editors/space_sequencer/sequencer_ops.c
branches/blender2.5/blender/source/blender/editors/space_view3d/view3d_buttons.c
branches/blender2.5/blender/source/blender/editors/space_view3d/view3d_draw.c
branches/blender2.5/blender/source/blender/editors/space_view3d/view3d_edit.c
branches/blender2.5/blender/source/blender/editors/space_view3d/view3d_header.c
branches/blender2.5/blender/source/blender/editors/space_view3d/view3d_ops.c
branches/blender2.5/blender/source/blender/editors/space_view3d/view3d_select.c
branches/blender2.5/blender/source/blender/editors/space_view3d/view3d_toolbar.c
branches/blender2.5/blender/source/blender/editors/transform/transform.h
branches/blender2.5/blender/source/blender/editors/transform/transform_conversions.c
branches/blender2.5/blender/source/blender/editors/transform/transform_generics.c
branches/blender2.5/blender/source/blender/editors/transform/transform_manipulator.c
branches/blender2.5/blender/source/blender/editors/transform/transform_snap.c
branches/blender2.5/blender/source/blender/editors/uvedit/uvedit_ops.c
Added Paths:
-----------
branches/blender2.5/blender/source/blender/editors/include/ED_retopo.h
branches/blender2.5/blender/source/blender/editors/include/ED_transform.h
Removed Paths:
-------------
branches/blender2.5/blender/source/blender/editors/include/BIF_retopo.h
branches/blender2.5/blender/source/blender/editors/include/BIF_transform.h
branches/blender2.5/blender/source/blender/editors/include/ED_transform.h
Modified: branches/blender2.5/blender/source/blender/blenkernel/intern/subsurf_ccg.c
===================================================================
--- branches/blender2.5/blender/source/blender/blenkernel/intern/subsurf_ccg.c 2009-07-08 15:34:41 UTC (rev 21431)
+++ branches/blender2.5/blender/source/blender/blenkernel/intern/subsurf_ccg.c 2009-07-08 16:17:47 UTC (rev 21432)
@@ -60,6 +60,7 @@
#include "BLI_edgehash.h"
#include "BIF_gl.h"
+#include "BIF_glutil.h"
#include "GPU_draw.h"
#include "GPU_extensions.h"
Modified: branches/blender2.5/blender/source/blender/editors/armature/editarmature.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/armature/editarmature.c 2009-07-08 15:34:41 UTC (rev 21431)
+++ branches/blender2.5/blender/source/blender/editors/armature/editarmature.c 2009-07-08 16:17:47 UTC (rev 21432)
@@ -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"
Modified: branches/blender2.5/blender/source/blender/editors/armature/editarmature_sketch.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/armature/editarmature_sketch.c 2009-07-08 15:34:41 UTC (rev 21431)
+++ branches/blender2.5/blender/source/blender/editors/armature/editarmature_sketch.c 2009-07-08 16:17:47 UTC (rev 21432)
@@ -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"
Modified: branches/blender2.5/blender/source/blender/editors/armature/poseobject.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/armature/poseobject.c 2009-07-08 15:34:41 UTC (rev 21431)
+++ branches/blender2.5/blender/source/blender/editors/armature/poseobject.c 2009-07-08 16:17:47 UTC (rev 21432)
@@ -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"
Modified: branches/blender2.5/blender/source/blender/editors/curve/curve_ops.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/curve/curve_ops.c 2009-07-08 15:34:41 UTC (rev 21431)
+++ branches/blender2.5/blender/source/blender/editors/curve/curve_ops.c 2009-07-08 16:17:47 UTC (rev 21432)
@@ -53,11 +53,10 @@
#include "WM_api.h"
#include "WM_types.h"
-#include "ED_screen.h"
#include "ED_object.h"
+#include "ED_screen.h"
+#include "ED_transform.h"
-#include "BIF_transform.h"
-
#include "UI_interface.h"
#include "curve_intern.h"
Modified: branches/blender2.5/blender/source/blender/editors/curve/editcurve.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/curve/editcurve.c 2009-07-08 15:34:41 UTC (rev 21431)
+++ branches/blender2.5/blender/source/blender/editors/curve/editcurve.c 2009-07-08 16:17:47 UTC (rev 21432)
@@ -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"
Modified: branches/blender2.5/blender/source/blender/editors/include/BIF_gl.h
===================================================================
--- branches/blender2.5/blender/source/blender/editors/include/BIF_gl.h 2009-07-08 15:34:41 UTC (rev 21431)
+++ branches/blender2.5/blender/source/blender/editors/include/BIF_gl.h 2009-07-08 16:17:47 UTC (rev 21432)
@@ -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 */
Modified: branches/blender2.5/blender/source/blender/editors/include/BIF_glutil.h
===================================================================
--- branches/blender2.5/blender/source/blender/editors/include/BIF_glutil.h 2009-07-08 15:34:41 UTC (rev 21431)
+++ branches/blender2.5/blender/source/blender/editors/include/BIF_glutil.h 2009-07-08 16:17:47 UTC (rev 21432)
@@ -45,6 +45,9 @@
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 @@
void set_inverted_drawing(int enable);
void setlinestyle(int nr);
-
/* own working polygon offset */
void bglPolygonOffset(float viewdist, float dist);
Deleted: branches/blender2.5/blender/source/blender/editors/include/BIF_retopo.h
===================================================================
--- branches/blender2.5/blender/source/blender/editors/include/BIF_retopo.h 2009-07-08 15:34:41 UTC (rev 21431)
+++ branches/blender2.5/blender/source/blender/editors/include/BIF_retopo.h 2009-07-08 16:17:47 UTC (rev 21432)
@@ -1,110 +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) 2006 by Nicholas Bishop
- * All rights reserved.
- *
- * The Original Code is: all of this file.
- *
- * Contributor(s): none yet.
- *
- * ***** END GPL LICENSE BLOCK *****
- */
-
-#ifndef BIF_RETOPO_H
-#define BIF_RETOPO_H
-
-#include "DNA_vec_types.h"
-
-/* For bglMats */
-#include "BIF_glutil.h"
-
-struct EditVert;
-struct Mesh;
-struct View3D;
-
-typedef struct RetopoViewData {
- bglMats mats;
-
- char queue_matrix_update;
-} RetopoViewData;
-
-typedef struct RetopoPaintPoint {
- struct RetopoPaintPoint *next, *prev;
- vec2s loc;
- short index;
- float co[3];
- struct EditVert *eve;
-} RetopoPaintPoint;
-
-typedef struct RetopoPaintLine {
- struct RetopoPaintLine *next, *prev;
- ListBase points;
- ListBase hitlist; /* RetopoPaintHit */
- RetopoPaintPoint *cyclic;
-} RetopoPaintLine;
-
-typedef struct RetopoPaintSel {
- struct RetopoPaintSel *next, *prev;
- RetopoPaintLine *line;
- char first;
-} RetopoPaintSel;
-
-typedef struct RetopoPaintData {
- char in_drag;
- short sloc[2];
-
- ListBase lines;
- ListBase intersections; /* RetopoPaintPoint */
-
- short seldist;
- RetopoPaintSel nearest;
-
- struct View3D *paint_v3d;
-} RetopoPaintData;
-
-RetopoPaintData *get_retopo_paint_data(void);
-
-char retopo_mesh_check(void);
-char retopo_curve_check(void);
-
-void retopo_end_okee(void);
-
-void retopo_free_paint_data(RetopoPaintData *rpd);
-void retopo_free_paint(void);
-
-char retopo_mesh_paint_check(void);
-void retopo_paint_view_update(struct View3D *v3d);
-void retopo_force_update(void);
-void retopo_paint_toggle(void*,void*);
-char retopo_paint(const unsigned short event);
-void retopo_draw_paint_lines(void);
-RetopoPaintData *retopo_paint_data_copy(RetopoPaintData *rpd);
-
-void retopo_toggle(void*,void*);
-void retopo_do_vert(struct View3D *v3d, float *v);
-void retopo_do_all(void);
-void retopo_do_all_cb(void *, void *);
-void retopo_queue_updates(struct View3D *v3d);
-
-void retopo_matrix_update(struct View3D *v3d);
-
-void retopo_free_view_data(struct View3D *v3d);
-
-#endif
Deleted: branches/blender2.5/blender/source/blender/editors/include/BIF_transform.h
===================================================================
--- branches/blender2.5/blender/source/blender/editors/include/BIF_transform.h 2009-07-08 15:34:41 UTC (rev 21431)
+++ branches/blender2.5/blender/source/blender/editors/include/BIF_transform.h 2009-07-08 16:17:47 UTC (rev 21432)
@@ -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
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list