[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [36556] branches/bmesh/blender: more syncing with trunk, also cleared many warnings with gcc4.6
Campbell Barton
ideasman42 at gmail.com
Mon May 9 06:06:51 CEST 2011
Revision: 36556
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=36556
Author: campbellbarton
Date: 2011-05-09 04:06:48 +0000 (Mon, 09 May 2011)
Log Message:
-----------
more syncing with trunk, also cleared many warnings with gcc4.6
Modified Paths:
--------------
branches/bmesh/blender/intern/itasc/kdl/framevel.hpp
branches/bmesh/blender/source/blender/blenkernel/BKE_context.h
branches/bmesh/blender/source/blender/blenkernel/BKE_tessmesh.h
branches/bmesh/blender/source/blender/blenkernel/BKE_utildefines.h
branches/bmesh/blender/source/blender/blenkernel/SConscript
branches/bmesh/blender/source/blender/blenkernel/intern/BME_Customdata.c
branches/bmesh/blender/source/blender/blenkernel/intern/BME_conversions.c
branches/bmesh/blender/source/blender/blenkernel/intern/BME_eulers.c
branches/bmesh/blender/source/blender/blenkernel/intern/BME_mesh.c
branches/bmesh/blender/source/blender/blenkernel/intern/BME_structure.c
branches/bmesh/blender/source/blender/blenkernel/intern/BME_tools.c
branches/bmesh/blender/source/blender/blenkernel/intern/cloth.c
branches/bmesh/blender/source/blender/blenkernel/intern/collision.c
branches/bmesh/blender/source/blender/blenkernel/intern/context.c
branches/bmesh/blender/source/blender/blenkernel/intern/customdata.c
branches/bmesh/blender/source/blender/blenkernel/intern/editderivedbmesh.c
branches/bmesh/blender/source/blender/blenkernel/intern/mesh.c
branches/bmesh/blender/source/blender/blenkernel/intern/modifiers_bmesh.c
branches/bmesh/blender/source/blender/blenkernel/intern/particle_system.c
branches/bmesh/blender/source/blender/blenkernel/intern/smoke.c
branches/bmesh/blender/source/blender/blenkernel/intern/subsurf_ccg.c
branches/bmesh/blender/source/blender/blenlib/BLI_ghash.h
branches/bmesh/blender/source/blender/blenlib/CMakeLists.txt
branches/bmesh/blender/source/blender/blenlib/intern/BLI_cellalloc.c
branches/bmesh/blender/source/blender/blenlib/intern/BLI_mempool.c
branches/bmesh/blender/source/blender/blenlib/intern/edgehash.c
branches/bmesh/blender/source/blender/blenloader/intern/readfile.c
branches/bmesh/blender/source/blender/bmesh/intern/bmesh_mods.c
branches/bmesh/blender/source/blender/bmesh/intern/bmesh_newcore.c
branches/bmesh/blender/source/blender/bmesh/intern/bmesh_operators.c
branches/bmesh/blender/source/blender/bmesh/intern/bmesh_walkers.c
branches/bmesh/blender/source/blender/bmesh/intern/bmesh_walkers_impl.c
branches/bmesh/blender/source/blender/bmesh/operators/bevel.c
branches/bmesh/blender/source/blender/bmesh/operators/bmesh_dupeops.c
branches/bmesh/blender/source/blender/bmesh/operators/createops.c
branches/bmesh/blender/source/blender/bmesh/operators/extrudeops.c
branches/bmesh/blender/source/blender/bmesh/operators/mesh_conv.c
branches/bmesh/blender/source/blender/bmesh/operators/primitiveops.c
branches/bmesh/blender/source/blender/bmesh/operators/removedoubles.c
branches/bmesh/blender/source/blender/editors/armature/meshlaplacian.c
branches/bmesh/blender/source/blender/editors/mesh/bmesh_select.c
branches/bmesh/blender/source/blender/editors/mesh/bmesh_tools.c
branches/bmesh/blender/source/blender/editors/mesh/bmeshutils.c
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/editface.c
branches/bmesh/blender/source/blender/editors/mesh/knifetool.c
branches/bmesh/blender/source/blender/editors/mesh/mesh_data.c
branches/bmesh/blender/source/blender/editors/space_view3d/drawmesh.c
branches/bmesh/blender/source/blender/editors/space_view3d/drawobject.c
branches/bmesh/blender/source/blender/editors/space_view3d/drawvolume.c
branches/bmesh/blender/source/blender/editors/uvedit/uvedit_unwrap_ops.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_mesh.c
branches/bmesh/blender/source/blender/modifiers/intern/MOD_array.c
branches/bmesh/blender/source/blender/modifiers/intern/MOD_edgesplit.c
branches/bmesh/blender/source/blender/modifiers/intern/MOD_explode.c
branches/bmesh/blender/source/blender/modifiers/intern/MOD_solidify.c
branches/bmesh/blender/source/blender/modifiers/intern/MOD_warp.c
branches/bmesh/blender/source/creator/creator.c
Removed Paths:
-------------
branches/bmesh/blender/source/blender/blenkernel/BKE_verse.h
branches/bmesh/blender/source/blender/blenkernel/intern/booleanops.c
branches/bmesh/blender/source/blender/blenkernel/intern/verse_bitmap_node.c
branches/bmesh/blender/source/blender/blenkernel/intern/verse_geometry_node.c
branches/bmesh/blender/source/blender/blenkernel/intern/verse_method.c
branches/bmesh/blender/source/blender/blenkernel/intern/verse_node.c
branches/bmesh/blender/source/blender/blenkernel/intern/verse_object_node.c
branches/bmesh/blender/source/blender/blenkernel/intern/verse_session.c
branches/bmesh/blender/source/blender/blenlib/BLI_arithb.h
branches/bmesh/blender/source/blender/editors/space_image/image_header.c
Modified: branches/bmesh/blender/intern/itasc/kdl/framevel.hpp
===================================================================
--- branches/bmesh/blender/intern/itasc/kdl/framevel.hpp 2011-05-09 02:45:52 UTC (rev 36555)
+++ branches/bmesh/blender/intern/itasc/kdl/framevel.hpp 2011-05-09 04:06:48 UTC (rev 36556)
@@ -133,8 +133,8 @@
Vector w; // rotation vector
public:
RotationVel():R(),w() {}
- explicit RotationVel(const Rotation& _R):R(_R),w(Vector::Zero()){}
- RotationVel(const Rotation& _R,const Vector& _w):R(_R),w(_w){}
+ explicit RotationVel(const Rotation& R_):R(R_),w(Vector::Zero()){}
+ RotationVel(const Rotation& R_,const Vector& _w):R(R_),w(_w){}
Rotation value() const { return R;}
@@ -194,11 +194,11 @@
public:
FrameVel(){}
- explicit FrameVel(const Frame& _T):
- M(_T.M),p(_T.p) {}
+ explicit FrameVel(const Frame& T_):
+ M(T_.M),p(T_.p) {}
- FrameVel(const Frame& _T,const Twist& _t):
- M(_T.M,_t.rot),p(_T.p,_t.vel) {}
+ FrameVel(const Frame& T_,const Twist& _t):
+ M(T_.M,_t.rot),p(T_.p,_t.vel) {}
FrameVel(const RotationVel& _M,const VectorVel& _p):
M(_M),p(_p) {}
Modified: branches/bmesh/blender/source/blender/blenkernel/BKE_context.h
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/BKE_context.h 2011-05-09 02:45:52 UTC (rev 36555)
+++ branches/bmesh/blender/source/blender/blenkernel/BKE_context.h 2011-05-09 04:06:48 UTC (rev 36556)
@@ -278,7 +278,7 @@
int CTX_rec_events(bContext *C);
FILE *CTX_rec_file(bContext *C);
-int CTX_set_events_path(bContext *C, char *path);
+int CTX_set_events_path(bContext *C, const char *path);
int CTX_play_events(bContext *C, char **playpath);
int CTX_rec_events_set(bContext *C, int state);
double CTX_rec_lasttime(bContext *C, double newtime);
Modified: branches/bmesh/blender/source/blender/blenkernel/BKE_tessmesh.h
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/BKE_tessmesh.h 2011-05-09 02:45:52 UTC (rev 36555)
+++ branches/bmesh/blender/source/blender/blenkernel/BKE_tessmesh.h 2011-05-09 04:06:48 UTC (rev 36556)
@@ -50,10 +50,9 @@
struct BMFace **face_index;
/*selection mode*/
- int selectmode;
+ short selectmode;
+ short mat_nr;
- int mat_nr;
-
/*Mesh structure this editmesh came from, if it came from one*/
struct Mesh *me;
struct Object *ob;
@@ -69,4 +68,4 @@
void BMEdit_Free(BMEditMesh *em);
void BMEdit_UpdateLinkedCustomData(BMEditMesh *em);
-#endif /* _BKE_TESSMESH_H */
\ No newline at end of file
+#endif /* _BKE_TESSMESH_H */
Modified: branches/bmesh/blender/source/blender/blenkernel/BKE_utildefines.h
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/BKE_utildefines.h 2011-05-09 02:45:52 UTC (rev 36555)
+++ branches/bmesh/blender/source/blender/blenkernel/BKE_utildefines.h 2011-05-09 04:06:48 UTC (rev 36556)
@@ -87,16 +87,9 @@
#define BROW(min, max) (((max)>=31? 0xFFFFFFFF: (1<<(max+1))-1) - ((min)? ((1<<(min))-1):0) )
#define BMEMSET(mem, val, size) {unsigned int _i; char *_c = (char*) mem; for (_i=0; _i<size; _i++) *_c++ = val;}
-/*little macro so inline keyword works*/
-#if defined(_MSC_VER)
-#define BM_INLINE static __forceinline
-#else
-#define BM_INLINE static inline __attribute((always_inline))
-#endif
#ifdef __cplusplus
}
#endif
#endif // BKE_UTILDEFINES_H
-
Deleted: branches/bmesh/blender/source/blender/blenkernel/BKE_verse.h
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/BKE_verse.h 2011-05-09 02:45:52 UTC (rev 36555)
+++ branches/bmesh/blender/source/blender/blenkernel/BKE_verse.h 2011-05-09 04:06:48 UTC (rev 36556)
@@ -1,586 +0,0 @@
-/**
- * $Id: BKE_verse.h 12931 2007-12-17 18:20:48Z theeth $
- *
- * ***** BEGIN GPL/BL DUAL 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. The Blender
- * Foundation also sells licenses for use in proprietary software under
- * the Blender License. See http://www.blender.org/BL/ for information
- * about this.
- *
- * 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.
- *
- * Contributor(s): Jiri Hnidek.
- *
- * ***** END GPL/BL DUAL LICENSE BLOCK *****
- */
-
-/* #define WITH_VERSE */
-
-#ifndef BKE_VERSE_H
-#define BKE_VERSE_H
-
-#include "DNA_listBase.h"
-#include "BLI_dynamiclist.h"
-
-#include "verse.h"
-#include "verse_ms.h"
-
-struct VNode;
-struct VerseEdge;
-
-/*
- * Verse Edge Hash (similar to edit edge hash)
- */
-#define VEDHASHSIZE (512*512)
-#define VEDHASH(a, b) ((a<b ? a : b) % VEDHASHSIZE)
-
-/*
- * verse data: 4 float value
- */
-typedef struct quat_real32_item {
- struct quat_real32_item *next, *prev;
- struct VLayer *vlayer; /* pointer at VerseLayer */
- uint32 id; /* id of item */
- real32 value[4];
-} quat_real32_item;
-
-/*
- * verse data: 4 uint32 values
- */
-typedef struct quat_uint32_item {
- struct quat_uint32_item *next, *prev;
- struct VLayer *vlayer; /* pointer at VerseLayer */
- uint32 id; /* id of item */
- uint32 value[4];
-} quat_uint32_item;
-
-/*
- * verse data: 3 float values
- */
-typedef struct vec_real32_item {
- struct vec_real32_item *next, *prev;
- struct VLayer *vlayer; /* pointer at VerseLayer */
- uint32 id; /* id of item */
- real32 value[3];
-} vec_real32_item;
-
-/*
- * verse data: float value (weight)
- */
-typedef struct real32_item {
- struct real32_item *next, *prev;
- struct VLayer *vlayer; /* pointer at VerseLayer */
- uint32 id; /* id of item */
- real32 value;
-} real32_item;
-
-/*
- * verse data: uint32 value
- */
-typedef struct uint32_item {
- struct uint32_item *next, *prev;
- struct VLayer *vlayer; /* pointer at VerseLayer */
- uint32 id; /* id of item */
- uint32 value;
-} uint32_item;
-
-/*
- * verse data: uint8 value
- */
-typedef struct uint8_item {
- struct uint8_item *next, *prev;
- struct VLayer *vlayer; /* pointer at VerseLayer */
- uint32 id; /* id of item */
- uint8 value;
-} uint8_item;
-
-/*
- * verse data: vertex
- */
-typedef struct VerseVert {
- struct VerseVert *next, *prev;
- /* verse data */
- struct VLayer *vlayer; /* pointer at VerseLayer */
- uint32 id; /* id of vertex */
- real32 co[3]; /* x,y,z-coordinates of vertex */
- real32 no[3]; /* normal of vertex */
- /* blender internals */
- short flag; /* flags: VERT_DELETED, VERT_RECEIVED, etc. */
- void *vertex; /* pointer at EditVert or MVert */
- int counter; /* counter of VerseFaces using this VerseVert */
- union {
- unsigned int index; /* counter need during transformation to mesh */
- struct VerseVert *vvert;
- } tmp; /* pointer at new created verse vert, it is
- * used during duplicating geometry node */
- float *cos; /* modified coordinates of vertex */
- float *nos; /* modified normal vector */
-} VerseVert;
-
-/*
- * structture used for verse edge hash
- */
-typedef struct HashVerseEdge {
- struct VerseEdge *vedge;
- struct HashVerseEdge *next;
-} HashVerseEdge;
-
-/*
- * fake verse data: edge
- */
-typedef struct VerseEdge {
- struct VerseEdge *next, *prev;
- uint32 v0, v1; /* indexes of verse vertexes */
- int counter; /* counter of verse faces using this edge */
- struct HashVerseEdge hash; /* hash table */
- union {
- unsigned int index; /* temporary index of edge */
- } tmp;
-} VerseEdge;
-
-/*
- * verse data: polygon
- */
-typedef struct VerseFace {
- struct VerseFace *next, *prev;
- /* verse data */
- struct VLayer *vlayer; /* pointer at VerseLayer */
- uint32 id; /* id of face */
- struct VerseVert *vvert0; /* pointer at 1st VerseVert */
- struct VerseVert *vvert1; /* pointer at 2nd VerseVert */
- struct VerseVert *vvert2; /* pointer at 3th VerseVert */
- struct VerseVert *vvert3; /* pointer at 4th VerseVert */
- unsigned int v0, v1, v2, v3; /* indexes of VerseVerts ... needed during receiving */
- /* blender internals */
- char flag; /* flags: FACE_SEND_READY, FACE_SENT, FACE_RECEIVED, FACE_CHANGED*/
- short counter; /* counter of missed VerseVertexes */
- void *face; /* pointer at EditFace */
- float no[3]; /* normal vector */
- float *nos; /* modified normal vector */
-} VerseFace;
-
-/*
- * verse data: layer
- */
-typedef struct VLayer {
- struct VLayer *next, *prev;
- /* verse data*/
- struct VNode *vnode; /* pointer at VerseNode */
- uint16 id; /* id of layer */
- char *name; /* name of layer */
- VNGLayerType type; /* type of layer (VN_G_LAYER_VERTEX_XYZ, VN_G_LAYER_POLYGON_CORNER_UINT32) */
- uint32 def_int; /* default integer value */
- real64 def_real; /* default float value */
- /* blender internals */
- char flag; /* flags: LAYER_SENT, LAYER_RECEIVED, LAYER_DELETED, LAYER_OBSOLETE */
- short content; /* type of content (VERTEX_LAYER, POLYGON_LAYER) */
- struct DynamicList dl; /* vertexes, polygons, etc. */
- struct ListBase queue; /* queue of vertexes, polygons, etc. waiting for sending to verse server */
- struct ListBase orphans; /* list of versedata (polygons, etc.), that can be added to the DynamicList
- * due to not received VerseVerts */
- unsigned int counter; /* counter of sent items */
- /* client dependent methods */
- void (*post_layer_create)(struct VLayer *vlayer);
- void (*post_layer_destroy)(struct VLayer *vlayer);
-} VLayer;
-
-/*
- * verse data: link
- */
-typedef struct VLink{
- struct VLink *next, *prev;
- /* verse data */
- struct VerseSession *session; /* session pointer */
- struct VNode *source; /* object VerseNode "pointing" at some other VerseNode */
- struct VNode *target; /* VerseNode linked with some object node */
- unsigned int id; /* id of VerseLink */
- unsigned int target_id; /* some unknow id */
- char *label; /* name/label of VerseLink */
- /* blender internals */
- char flag; /* flags: LINK_SEND_READY */
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list