[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [44216] branches/bmesh/blender/source/ blender: more syncing smaller changes with trunk
Campbell Barton
ideasman42 at gmail.com
Fri Feb 17 22:32:31 CET 2012
Revision: 44216
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=44216
Author: campbellbarton
Date: 2012-02-17 21:32:30 +0000 (Fri, 17 Feb 2012)
Log Message:
-----------
more syncing smaller changes with trunk
Modified Paths:
--------------
branches/bmesh/blender/source/blender/blenlib/BLI_editVert.h
branches/bmesh/blender/source/blender/blenlib/intern/BLI_ghash.c
branches/bmesh/blender/source/blender/blenlib/intern/math_base_inline.c
branches/bmesh/blender/source/blender/editors/include/ED_mesh.h
Modified: branches/bmesh/blender/source/blender/blenlib/BLI_editVert.h
===================================================================
--- branches/bmesh/blender/source/blender/blenlib/BLI_editVert.h 2012-02-17 21:22:18 UTC (rev 44215)
+++ branches/bmesh/blender/source/blender/blenlib/BLI_editVert.h 2012-02-17 21:32:30 UTC (rev 44216)
@@ -42,7 +42,6 @@
#include "BLO_sys_types.h" // for intptr_t support
struct DerivedMesh;
-struct BLI_mempool;
/* note; changing this also might affect the undo copy in editmesh.c */
typedef struct EditVert
@@ -156,8 +155,6 @@
HashEdge *hashedgetab;
/* this is for the editmesh_fastmalloc */
- struct BLI_mempool *vertpool, *edgepool, *facepool;
-
EditVert *allverts, *curvert;
EditEdge *alledges, *curedge;
EditFace *allfaces, *curface;
Modified: branches/bmesh/blender/source/blender/blenlib/intern/BLI_ghash.c
===================================================================
--- branches/bmesh/blender/source/blender/blenlib/intern/BLI_ghash.c 2012-02-17 21:22:18 UTC (rev 44215)
+++ branches/bmesh/blender/source/blender/blenlib/intern/BLI_ghash.c 2012-02-17 21:32:30 UTC (rev 44216)
@@ -61,7 +61,7 @@
GHash *gh= MEM_mallocN(sizeof(*gh), info);
gh->hashfp= hashfp;
gh->cmpfp= cmpfp;
- gh->entrypool = BLI_mempool_create(sizeof(Entry), 64, 64, TRUE, FALSE);
+ gh->entrypool = BLI_mempool_create(sizeof(Entry), 64, 64, FALSE, FALSE);
gh->cursize= 0;
gh->nentries= 0;
Modified: branches/bmesh/blender/source/blender/blenlib/intern/math_base_inline.c
===================================================================
--- branches/bmesh/blender/source/blender/blenlib/intern/math_base_inline.c 2012-02-17 21:22:18 UTC (rev 44215)
+++ branches/bmesh/blender/source/blender/blenlib/intern/math_base_inline.c 2012-02-17 21:32:30 UTC (rev 44216)
@@ -106,7 +106,7 @@
* the distance gets very high, 180d would be inf, but this case isn't valid */
MINLINE float shell_angle_to_dist(const float angle)
{
- return (1.0f + SMALL_NUMBER) / ((float)fabs(cosf(angle)) + SMALL_NUMBER);
+ return (angle < SMALL_NUMBER) ? 1.0f : fabsf(1.0f / cosf(angle));
}
/* used for zoom values*/
Modified: branches/bmesh/blender/source/blender/editors/include/ED_mesh.h
===================================================================
--- branches/bmesh/blender/source/blender/editors/include/ED_mesh.h 2012-02-17 21:22:18 UTC (rev 44215)
+++ branches/bmesh/blender/source/blender/editors/include/ED_mesh.h 2012-02-17 21:32:30 UTC (rev 44216)
@@ -43,6 +43,7 @@
struct EditEdge;
struct EditFace;
struct bContext;
+struct wmOperator;
struct wmWindowManager;
struct wmKeyConfig;
struct ReportList;
@@ -69,33 +70,30 @@
struct BMFace;
struct UvVertMap;
struct UvMapVert;
+struct ToolSettings;
struct Material;
struct Object;
struct rcti;
-struct wmOperator;
-struct ToolSettings;
-// edge and face flag both
-#define EM_FGON 2
-// face flag
-#define EM_FGON_DRAW 1
+#define EM_FGON_DRAW 1 // face flag
+#define EM_FGON 2 // edge and face flag both
/* editbutflag */
-#define B_CLOCKWISE 1
-#define B_KEEPORIG 2
-#define B_BEAUTY 4
-#define B_SMOOTH 8
-#define B_BEAUTY_SHORT 16
-#define B_AUTOFGON 32
-#define B_KNIFE 0x80
+#define B_CLOCKWISE 1
+#define B_KEEPORIG 2
+#define B_BEAUTY 4
+#define B_SMOOTH 8
+#define B_BEAUTY_SHORT 0x10
+#define B_AUTOFGON 0x20
+#define B_KNIFE 0x80
#define B_PERCENTSUBD 0x40
//#define B_MESH_X_MIRROR 0x100 // deprecated, use mesh
#define B_JOINTRIA_UV 0x200
#define B_JOINTRIA_VCOL 0X400
#define B_JOINTRIA_SHARP 0X800
#define B_JOINTRIA_MAT 0X1000
-#define B_FRACTAL 0x2000
-#define B_SPHERE 0x4000
+#define B_FRACTAL 0x2000
+#define B_SPHERE 0x4000
intptr_t mesh_octree_table(struct Object *ob, struct BMEditMesh *em, float *co, char mode);
int mesh_mirrtopo_table(struct Object *ob, char mode);
More information about the Bf-blender-cvs
mailing list