Revision: 39109
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=39109
Author: psy-fi
Date: 2011-08-06 22:59:05 +0000 (Sat, 06 Aug 2011)
Log Message:
-----------
change UvVertMap2 to UvElementMap, much better naming.
Modified Paths:
--------------
branches/soc-2011-onion/source/blender/blenkernel/BKE_mesh.h
branches/soc-2011-onion/source/blender/editors/include/ED_mesh.h
branches/soc-2011-onion/source/blender/editors/mesh/editmesh_lib.c
branches/soc-2011-onion/source/blender/editors/sculpt_paint/paint_uv.c
branches/soc-2011-onion/source/blender/editors/uvedit/uvedit_ops.c
Modified: branches/soc-2011-onion/source/blender/blenkernel/BKE_mesh.h
===================================================================
--- branches/soc-2011-onion/source/blender/blenkernel/BKE_mesh.h
2011-08-06 22:31:16 UTC (rev 39108)
+++ branches/soc-2011-onion/source/blender/blenkernel/BKE_mesh.h
2011-08-06 22:59:05 UTC (rev 39109)
@@ -55,7 +55,7 @@
struct Scene;
struct UvVertMap;
struct UvMapVert;
-struct UvVertMap2;
+struct UvElementMap;
struct UvElement;
#ifdef __cplusplus
@@ -126,13 +126,13 @@
unsigned char tfindex, separate, flag;
} UvMapVert;
-typedef struct UvVertMap2 {
+typedef struct UvElementMap {
struct UvElement **vert;
struct UvElement *buf;
int numOfUVs;
int numOfIslands;
int *islandIndices;
-} UvVertMap2;
+} UvElementMap;
typedef struct UvElement {
struct UvElement *next;
Modified: branches/soc-2011-onion/source/blender/editors/include/ED_mesh.h
===================================================================
--- branches/soc-2011-onion/source/blender/editors/include/ED_mesh.h
2011-08-06 22:31:16 UTC (rev 39108)
+++ branches/soc-2011-onion/source/blender/editors/include/ED_mesh.h
2011-08-06 22:59:05 UTC (rev 39109)
@@ -156,9 +156,9 @@
struct UvMapVert *EM_get_uv_map_vert(struct UvVertMap *vmap, unsigned int v);
void EM_free_uv_vert_map(struct UvVertMap *vmap);
-struct UvVertMap2 *EM_make_uv_vert_map2(struct EditMesh *em, int selected);
-struct UvElement *EM_get_uv_map_vert_for_edge(struct UvVertMap2 *vmap, struct
EditMesh *em, struct EditEdge *edge, int initVertexArray);
-void EM_free_uv_vert_map2(struct UvVertMap2 *vmap);
+struct UvElementMap *EM_make_uv_vert_map2(struct EditMesh *em, int selected);
+struct UvElement *EM_get_uv_map_vert_for_edge(struct UvElementMap *vmap,
struct EditMesh *em, struct EditEdge *edge, int initVertexArray);
+void EM_free_uv_vert_map2(struct UvElementMap *vmap);
void EM_add_data_layer(struct EditMesh *em, struct CustomData *data,
int type, const char *name);
void EM_free_data_layer(struct EditMesh *em, struct CustomData
*data, int type);
Modified: branches/soc-2011-onion/source/blender/editors/mesh/editmesh_lib.c
===================================================================
--- branches/soc-2011-onion/source/blender/editors/mesh/editmesh_lib.c
2011-08-06 22:31:16 UTC (rev 39108)
+++ branches/soc-2011-onion/source/blender/editors/mesh/editmesh_lib.c
2011-08-06 22:59:05 UTC (rev 39109)
@@ -2358,14 +2358,14 @@
}
/* A specialized vert map used by stitch operator */
-UvVertMap2 *EM_make_uv_vert_map2(EditMesh *em, int selected)
+UvElementMap *EM_make_uv_vert_map2(EditMesh *em, int selected)
{
EditVert *ev;
EditFace *efa;
int totverts;
/* vars from original func */
- UvVertMap2 *vmap;
+ UvElementMap *vmap;
UvElement *buf;
UvElement *islandbuf;
MTFace *tf;
@@ -2391,7 +2391,7 @@
if(totuv==0) {
return NULL;
}
- vmap= (UvVertMap2 *)MEM_callocN(sizeof(*vmap), "UvVertMap2");
+ vmap= (UvElementMap *)MEM_callocN(sizeof(*vmap), "UvVertMap2");
if (!vmap) {
return NULL;
}
@@ -2609,7 +2609,7 @@
}
}
-void EM_free_uv_vert_map2(UvVertMap2 *vmap)
+void EM_free_uv_vert_map2(UvElementMap *vmap)
{
if (vmap) {
if (vmap->vert) MEM_freeN(vmap->vert);
Modified: branches/soc-2011-onion/source/blender/editors/sculpt_paint/paint_uv.c
===================================================================
--- branches/soc-2011-onion/source/blender/editors/sculpt_paint/paint_uv.c
2011-08-06 22:31:16 UTC (rev 39108)
+++ branches/soc-2011-onion/source/blender/editors/sculpt_paint/paint_uv.c
2011-08-06 22:59:05 UTC (rev 39109)
@@ -47,6 +47,7 @@
#include "BKE_context.h"
#include "BKE_main.h"
#include "BKE_depsgraph.h"
+#include "BKE_mesh.h"
#include "ED_screen.h"
Modified: branches/soc-2011-onion/source/blender/editors/uvedit/uvedit_ops.c
===================================================================
--- branches/soc-2011-onion/source/blender/editors/uvedit/uvedit_ops.c
2011-08-06 22:31:16 UTC (rev 39108)
+++ branches/soc-2011-onion/source/blender/editors/uvedit/uvedit_ops.c
2011-08-06 22:59:05 UTC (rev 39109)
@@ -1286,7 +1286,7 @@
/* editmesh, cached for use in modal handler */
EditMesh *em;
/* vertmap, contains vertices sharing uv's in linked lists. */
- UvVertMap2 *vmap;
+ UvElementMap *vmap;
} StitchState;
@@ -1515,7 +1515,7 @@
{
StitchPreviewer *preview = uv_get_stitch_previewer();
UVVertAverage *uv_average;
- UvVertMap2 *vmap = state->vmap;
+ UvElementMap *vmap = state->vmap;
UvElement *element;
int i;
int bufferIterator = 0;
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
