archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity
This repository has been archived on 2023-10-09. You can view files and clone it, but cannot push or open issues or pull requests.
Files
76b1e8bc09410398192fce47be9ac88a7368085c
blender-archive/source/blender/blenkernel/intern/mesh.c

3564 lines
94 KiB
C
Raw Normal View History

header cleanup (no functional changes)
2011-10-10 09:38:02 +00:00
/*
Patch to change license to GPL only, from GSR.
2008-01-07 19:13:47 +00:00
* ***** BEGIN GPL LICENSE BLOCK *****
Initial revision
2002-10-12 11:37:38 +00:00
*
* 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
Patch to change license to GPL only, from GSR.
2008-01-07 19:13:47 +00:00
* of the License, or (at your option) any later version.
Initial revision
2002-10-12 11:37:38 +00:00
*
* 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,
correct fsf address
2010-02-12 13:34:04 +00:00
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
Initial revision
2002-10-12 11:37:38 +00:00
*
* The Original Code is Copyright (C) 2001-2002 by NaN Holding BV.
* All rights reserved.
*
2.5 Think global, act local! The old favorite G.scene gone! Man... that took almost 2 days. Also removed G.curscreen and G.edbo. Not everything could get solved; here's some notes. - modifiers now store current scene in ModifierData. This is not meant for permanent, but it can probably stick there until we cleaned the anim system and depsgraph to cope better with timing issues. - Game engine G.scene should become an argument for staring it. Didn't solve this yet. - Texture nodes should get scene cfra, but the current implementation is too tightly wrapped to do it easily.
2009-01-04 14:14:06 +00:00
* Contributor(s): Blender Foundation
Initial revision
2002-10-12 11:37:38 +00:00
*
Patch to change license to GPL only, from GSR.
2008-01-07 19:13:47 +00:00
* ***** END GPL LICENSE BLOCK *****
Initial revision
2002-10-12 11:37:38 +00:00
*/
doxygen: blender/blenkernel tagged.
2011-02-27 20:40:57 +00:00
/** \file blender/blenkernel/intern/mesh.c
* \ingroup bke
*/
Initial revision
2002-10-12 11:37:38 +00:00
#include <stdlib.h>
#include <string.h>
#include <stdio.h>
#include <math.h>
#include "MEM_guardedalloc.h"
merge with trunk/2.5 at r23876 [[Split portion of a mixed commit.]]
2009-10-22 23:22:05 +00:00
#include "DNA_scene_types.h"
Initial revision
2002-10-12 11:37:38 +00:00
#include "DNA_material_types.h"
#include "DNA_object_types.h"
#include "DNA_key_types.h"
- remove some unused editmesh functions. - copy & rename EditMesh stricts for use with scanfill (remove unused members)
2012-02-19 22:17:30 +00:00
#include "DNA_mesh_types.h"
- split the data structures that actually constitute a mesh (MVert,MFace,etc) off into DNA_meshdata_types.h, to isolate areas of source that actually edit mesh *data* vs. areas that just edit mesh object information.
2004-03-20 22:55:42 +00:00
#include "DNA_meshdata_types.h"
Bugfix #4979: unlinking mesh obdata which has shape keys was not decrementing the IPO user reference count when the key's reference count reached zero.
2006-09-12 14:05:26 +00:00
#include "DNA_ipo_types.h"
ad-hoc test sys that can handle paint stuff. temporary.
2010-10-27 02:22:55 +00:00
#include "DNA_customdata_types.h"
Initial revision
2002-10-12 11:37:38 +00:00
more syncing with trunk, also cleared many warnings with gcc4.6
2011-05-09 04:06:48 +00:00
#include "BLI_utildefines.h"
split BKE_utildefines.h, now it only has blender specific defines like GS() MAKE_ID, FILE_MAXDIR, moved the generic defines to BLI_utildefines.h. no functional changes.
2011-01-07 18:36:47 +00:00
#include "BLI_blenlib.h"
#include "BLI_math.h"
#include "BLI_edgehash.h"
merge with/from trunk at r35190
2011-02-27 06:19:40 +00:00
#include "BLI_scanfill.h"
code cleanup: - remove duplicate includes - blender builds with -Werror in C++ for fluids/smoke
2012-05-21 06:33:45 +00:00
#include "BLI_array.h"
split BKE_utildefines.h, now it only has blender specific defines like GS() MAKE_ID, FILE_MAXDIR, moved the generic defines to BLI_utildefines.h. no functional changes.
2011-01-07 18:36:47 +00:00
Assorted Animation/RNA fixes: * Fix for compiler warning in mesh.c from previous commit * Fix for wrong name for dopesheet filter button used for meshes * Added RNA defines for the default values for quaternion and axis-angle rotations, so that clearing these to their default values "does the right thing (TM)"
2009-12-28 03:45:24 +00:00
#include "BKE_animsys.h"
Initial revision
2002-10-12 11:37:38 +00:00
#include "BKE_main.h"
ad-hoc test sys that can handle paint stuff. temporary.
2010-10-27 02:22:55 +00:00
#include "BKE_customdata.h"
- added Mesh->derived and Mesh->decimated DerivedMesh pointers - removed DL_MESH displist type!!!! Now store a DerivedMesh directly. - May still be some issues left having to do with releasing this at the right time (old code just splashed free_displist all over the place).
2005-03-29 16:43:39 +00:00
#include "BKE_DerivedMesh.h"
Initial revision
2002-10-12 11:37:38 +00:00
#include "BKE_global.h"
#include "BKE_mesh.h"
#include "BKE_displist.h"
#include "BKE_library.h"
#include "BKE_material.h"
== Multires == Fixed bug #23657, "Modifiers dosen't work when you select diffrent mesh for object" Multires modifier now adds empty mdisps if they're missing, rather than displaying a warning Switching an object's mesh will now check for a multires modifier; if found the modifier's total number of levels are reset to match the mesh's mdisps Switching the mesh also forces a multires update so that sculpted changes aren't lost
2010-09-09 00:14:51 +00:00
#include "BKE_modifier.h"
#include "BKE_multires.h"
Initial revision
2002-10-12 11:37:38 +00:00
#include "BKE_key.h"
/* these 2 are only used by conversion functions */
#include "BKE_curve.h"
/* -- */
#include "BKE_object.h"
code cleanup: rename BKE_tessmesh -> BKE_editmesh, rename EditDerivedBMesh.tc -> em. ('tc' is odd name which isn't used elsewhere).
2013-04-13 20:31:52 +00:00
#include "BKE_editmesh.h"
ad-hoc test sys that can handle paint stuff. temporary.
2010-10-27 02:22:55 +00:00
#include "BLI_edgehash.h"
Initial revision
2002-10-12 11:37:38 +00:00
mesh DNA modficiations; two new structures added for storing ngons, MPoly and MLoop.
2009-05-26 04:17:47 +00:00
#include "bmesh.h"
ad-hoc test sys that can handle paint stuff. temporary.
2010-10-27 02:22:55 +00:00
enum {
MESHCMP_DVERT_WEIGHTMISMATCH = 1,
MESHCMP_DVERT_GROUPMISMATCH,
MESHCMP_DVERT_TOTGROUPMISMATCH,
MESHCMP_LOOPCOLMISMATCH,
MESHCMP_LOOPUVMISMATCH,
MESHCMP_LOOPMISMATCH,
MESHCMP_POLYVERTMISMATCH,
MESHCMP_POLYMISMATCH,
MESHCMP_EDGEUNKNOWN,
MESHCMP_VERTCOMISMATCH,
code cleanup: - remove duplicate includes - blender builds with -Werror in C++ for fluids/smoke
2012-05-21 06:33:45 +00:00
MESHCMP_CDLAYERS_MISMATCH
ad-hoc test sys that can handle paint stuff. temporary.
2010-10-27 02:22:55 +00:00
};
quiet more compiler warnings, also found a bug using printf rather then fprintf.
2011-05-09 05:09:07 +00:00
static const char *cmpcode_to_str(int code)
ad-hoc test sys that can handle paint stuff. temporary.
2010-10-27 02:22:55 +00:00
{
switch (code) {
case MESHCMP_DVERT_WEIGHTMISMATCH:
return "Vertex Weight Mismatch";
case MESHCMP_DVERT_GROUPMISMATCH:
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
return "Vertex Group Mismatch";
ad-hoc test sys that can handle paint stuff. temporary.
2010-10-27 02:22:55 +00:00
case MESHCMP_DVERT_TOTGROUPMISMATCH:
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
return "Vertex Doesn't Belong To Same Number Of Groups";
ad-hoc test sys that can handle paint stuff. temporary.
2010-10-27 02:22:55 +00:00
case MESHCMP_LOOPCOLMISMATCH:
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
return "Vertex Color Mismatch";
ad-hoc test sys that can handle paint stuff. temporary.
2010-10-27 02:22:55 +00:00
case MESHCMP_LOOPUVMISMATCH:
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
return "UV Mismatch";
ad-hoc test sys that can handle paint stuff. temporary.
2010-10-27 02:22:55 +00:00
case MESHCMP_LOOPMISMATCH:
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
return "Loop Mismatch";
ad-hoc test sys that can handle paint stuff. temporary.
2010-10-27 02:22:55 +00:00
case MESHCMP_POLYVERTMISMATCH:
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
return "Loop Vert Mismatch In Poly Test";
ad-hoc test sys that can handle paint stuff. temporary.
2010-10-27 02:22:55 +00:00
case MESHCMP_POLYMISMATCH:
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
return "Loop Vert Mismatch";
ad-hoc test sys that can handle paint stuff. temporary.
2010-10-27 02:22:55 +00:00
case MESHCMP_EDGEUNKNOWN:
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
return "Edge Mismatch";
ad-hoc test sys that can handle paint stuff. temporary.
2010-10-27 02:22:55 +00:00
case MESHCMP_VERTCOMISMATCH:
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
return "Vertex Coordinate Mismatch";
ad-hoc test sys that can handle paint stuff. temporary.
2010-10-27 02:22:55 +00:00
case MESHCMP_CDLAYERS_MISMATCH:
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
return "CustomData Layer Count Mismatch";
ad-hoc test sys that can handle paint stuff. temporary.
2010-10-27 02:22:55 +00:00
default:
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
return "Mesh Comparison Code Unknown";
}
ad-hoc test sys that can handle paint stuff. temporary.
2010-10-27 02:22:55 +00:00
}
style cleanup / comment formatting for bli/bke/bmesh
2012-03-03 20:19:11 +00:00
/* thresh is threshold for comparing vertices, uvs, vertex colors,
* weights, etc.*/
add matrix multiply for projection that outputs 2d values.
2013-05-08 12:55:36 +00:00
static int customdata_compare(CustomData *c1, CustomData *c2, Mesh *m1, Mesh *m2, const float thresh)
ad-hoc test sys that can handle paint stuff. temporary.
2010-10-27 02:22:55 +00:00
{
add matrix multiply for projection that outputs 2d values.
2013-05-08 12:55:36 +00:00
const float thresh_sq = thresh * thresh;
ad-hoc test sys that can handle paint stuff. temporary.
2010-10-27 02:22:55 +00:00
CustomDataLayer *l1, *l2;
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
int i, i1 = 0, i2 = 0, tot, j;
ad-hoc test sys that can handle paint stuff. temporary.
2010-10-27 02:22:55 +00:00
style cleanup: changes to brace placement / newlines - for/while/if/switch
2012-04-28 06:31:57 +00:00
for (i = 0; i < c1->totlayer; i++) {
if (ELEM7(c1->layers[i].type, CD_MVERT, CD_MEDGE, CD_MPOLY,
CD_MLOOPUV, CD_MLOOPCOL, CD_MTEXPOLY, CD_MDEFORMVERT))
{
ad-hoc test sys that can handle paint stuff. temporary.
2010-10-27 02:22:55 +00:00
i1++;
style cleanup: changes to brace placement / newlines - for/while/if/switch
2012-04-28 06:31:57 +00:00
}
ad-hoc test sys that can handle paint stuff. temporary.
2010-10-27 02:22:55 +00:00
}
style cleanup: changes to brace placement / newlines - for/while/if/switch
2012-04-28 06:31:57 +00:00
for (i = 0; i < c2->totlayer; i++) {
if (ELEM7(c2->layers[i].type, CD_MVERT, CD_MEDGE, CD_MPOLY,
CD_MLOOPUV, CD_MLOOPCOL, CD_MTEXPOLY, CD_MDEFORMVERT))
{
ad-hoc test sys that can handle paint stuff. temporary.
2010-10-27 02:22:55 +00:00
i2++;
style cleanup: changes to brace placement / newlines - for/while/if/switch
2012-04-28 06:31:57 +00:00
}
ad-hoc test sys that can handle paint stuff. temporary.
2010-10-27 02:22:55 +00:00
}
style cleanup: changes to brace placement / newlines - for/while/if/switch
2012-04-28 06:31:57 +00:00
ad-hoc test sys that can handle paint stuff. temporary.
2010-10-27 02:22:55 +00:00
if (i1 != i2)
return MESHCMP_CDLAYERS_MISMATCH;
l1 = c1->layers; l2 = c2->layers;
tot = i1;
i1 = 0; i2 = 0;
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
for (i = 0; i < tot; i++) {
ad-hoc test sys that can handle paint stuff. temporary.
2010-10-27 02:22:55 +00:00
while (i1 < c1->totlayer && !ELEM7(l1->type, CD_MVERT, CD_MEDGE, CD_MPOLY,
style cleanup: changes to brace placement / newlines - for/while/if/switch
2012-04-28 06:31:57 +00:00
CD_MLOOPUV, CD_MLOOPCOL, CD_MTEXPOLY, CD_MDEFORMVERT))
{
ad-hoc test sys that can handle paint stuff. temporary.
2010-10-27 02:22:55 +00:00
i1++, l1++;
style cleanup: changes to brace placement / newlines - for/while/if/switch
2012-04-28 06:31:57 +00:00
}
ad-hoc test sys that can handle paint stuff. temporary.
2010-10-27 02:22:55 +00:00
style cleanup: changes to brace placement / newlines - for/while/if/switch
2012-04-28 06:31:57 +00:00
while (i2 < c2->totlayer && !ELEM7(l2->type, CD_MVERT, CD_MEDGE, CD_MPOLY,
CD_MLOOPUV, CD_MLOOPCOL, CD_MTEXPOLY, CD_MDEFORMVERT))
{
ad-hoc test sys that can handle paint stuff. temporary.
2010-10-27 02:22:55 +00:00
i2++, l2++;
style cleanup: changes to brace placement / newlines - for/while/if/switch
2012-04-28 06:31:57 +00:00
}
ad-hoc test sys that can handle paint stuff. temporary.
2010-10-27 02:22:55 +00:00
if (l1->type == CD_MVERT) {
MVert *v1 = l1->data;
MVert *v2 = l2->data;
int vtot = m1->totvert;
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
for (j = 0; j < vtot; j++, v1++, v2++) {
ad-hoc test sys that can handle paint stuff. temporary.
2010-10-27 02:22:55 +00:00
if (len_v3v3(v1->co, v2->co) > thresh)
return MESHCMP_VERTCOMISMATCH;
fix own error in recent smoothview cleanup, also correct some cross references in bmesh docs.
2012-08-17 14:43:20 +00:00
/* I don't care about normals, let's just do coodinates */
ad-hoc test sys that can handle paint stuff. temporary.
2010-10-27 02:22:55 +00:00
}
}
/*we're order-agnostic for edges here*/
if (l1->type == CD_MEDGE) {
MEdge *e1 = l1->data;
MEdge *e2 = l2->data;
EdgeHash *eh = BLI_edgehash_new();
int etot = m1->totedge;
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
for (j = 0; j < etot; j++, e1++) {
ad-hoc test sys that can handle paint stuff. temporary.
2010-10-27 02:22:55 +00:00
BLI_edgehash_insert(eh, e1->v1, e1->v2, e1);
}
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
for (j = 0; j < etot; j++, e2++) {
ad-hoc test sys that can handle paint stuff. temporary.
2010-10-27 02:22:55 +00:00
if (!BLI_edgehash_lookup(eh, e2->v1, e2->v2))
return MESHCMP_EDGEUNKNOWN;
}
BLI_edgehash_free(eh, NULL);
}
if (l1->type == CD_MPOLY) {
MPoly *p1 = l1->data;
MPoly *p2 = l2->data;
int ptot = m1->totpoly;
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
for (j = 0; j < ptot; j++, p1++, p2++) {
ad-hoc test sys that can handle paint stuff. temporary.
2010-10-27 02:22:55 +00:00
MLoop *lp1, *lp2;
int k;
if (p1->totloop != p2->totloop)
return MESHCMP_POLYMISMATCH;
lp1 = m1->mloop + p1->loopstart;
lp2 = m2->mloop + p2->loopstart;
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
for (k = 0; k < p1->totloop; k++, lp1++, lp2++) {
ad-hoc test sys that can handle paint stuff. temporary.
2010-10-27 02:22:55 +00:00
if (lp1->v != lp2->v)
return MESHCMP_POLYVERTMISMATCH;
}
}
}
if (l1->type == CD_MLOOP) {
MLoop *lp1 = l1->data;
MLoop *lp2 = l2->data;
int ltot = m1->totloop;
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
for (j = 0; j < ltot; j++, lp1++, lp2++) {
ad-hoc test sys that can handle paint stuff. temporary.
2010-10-27 02:22:55 +00:00
if (lp1->v != lp2->v)
return MESHCMP_LOOPMISMATCH;
}
}
if (l1->type == CD_MLOOPUV) {
MLoopUV *lp1 = l1->data;
MLoopUV *lp2 = l2->data;
int ltot = m1->totloop;
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
for (j = 0; j < ltot; j++, lp1++, lp2++) {
add matrix multiply for projection that outputs 2d values.
2013-05-08 12:55:36 +00:00
if (len_squared_v2v2(lp1->uv, lp2->uv) > thresh_sq)
ad-hoc test sys that can handle paint stuff. temporary.
2010-10-27 02:22:55 +00:00
return MESHCMP_LOOPUVMISMATCH;
}
}
if (l1->type == CD_MLOOPCOL) {
MLoopCol *lp1 = l1->data;
MLoopCol *lp2 = l2->data;
int ltot = m1->totloop;
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
for (j = 0; j < ltot; j++, lp1++, lp2++) {
ad-hoc test sys that can handle paint stuff. temporary.
2010-10-27 02:22:55 +00:00
if (ABS(lp1->r - lp2->r) > thresh ||
ABS(lp1->g - lp2->g) > thresh ||
ABS(lp1->b - lp2->b) > thresh ||
ABS(lp1->a - lp2->a) > thresh)
{
return MESHCMP_LOOPCOLMISMATCH;
}
}
}
if (l1->type == CD_MDEFORMVERT) {
MDeformVert *dv1 = l1->data;
MDeformVert *dv2 = l2->data;
int dvtot = m1->totvert;
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
for (j = 0; j < dvtot; j++, dv1++, dv2++) {
ad-hoc test sys that can handle paint stuff. temporary.
2010-10-27 02:22:55 +00:00
int k;
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
MDeformWeight *dw1 = dv1->dw, *dw2 = dv2->dw;
ad-hoc test sys that can handle paint stuff. temporary.
2010-10-27 02:22:55 +00:00
if (dv1->totweight != dv2->totweight)
return MESHCMP_DVERT_TOTGROUPMISMATCH;
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
for (k = 0; k < dv1->totweight; k++, dw1++, dw2++) {
ad-hoc test sys that can handle paint stuff. temporary.
2010-10-27 02:22:55 +00:00
if (dw1->def_nr != dw2->def_nr)
return MESHCMP_DVERT_GROUPMISMATCH;
if (ABS(dw1->weight - dw2->weight) > thresh)
return MESHCMP_DVERT_WEIGHTMISMATCH;
}
}
}
}
=BMesh: (personal) Testing Framework= I've got my testing framework done now. It's based on recording events at the GHOST level. This has issues; a test created on one computer might not pass on another, due to floating point inaccuracies (though I tried to blunt this a bit). This isn't appropriate for general use. I wrote it for personal use, and other devs might find it useful for their personal use as well. However, it lacks the reliability you'd need for a real unit testing framework. This isn't meant to replace lief's work, by any means, which is a real unit testing framework.
2010-11-11 23:36:56 +00:00
return 0;
ad-hoc test sys that can handle paint stuff. temporary.
2010-10-27 02:22:55 +00:00
}
/*used for testing. returns an error string the two meshes don't match*/
code cleanup: naming - BKE_mesh_*
2012-05-05 21:28:12 +00:00
const char *BKE_mesh_cmp(Mesh *me1, Mesh *me2, float thresh)
ad-hoc test sys that can handle paint stuff. temporary.
2010-10-27 02:22:55 +00:00
{
int c;
if (!me1 || !me2)
return "Requires two input meshes";
if (me1->totvert != me2->totvert)
return "Number of verts don't match";
if (me1->totedge != me2->totedge)
return "Number of edges don't match";
if (me1->totpoly != me2->totpoly)
return "Number of faces don't match";
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
if (me1->totloop != me2->totloop)
ad-hoc test sys that can handle paint stuff. temporary.
2010-10-27 02:22:55 +00:00
return "Number of loops don't match";
if ((c = customdata_compare(&me1->vdata, &me2->vdata, me1, me2, thresh)))
return cmpcode_to_str(c);
if ((c = customdata_compare(&me1->edata, &me2->edata, me1, me2, thresh)))
return cmpcode_to_str(c);
if ((c = customdata_compare(&me1->ldata, &me2->ldata, me1, me2, thresh)))
return cmpcode_to_str(c);
if ((c = customdata_compare(&me1->pdata, &me2->pdata, me1, me2, thresh)))
return cmpcode_to_str(c);
return NULL;
}
style cleanup - spelling - turns out we had tessellation spelt wrong all over. - use \directive for doxy (not @directive) - remove BLI_sparsemap.h - was from bmesh merge IIRC but entire file commented and not used.
2012-03-02 16:05:54 +00:00
static void mesh_ensure_tessellation_customdata(Mesh *me)
vpaint works with the new face structures, yay, though it probably still has issues, needs more testing. also hopefully fixed subsurf crash everyone but me was getting, what I found should have caused crashes even for me, no idea why it did not. also got face flags to work with subsurf, and partially got materials, though theres still a problem there.
2009-08-30 21:30:07 +00:00
{
fix [#30583] very old blend files are loading post-bmesh with no face/uv information, just wires versioning code called a customdata update function which ended up clearing tessfaces - before converting polygons to tessfaces. Added check so tessfaces aren't cleared when there are no polygons.
2012-03-20 05:04:51 +00:00
if (UNLIKELY((me->totface != 0) && (me->totpoly == 0))) {
/* Pass, otherwise this function clears 'mface' before
* versioning 'mface -> mpoly' code kicks in [#30583]
*
* Callers could also check but safer to do here - campbell */
}
else {
const int tottex_original = CustomData_number_of_layers(&me->pdata, CD_MTEXPOLY);
const int totcol_original = CustomData_number_of_layers(&me->ldata, CD_MLOOPCOL);
vpaint works with the new face structures, yay, though it probably still has issues, needs more testing. also hopefully fixed subsurf crash everyone but me was getting, what I found should have caused crashes even for me, no idea why it did not. also got face flags to work with subsurf, and partially got materials, though theres still a problem there.
2009-08-30 21:30:07 +00:00
fix [#30583] very old blend files are loading post-bmesh with no face/uv information, just wires versioning code called a customdata update function which ended up clearing tessfaces - before converting polygons to tessfaces. Added check so tessfaces aren't cleared when there are no polygons.
2012-03-20 05:04:51 +00:00
const int tottex_tessface = CustomData_number_of_layers(&me->fdata, CD_MTFACE);
const int totcol_tessface = CustomData_number_of_layers(&me->fdata, CD_MCOL);
Quiet annoying warning: Warning! Tesselation uvs or vcol data got out of sync, "had to reset! This would happen on every editmode edit with UV's and wasn't too reassuring that blender was handling uvs/vcols correctly. From looking into the problem I found that creating the undo mesh would act as if it was tessellating the existing mesh each time and complain that the data was out of sync, when infact the mesh was just created and being filled in. Also, allocating uv and vcol customdata arrats for tessfaces isn't needed for undo mesh, so save some memory and dont allocate these in the first place.
2011-12-06 09:28:25 +00:00
fix [#30583] very old blend files are loading post-bmesh with no face/uv information, just wires versioning code called a customdata update function which ended up clearing tessfaces - before converting polygons to tessfaces. Added check so tessfaces aren't cleared when there are no polygons.
2012-03-20 05:04:51 +00:00
if (tottex_tessface != tottex_original ||
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
totcol_tessface != totcol_original)
fix [#30583] very old blend files are loading post-bmesh with no face/uv information, just wires versioning code called a customdata update function which ended up clearing tessfaces - before converting polygons to tessfaces. Added check so tessfaces aren't cleared when there are no polygons.
2012-03-20 05:04:51 +00:00
{
BKE_mesh_tessface_clear(me);
vpaint works with the new face structures, yay, though it probably still has issues, needs more testing. also hopefully fixed subsurf crash everyone but me was getting, what I found should have caused crashes even for me, no idea why it did not. also got face flags to work with subsurf, and partially got materials, though theres still a problem there.
2009-08-30 21:30:07 +00:00
fix [#30583] very old blend files are loading post-bmesh with no face/uv information, just wires versioning code called a customdata update function which ended up clearing tessfaces - before converting polygons to tessfaces. Added check so tessfaces aren't cleared when there are no polygons.
2012-03-20 05:04:51 +00:00
CustomData_from_bmeshpoly(&me->fdata, &me->pdata, &me->ldata, me->totface);
Quiet annoying warning: Warning! Tesselation uvs or vcol data got out of sync, "had to reset! This would happen on every editmode edit with UV's and wasn't too reassuring that blender was handling uvs/vcols correctly. From looking into the problem I found that creating the undo mesh would act as if it was tessellating the existing mesh each time and complain that the data was out of sync, when infact the mesh was just created and being filled in. Also, allocating uv and vcol customdata arrats for tessfaces isn't needed for undo mesh, so save some memory and dont allocate these in the first place.
2011-12-06 09:28:25 +00:00
improve mesh error prints and quiet a print in mesh_ensure_tessellation_customdata() which happened too often.
2012-04-12 14:36:57 +00:00
/* TODO - add some --debug-mesh option */
if (G.debug & G_DEBUG) {
code cleanup: typos and set gcc attributes for string formatting.
2012-04-25 06:06:40 +00:00
/* note: this warning may be un-called for if we are initializing the mesh for the
improve mesh error prints and quiet a print in mesh_ensure_tessellation_customdata() which happened too often.
2012-04-12 14:36:57 +00:00
* first time from bmesh, rather then giving a warning about this we could be smarter
* and check if there was any data to begin with, for now just print the warning with
* some info to help troubleshoot whats going on - campbell */
printf("%s: warning! Tessellation uvs or vcol data got out of sync, "
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
"had to reset!\n CD_MTFACE: %d != CD_MTEXPOLY: %d || CD_MCOL: %d != CD_MLOOPCOL: %d\n",
__func__, tottex_tessface, tottex_original, totcol_tessface, totcol_original);
improve mesh error prints and quiet a print in mesh_ensure_tessellation_customdata() which happened too often.
2012-04-12 14:36:57 +00:00
}
fix [#30583] very old blend files are loading post-bmesh with no face/uv information, just wires versioning code called a customdata update function which ended up clearing tessfaces - before converting polygons to tessfaces. Added check so tessfaces aren't cleared when there are no polygons.
2012-03-20 05:04:51 +00:00
}
vpaint works with the new face structures, yay, though it probably still has issues, needs more testing. also hopefully fixed subsurf crash everyone but me was getting, what I found should have caused crashes even for me, no idea why it did not. also got face flags to work with subsurf, and partially got materials, though theres still a problem there.
2009-08-30 21:30:07 +00:00
}
}
Quiet annoying warning: Warning! Tesselation uvs or vcol data got out of sync, "had to reset! This would happen on every editmode edit with UV's and wasn't too reassuring that blender was handling uvs/vcols correctly. From looking into the problem I found that creating the undo mesh would act as if it was tessellating the existing mesh each time and complain that the data was out of sync, when infact the mesh was just created and being filled in. Also, allocating uv and vcol customdata arrats for tessfaces isn't needed for undo mesh, so save some memory and dont allocate these in the first place.
2011-12-06 09:28:25 +00:00
/* this ensures grouped customdata (e.g. mtexpoly and mloopuv and mtface, or
* mloopcol and mcol) have the same relative active/render/clone/mask indices.
*
* note that for undo mesh data we want to skip 'ensure_tess_cd' call since
spelling cleanup
2012-03-18 07:38:51 +00:00
* we don't want to store memory for tessface when its only used for older
Quiet annoying warning: Warning! Tesselation uvs or vcol data got out of sync, "had to reset! This would happen on every editmode edit with UV's and wasn't too reassuring that blender was handling uvs/vcols correctly. From looking into the problem I found that creating the undo mesh would act as if it was tessellating the existing mesh each time and complain that the data was out of sync, when infact the mesh was just created and being filled in. Also, allocating uv and vcol customdata arrats for tessfaces isn't needed for undo mesh, so save some memory and dont allocate these in the first place.
2011-12-06 09:28:25 +00:00
* versions of the mesh. - campbell*/
code cleanup: name mesh functions more consistently, also use bools for mesh args.
2013-03-17 19:55:10 +00:00
static void mesh_update_linked_customdata(Mesh *me, const bool do_ensure_tess_cd)
vpaint works with the new face structures, yay, though it probably still has issues, needs more testing. also hopefully fixed subsurf crash everyone but me was getting, what I found should have caused crashes even for me, no idea why it did not. also got face flags to work with subsurf, and partially got materials, though theres still a problem there.
2009-08-30 21:30:07 +00:00
{
if (me->edit_btmesh)
code cleanup: use BKE naming conventions for functions in BKE_editmesh.h and BKE_editmesh_bvh.h
2013-04-16 05:59:48 +00:00
BKE_editmesh_update_linked_customdata(me->edit_btmesh);
vpaint works with the new face structures, yay, though it probably still has issues, needs more testing. also hopefully fixed subsurf crash everyone but me was getting, what I found should have caused crashes even for me, no idea why it did not. also got face flags to work with subsurf, and partially got materials, though theres still a problem there.
2009-08-30 21:30:07 +00:00
Quiet annoying warning: Warning! Tesselation uvs or vcol data got out of sync, "had to reset! This would happen on every editmode edit with UV's and wasn't too reassuring that blender was handling uvs/vcols correctly. From looking into the problem I found that creating the undo mesh would act as if it was tessellating the existing mesh each time and complain that the data was out of sync, when infact the mesh was just created and being filled in. Also, allocating uv and vcol customdata arrats for tessfaces isn't needed for undo mesh, so save some memory and dont allocate these in the first place.
2011-12-06 09:28:25 +00:00
if (do_ensure_tess_cd) {
style cleanup - spelling - turns out we had tessellation spelt wrong all over. - use \directive for doxy (not @directive) - remove BLI_sparsemap.h - was from bmesh merge IIRC but entire file commented and not used.
2012-03-02 16:05:54 +00:00
mesh_ensure_tessellation_customdata(me);
Quiet annoying warning: Warning! Tesselation uvs or vcol data got out of sync, "had to reset! This would happen on every editmode edit with UV's and wasn't too reassuring that blender was handling uvs/vcols correctly. From looking into the problem I found that creating the undo mesh would act as if it was tessellating the existing mesh each time and complain that the data was out of sync, when infact the mesh was just created and being filled in. Also, allocating uv and vcol customdata arrats for tessfaces isn't needed for undo mesh, so save some memory and dont allocate these in the first place.
2011-12-06 09:28:25 +00:00
}
vpaint works with the new face structures, yay, though it probably still has issues, needs more testing. also hopefully fixed subsurf crash everyone but me was getting, what I found should have caused crashes even for me, no idea why it did not. also got face flags to work with subsurf, and partially got materials, though theres still a problem there.
2009-08-30 21:30:07 +00:00
Fix for [#29467] Selection of active vertex color layer doesn't work Need to push active layer indices from loops & polys to faces again after tesselations
2011-12-01 09:49:27 +00:00
CustomData_bmesh_update_active_layers(&me->fdata, &me->pdata, &me->ldata);
vpaint works with the new face structures, yay, though it probably still has issues, needs more testing. also hopefully fixed subsurf crash everyone but me was getting, what I found should have caused crashes even for me, no idea why it did not. also got face flags to work with subsurf, and partially got materials, though theres still a problem there.
2009-08-30 21:30:07 +00:00
}
merge with 2.5 at r20307. note there were some python hacking necassary for this to work, so um hopefully there's not too much cruft from that. [[Split portion of a mixed commit.]]
2009-05-23 03:24:15 +00:00
code cleanup: name mesh functions more consistently, also use bools for mesh args.
2013-03-17 19:55:10 +00:00
void BKE_mesh_update_customdata_pointers(Mesh *me, const bool do_ensure_tess_cd)
Added custom vertex/edge/face data for meshes: All data layers, including MVert/MEdge/MFace, are now managed as custom data layers. The pointers like Mesh.mvert, Mesh.dvert or Mesh.mcol are still used of course, but allocating, copying or freeing these arrays should be done through the CustomData API. Work in progress documentation on this is here: http://mediawiki.blender.org/index.php/BlenderDev/BlenderArchitecture/CustomData Replaced TFace by MTFace: This is the same struct, except that it does not contain color, that now always stays separated in MCol. This was not a good design decision to begin with, and it is needed for adding multiple color layers later. Note that this does mean older Blender versions will not be able to read UV coordinates from the next release, due to an SDNA limitation. Removed DispListMesh: This now fully replaced by DerivedMesh. To provide access to arrays of vertices, edges and faces, like DispListMesh does. The semantics of the DerivedMesh.getVertArray() and similar functions were changed to return a pointer to an array if one exists, or otherwise allocate a temporary one. On releasing the DerivedMesh, this temporary array will be removed automatically. Removed ssDM and meshDM DerivedMesh backends: The ssDM backend was for DispListMesh, so that became obsolete automatically. The meshDM backend was replaced by the custom data backend, that now figures out which layers need to be modified, and only duplicates those. This changes code in many places, and overall removes 2514 lines of code. So, there's a good chance this might break some stuff, although I've been testing it for a few days now. The good news is, adding multiple color and uv layers should now become easy.
2006-11-20 04:28:02 +00:00
{
Quiet annoying warning: Warning! Tesselation uvs or vcol data got out of sync, "had to reset! This would happen on every editmode edit with UV's and wasn't too reassuring that blender was handling uvs/vcols correctly. From looking into the problem I found that creating the undo mesh would act as if it was tessellating the existing mesh each time and complain that the data was out of sync, when infact the mesh was just created and being filled in. Also, allocating uv and vcol customdata arrats for tessfaces isn't needed for undo mesh, so save some memory and dont allocate these in the first place.
2011-12-06 09:28:25 +00:00
mesh_update_linked_customdata(me, do_ensure_tess_cd);
vpaint works with the new face structures, yay, though it probably still has issues, needs more testing. also hopefully fixed subsurf crash everyone but me was getting, what I found should have caused crashes even for me, no idea why it did not. also got face flags to work with subsurf, and partially got materials, though theres still a problem there.
2009-08-30 21:30:07 +00:00
Added custom vertex/edge/face data for meshes: All data layers, including MVert/MEdge/MFace, are now managed as custom data layers. The pointers like Mesh.mvert, Mesh.dvert or Mesh.mcol are still used of course, but allocating, copying or freeing these arrays should be done through the CustomData API. Work in progress documentation on this is here: http://mediawiki.blender.org/index.php/BlenderDev/BlenderArchitecture/CustomData Replaced TFace by MTFace: This is the same struct, except that it does not contain color, that now always stays separated in MCol. This was not a good design decision to begin with, and it is needed for adding multiple color layers later. Note that this does mean older Blender versions will not be able to read UV coordinates from the next release, due to an SDNA limitation. Removed DispListMesh: This now fully replaced by DerivedMesh. To provide access to arrays of vertices, edges and faces, like DispListMesh does. The semantics of the DerivedMesh.getVertArray() and similar functions were changed to return a pointer to an array if one exists, or otherwise allocate a temporary one. On releasing the DerivedMesh, this temporary array will be removed automatically. Removed ssDM and meshDM DerivedMesh backends: The ssDM backend was for DispListMesh, so that became obsolete automatically. The meshDM backend was replaced by the custom data backend, that now figures out which layers need to be modified, and only duplicates those. This changes code in many places, and overall removes 2514 lines of code. So, there's a good chance this might break some stuff, although I've been testing it for a few days now. The good news is, adding multiple color and uv layers should now become easy.
2006-11-20 04:28:02 +00:00
me->mvert = CustomData_get_layer(&me->vdata, CD_MVERT);
me->dvert = CustomData_get_layer(&me->vdata, CD_MDEFORMVERT);
me->medge = CustomData_get_layer(&me->edata, CD_MEDGE);
me->mface = CustomData_get_layer(&me->fdata, CD_MFACE);
me->mcol = CustomData_get_layer(&me->fdata, CD_MCOL);
me->mtface = CustomData_get_layer(&me->fdata, CD_MTFACE);
merge with 2.5 at r21568
2009-07-16 06:27:37 +00:00
mesh DNA modficiations; two new structures added for storing ngons, MPoly and MLoop.
2009-05-26 04:17:47 +00:00
me->mpoly = CustomData_get_layer(&me->pdata, CD_MPOLY);
me->mloop = CustomData_get_layer(&me->ldata, CD_MLOOP);
me->mtpoly = CustomData_get_layer(&me->pdata, CD_MTEXPOLY);
me->mloopcol = CustomData_get_layer(&me->ldata, CD_MLOOPCOL);
me->mloopuv = CustomData_get_layer(&me->ldata, CD_MLOOPUV);
Added custom vertex/edge/face data for meshes: All data layers, including MVert/MEdge/MFace, are now managed as custom data layers. The pointers like Mesh.mvert, Mesh.dvert or Mesh.mcol are still used of course, but allocating, copying or freeing these arrays should be done through the CustomData API. Work in progress documentation on this is here: http://mediawiki.blender.org/index.php/BlenderDev/BlenderArchitecture/CustomData Replaced TFace by MTFace: This is the same struct, except that it does not contain color, that now always stays separated in MCol. This was not a good design decision to begin with, and it is needed for adding multiple color layers later. Note that this does mean older Blender versions will not be able to read UV coordinates from the next release, due to an SDNA limitation. Removed DispListMesh: This now fully replaced by DerivedMesh. To provide access to arrays of vertices, edges and faces, like DispListMesh does. The semantics of the DerivedMesh.getVertArray() and similar functions were changed to return a pointer to an array if one exists, or otherwise allocate a temporary one. On releasing the DerivedMesh, this temporary array will be removed automatically. Removed ssDM and meshDM DerivedMesh backends: The ssDM backend was for DispListMesh, so that became obsolete automatically. The meshDM backend was replaced by the custom data backend, that now figures out which layers need to be modified, and only duplicates those. This changes code in many places, and overall removes 2514 lines of code. So, there's a good chance this might break some stuff, although I've been testing it for a few days now. The good news is, adding multiple color and uv layers should now become easy.
2006-11-20 04:28:02 +00:00
}
Bugfix #4979: unlinking mesh obdata which has shape keys was not decrementing the IPO user reference count when the key's reference count reached zero.
2006-09-12 14:05:26 +00:00
/* Note: unlinking is called when me->id.us is 0, question remains how
* much unlinking of Library data in Mesh should be done... probably
* we need a more generic method, like the expand() functions in
* readfile.c */
code cleanup: naming - BKE_mesh_*
2012-05-05 21:28:12 +00:00
void BKE_mesh_unlink(Mesh *me)
Initial revision
2002-10-12 11:37:38 +00:00
{
int a;
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
if (me == NULL) return;
Initial revision
2002-10-12 11:37:38 +00:00
support for curve orco uv's as UV's in cycles. ideally these would be used as generated coordinates, but this is tricly because cycles calculates its own orco's and doesnt know about curve settings.
2012-07-31 13:43:26 +00:00
if (me->mat)
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
for (a = 0; a < me->totcol; a++) {
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
if (me->mat[a]) me->mat[a]->id.us--;
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
me->mat[a] = NULL;
Initial revision
2002-10-12 11:37:38 +00:00
}
Bugfix #4979: unlinking mesh obdata which has shape keys was not decrementing the IPO user reference count when the key's reference count reached zero.
2006-09-12 14:05:26 +00:00
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
if (me->key) {
remove use of deprecated struct members - editmesh smooth & subdivide were using old mirror axis flag still. - removed colbits from outliner and object code. - commented some other parts of the code which access deprecated members and aren't called anywhere.
2011-12-04 06:39:35 +00:00
me->key->id.us--;
Bugfix #4979: unlinking mesh obdata which has shape keys was not decrementing the IPO user reference count when the key's reference count reached zero.
2006-09-12 14:05:26 +00:00
}
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
me->key = NULL;
Initial revision
2002-10-12 11:37:38 +00:00
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
if (me->texcomesh) me->texcomesh = NULL;
Initial revision
2002-10-12 11:37:38 +00:00
}
The last of the blenkernel files with translated comments
2003-04-26 13:07:59 +00:00
/* do not free mesh itself */
code cleanup: function naming, use BKE_*type* prefix.
2012-05-05 14:03:12 +00:00
void BKE_mesh_free(Mesh *me, int unlink)
Initial revision
2002-10-12 11:37:38 +00:00
{
editmode undo stores data as mesh dna now, instead of bmesh copies. also fixed a bug related to vpaint and hide flags.
2009-09-10 06:08:52 +00:00
if (unlink)
code cleanup: naming - BKE_mesh_*
2012-05-05 21:28:12 +00:00
BKE_mesh_unlink(me);
Initial revision
2002-10-12 11:37:38 +00:00
Added custom vertex/edge/face data for meshes: All data layers, including MVert/MEdge/MFace, are now managed as custom data layers. The pointers like Mesh.mvert, Mesh.dvert or Mesh.mcol are still used of course, but allocating, copying or freeing these arrays should be done through the CustomData API. Work in progress documentation on this is here: http://mediawiki.blender.org/index.php/BlenderDev/BlenderArchitecture/CustomData Replaced TFace by MTFace: This is the same struct, except that it does not contain color, that now always stays separated in MCol. This was not a good design decision to begin with, and it is needed for adding multiple color layers later. Note that this does mean older Blender versions will not be able to read UV coordinates from the next release, due to an SDNA limitation. Removed DispListMesh: This now fully replaced by DerivedMesh. To provide access to arrays of vertices, edges and faces, like DispListMesh does. The semantics of the DerivedMesh.getVertArray() and similar functions were changed to return a pointer to an array if one exists, or otherwise allocate a temporary one. On releasing the DerivedMesh, this temporary array will be removed automatically. Removed ssDM and meshDM DerivedMesh backends: The ssDM backend was for DispListMesh, so that became obsolete automatically. The meshDM backend was replaced by the custom data backend, that now figures out which layers need to be modified, and only duplicates those. This changes code in many places, and overall removes 2514 lines of code. So, there's a good chance this might break some stuff, although I've been testing it for a few days now. The good news is, adding multiple color and uv layers should now become easy.
2006-11-20 04:28:02 +00:00
CustomData_free(&me->vdata, me->totvert);
CustomData_free(&me->edata, me->totedge);
CustomData_free(&me->fdata, me->totface);
mesh DNA modficiations; two new structures added for storing ngons, MPoly and MLoop.
2009-05-26 04:17:47 +00:00
CustomData_free(&me->ldata, me->totloop);
CustomData_free(&me->pdata, me->totpoly);
Quite a large one this time... but now we have: Edges in Mesh - adds automatic when you use creases. For other situations; call the void make_edges(Mesh *me) in mesh.c. Of course, once in editmode the edges are automatically recreated. - in F9 buttons you can add/remove edges too - both for Mesh and DisplistMesh, so it speeds up drawing quite some in wireframe - render for edges can't work... edges have no material nor tface nor col.. so here still the faces are rendered in wire Creases in Subsurf - based on the code by Chris McFarlen - main changes is that now edges are used, saving quite some data in file - use SHIFT+E in editmode to set edges-sharpness. values go from 0-1 - in F9 buttons you can set draw-crease mode. It draws now blended from wire color to edge-select color (as provided in Theme) Known issue: setting sharpness on 1 cube (subdiv 2) gives weird results with some values... Chris, can you check? Further; code cleanups, changing 0 in NULL when needed, no warnings, etc etc
2004-07-08 20:38:27 +00:00
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
if (me->adt) {
Mesh Animation + Depsgraph Tweaks: * Mesh data/settings can now be animated. It is not recommended that geometry be animated directly, but other settings such as autosmooth, etc. can be... * Code cleanups for depsgraph, making sure that drivers get included for all object data types.
2009-12-28 00:52:31 +00:00
BKE_free_animdata(&me->id);
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
me->adt = NULL;
Mesh Animation + Depsgraph Tweaks: * Mesh data/settings can now be animated. It is not recommended that geometry be animated directly, but other settings such as autosmooth, etc. can be... * Code cleanups for depsgraph, making sure that drivers get included for all object data types.
2009-12-28 00:52:31 +00:00
}
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
if (me->mat) MEM_freeN(me->mat);
- removed orco pointer from struct Mesh - switch renderer to store orco's in a hash table instead of caching in mesh (I don't like the renderer caching data in the actual mesh structure) - added mesh_create_orco[_render] function
2005-07-18 18:28:16 +00:00
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
if (me->bb) MEM_freeN(me->bb);
if (me->mselect) MEM_freeN(me->mselect);
if (me->edit_btmesh) MEM_freeN(me->edit_btmesh);
Initial revision
2002-10-12 11:37:38 +00:00
}
Fix for fracture object crash Issue was caused by incorrect resetting of tesselated fave data in copy_mesh: - CustomData_free will free data from original mesh because layers in new mesh are pointing to the same memory just after copy. So it's needed only to set some pointers to NULL. - It was incorrect filling fdata with zeroes because of incorrect structure size used.
2012-03-06 16:22:41 +00:00
static void mesh_tessface_clear_intern(Mesh *mesh, int free_customdata)
{
make use customdata typeoffset more, add an assert to ensure its to date.
2012-10-31 09:50:24 +00:00
if (free_customdata) {
Fix for fracture object crash Issue was caused by incorrect resetting of tesselated fave data in copy_mesh: - CustomData_free will free data from original mesh because layers in new mesh are pointing to the same memory just after copy. So it's needed only to set some pointers to NULL. - It was incorrect filling fdata with zeroes because of incorrect structure size used.
2012-03-06 16:22:41 +00:00
CustomData_free(&mesh->fdata, mesh->totface);
make use customdata typeoffset more, add an assert to ensure its to date.
2012-10-31 09:50:24 +00:00
}
else {
CustomData_reset(&mesh->fdata);
}
Fix for fracture object crash Issue was caused by incorrect resetting of tesselated fave data in copy_mesh: - CustomData_free will free data from original mesh because layers in new mesh are pointing to the same memory just after copy. So it's needed only to set some pointers to NULL. - It was incorrect filling fdata with zeroes because of incorrect structure size used.
2012-03-06 16:22:41 +00:00
mesh->mface = NULL;
mesh->mtface = NULL;
mesh->mcol = NULL;
mesh->totface = 0;
}
Fix #34040: Moving Normal Node with enabled Cycles Material Preview crashes Issue was caused by couple of circumstances: - Normal Map node requires tesselated faces to compute tangent space - All temporary meshes needed for Cycles export were adding to G.main - Undo pushes would temporary set meshes tessfaces to NULL - Moving node will cause undo push and tree re-evaluate fr preview All this leads to threading conflict between preview render and undo system. Solved it in way that all temporary meshes are adding to that exact Main which was passed to Cycles via BlendData. This required couple of mechanic changes like adding extra parameter to *_add() functions and adding some *_ex() functions to make it possible RNA adds objects to Main passed to new() RNA function. This was tricky to pass Main to RNA function and IMO that's not so nice to pass main to function, so ended up with such decision: - Object.to_mesh() will add temp mesh to G.main - Added Main.meshes.new_from_object() which does the same as to_mesh, but adds temporary mesh to specified Main. So now all temporary meshes needed for preview render would be added to preview_main which does not conflict with undo pushes. Viewport render shall not be an issue because object sync happens from main thread in this case. It could be some issues with final render, but that's not so much likely to happen, so shall be fine. Thanks to Brecht for review!
2013-02-05 12:46:15 +00:00
Mesh *BKE_mesh_add(Main *bmain, const char *name)
Initial revision
2002-10-12 11:37:38 +00:00
{
Mesh *me;
Fix #34040: Moving Normal Node with enabled Cycles Material Preview crashes Issue was caused by couple of circumstances: - Normal Map node requires tesselated faces to compute tangent space - All temporary meshes needed for Cycles export were adding to G.main - Undo pushes would temporary set meshes tessfaces to NULL - Moving node will cause undo push and tree re-evaluate fr preview All this leads to threading conflict between preview render and undo system. Solved it in way that all temporary meshes are adding to that exact Main which was passed to Cycles via BlendData. This required couple of mechanic changes like adding extra parameter to *_add() functions and adding some *_ex() functions to make it possible RNA adds objects to Main passed to new() RNA function. This was tricky to pass Main to RNA function and IMO that's not so nice to pass main to function, so ended up with such decision: - Object.to_mesh() will add temp mesh to G.main - Added Main.meshes.new_from_object() which does the same as to_mesh, but adds temporary mesh to specified Main. So now all temporary meshes needed for preview render would be added to preview_main which does not conflict with undo pushes. Viewport render shall not be an issue because object sync happens from main thread in this case. It could be some issues with final render, but that's not so much likely to happen, so shall be fine. Thanks to Brecht for review!
2013-02-05 12:46:15 +00:00
me = BKE_libblock_alloc(&bmain->mesh, ID_ME, name);
Initial revision
2002-10-12 11:37:38 +00:00
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
me->size[0] = me->size[1] = me->size[2] = 1.0;
me->smoothresh = 30;
me->texflag = ME_AUTOSPACE;
me->flag = ME_TWOSIDED;
me->drawflag = ME_DRAWEDGES | ME_DRAWFACES | ME_DRAWCREASES;
fix for assert when rendering with cycles, caused by my recent commits.
2012-10-31 15:14:14 +00:00
CustomData_reset(&me->vdata);
CustomData_reset(&me->edata);
CustomData_reset(&me->fdata);
CustomData_reset(&me->pdata);
CustomData_reset(&me->ldata);
Initial revision
2002-10-12 11:37:38 +00:00
return me;
}
Fix #34040: Moving Normal Node with enabled Cycles Material Preview crashes Issue was caused by couple of circumstances: - Normal Map node requires tesselated faces to compute tangent space - All temporary meshes needed for Cycles export were adding to G.main - Undo pushes would temporary set meshes tessfaces to NULL - Moving node will cause undo push and tree re-evaluate fr preview All this leads to threading conflict between preview render and undo system. Solved it in way that all temporary meshes are adding to that exact Main which was passed to Cycles via BlendData. This required couple of mechanic changes like adding extra parameter to *_add() functions and adding some *_ex() functions to make it possible RNA adds objects to Main passed to new() RNA function. This was tricky to pass Main to RNA function and IMO that's not so nice to pass main to function, so ended up with such decision: - Object.to_mesh() will add temp mesh to G.main - Added Main.meshes.new_from_object() which does the same as to_mesh, but adds temporary mesh to specified Main. So now all temporary meshes needed for preview render would be added to preview_main which does not conflict with undo pushes. Viewport render shall not be an issue because object sync happens from main thread in this case. It could be some issues with final render, but that's not so much likely to happen, so shall be fine. Thanks to Brecht for review!
2013-02-05 12:46:15 +00:00
Mesh *BKE_mesh_copy_ex(Main *bmain, Mesh *me)
Initial revision
2002-10-12 11:37:38 +00:00
{
Mesh *men;
Multiple UV and vertex color layers: (still work in progress) These can be created and deleted in the Mesh panel in the same place as before. There is always one active UV and vertex color layer, that is edited and displayed. Important things to do: - Render engine, material support - Multires and NMesh now lose non active layers Also CustomData changes to support muliple layers of the same type, and changes to layer allocation, updated documentation is here: http://mediawiki.blender.org/index.php/BlenderDev/BlenderArchitecture/CustomData
2006-12-12 21:29:09 +00:00
MTFace *tface;
mesh DNA modficiations; two new structures added for storing ngons, MPoly and MLoop.
2009-05-26 04:17:47 +00:00
MTexPoly *txface;
Multiple UV and vertex color layers: (still work in progress) These can be created and deleted in the Mesh panel in the same place as before. There is always one active UV and vertex color layer, that is edited and displayed. Important things to do: - Render engine, material support - Multires and NMesh now lose non active layers Also CustomData changes to support muliple layers of the same type, and changes to layer allocation, updated documentation is here: http://mediawiki.blender.org/index.php/BlenderDev/BlenderArchitecture/CustomData
2006-12-12 21:29:09 +00:00
int a, i;
copying a mesh was generating tessfaces which isnt needed
2012-03-05 18:05:06 +00:00
const int do_tessface = ((me->totface != 0) && (me->totpoly == 0)); /* only do tessface if we have no polys */
Initial revision
2002-10-12 11:37:38 +00:00
Fix #34040: Moving Normal Node with enabled Cycles Material Preview crashes Issue was caused by couple of circumstances: - Normal Map node requires tesselated faces to compute tangent space - All temporary meshes needed for Cycles export were adding to G.main - Undo pushes would temporary set meshes tessfaces to NULL - Moving node will cause undo push and tree re-evaluate fr preview All this leads to threading conflict between preview render and undo system. Solved it in way that all temporary meshes are adding to that exact Main which was passed to Cycles via BlendData. This required couple of mechanic changes like adding extra parameter to *_add() functions and adding some *_ex() functions to make it possible RNA adds objects to Main passed to new() RNA function. This was tricky to pass Main to RNA function and IMO that's not so nice to pass main to function, so ended up with such decision: - Object.to_mesh() will add temp mesh to G.main - Added Main.meshes.new_from_object() which does the same as to_mesh, but adds temporary mesh to specified Main. So now all temporary meshes needed for preview render would be added to preview_main which does not conflict with undo pushes. Viewport render shall not be an issue because object sync happens from main thread in this case. It could be some issues with final render, but that's not so much likely to happen, so shall be fine. Thanks to Brecht for review!
2013-02-05 12:46:15 +00:00
men = BKE_libblock_copy_ex(bmain, &me->id);
Initial revision
2002-10-12 11:37:38 +00:00
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
men->mat = MEM_dupallocN(me->mat);
for (a = 0; a < men->totcol; a++) {
Initial revision
2002-10-12 11:37:38 +00:00
id_us_plus((ID *)men->mat[a]);
}
id_us_plus((ID *)men->texcomesh);
Added custom vertex/edge/face data for meshes: All data layers, including MVert/MEdge/MFace, are now managed as custom data layers. The pointers like Mesh.mvert, Mesh.dvert or Mesh.mcol are still used of course, but allocating, copying or freeing these arrays should be done through the CustomData API. Work in progress documentation on this is here: http://mediawiki.blender.org/index.php/BlenderDev/BlenderArchitecture/CustomData Replaced TFace by MTFace: This is the same struct, except that it does not contain color, that now always stays separated in MCol. This was not a good design decision to begin with, and it is needed for adding multiple color layers later. Note that this does mean older Blender versions will not be able to read UV coordinates from the next release, due to an SDNA limitation. Removed DispListMesh: This now fully replaced by DerivedMesh. To provide access to arrays of vertices, edges and faces, like DispListMesh does. The semantics of the DerivedMesh.getVertArray() and similar functions were changed to return a pointer to an array if one exists, or otherwise allocate a temporary one. On releasing the DerivedMesh, this temporary array will be removed automatically. Removed ssDM and meshDM DerivedMesh backends: The ssDM backend was for DispListMesh, so that became obsolete automatically. The meshDM backend was replaced by the custom data backend, that now figures out which layers need to be modified, and only duplicates those. This changes code in many places, and overall removes 2514 lines of code. So, there's a good chance this might break some stuff, although I've been testing it for a few days now. The good news is, adding multiple color and uv layers should now become easy.
2006-11-20 04:28:02 +00:00
CustomData_copy(&me->vdata, &men->vdata, CD_MASK_MESH, CD_DUPLICATE, men->totvert);
CustomData_copy(&me->edata, &men->edata, CD_MASK_MESH, CD_DUPLICATE, men->totedge);
mesh DNA modficiations; two new structures added for storing ngons, MPoly and MLoop.
2009-05-26 04:17:47 +00:00
CustomData_copy(&me->ldata, &men->ldata, CD_MASK_MESH, CD_DUPLICATE, men->totloop);
CustomData_copy(&me->pdata, &men->pdata, CD_MASK_MESH, CD_DUPLICATE, men->totpoly);
copying a mesh was generating tessfaces which isnt needed
2012-03-05 18:05:06 +00:00
if (do_tessface) {
CustomData_copy(&me->fdata, &men->fdata, CD_MASK_MESH, CD_DUPLICATE, men->totface);
}
else {
Fix for fracture object crash Issue was caused by incorrect resetting of tesselated fave data in copy_mesh: - CustomData_free will free data from original mesh because layers in new mesh are pointing to the same memory just after copy. So it's needed only to set some pointers to NULL. - It was incorrect filling fdata with zeroes because of incorrect structure size used.
2012-03-06 16:22:41 +00:00
mesh_tessface_clear_intern(men, FALSE);
copying a mesh was generating tessfaces which isnt needed
2012-03-05 18:05:06 +00:00
}
code cleanup: name mesh functions more consistently, also use bools for mesh args.
2013-03-17 19:55:10 +00:00
BKE_mesh_update_customdata_pointers(men, do_tessface);
Added custom vertex/edge/face data for meshes: All data layers, including MVert/MEdge/MFace, are now managed as custom data layers. The pointers like Mesh.mvert, Mesh.dvert or Mesh.mcol are still used of course, but allocating, copying or freeing these arrays should be done through the CustomData API. Work in progress documentation on this is here: http://mediawiki.blender.org/index.php/BlenderDev/BlenderArchitecture/CustomData Replaced TFace by MTFace: This is the same struct, except that it does not contain color, that now always stays separated in MCol. This was not a good design decision to begin with, and it is needed for adding multiple color layers later. Note that this does mean older Blender versions will not be able to read UV coordinates from the next release, due to an SDNA limitation. Removed DispListMesh: This now fully replaced by DerivedMesh. To provide access to arrays of vertices, edges and faces, like DispListMesh does. The semantics of the DerivedMesh.getVertArray() and similar functions were changed to return a pointer to an array if one exists, or otherwise allocate a temporary one. On releasing the DerivedMesh, this temporary array will be removed automatically. Removed ssDM and meshDM DerivedMesh backends: The ssDM backend was for DispListMesh, so that became obsolete automatically. The meshDM backend was replaced by the custom data backend, that now figures out which layers need to be modified, and only duplicates those. This changes code in many places, and overall removes 2514 lines of code. So, there's a good chance this might break some stuff, although I've been testing it for a few days now. The good news is, adding multiple color and uv layers should now become easy.
2006-11-20 04:28:02 +00:00
Multiple UV and vertex color layers: (still work in progress) These can be created and deleted in the Mesh panel in the same place as before. There is always one active UV and vertex color layer, that is edited and displayed. Important things to do: - Render engine, material support - Multires and NMesh now lose non active layers Also CustomData changes to support muliple layers of the same type, and changes to layer allocation, updated documentation is here: http://mediawiki.blender.org/index.php/BlenderDev/BlenderArchitecture/CustomData
2006-12-12 21:29:09 +00:00
/* ensure indirect linked data becomes lib-extern */
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
for (i = 0; i < me->fdata.totlayer; i++) {
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
if (me->fdata.layers[i].type == CD_MTFACE) {
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
tface = (MTFace *)me->fdata.layers[i].data;
Multiple UV and vertex color layers: (still work in progress) These can be created and deleted in the Mesh panel in the same place as before. There is always one active UV and vertex color layer, that is edited and displayed. Important things to do: - Render engine, material support - Multires and NMesh now lose non active layers Also CustomData changes to support muliple layers of the same type, and changes to layer allocation, updated documentation is here: http://mediawiki.blender.org/index.php/BlenderDev/BlenderArchitecture/CustomData
2006-12-12 21:29:09 +00:00
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
for (a = 0; a < me->totface; a++, tface++)
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
if (tface->tpage)
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
id_lib_extern((ID *)tface->tpage);
Multiple UV and vertex color layers: (still work in progress) These can be created and deleted in the Mesh panel in the same place as before. There is always one active UV and vertex color layer, that is edited and displayed. Important things to do: - Render engine, material support - Multires and NMesh now lose non active layers Also CustomData changes to support muliple layers of the same type, and changes to layer allocation, updated documentation is here: http://mediawiki.blender.org/index.php/BlenderDev/BlenderArchitecture/CustomData
2006-12-12 21:29:09 +00:00
}
Bugfix #5090 Duplicating a Library-linked Mesh with Library-linked texture Images forgot to set the texture Image link flag to LIB_EXTERN (LIB_INDIRECT means the ID is not saved in file). Error was that a the duplicated Mesh lost texture.
2006-10-16 11:31:09 +00:00
}
Added a copy function for multires; duplicating a mesh with multires now works properly.
2006-12-01 18:41:25 +00:00
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
for (i = 0; i < me->pdata.totlayer; i++) {
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
if (me->pdata.layers[i].type == CD_MTEXPOLY) {
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
txface = (MTexPoly *)me->pdata.layers[i].data;
mesh DNA modficiations; two new structures added for storing ngons, MPoly and MLoop.
2009-05-26 04:17:47 +00:00
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
for (a = 0; a < me->totpoly; a++, txface++)
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
if (txface->tpage)
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
id_lib_extern((ID *)txface->tpage);
mesh DNA modficiations; two new structures added for storing ngons, MPoly and MLoop.
2009-05-26 04:17:47 +00:00
}
}
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
men->mselect = NULL;
men->edit_btmesh = NULL;
Bugfix #4175 Copying a Mesh did set the "texco mesh" pointer to zero... very weird code from NaN days, which is a line that should just be removed. :)
2006-05-10 17:22:49 +00:00
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
men->bb = MEM_dupallocN(men->bb);
Initial revision
2002-10-12 11:37:38 +00:00
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
men->key = BKE_key_copy(me->key);
if (men->key) men->key->from = (ID *)men;
Huge commit: VERSE - All code is in #ifdef ... #endif - Only make build system is supported and you have to add: export WITH_VERSE=true to user-def.mk file - Blender can share only mesh objects and bitmaps now - More informations can be found at wiki: http://mediawiki.blender.org/index.php/BlenderDev/VerseIntegrationToBlender http://mediawiki.blender.org/index.php/BlenderDev/VerseIntegrationToBlenderUserDoc I hope, that I didn't forget at anything
2006-08-20 15:22:56 +00:00
Initial revision
2002-10-12 11:37:38 +00:00
return men;
}
Fix #34040: Moving Normal Node with enabled Cycles Material Preview crashes Issue was caused by couple of circumstances: - Normal Map node requires tesselated faces to compute tangent space - All temporary meshes needed for Cycles export were adding to G.main - Undo pushes would temporary set meshes tessfaces to NULL - Moving node will cause undo push and tree re-evaluate fr preview All this leads to threading conflict between preview render and undo system. Solved it in way that all temporary meshes are adding to that exact Main which was passed to Cycles via BlendData. This required couple of mechanic changes like adding extra parameter to *_add() functions and adding some *_ex() functions to make it possible RNA adds objects to Main passed to new() RNA function. This was tricky to pass Main to RNA function and IMO that's not so nice to pass main to function, so ended up with such decision: - Object.to_mesh() will add temp mesh to G.main - Added Main.meshes.new_from_object() which does the same as to_mesh, but adds temporary mesh to specified Main. So now all temporary meshes needed for preview render would be added to preview_main which does not conflict with undo pushes. Viewport render shall not be an issue because object sync happens from main thread in this case. It could be some issues with final render, but that's not so much likely to happen, so shall be fine. Thanks to Brecht for review!
2013-02-05 12:46:15 +00:00
Mesh *BKE_mesh_copy(Mesh *me)
{
return BKE_mesh_copy_ex(G.main, me);
}
revert own commit r40051, mesh and object pointers are needed for undo, this commit caused bug [#28625] Separate crash bug. also added a safety check for the crash, even though reverting fixes. bmesh_to_mesh_exec() could set me->mface array to NULL but leave me->totface when notellelation=1, which is likely to give trouble elsewhere.
2011-09-12 02:23:30 +00:00
BMesh *BKE_mesh_to_bmesh(Mesh *me, Object *ob)
mesh DNA modficiations; two new structures added for storing ngons, MPoly and MLoop.
2009-05-26 04:17:47 +00:00
{
BMesh *bm;
remove Object member from BMesh struct - was only used for undo and BMEditMesh already stores an object pointer. also fix for own mistake with mesh conversion refactor, shape key index was off by 1 when switching editmode.
2012-03-11 19:58:56 +00:00
bm = BM_mesh_create(&bm_mesh_allocsize_default);
mesh DNA modficiations; two new structures added for storing ngons, MPoly and MLoop.
2009-05-26 04:17:47 +00:00
use booleans for bmesh api.
2013-01-14 16:42:43 +00:00
BM_mesh_bm_from_me(bm, me, true, ob->shapenr);
mesh DNA modficiations; two new structures added for storing ngons, MPoly and MLoop.
2009-05-26 04:17:47 +00:00
return bm;
}
remove $Id: tags after discussion on the mailign list: http://markmail.org/message/fp7ozcywxum3ar7n
2011-10-23 17:52:20 +00:00
static void expand_local_mesh(Mesh *me)
Initial revision
2002-10-12 11:37:38 +00:00
{
remove $Id: tags after discussion on the mailign list: http://markmail.org/message/fp7ozcywxum3ar7n
2011-10-23 17:52:20 +00:00
id_lib_extern((ID *)me->texcomesh);
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
if (me->mtface || me->mtpoly) {
remove $Id: tags after discussion on the mailign list: http://markmail.org/message/fp7ozcywxum3ar7n
2011-10-23 17:52:20 +00:00
int a, i;
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
for (i = 0; i < me->pdata.totlayer; i++) {
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
if (me->pdata.layers[i].type == CD_MTEXPOLY) {
fix [#32829] Crash when making linked Mesh with UV Map local
2012-10-11 00:56:34 +00:00
MTexPoly *txface = (MTexPoly *)me->pdata.layers[i].data;
svn merge -r41287:41310 ^/trunk/blender note, mirror modifier had slow, per vertex name flipping, replaced with flip_map from trunk
2011-10-27 09:42:03 +00:00
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
for (a = 0; a < me->totpoly; a++, txface++) {
svn merge -r41287:41310 ^/trunk/blender note, mirror modifier had slow, per vertex name flipping, replaced with flip_map from trunk
2011-10-27 09:42:03 +00:00
/* special case: ima always local immediately */
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
if (txface->tpage) {
code cleanup: duplicate checks and double assignments.
2012-03-08 04:38:35 +00:00
id_lib_extern((ID *)txface->tpage);
mesh DNA modficiations; two new structures added for storing ngons, MPoly and MLoop.
2009-05-26 04:17:47 +00:00
}
}
}
}
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
for (i = 0; i < me->fdata.totlayer; i++) {
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
if (me->fdata.layers[i].type == CD_MTFACE) {
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
MTFace *tface = (MTFace *)me->fdata.layers[i].data;
remove $Id: tags after discussion on the mailign list: http://markmail.org/message/fp7ozcywxum3ar7n
2011-10-23 17:52:20 +00:00
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
for (a = 0; a < me->totface; a++, tface++) {
svn merge -r41287:41310 ^/trunk/blender note, mirror modifier had slow, per vertex name flipping, replaced with flip_map from trunk
2011-10-27 09:42:03 +00:00
/* special case: ima always local immediately */
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
if (tface->tpage) {
code cleanup: duplicate checks and double assignments.
2012-03-08 04:38:35 +00:00
id_lib_extern((ID *)tface->tpage);
Multiple UV and vertex color layers: (still work in progress) These can be created and deleted in the Mesh panel in the same place as before. There is always one active UV and vertex color layer, that is edited and displayed. Important things to do: - Render engine, material support - Multires and NMesh now lose non active layers Also CustomData changes to support muliple layers of the same type, and changes to layer allocation, updated documentation is here: http://mediawiki.blender.org/index.php/BlenderDev/BlenderArchitecture/CustomData
2006-12-12 21:29:09 +00:00
}
}
Initial revision
2002-10-12 11:37:38 +00:00
}
}
}
fix [#27178] Material links lost when making mesh data local - making local object data - Curve/Mesh/MBall lost references to linked materials. - joining a linked mesh object into a local one lost the link. As well as these reported bugs, checked all local functions for consistency/correctness and found other cases which would also fail. - making local metaball didn't ensure unique ID name. - make_local_armature() was missing check for object users - main body of code would never run. - local particles didn't set the dupli-group or textures to extern. checked all local functions for consistency/correctness.
2011-04-26 07:17:21 +00:00
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
if (me->mat) {
fix [#27178] Material links lost when making mesh data local - making local object data - Curve/Mesh/MBall lost references to linked materials. - joining a linked mesh object into a local one lost the link. As well as these reported bugs, checked all local functions for consistency/correctness and found other cases which would also fail. - making local metaball didn't ensure unique ID name. - make_local_armature() was missing check for object users - main body of code would never run. - local particles didn't set the dupli-group or textures to extern. checked all local functions for consistency/correctness.
2011-04-26 07:17:21 +00:00
extern_local_matarar(me->mat, me->totcol);
}
}
code cleanup: function naming, use BKE_*type* prefix.
2012-05-05 14:03:12 +00:00
void BKE_mesh_make_local(Mesh *me)
Initial revision
2002-10-12 11:37:38 +00:00
{
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
Main *bmain = G.main;
Initial revision
2002-10-12 11:37:38 +00:00
Object *ob;
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
int is_local = FALSE, is_lib = FALSE;
The last of the blenkernel files with translated comments
2003-04-26 13:07:59 +00:00
/* - only lib users: do nothing
fix [#27178] Material links lost when making mesh data local - making local object data - Curve/Mesh/MBall lost references to linked materials. - joining a linked mesh object into a local one lost the link. As well as these reported bugs, checked all local functions for consistency/correctness and found other cases which would also fail. - making local metaball didn't ensure unique ID name. - make_local_armature() was missing check for object users - main body of code would never run. - local particles didn't set the dupli-group or textures to extern. checked all local functions for consistency/correctness.
2011-04-26 07:17:21 +00:00
* - only local users: set flag
* - mixed: make copy
*/
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
if (me->id.lib == NULL) return;
if (me->id.us == 1) {
this missed merging from trunk somehow (mesh make local edits)
2011-12-28 22:47:55 +00:00
id_clear_lib_data(bmain, &me->id);
remove $Id: tags after discussion on the mailign list: http://markmail.org/message/fp7ozcywxum3ar7n
2011-10-23 17:52:20 +00:00
expand_local_mesh(me);
Initial revision
2002-10-12 11:37:38 +00:00
return;
}
fix [#27178] Material links lost when making mesh data local - making local object data - Curve/Mesh/MBall lost references to linked materials. - joining a linked mesh object into a local one lost the link. As well as these reported bugs, checked all local functions for consistency/correctness and found other cases which would also fail. - making local metaball didn't ensure unique ID name. - make_local_armature() was missing check for object users - main body of code would never run. - local particles didn't set the dupli-group or textures to extern. checked all local functions for consistency/correctness.
2011-04-26 07:17:21 +00:00
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
for (ob = bmain->object.first; ob && ELEM(0, is_lib, is_local); ob = ob->id.next) {
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
if (me == ob->data) {
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
if (ob->id.lib) is_lib = TRUE;
else is_local = TRUE;
Initial revision
2002-10-12 11:37:38 +00:00
}
}
fix [#27178] Material links lost when making mesh data local - making local object data - Curve/Mesh/MBall lost references to linked materials. - joining a linked mesh object into a local one lost the link. As well as these reported bugs, checked all local functions for consistency/correctness and found other cases which would also fail. - making local metaball didn't ensure unique ID name. - make_local_armature() was missing check for object users - main body of code would never run. - local particles didn't set the dupli-group or textures to extern. checked all local functions for consistency/correctness.
2011-04-26 07:17:21 +00:00
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
if (is_local && is_lib == FALSE) {
this missed merging from trunk somehow (mesh make local edits)
2011-12-28 22:47:55 +00:00
id_clear_lib_data(bmain, &me->id);
remove $Id: tags after discussion on the mailign list: http://markmail.org/message/fp7ozcywxum3ar7n
2011-10-23 17:52:20 +00:00
expand_local_mesh(me);
Initial revision
2002-10-12 11:37:38 +00:00
}
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
else if (is_local && is_lib) {
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
Mesh *me_new = BKE_mesh_copy(me);
me_new->id.us = 0;
fix [#27178] Material links lost when making mesh data local - making local object data - Curve/Mesh/MBall lost references to linked materials. - joining a linked mesh object into a local one lost the link. As well as these reported bugs, checked all local functions for consistency/correctness and found other cases which would also fail. - making local metaball didn't ensure unique ID name. - make_local_armature() was missing check for object users - main body of code would never run. - local particles didn't set the dupli-group or textures to extern. checked all local functions for consistency/correctness.
2011-04-26 07:17:21 +00:00
this missed merging from trunk somehow (mesh make local edits)
2011-12-28 22:47:55 +00:00
/* Remap paths of new ID using old library as base. */
fix [#29459] Crash making a linked object group local was an error with make-local refactor & path updating.
2011-11-30 00:32:13 +00:00
BKE_id_lib_local_paths(bmain, me->id.lib, &me_new->id);
use path remapping for all make local functions, patch from Alex Fraser with changes.
2011-10-27 05:34:39 +00:00
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
for (ob = bmain->object.first; ob; ob = ob->id.next) {
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
if (me == ob->data) {
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
if (ob->id.lib == NULL) {
code cleanup: name mesh functions more consistently, also use bools for mesh args.
2013-03-17 19:55:10 +00:00
BKE_mesh_assign_object(ob, me_new);
Initial revision
2002-10-12 11:37:38 +00:00
}
}
}
}
}
code cleanup: naming - BKE_mesh_*
2012-05-05 21:28:12 +00:00
void BKE_mesh_boundbox_calc(Mesh *me, float r_loc[3], float r_size[3])
Initial revision
2002-10-12 11:37:38 +00:00
{
BoundBox *bb;
float min[3], max[3];
float mloc[3], msize[3];
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
if (me->bb == NULL) me->bb = MEM_callocN(sizeof(BoundBox), "boundbox");
bb = me->bb;
Initial revision
2002-10-12 11:37:38 +00:00
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
if (!r_loc) r_loc = mloc;
if (!r_size) r_size = msize;
Initial revision
2002-10-12 11:37:38 +00:00
set origin was setting surfaces as 2D curves, added dupli-group support using the dupli's offset value.
2010-08-03 00:56:43 +00:00
INIT_MINMAX(min, max);
code cleanup: naming - BKE_mesh_*
2012-05-05 21:28:12 +00:00
if (!BKE_mesh_minmax(me, min, max)) {
- added boundbox_set_from_min_max function - fix DerivedMesh.getMinMax implementations to set min & max when there are no vertices - mesh boundbox calc was wrong in some cases, messed up HOMEKEY and localview zooming
2005-07-18 17:33:51 +00:00
min[0] = min[1] = min[2] = -1.0f;
max[0] = max[1] = max[2] = 1.0f;
Initial revision
2002-10-12 11:37:38 +00:00
}
code cleanup: naming - BKE_mesh_*
2012-05-05 21:28:12 +00:00
mid_v3_v3v3(r_loc, min, max);
- added boundbox_set_from_min_max function - fix DerivedMesh.getMinMax implementations to set min & max when there are no vertices - mesh boundbox calc was wrong in some cases, messed up HOMEKEY and localview zooming
2005-07-18 17:33:51 +00:00
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
r_size[0] = (max[0] - min[0]) / 2.0f;
r_size[1] = (max[1] - min[1]) / 2.0f;
r_size[2] = (max[2] - min[2]) / 2.0f;
- added boundbox_set_from_min_max function - fix DerivedMesh.getMinMax implementations to set min & max when there are no vertices - mesh boundbox calc was wrong in some cases, messed up HOMEKEY and localview zooming
2005-07-18 17:33:51 +00:00
code cleanup: function naming, use BKE_*type* prefix.
2012-05-05 14:03:12 +00:00
BKE_boundbox_init_from_minmax(bb, min, max);
Initial revision
2002-10-12 11:37:38 +00:00
}
code cleanup: naming - BKE_mesh_*
2012-05-05 21:28:12 +00:00
void BKE_mesh_texspace_calc(Mesh *me)
Initial revision
2002-10-12 11:37:38 +00:00
{
commit before doing some hefty shapekey change, will break compilation
2009-11-01 00:06:53 +00:00
float loc[3], size[3];
Initial revision
2002-10-12 11:37:38 +00:00
int a;
code cleanup: naming - BKE_mesh_*
2012-05-05 21:28:12 +00:00
BKE_mesh_boundbox_calc(me, loc, size);
Initial revision
2002-10-12 11:37:38 +00:00
- remove some unused editmesh functions. - copy & rename EditMesh stricts for use with scanfill (remove unused members)
2012-02-19 22:17:30 +00:00
if (me->texflag & ME_AUTOSPACE) {
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
for (a = 0; a < 3; a++) {
if (size[a] == 0.0f) size[a] = 1.0f;
else if (size[a] > 0.0f && size[a] < 0.00001f) size[a] = 0.00001f;
else if (size[a] < 0.0f && size[a] > -0.00001f) size[a] = -0.00001f;
- added mesh_get_texspace (should be used instead of direct access) which calculates texspace on demand if need be. - removed almost all calls to tex_space_mesh There may be a few corner cases where this goes wrong (meshes with vertex keys) but these should get ironed out by coming modifier system.
2005-07-14 21:57:18 +00:00
}
bugfix's [#23108] bpy.ops.object.origin_set(type='GEOMETRY_ORIGIN') dosen't work in console [#23115] Crash when moving armature origin - setting the armature in editmode would leave editdata in some cases. - transforming selected linked objects to account for the movement of the obdata was only done for meshes, now do for curves and text3d. - added utility functions for getting curve & mesh bounds. - text3d moving center wasn't working at all. - changed drawobject.c to use BLI_math funcs in more places. - remove some unused code from operator object.origin_set.
2010-08-01 11:00:36 +00:00
copy_v3_v3(me->loc, loc);
copy_v3_v3(me->size, size);
zero_v3(me->rot);
Initial revision
2002-10-12 11:37:38 +00:00
}
}
code cleanup: naming - BKE_mesh_*
2012-05-05 21:28:12 +00:00
BoundBox *BKE_mesh_boundbox_get(Object *ob)
- add mesh_get_bb function to return mesh boundbox and calc if needed - switch all mesh boundbox access to go through mesh_get_bb - switch object_handle_update to call mesh_changed instead of making the displist data immediately (delayed calculation)
2005-07-14 18:04:27 +00:00
{
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
Mesh *me = ob->data;
Bugfix for mysteriously disappearing left eyeball. Bounding boxes used for clipping were being stored in the mesh, but modifiers can result in two objects with the same mesh having a different bounding box. Solution is to store bounding box in the object.
2007-12-05 21:50:23 +00:00
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
if (ob->bb)
Bugfix for mysteriously disappearing left eyeball. Bounding boxes used for clipping were being stored in the mesh, but modifiers can result in two objects with the same mesh having a different bounding box. Solution is to store bounding box in the object.
2007-12-05 21:50:23 +00:00
return ob->bb;
if (!me->bb)
code cleanup: naming - BKE_mesh_*
2012-05-05 21:28:12 +00:00
BKE_mesh_texspace_calc(me);
- add mesh_get_bb function to return mesh boundbox and calc if needed - switch all mesh boundbox access to go through mesh_get_bb - switch object_handle_update to call mesh_changed instead of making the displist data immediately (delayed calculation)
2005-07-14 18:04:27 +00:00
return me->bb;
}
code cleanup: naming - BKE_mesh_*
2012-05-05 21:28:12 +00:00
void BKE_mesh_texspace_get(Mesh *me, float r_loc[3], float r_rot[3], float r_size[3])
- added mesh_get_texspace (should be used instead of direct access) which calculates texspace on demand if need be. - removed almost all calls to tex_space_mesh There may be a few corner cases where this goes wrong (meshes with vertex keys) but these should get ironed out by coming modifier system.
2005-07-14 21:57:18 +00:00
{
if (!me->bb) {
code cleanup: naming - BKE_mesh_*
2012-05-05 21:28:12 +00:00
BKE_mesh_texspace_calc(me);
- added mesh_get_texspace (should be used instead of direct access) which calculates texspace on demand if need be. - removed almost all calls to tex_space_mesh There may be a few corner cases where this goes wrong (meshes with vertex keys) but these should get ironed out by coming modifier system.
2005-07-14 21:57:18 +00:00
}
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
if (r_loc) copy_v3_v3(r_loc, me->loc);
if (r_rot) copy_v3_v3(r_rot, me->rot);
code cleanup: use float vector size in function definitions, and const's where the values are unchanged.
2012-02-28 14:05:00 +00:00
if (r_size) copy_v3_v3(r_size, me->size);
- added mesh_get_texspace (should be used instead of direct access) which calculates texspace on demand if need be. - removed almost all calls to tex_space_mesh There may be a few corner cases where this goes wrong (meshes with vertex keys) but these should get ironed out by coming modifier system.
2005-07-14 21:57:18 +00:00
}
minor bmesh improvements - use 2 omp sections for vert -> (edge, face) selection flushing. - dont use face-loop iterator for cddm_from_bmesh_ex conversion to give some speedup (some modifiers use this). - use float(*)[3] for functions that return coords.
2012-12-21 07:28:14 +00:00
float (*BKE_mesh_orco_verts_get(Object *ob))[3]
Initial revision
2002-10-12 11:37:38 +00:00
{
- for some reason mesh_create_derived_no_deform took the raw data (not an object) but this is not going to work... I can't remember the reason I did it this way in the first place either! oops! regardless, switch to all mesh_ derived accessors taking object argument. there is still a bug in render orco calculation though. (hunt hunt) - removed python files that should have been ditched in previous commit
2005-07-20 04:44:02 +00:00
Mesh *me = ob->data;
commit before doing some hefty shapekey change, will break compilation
2009-11-01 00:06:53 +00:00
MVert *mvert = NULL;
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
Mesh *tme = me->texcomesh ? me->texcomesh : me;
- added DerivedMesh.getVertCos function and implementations - added mesh_create_derived_no_deform[_render] - mesh_create_orco now always goes through a DerivedMesh, some redundant copying atm but can be fixed (and orco generation is not a big bottleneck) New feature: TexMesh (texcomesh) works with subsurf now (are you listening rob?)
2005-07-18 19:58:23 +00:00
int a, totvert;
= Multires = Fixed bug #5756, Rendering artifacts when MRM is not set to maximum Several changes were made: * Added function multires_level_n to get the nth level from a multires mesh * Removed the changes I made some time ago to init_render_mesh for multires meshes. Previously it was making a full copy of the mesh object in order to be able to apply deformations to the Pin level and propagate them to the Render level. * Added two functions to DerivedMesh.c, multires_render_pin and multires_render_final. These two functions work together in the mesh_create_derived_*_render functions to apply all modifiers to the Pin level, then create the DerivedMesh from the Render level, and lastly restore the mesh to its original (undeformed) state. * Added a check in multires_del_lower and multires_del_higher to ensure that level indices are properly clipped to the actual range of available levels.
2007-01-21 23:46:00 +00:00
float (*vcos)[3] = NULL;
- removed orco pointer from struct Mesh - switch renderer to store orco's in a hash table instead of caching in mesh (I don't like the renderer caching data in the actual mesh structure) - added mesh_create_orco[_render] function
2005-07-18 18:28:16 +00:00
Particles ========= - Texture orco coordinates for particles are now actual orcos instead of just the vertex positions, which means they are the same under deformations and the same as the ones on the mesh. - Particle distribution now uses these orcos to get consistent distributions independent of deformation. - This required changing the way orco's are computed for meshes. Now instead of generating an orco derivedmesh separately, the derivedmesh is generated alongside the regular one and stored in an orco custom data layer.
2007-12-05 12:40:54 +00:00
/* Get appropriate vertex coordinates */
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
vcos = MEM_callocN(sizeof(*vcos) * me->totvert, "orco mesh");
commit before doing some hefty shapekey change, will break compilation
2009-11-01 00:06:53 +00:00
mvert = tme->mvert;
rename api functions... - minf, maxf, mini, maxi --> min_ff, max_ff, min_ii, max_ii
2012-10-23 13:28:22 +00:00
totvert = min_ii(tme->totvert, me->totvert);
commit before doing some hefty shapekey change, will break compilation
2009-11-01 00:06:53 +00:00
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
for (a = 0; a < totvert; a++, mvert++) {
bugfix's [#23108] bpy.ops.object.origin_set(type='GEOMETRY_ORIGIN') dosen't work in console [#23115] Crash when moving armature origin - setting the armature in editmode would leave editdata in some cases. - transforming selected linked objects to account for the movement of the obdata was only done for meshes, now do for curves and text3d. - added utility functions for getting curve & mesh bounds. - text3d moving center wasn't working at all. - changed drawobject.c to use BLI_math funcs in more places. - remove some unused code from operator object.origin_set.
2010-08-01 11:00:36 +00:00
copy_v3_v3(vcos[a], mvert->co);
Initial revision
2002-10-12 11:37:38 +00:00
}
- removed orco pointer from struct Mesh - switch renderer to store orco's in a hash table instead of caching in mesh (I don't like the renderer caching data in the actual mesh structure) - added mesh_create_orco[_render] function
2005-07-18 18:28:16 +00:00
minor bmesh improvements - use 2 omp sections for vert -> (edge, face) selection flushing. - dont use face-loop iterator for cddm_from_bmesh_ex conversion to give some speedup (some modifiers use this). - use float(*)[3] for functions that return coords.
2012-12-21 07:28:14 +00:00
return vcos;
Particles ========= - Texture orco coordinates for particles are now actual orcos instead of just the vertex positions, which means they are the same under deformations and the same as the ones on the mesh. - Particle distribution now uses these orcos to get consistent distributions independent of deformation. - This required changing the way orco's are computed for meshes. Now instead of generating an orco derivedmesh separately, the derivedmesh is generated alongside the regular one and stored in an orco custom data layer.
2007-12-05 12:40:54 +00:00
}
- added DerivedMesh.getVertCos function and implementations - added mesh_create_derived_no_deform[_render] - mesh_create_orco now always goes through a DerivedMesh, some redundant copying atm but can be fixed (and orco generation is not a big bottleneck) New feature: TexMesh (texcomesh) works with subsurf now (are you listening rob?)
2005-07-18 19:58:23 +00:00
code cleanup: naming - BKE_mesh_*
2012-05-05 21:28:12 +00:00
void BKE_mesh_orco_verts_transform(Mesh *me, float (*orco)[3], int totvert, int invert)
Particles ========= - Texture orco coordinates for particles are now actual orcos instead of just the vertex positions, which means they are the same under deformations and the same as the ones on the mesh. - Particle distribution now uses these orcos to get consistent distributions independent of deformation. - This required changing the way orco's are computed for meshes. Now instead of generating an orco derivedmesh separately, the derivedmesh is generated alongside the regular one and stored in an orco custom data layer.
2007-12-05 12:40:54 +00:00
{
float loc[3], size[3];
int a;
- added DerivedMesh.getVertCos function and implementations - added mesh_create_derived_no_deform[_render] - mesh_create_orco now always goes through a DerivedMesh, some redundant copying atm but can be fixed (and orco generation is not a big bottleneck) New feature: TexMesh (texcomesh) works with subsurf now (are you listening rob?)
2005-07-18 19:58:23 +00:00
code cleanup: naming - BKE_mesh_*
2012-05-05 21:28:12 +00:00
BKE_mesh_texspace_get(me->texcomesh ? me->texcomesh : me, loc, NULL, size);
- added DerivedMesh.getVertCos function and implementations - added mesh_create_derived_no_deform[_render] - mesh_create_orco now always goes through a DerivedMesh, some redundant copying atm but can be fixed (and orco generation is not a big bottleneck) New feature: TexMesh (texcomesh) works with subsurf now (are you listening rob?)
2005-07-18 19:58:23 +00:00
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
if (invert) {
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
for (a = 0; a < totvert; a++) {
Fix for mirroring issues in particle mode, where the particles were not mirrored exactly, though the problem is not completely solved. The way local frames are computed for particles is still not fully symmetric, which shows especially on long hairs... Also made the shift+o subsurf switch work recursively into dupli-groups, did only the first level before.
2007-12-11 20:02:21 +00:00
float *co = orco[a];
bugfix's [#23108] bpy.ops.object.origin_set(type='GEOMETRY_ORIGIN') dosen't work in console [#23115] Crash when moving armature origin - setting the armature in editmode would leave editdata in some cases. - transforming selected linked objects to account for the movement of the obdata was only done for meshes, now do for curves and text3d. - added utility functions for getting curve & mesh bounds. - text3d moving center wasn't working at all. - changed drawobject.c to use BLI_math funcs in more places. - remove some unused code from operator object.origin_set.
2010-08-01 11:00:36 +00:00
madd_v3_v3v3v3(co, loc, co, size);
Fix for mirroring issues in particle mode, where the particles were not mirrored exactly, though the problem is not completely solved. The way local frames are computed for particles is still not fully symmetric, which shows especially on long hairs... Also made the shift+o subsurf switch work recursively into dupli-groups, did only the first level before.
2007-12-11 20:02:21 +00:00
}
}
else {
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
for (a = 0; a < totvert; a++) {
Fix for mirroring issues in particle mode, where the particles were not mirrored exactly, though the problem is not completely solved. The way local frames are computed for particles is still not fully symmetric, which shows especially on long hairs... Also made the shift+o subsurf switch work recursively into dupli-groups, did only the first level before.
2007-12-11 20:02:21 +00:00
float *co = orco[a];
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
co[0] = (co[0] - loc[0]) / size[0];
co[1] = (co[1] - loc[1]) / size[1];
co[2] = (co[2] - loc[2]) / size[2];
Fix for mirroring issues in particle mode, where the particles were not mirrored exactly, though the problem is not completely solved. The way local frames are computed for particles is still not fully symmetric, which shows especially on long hairs... Also made the shift+o subsurf switch work recursively into dupli-groups, did only the first level before.
2007-12-11 20:02:21 +00:00
}
- added DerivedMesh.getVertCos function and implementations - added mesh_create_derived_no_deform[_render] - mesh_create_orco now always goes through a DerivedMesh, some redundant copying atm but can be fixed (and orco generation is not a big bottleneck) New feature: TexMesh (texcomesh) works with subsurf now (are you listening rob?)
2005-07-18 19:58:23 +00:00
}
Initial revision
2002-10-12 11:37:38 +00:00
}
Modified the way booleans preserve face data, and cleaned up some duplicate code. Also removed redundant files from the bsp module, that where replaced by boolop last year, no sense in updating them for these changes. On the user level things should still work the same, this is only preparation work. Not counting the removed files, -1501 lines of code, not too bad :)
2006-11-08 20:14:04 +00:00
/* rotates the vertices of a face in case v[2] or v[3] (vertex index) is = 0.
style cleanup / comment formatting for bli/bke/bmesh
2012-03-03 20:19:11 +00:00
* this is necessary to make the if (mface->v4) check for quads work */
Fix for bug #7965: Array modifier could generate edges with twice the same vertex, fix provided by Ken, thanks.
2008-01-29 19:49:03 +00:00
int test_index_face(MFace *mface, CustomData *fdata, int mfindex, int nr)
Initial revision
2002-10-12 11:37:38 +00:00
{
/* first test if the face is legal */
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
if ((mface->v3 || nr == 4) && mface->v3 == mface->v4) {
mface->v4 = 0;
Initial revision
2002-10-12 11:37:38 +00:00
nr--;
}
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
if ((mface->v2 || mface->v4) && mface->v2 == mface->v3) {
mface->v3 = mface->v4;
mface->v4 = 0;
Initial revision
2002-10-12 11:37:38 +00:00
nr--;
}
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
if (mface->v1 == mface->v2) {
mface->v2 = mface->v3;
mface->v3 = mface->v4;
mface->v4 = 0;
Initial revision
2002-10-12 11:37:38 +00:00
nr--;
}
incorrect spelling in comments
2012-09-26 20:05:38 +00:00
/* check corrupt cases, bow-tie geometry, cant handle these because edge data wont exist so just return 0 */
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
if (nr == 3) {
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
if (
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
/* real edges */
mface->v1 == mface->v2 ||
mface->v2 == mface->v3 ||
mface->v3 == mface->v1)
{
fix [#25968] Crash on changing merge distance in array modifier with edgesplit modifier in chain
2011-02-09 04:45:53 +00:00
return 0;
}
}
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
else if (nr == 4) {
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
if (
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
/* real edges */
mface->v1 == mface->v2 ||
mface->v2 == mface->v3 ||
mface->v3 == mface->v4 ||
mface->v4 == mface->v1 ||
/* across the face */
mface->v1 == mface->v3 ||
code cleanup: - style - multi-line ifs move braces onto new lines. - iterators - convert some to macros, other split up and move brace.
2012-05-20 19:49:27 +00:00
mface->v2 == mface->v4)
{
fix [#25968] Crash on changing merge distance in array modifier with edgesplit modifier in chain
2011-02-09 04:45:53 +00:00
return 0;
}
}
The last of the blenkernel files with translated comments
2003-04-26 13:07:59 +00:00
/* prevent a zero at wrong index location */
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
if (nr == 3) {
if (mface->v3 == 0) {
Added custom vertex/edge/face data for meshes: All data layers, including MVert/MEdge/MFace, are now managed as custom data layers. The pointers like Mesh.mvert, Mesh.dvert or Mesh.mcol are still used of course, but allocating, copying or freeing these arrays should be done through the CustomData API. Work in progress documentation on this is here: http://mediawiki.blender.org/index.php/BlenderDev/BlenderArchitecture/CustomData Replaced TFace by MTFace: This is the same struct, except that it does not contain color, that now always stays separated in MCol. This was not a good design decision to begin with, and it is needed for adding multiple color layers later. Note that this does mean older Blender versions will not be able to read UV coordinates from the next release, due to an SDNA limitation. Removed DispListMesh: This now fully replaced by DerivedMesh. To provide access to arrays of vertices, edges and faces, like DispListMesh does. The semantics of the DerivedMesh.getVertArray() and similar functions were changed to return a pointer to an array if one exists, or otherwise allocate a temporary one. On releasing the DerivedMesh, this temporary array will be removed automatically. Removed ssDM and meshDM DerivedMesh backends: The ssDM backend was for DispListMesh, so that became obsolete automatically. The meshDM backend was replaced by the custom data backend, that now figures out which layers need to be modified, and only duplicates those. This changes code in many places, and overall removes 2514 lines of code. So, there's a good chance this might break some stuff, although I've been testing it for a few days now. The good news is, adding multiple color and uv layers should now become easy.
2006-11-20 04:28:02 +00:00
static int corner_indices[4] = {1, 2, 0, 3};
remove unneeded casts from 'unsigned int' to 'int'
2011-12-27 03:54:23 +00:00
SWAP(unsigned int, mface->v1, mface->v2);
SWAP(unsigned int, mface->v2, mface->v3);
Initial revision
2002-10-12 11:37:38 +00:00
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
if (fdata)
Fix for a missing check for NULL face data in test_index_face in my previous commit.
2006-11-20 19:03:37 +00:00
CustomData_swap(fdata, mfindex, corner_indices);
Initial revision
2002-10-12 11:37:38 +00:00
}
}
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
else if (nr == 4) {
if (mface->v3 == 0 || mface->v4 == 0) {
Added custom vertex/edge/face data for meshes: All data layers, including MVert/MEdge/MFace, are now managed as custom data layers. The pointers like Mesh.mvert, Mesh.dvert or Mesh.mcol are still used of course, but allocating, copying or freeing these arrays should be done through the CustomData API. Work in progress documentation on this is here: http://mediawiki.blender.org/index.php/BlenderDev/BlenderArchitecture/CustomData Replaced TFace by MTFace: This is the same struct, except that it does not contain color, that now always stays separated in MCol. This was not a good design decision to begin with, and it is needed for adding multiple color layers later. Note that this does mean older Blender versions will not be able to read UV coordinates from the next release, due to an SDNA limitation. Removed DispListMesh: This now fully replaced by DerivedMesh. To provide access to arrays of vertices, edges and faces, like DispListMesh does. The semantics of the DerivedMesh.getVertArray() and similar functions were changed to return a pointer to an array if one exists, or otherwise allocate a temporary one. On releasing the DerivedMesh, this temporary array will be removed automatically. Removed ssDM and meshDM DerivedMesh backends: The ssDM backend was for DispListMesh, so that became obsolete automatically. The meshDM backend was replaced by the custom data backend, that now figures out which layers need to be modified, and only duplicates those. This changes code in many places, and overall removes 2514 lines of code. So, there's a good chance this might break some stuff, although I've been testing it for a few days now. The good news is, adding multiple color and uv layers should now become easy.
2006-11-20 04:28:02 +00:00
static int corner_indices[4] = {2, 3, 0, 1};
remove unneeded casts from 'unsigned int' to 'int'
2011-12-27 03:54:23 +00:00
SWAP(unsigned int, mface->v1, mface->v3);
SWAP(unsigned int, mface->v2, mface->v4);
- convert all DerivedMesh map functions to use index based mapping (instead of Edit{Vert,Edge,Face} pointers) - dropped convertToDispListMeshMapped (whew, glad of it too) - added DerivedMesh drawMappedFaces function - dropped EM suffix for DerivedMesh functions, it was neither particularly correct nor descriptive - converted test_index_mface to test_index_face that also corrects MCol and TFace. Good thing we had three versions of this routine, you never know when one might burn down. - removed flipnorm_mesh, not used anymore (and was incorrect to boot) - Getting face select to work with modifiers turned out to be much more complicated than expected. Reworked mapping architecture for modifiers - basically elements in a DispListMesh are now required to be stored in an order that corresponds exactly to original ordering. MVert/MEdge/MFace all have a new flag ME_XXX_STEPINDEX that is set on each element that is set on the first derived element of each original element. I can't say the code to follow these requirements for subsurf is particularly transparent, but on the upside it is a reasonably consistent and simple system that is memory efficient and allows keeping the DispListMesh structure. - rewrote mirror modifier to be simpler/conform to new requirements for mapped DispListMesh structure. This also means that mirror interacts much better with incremental subsurf calculation (it used to recalc one entire side on any topology change, now it generally avoids that). - added EM_{init,free}_index_arrays and EM_get_{vert,edge,face}_for_index functions to handle mapping indices back into appropriate EditMesh structures. - bug fix, make edges didn't recalc object data - bug fix, initial image assignment to TFace's didn't recalc object data - new feature, added circle select support for FACESELECT - bug fix, creating new faces in editmode duplicated the TFACE active flag - but there should only be one active tface - bug fix, possible crash when deleting all faces in faceselect mode on mesh with tfaces... Still todo: TFace edge drawing is still not always correct in face mode, in particular with a mirror modifier when mesh has edges (and no preceeding subsurf). Have not yet decided how to deal with this. Best solution is probably to do switch to meshes all having MEdge's, in which case I can get rid of TFace edge flags (and need to recalc modifiers on tface selection change).
2005-08-20 03:08:23 +00:00
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
if (fdata)
Fix for a missing check for NULL face data in test_index_face in my previous commit.
2006-11-20 19:03:37 +00:00
CustomData_swap(fdata, mfindex, corner_indices);
Initial revision
2002-10-12 11:37:38 +00:00
}
}
Fix for bug #7965: Array modifier could generate edges with twice the same vertex, fix provided by Ken, thanks.
2008-01-29 19:49:03 +00:00
return nr;
Initial revision
2002-10-12 11:37:38 +00:00
}
code cleanup: naming - pose/armature/image also use ..._find_name(..., name) rather then ..._find_named(..., name) --- both were used.
2012-05-05 16:03:57 +00:00
Mesh *BKE_mesh_from_object(Object *ob)
Initial revision
2002-10-12 11:37:38 +00:00
{
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
if (ob == NULL) return NULL;
if (ob->type == OB_MESH) return ob->data;
fix for warnings from Sparse static source code checker, mostly BKE/BLI and python functions. - use NULL rather then 0 where possible (makes code & function calls more readable IMHO). - set static variables and functions (exposed some unused vars/funcs). - use func(void) rather then func() for definitions.
2011-02-13 10:52:18 +00:00
else return NULL;
Initial revision
2002-10-12 11:37:38 +00:00
}
code cleanup: name mesh functions more consistently, also use bools for mesh args.
2013-03-17 19:55:10 +00:00
void BKE_mesh_assign_object(Object *ob, Mesh *me)
Initial revision
2002-10-12 11:37:38 +00:00
{
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
Mesh *old = NULL;
== Multires == Fixed bug #23657, "Modifiers dosen't work when you select diffrent mesh for object" Multires modifier now adds empty mdisps if they're missing, rather than displaying a warning Switching an object's mesh will now check for a multires modifier; if found the modifier's total number of levels are reset to match the mesh's mdisps Switching the mesh also forces a multires update so that sculpted changes aren't lost
2010-09-09 00:14:51 +00:00
multires_force_update(ob);
Initial revision
2002-10-12 11:37:38 +00:00
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
if (ob == NULL) return;
Initial revision
2002-10-12 11:37:38 +00:00
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
if (ob->type == OB_MESH) {
old = ob->data;
merge with trunk/2.5 at r23876 [[Split portion of a mixed commit.]]
2009-10-22 23:22:05 +00:00
if (old)
old->id.us--;
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
ob->data = me;
Initial revision
2002-10-12 11:37:38 +00:00
id_us_plus((ID *)me);
}
Make freestyle use local Main for temporary objects This means main database is no longer pollutes with temporary scene and objects needed for freestyle render. Actually, there're few of separated temporary mains now. Ideally it's better to use single one, but it's not so much trivial to pass it to all classes. Not so big deal actually. Required some changes to blender kernel, to make it possible to add object to a given main, also to check on mesh materials for objects in given main. This is all straightforward changes. As an additional, solved issue with main database being infinitely polluted with text blocks created by create_lineset_handler function. This fixes: - #35003: Freestyle crashes if user expands objects in FRS1_Scene - #35012: ctrl+f12 rendering crashes when using Freestyle
2013-04-18 08:58:21 +00:00
test_object_materials(G.main, (ID *)me);
== Multires == Fixed bug #23657, "Modifiers dosen't work when you select diffrent mesh for object" Multires modifier now adds empty mdisps if they're missing, rather than displaying a warning Switching an object's mesh will now check for a multires modifier; if found the modifier's total number of levels are reset to match the mesh's mdisps Switching the mesh also forces a multires update so that sculpted changes aren't lost
2010-09-09 00:14:51 +00:00
test_object_modifiers(ob);
Initial revision
2002-10-12 11:37:38 +00:00
}
Quite a large one this time... but now we have: Edges in Mesh - adds automatic when you use creases. For other situations; call the void make_edges(Mesh *me) in mesh.c. Of course, once in editmode the edges are automatically recreated. - in F9 buttons you can add/remove edges too - both for Mesh and DisplistMesh, so it speeds up drawing quite some in wireframe - render for edges can't work... edges have no material nor tface nor col.. so here still the faces are rendered in wire Creases in Subsurf - based on the code by Chris McFarlen - main changes is that now edges are used, saving quite some data in file - use SHIFT+E in editmode to set edges-sharpness. values go from 0-1 - in F9 buttons you can set draw-crease mode. It draws now blended from wire color to edge-select color (as provided in Theme) Known issue: setting sharpness on 1 cube (subdiv 2) gives weird results with some values... Chris, can you check? Further; code cleanups, changing 0 in NULL when needed, no warnings, etc etc
2004-07-08 20:38:27 +00:00
/* ************** make edges in a Mesh, for outside of editmode */
struct edgesort {
remove unneeded casts from 'unsigned int' to 'int'
2011-12-27 03:54:23 +00:00
unsigned int v1, v2;
Bugfix #3077 Radiosity didn't add edges block, on "Replace Meshes". Caused wireframe not to draw, but also crashes like for join(). Also: added patch that sets the drawflags in edges derived from the ones set in faces. This ensures the conversion to be done correct. TODO: this edges call also used in other areas in code, that has to be catched and done differently.
2005-09-22 17:00:58 +00:00
short is_loose, is_draw;
Quite a large one this time... but now we have: Edges in Mesh - adds automatic when you use creases. For other situations; call the void make_edges(Mesh *me) in mesh.c. Of course, once in editmode the edges are automatically recreated. - in F9 buttons you can add/remove edges too - both for Mesh and DisplistMesh, so it speeds up drawing quite some in wireframe - render for edges can't work... edges have no material nor tface nor col.. so here still the faces are rendered in wire Creases in Subsurf - based on the code by Chris McFarlen - main changes is that now edges are used, saving quite some data in file - use SHIFT+E in editmode to set edges-sharpness. values go from 0-1 - in F9 buttons you can set draw-crease mode. It draws now blended from wire color to edge-select color (as provided in Theme) Known issue: setting sharpness on 1 cube (subdiv 2) gives weird results with some values... Chris, can you check? Further; code cleanups, changing 0 in NULL when needed, no warnings, etc etc
2004-07-08 20:38:27 +00:00
};
/* edges have to be added with lowest index first for sorting */
remove unneeded casts from 'unsigned int' to 'int'
2011-12-27 03:54:23 +00:00
static void to_edgesort(struct edgesort *ed,
unsigned int v1, unsigned int v2,
short is_loose, short is_draw)
Quite a large one this time... but now we have: Edges in Mesh - adds automatic when you use creases. For other situations; call the void make_edges(Mesh *me) in mesh.c. Of course, once in editmode the edges are automatically recreated. - in F9 buttons you can add/remove edges too - both for Mesh and DisplistMesh, so it speeds up drawing quite some in wireframe - render for edges can't work... edges have no material nor tface nor col.. so here still the faces are rendered in wire Creases in Subsurf - based on the code by Chris McFarlen - main changes is that now edges are used, saving quite some data in file - use SHIFT+E in editmode to set edges-sharpness. values go from 0-1 - in F9 buttons you can set draw-crease mode. It draws now blended from wire color to edge-select color (as provided in Theme) Known issue: setting sharpness on 1 cube (subdiv 2) gives weird results with some values... Chris, can you check? Further; code cleanups, changing 0 in NULL when needed, no warnings, etc etc
2004-07-08 20:38:27 +00:00
{
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
if (v1 < v2) {
ed->v1 = v1; ed->v2 = v2;
Quite a large one this time... but now we have: Edges in Mesh - adds automatic when you use creases. For other situations; call the void make_edges(Mesh *me) in mesh.c. Of course, once in editmode the edges are automatically recreated. - in F9 buttons you can add/remove edges too - both for Mesh and DisplistMesh, so it speeds up drawing quite some in wireframe - render for edges can't work... edges have no material nor tface nor col.. so here still the faces are rendered in wire Creases in Subsurf - based on the code by Chris McFarlen - main changes is that now edges are used, saving quite some data in file - use SHIFT+E in editmode to set edges-sharpness. values go from 0-1 - in F9 buttons you can set draw-crease mode. It draws now blended from wire color to edge-select color (as provided in Theme) Known issue: setting sharpness on 1 cube (subdiv 2) gives weird results with some values... Chris, can you check? Further; code cleanups, changing 0 in NULL when needed, no warnings, etc etc
2004-07-08 20:38:27 +00:00
}
else {
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
ed->v1 = v2; ed->v2 = v1;
Quite a large one this time... but now we have: Edges in Mesh - adds automatic when you use creases. For other situations; call the void make_edges(Mesh *me) in mesh.c. Of course, once in editmode the edges are automatically recreated. - in F9 buttons you can add/remove edges too - both for Mesh and DisplistMesh, so it speeds up drawing quite some in wireframe - render for edges can't work... edges have no material nor tface nor col.. so here still the faces are rendered in wire Creases in Subsurf - based on the code by Chris McFarlen - main changes is that now edges are used, saving quite some data in file - use SHIFT+E in editmode to set edges-sharpness. values go from 0-1 - in F9 buttons you can set draw-crease mode. It draws now blended from wire color to edge-select color (as provided in Theme) Known issue: setting sharpness on 1 cube (subdiv 2) gives weird results with some values... Chris, can you check? Further; code cleanups, changing 0 in NULL when needed, no warnings, etc etc
2004-07-08 20:38:27 +00:00
}
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
ed->is_loose = is_loose;
ed->is_draw = is_draw;
Quite a large one this time... but now we have: Edges in Mesh - adds automatic when you use creases. For other situations; call the void make_edges(Mesh *me) in mesh.c. Of course, once in editmode the edges are automatically recreated. - in F9 buttons you can add/remove edges too - both for Mesh and DisplistMesh, so it speeds up drawing quite some in wireframe - render for edges can't work... edges have no material nor tface nor col.. so here still the faces are rendered in wire Creases in Subsurf - based on the code by Chris McFarlen - main changes is that now edges are used, saving quite some data in file - use SHIFT+E in editmode to set edges-sharpness. values go from 0-1 - in F9 buttons you can set draw-crease mode. It draws now blended from wire color to edge-select color (as provided in Theme) Known issue: setting sharpness on 1 cube (subdiv 2) gives weird results with some values... Chris, can you check? Further; code cleanups, changing 0 in NULL when needed, no warnings, etc etc
2004-07-08 20:38:27 +00:00
}
static int vergedgesort(const void *v1, const void *v2)
{
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
const struct edgesort *x1 = v1, *x2 = v2;
Quite a large one this time... but now we have: Edges in Mesh - adds automatic when you use creases. For other situations; call the void make_edges(Mesh *me) in mesh.c. Of course, once in editmode the edges are automatically recreated. - in F9 buttons you can add/remove edges too - both for Mesh and DisplistMesh, so it speeds up drawing quite some in wireframe - render for edges can't work... edges have no material nor tface nor col.. so here still the faces are rendered in wire Creases in Subsurf - based on the code by Chris McFarlen - main changes is that now edges are used, saving quite some data in file - use SHIFT+E in editmode to set edges-sharpness. values go from 0-1 - in F9 buttons you can set draw-crease mode. It draws now blended from wire color to edge-select color (as provided in Theme) Known issue: setting sharpness on 1 cube (subdiv 2) gives weird results with some values... Chris, can you check? Further; code cleanups, changing 0 in NULL when needed, no warnings, etc etc
2004-07-08 20:38:27 +00:00
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
if (x1->v1 > x2->v1) return 1;
else if (x1->v1 < x2->v1) return -1;
else if (x1->v2 > x2->v2) return 1;
else if (x1->v2 < x2->v2) return -1;
Quite a large one this time... but now we have: Edges in Mesh - adds automatic when you use creases. For other situations; call the void make_edges(Mesh *me) in mesh.c. Of course, once in editmode the edges are automatically recreated. - in F9 buttons you can add/remove edges too - both for Mesh and DisplistMesh, so it speeds up drawing quite some in wireframe - render for edges can't work... edges have no material nor tface nor col.. so here still the faces are rendered in wire Creases in Subsurf - based on the code by Chris McFarlen - main changes is that now edges are used, saving quite some data in file - use SHIFT+E in editmode to set edges-sharpness. values go from 0-1 - in F9 buttons you can set draw-crease mode. It draws now blended from wire color to edge-select color (as provided in Theme) Known issue: setting sharpness on 1 cube (subdiv 2) gives weird results with some values... Chris, can you check? Further; code cleanups, changing 0 in NULL when needed, no warnings, etc etc
2004-07-08 20:38:27 +00:00
return 0;
}
fix for crash converting a curve into a mesh (Alt+C conversion), this would crash on entering editmode. now curves convert to polygons directly, rather then faces, and polygons after.
2012-02-03 04:58:55 +00:00
Constructive modifiers for curves and surfaces Used approach with creating DerivedMesh for curves whet they've got such modifiers. Available modifiers are: array, edge split, mirror, solidify, subsurf.
2010-03-05 16:47:52 +00:00
/* Create edges based on known verts and faces */
=bmesh= merge from trunk at r36153
2011-04-15 01:19:13 +00:00
static void make_edges_mdata(MVert *UNUSED(allvert), MFace *allface, MLoop *allloop,
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
MPoly *allpoly, int UNUSED(totvert), int totface, int UNUSED(totloop), int totpoly,
int old, MEdge **alledge, int *_totedge)
Quite a large one this time... but now we have: Edges in Mesh - adds automatic when you use creases. For other situations; call the void make_edges(Mesh *me) in mesh.c. Of course, once in editmode the edges are automatically recreated. - in F9 buttons you can add/remove edges too - both for Mesh and DisplistMesh, so it speeds up drawing quite some in wireframe - render for edges can't work... edges have no material nor tface nor col.. so here still the faces are rendered in wire Creases in Subsurf - based on the code by Chris McFarlen - main changes is that now edges are used, saving quite some data in file - use SHIFT+E in editmode to set edges-sharpness. values go from 0-1 - in F9 buttons you can set draw-crease mode. It draws now blended from wire color to edge-select color (as provided in Theme) Known issue: setting sharpness on 1 cube (subdiv 2) gives weird results with some values... Chris, can you check? Further; code cleanups, changing 0 in NULL when needed, no warnings, etc etc
2004-07-08 20:38:27 +00:00
{
=bmesh= merge from trunk at r36153
2011-04-15 01:19:13 +00:00
MPoly *mpoly;
Quite a large one this time... but now we have: Edges in Mesh - adds automatic when you use creases. For other situations; call the void make_edges(Mesh *me) in mesh.c. Of course, once in editmode the edges are automatically recreated. - in F9 buttons you can add/remove edges too - both for Mesh and DisplistMesh, so it speeds up drawing quite some in wireframe - render for edges can't work... edges have no material nor tface nor col.. so here still the faces are rendered in wire Creases in Subsurf - based on the code by Chris McFarlen - main changes is that now edges are used, saving quite some data in file - use SHIFT+E in editmode to set edges-sharpness. values go from 0-1 - in F9 buttons you can set draw-crease mode. It draws now blended from wire color to edge-select color (as provided in Theme) Known issue: setting sharpness on 1 cube (subdiv 2) gives weird results with some values... Chris, can you check? Further; code cleanups, changing 0 in NULL when needed, no warnings, etc etc
2004-07-08 20:38:27 +00:00
MFace *mface;
MEdge *medge;
=bmesh= merge from trunk at r36153
2011-04-15 01:19:13 +00:00
EdgeHash *hash = BLI_edgehash_new();
Quite a large one this time... but now we have: Edges in Mesh - adds automatic when you use creases. For other situations; call the void make_edges(Mesh *me) in mesh.c. Of course, once in editmode the edges are automatically recreated. - in F9 buttons you can add/remove edges too - both for Mesh and DisplistMesh, so it speeds up drawing quite some in wireframe - render for edges can't work... edges have no material nor tface nor col.. so here still the faces are rendered in wire Creases in Subsurf - based on the code by Chris McFarlen - main changes is that now edges are used, saving quite some data in file - use SHIFT+E in editmode to set edges-sharpness. values go from 0-1 - in F9 buttons you can set draw-crease mode. It draws now blended from wire color to edge-select color (as provided in Theme) Known issue: setting sharpness on 1 cube (subdiv 2) gives weird results with some values... Chris, can you check? Further; code cleanups, changing 0 in NULL when needed, no warnings, etc etc
2004-07-08 20:38:27 +00:00
struct edgesort *edsort, *ed;
fix for bmesh regression similar to last revision r54920. only effected loading old blend files without edge data.
2013-02-28 04:18:01 +00:00
int a, totedge = 0, final = 0;
Constructive modifiers for curves and surfaces Used approach with creating DerivedMesh for curves whet they've got such modifiers. Available modifiers are: array, edge split, mirror, solidify, subsurf.
2010-03-05 16:47:52 +00:00
Quite a large one this time... but now we have: Edges in Mesh - adds automatic when you use creases. For other situations; call the void make_edges(Mesh *me) in mesh.c. Of course, once in editmode the edges are automatically recreated. - in F9 buttons you can add/remove edges too - both for Mesh and DisplistMesh, so it speeds up drawing quite some in wireframe - render for edges can't work... edges have no material nor tface nor col.. so here still the faces are rendered in wire Creases in Subsurf - based on the code by Chris McFarlen - main changes is that now edges are used, saving quite some data in file - use SHIFT+E in editmode to set edges-sharpness. values go from 0-1 - in F9 buttons you can set draw-crease mode. It draws now blended from wire color to edge-select color (as provided in Theme) Known issue: setting sharpness on 1 cube (subdiv 2) gives weird results with some values... Chris, can you check? Further; code cleanups, changing 0 in NULL when needed, no warnings, etc etc
2004-07-08 20:38:27 +00:00
/* we put all edges in array, sort them, and detect doubles that way */
Constructive modifiers for curves and surfaces Used approach with creating DerivedMesh for curves whet they've got such modifiers. Available modifiers are: array, edge split, mirror, solidify, subsurf.
2010-03-05 16:47:52 +00:00
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
for (a = totface, mface = allface; a > 0; a--, mface++) {
if (mface->v4) totedge += 4;
else if (mface->v3) totedge += 3;
else totedge += 1;
Quite a large one this time... but now we have: Edges in Mesh - adds automatic when you use creases. For other situations; call the void make_edges(Mesh *me) in mesh.c. Of course, once in editmode the edges are automatically recreated. - in F9 buttons you can add/remove edges too - both for Mesh and DisplistMesh, so it speeds up drawing quite some in wireframe - render for edges can't work... edges have no material nor tface nor col.. so here still the faces are rendered in wire Creases in Subsurf - based on the code by Chris McFarlen - main changes is that now edges are used, saving quite some data in file - use SHIFT+E in editmode to set edges-sharpness. values go from 0-1 - in F9 buttons you can set draw-crease mode. It draws now blended from wire color to edge-select color (as provided in Theme) Known issue: setting sharpness on 1 cube (subdiv 2) gives weird results with some values... Chris, can you check? Further; code cleanups, changing 0 in NULL when needed, no warnings, etc etc
2004-07-08 20:38:27 +00:00
}
Constructive modifiers for curves and surfaces Used approach with creating DerivedMesh for curves whet they've got such modifiers. Available modifiers are: array, edge split, mirror, solidify, subsurf.
2010-03-05 16:47:52 +00:00
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
if (totedge == 0) {
Added custom vertex/edge/face data for meshes: All data layers, including MVert/MEdge/MFace, are now managed as custom data layers. The pointers like Mesh.mvert, Mesh.dvert or Mesh.mcol are still used of course, but allocating, copying or freeing these arrays should be done through the CustomData API. Work in progress documentation on this is here: http://mediawiki.blender.org/index.php/BlenderDev/BlenderArchitecture/CustomData Replaced TFace by MTFace: This is the same struct, except that it does not contain color, that now always stays separated in MCol. This was not a good design decision to begin with, and it is needed for adding multiple color layers later. Note that this does mean older Blender versions will not be able to read UV coordinates from the next release, due to an SDNA limitation. Removed DispListMesh: This now fully replaced by DerivedMesh. To provide access to arrays of vertices, edges and faces, like DispListMesh does. The semantics of the DerivedMesh.getVertArray() and similar functions were changed to return a pointer to an array if one exists, or otherwise allocate a temporary one. On releasing the DerivedMesh, this temporary array will be removed automatically. Removed ssDM and meshDM DerivedMesh backends: The ssDM backend was for DispListMesh, so that became obsolete automatically. The meshDM backend was replaced by the custom data backend, that now figures out which layers need to be modified, and only duplicates those. This changes code in many places, and overall removes 2514 lines of code. So, there's a good chance this might break some stuff, although I've been testing it for a few days now. The good news is, adding multiple color and uv layers should now become easy.
2006-11-20 04:28:02 +00:00
/* flag that mesh has edges */
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
(*alledge) = MEM_callocN(0, "make mesh edges");
Constructive modifiers for curves and surfaces Used approach with creating DerivedMesh for curves whet they've got such modifiers. Available modifiers are: array, edge split, mirror, solidify, subsurf.
2010-03-05 16:47:52 +00:00
(*_totedge) = 0;
- added data arguments to deformer modifiers, in case someone wants to write one that is based on geometry (and not just vertex position) - added editmode versions of modifier deform/apply calls and flag to tag modifiers that support editmode - added isFinalCalc param to applyModifier, basically a switch to let subsurf know if it is calc'ng orco or not (so it can deal with cache appropriately). This is kinda hacky and perhaps I can come up with a better solution (its also a waste to do a complete subdivide just to get vertex locations). - changed ccgsubsurf to not preallocate hash's to be approximately correct size... this was probably not a big performance savings but means that the order of faces returned by the iterator can vary after the first call, this messes up orco calculation so dropped for time being. - minor bug fix, meshes with only key didn't get vertex normals correctly calc'd - updated editmesh derivedmesh to support auxiliary locations - changed mesh_calc_modifiers to alloc deformVerts on demand - added editmesh_calc_modifiers for calculating editmesh cage and final derivedmesh's - bug fix, update shadedisplist to always calc colors (even if totvert==0) - changed load_editMesh and make_edge to build me->medge even if totedge==0 (incremental subsurf checks this) todo: add drawFacesTex for ccgderivedmesh So, modifiers in editmode are back (which means auto-mirror in edit mode works now) although still not finished. Currently no cage is computed, the cage is always the base mesh (in other words, Optimal edge style editing is off), and the final mesh currently includes all modifiers that work in edit mode (including lattice and curve). At some point there will be toggles for which modifiers affect the final/cage editmode derivedmesh's. Also, very nice new feature is that incremental subsurf in object mode returns a ccgderivedmesh object instead of copying to a new displistmesh. This can make a *huge* speed difference, and is very nice for working with deformed armatures (esp. with only small per frame changes).
2005-07-22 07:37:15 +00:00
return;
}
Constructive modifiers for curves and surfaces Used approach with creating DerivedMesh for curves whet they've got such modifiers. Available modifiers are: array, edge split, mirror, solidify, subsurf.
2010-03-05 16:47:52 +00:00
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
ed = edsort = MEM_mallocN(totedge * sizeof(struct edgesort), "edgesort");
Constructive modifiers for curves and surfaces Used approach with creating DerivedMesh for curves whet they've got such modifiers. Available modifiers are: array, edge split, mirror, solidify, subsurf.
2010-03-05 16:47:52 +00:00
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
for (a = totface, mface = allface; a > 0; a--, mface++) {
Bugfix #3077 Radiosity didn't add edges block, on "Replace Meshes". Caused wireframe not to draw, but also crashes like for join(). Also: added patch that sets the drawflags in edges derived from the ones set in faces. This ensures the conversion to be done correct. TODO: this edges call also used in other areas in code, that has to be catched and done differently.
2005-09-22 17:00:58 +00:00
to_edgesort(ed++, mface->v1, mface->v2, !mface->v3, mface->edcode & ME_V1V2);
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
if (mface->v4) {
Bugfix #3077 Radiosity didn't add edges block, on "Replace Meshes". Caused wireframe not to draw, but also crashes like for join(). Also: added patch that sets the drawflags in edges derived from the ones set in faces. This ensures the conversion to be done correct. TODO: this edges call also used in other areas in code, that has to be catched and done differently.
2005-09-22 17:00:58 +00:00
to_edgesort(ed++, mface->v2, mface->v3, 0, mface->edcode & ME_V2V3);
to_edgesort(ed++, mface->v3, mface->v4, 0, mface->edcode & ME_V3V4);
to_edgesort(ed++, mface->v4, mface->v1, 0, mface->edcode & ME_V4V1);
Quite a large one this time... but now we have: Edges in Mesh - adds automatic when you use creases. For other situations; call the void make_edges(Mesh *me) in mesh.c. Of course, once in editmode the edges are automatically recreated. - in F9 buttons you can add/remove edges too - both for Mesh and DisplistMesh, so it speeds up drawing quite some in wireframe - render for edges can't work... edges have no material nor tface nor col.. so here still the faces are rendered in wire Creases in Subsurf - based on the code by Chris McFarlen - main changes is that now edges are used, saving quite some data in file - use SHIFT+E in editmode to set edges-sharpness. values go from 0-1 - in F9 buttons you can set draw-crease mode. It draws now blended from wire color to edge-select color (as provided in Theme) Known issue: setting sharpness on 1 cube (subdiv 2) gives weird results with some values... Chris, can you check? Further; code cleanups, changing 0 in NULL when needed, no warnings, etc etc
2004-07-08 20:38:27 +00:00
}
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
else if (mface->v3) {
Bugfix #3077 Radiosity didn't add edges block, on "Replace Meshes". Caused wireframe not to draw, but also crashes like for join(). Also: added patch that sets the drawflags in edges derived from the ones set in faces. This ensures the conversion to be done correct. TODO: this edges call also used in other areas in code, that has to be catched and done differently.
2005-09-22 17:00:58 +00:00
to_edgesort(ed++, mface->v2, mface->v3, 0, mface->edcode & ME_V2V3);
to_edgesort(ed++, mface->v3, mface->v1, 0, mface->edcode & ME_V3V1);
Quite a large one this time... but now we have: Edges in Mesh - adds automatic when you use creases. For other situations; call the void make_edges(Mesh *me) in mesh.c. Of course, once in editmode the edges are automatically recreated. - in F9 buttons you can add/remove edges too - both for Mesh and DisplistMesh, so it speeds up drawing quite some in wireframe - render for edges can't work... edges have no material nor tface nor col.. so here still the faces are rendered in wire Creases in Subsurf - based on the code by Chris McFarlen - main changes is that now edges are used, saving quite some data in file - use SHIFT+E in editmode to set edges-sharpness. values go from 0-1 - in F9 buttons you can set draw-crease mode. It draws now blended from wire color to edge-select color (as provided in Theme) Known issue: setting sharpness on 1 cube (subdiv 2) gives weird results with some values... Chris, can you check? Further; code cleanups, changing 0 in NULL when needed, no warnings, etc etc
2004-07-08 20:38:27 +00:00
}
}
Constructive modifiers for curves and surfaces Used approach with creating DerivedMesh for curves whet they've got such modifiers. Available modifiers are: array, edge split, mirror, solidify, subsurf.
2010-03-05 16:47:52 +00:00
Quite a large one this time... but now we have: Edges in Mesh - adds automatic when you use creases. For other situations; call the void make_edges(Mesh *me) in mesh.c. Of course, once in editmode the edges are automatically recreated. - in F9 buttons you can add/remove edges too - both for Mesh and DisplistMesh, so it speeds up drawing quite some in wireframe - render for edges can't work... edges have no material nor tface nor col.. so here still the faces are rendered in wire Creases in Subsurf - based on the code by Chris McFarlen - main changes is that now edges are used, saving quite some data in file - use SHIFT+E in editmode to set edges-sharpness. values go from 0-1 - in F9 buttons you can set draw-crease mode. It draws now blended from wire color to edge-select color (as provided in Theme) Known issue: setting sharpness on 1 cube (subdiv 2) gives weird results with some values... Chris, can you check? Further; code cleanups, changing 0 in NULL when needed, no warnings, etc etc
2004-07-08 20:38:27 +00:00
qsort(edsort, totedge, sizeof(struct edgesort), vergedgesort);
Constructive modifiers for curves and surfaces Used approach with creating DerivedMesh for curves whet they've got such modifiers. Available modifiers are: array, edge split, mirror, solidify, subsurf.
2010-03-05 16:47:52 +00:00
Quite a large one this time... but now we have: Edges in Mesh - adds automatic when you use creases. For other situations; call the void make_edges(Mesh *me) in mesh.c. Of course, once in editmode the edges are automatically recreated. - in F9 buttons you can add/remove edges too - both for Mesh and DisplistMesh, so it speeds up drawing quite some in wireframe - render for edges can't work... edges have no material nor tface nor col.. so here still the faces are rendered in wire Creases in Subsurf - based on the code by Chris McFarlen - main changes is that now edges are used, saving quite some data in file - use SHIFT+E in editmode to set edges-sharpness. values go from 0-1 - in F9 buttons you can set draw-crease mode. It draws now blended from wire color to edge-select color (as provided in Theme) Known issue: setting sharpness on 1 cube (subdiv 2) gives weird results with some values... Chris, can you check? Further; code cleanups, changing 0 in NULL when needed, no warnings, etc etc
2004-07-08 20:38:27 +00:00
/* count final amount */
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
for (a = totedge, ed = edsort; a > 1; a--, ed++) {
Quite a large one this time... but now we have: Edges in Mesh - adds automatic when you use creases. For other situations; call the void make_edges(Mesh *me) in mesh.c. Of course, once in editmode the edges are automatically recreated. - in F9 buttons you can add/remove edges too - both for Mesh and DisplistMesh, so it speeds up drawing quite some in wireframe - render for edges can't work... edges have no material nor tface nor col.. so here still the faces are rendered in wire Creases in Subsurf - based on the code by Chris McFarlen - main changes is that now edges are used, saving quite some data in file - use SHIFT+E in editmode to set edges-sharpness. values go from 0-1 - in F9 buttons you can set draw-crease mode. It draws now blended from wire color to edge-select color (as provided in Theme) Known issue: setting sharpness on 1 cube (subdiv 2) gives weird results with some values... Chris, can you check? Further; code cleanups, changing 0 in NULL when needed, no warnings, etc etc
2004-07-08 20:38:27 +00:00
/* edge is unique when it differs from next edge, or is last */
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
if (ed->v1 != (ed + 1)->v1 || ed->v2 != (ed + 1)->v2) final++;
Quite a large one this time... but now we have: Edges in Mesh - adds automatic when you use creases. For other situations; call the void make_edges(Mesh *me) in mesh.c. Of course, once in editmode the edges are automatically recreated. - in F9 buttons you can add/remove edges too - both for Mesh and DisplistMesh, so it speeds up drawing quite some in wireframe - render for edges can't work... edges have no material nor tface nor col.. so here still the faces are rendered in wire Creases in Subsurf - based on the code by Chris McFarlen - main changes is that now edges are used, saving quite some data in file - use SHIFT+E in editmode to set edges-sharpness. values go from 0-1 - in F9 buttons you can set draw-crease mode. It draws now blended from wire color to edge-select color (as provided in Theme) Known issue: setting sharpness on 1 cube (subdiv 2) gives weird results with some values... Chris, can you check? Further; code cleanups, changing 0 in NULL when needed, no warnings, etc etc
2004-07-08 20:38:27 +00:00
}
final++;
Added custom vertex/edge/face data for meshes: All data layers, including MVert/MEdge/MFace, are now managed as custom data layers. The pointers like Mesh.mvert, Mesh.dvert or Mesh.mcol are still used of course, but allocating, copying or freeing these arrays should be done through the CustomData API. Work in progress documentation on this is here: http://mediawiki.blender.org/index.php/BlenderDev/BlenderArchitecture/CustomData Replaced TFace by MTFace: This is the same struct, except that it does not contain color, that now always stays separated in MCol. This was not a good design decision to begin with, and it is needed for adding multiple color layers later. Note that this does mean older Blender versions will not be able to read UV coordinates from the next release, due to an SDNA limitation. Removed DispListMesh: This now fully replaced by DerivedMesh. To provide access to arrays of vertices, edges and faces, like DispListMesh does. The semantics of the DerivedMesh.getVertArray() and similar functions were changed to return a pointer to an array if one exists, or otherwise allocate a temporary one. On releasing the DerivedMesh, this temporary array will be removed automatically. Removed ssDM and meshDM DerivedMesh backends: The ssDM backend was for DispListMesh, so that became obsolete automatically. The meshDM backend was replaced by the custom data backend, that now figures out which layers need to be modified, and only duplicates those. This changes code in many places, and overall removes 2514 lines of code. So, there's a good chance this might break some stuff, although I've been testing it for a few days now. The good news is, adding multiple color and uv layers should now become easy.
2006-11-20 04:28:02 +00:00
style cleanup: also fix for building ghost test and fix double free in one of the tests
2012-06-17 09:58:26 +00:00
(*alledge) = medge = MEM_callocN(sizeof(MEdge) * final, "BKE_mesh_make_edges mdge");
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
(*_totedge) = final;
Constructive modifiers for curves and surfaces Used approach with creating DerivedMesh for curves whet they've got such modifiers. Available modifiers are: array, edge split, mirror, solidify, subsurf.
2010-03-05 16:47:52 +00:00
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
for (a = totedge, ed = edsort; a > 1; a--, ed++) {
Quite a large one this time... but now we have: Edges in Mesh - adds automatic when you use creases. For other situations; call the void make_edges(Mesh *me) in mesh.c. Of course, once in editmode the edges are automatically recreated. - in F9 buttons you can add/remove edges too - both for Mesh and DisplistMesh, so it speeds up drawing quite some in wireframe - render for edges can't work... edges have no material nor tface nor col.. so here still the faces are rendered in wire Creases in Subsurf - based on the code by Chris McFarlen - main changes is that now edges are used, saving quite some data in file - use SHIFT+E in editmode to set edges-sharpness. values go from 0-1 - in F9 buttons you can set draw-crease mode. It draws now blended from wire color to edge-select color (as provided in Theme) Known issue: setting sharpness on 1 cube (subdiv 2) gives weird results with some values... Chris, can you check? Further; code cleanups, changing 0 in NULL when needed, no warnings, etc etc
2004-07-08 20:38:27 +00:00
/* edge is unique when it differs from next edge, or is last */
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
if (ed->v1 != (ed + 1)->v1 || ed->v2 != (ed + 1)->v2) {
medge->v1 = ed->v1;
medge->v2 = ed->v2;
if (old == 0 || ed->is_draw) medge->flag = ME_EDGEDRAW | ME_EDGERENDER;
if (ed->is_loose) medge->flag |= ME_LOOSEEDGE;
trick to give correct normals for cyclic curves used with the screw modifier.
2010-03-30 22:43:43 +00:00
/* order is swapped so extruding this edge as a surface wont flip face normals
* with cyclic curves */
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
if (ed->v1 + 1 != ed->v2) {
remove unneeded casts from 'unsigned int' to 'int'
2011-12-27 03:54:23 +00:00
SWAP(unsigned int, medge->v1, medge->v2);
trick to give correct normals for cyclic curves used with the screw modifier.
2010-03-30 22:43:43 +00:00
}
Quite a large one this time... but now we have: Edges in Mesh - adds automatic when you use creases. For other situations; call the void make_edges(Mesh *me) in mesh.c. Of course, once in editmode the edges are automatically recreated. - in F9 buttons you can add/remove edges too - both for Mesh and DisplistMesh, so it speeds up drawing quite some in wireframe - render for edges can't work... edges have no material nor tface nor col.. so here still the faces are rendered in wire Creases in Subsurf - based on the code by Chris McFarlen - main changes is that now edges are used, saving quite some data in file - use SHIFT+E in editmode to set edges-sharpness. values go from 0-1 - in F9 buttons you can set draw-crease mode. It draws now blended from wire color to edge-select color (as provided in Theme) Known issue: setting sharpness on 1 cube (subdiv 2) gives weird results with some values... Chris, can you check? Further; code cleanups, changing 0 in NULL when needed, no warnings, etc etc
2004-07-08 20:38:27 +00:00
medge++;
}
Bugfix #3077 Radiosity didn't add edges block, on "Replace Meshes". Caused wireframe not to draw, but also crashes like for join(). Also: added patch that sets the drawflags in edges derived from the ones set in faces. This ensures the conversion to be done correct. TODO: this edges call also used in other areas in code, that has to be catched and done differently.
2005-09-22 17:00:58 +00:00
else {
/* equal edge, we merge the drawflag */
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
(ed + 1)->is_draw |= ed->is_draw;
Bugfix #3077 Radiosity didn't add edges block, on "Replace Meshes". Caused wireframe not to draw, but also crashes like for join(). Also: added patch that sets the drawflags in edges derived from the ones set in faces. This ensures the conversion to be done correct. TODO: this edges call also used in other areas in code, that has to be catched and done differently.
2005-09-22 17:00:58 +00:00
}
Quite a large one this time... but now we have: Edges in Mesh - adds automatic when you use creases. For other situations; call the void make_edges(Mesh *me) in mesh.c. Of course, once in editmode the edges are automatically recreated. - in F9 buttons you can add/remove edges too - both for Mesh and DisplistMesh, so it speeds up drawing quite some in wireframe - render for edges can't work... edges have no material nor tface nor col.. so here still the faces are rendered in wire Creases in Subsurf - based on the code by Chris McFarlen - main changes is that now edges are used, saving quite some data in file - use SHIFT+E in editmode to set edges-sharpness. values go from 0-1 - in F9 buttons you can set draw-crease mode. It draws now blended from wire color to edge-select color (as provided in Theme) Known issue: setting sharpness on 1 cube (subdiv 2) gives weird results with some values... Chris, can you check? Further; code cleanups, changing 0 in NULL when needed, no warnings, etc etc
2004-07-08 20:38:27 +00:00
}
/* last edge */
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
medge->v1 = ed->v1;
medge->v2 = ed->v2;
medge->flag = ME_EDGEDRAW;
if (ed->is_loose) medge->flag |= ME_LOOSEEDGE;
- readded Subsurf "optimal" edge drawing/rendering - added ME_EDGERENDER flag, barely changes things atm except makes sure plain meshes with FasterDraw/etc set still render all edges. The edge drawing system needs a bit of a revamping - it is a cool feature but could use several improvements: (1) The algorithm could be better in choosing the best edges to draw. (2) The drawflags should interact well with modifiers. It is wierd to have a large grid with a deformer that draws no edges because flags are only calculated based on base mesh. (3) Drawflags should not be destroyed by editmode. Better design would be a "Draw % of edges" button. Of course, could also be the feature is not worth it and we should just drop. Feel free to comment if you have an opinion.
2005-08-12 21:55:50 +00:00
medge->flag |= ME_EDGERENDER;
Quite a large one this time... but now we have: Edges in Mesh - adds automatic when you use creases. For other situations; call the void make_edges(Mesh *me) in mesh.c. Of course, once in editmode the edges are automatically recreated. - in F9 buttons you can add/remove edges too - both for Mesh and DisplistMesh, so it speeds up drawing quite some in wireframe - render for edges can't work... edges have no material nor tface nor col.. so here still the faces are rendered in wire Creases in Subsurf - based on the code by Chris McFarlen - main changes is that now edges are used, saving quite some data in file - use SHIFT+E in editmode to set edges-sharpness. values go from 0-1 - in F9 buttons you can set draw-crease mode. It draws now blended from wire color to edge-select color (as provided in Theme) Known issue: setting sharpness on 1 cube (subdiv 2) gives weird results with some values... Chris, can you check? Further; code cleanups, changing 0 in NULL when needed, no warnings, etc etc
2004-07-08 20:38:27 +00:00
MEM_freeN(edsort);
=bmesh= merge from trunk at r36153
2011-04-15 01:19:13 +00:00
fix own error in recent smoothview cleanup, also correct some cross references in bmesh docs.
2012-08-17 14:43:20 +00:00
/* set edge members of mloops */
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
medge = *alledge;
for (a = 0; a < *_totedge; a++, medge++) {
=bmesh= merge from trunk at r36153
2011-04-15 01:19:13 +00:00
BLI_edgehash_insert(hash, medge->v1, medge->v2, SET_INT_IN_POINTER(a));
}
mpoly = allpoly;
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
for (a = 0; a < totpoly; a++, mpoly++) {
fix for bmesh regression similar to last revision r54920. only effected loading old blend files without edge data.
2013-02-28 04:18:01 +00:00
MLoop *ml, *ml_next;
int i = mpoly->totloop;
ml_next = allloop + mpoly->loopstart; /* first loop */
ml = &ml_next[i - 1]; /* last loop */
while (i-- != 0) {
ml->e = GET_INT_FROM_POINTER(BLI_edgehash_lookup(hash, ml->v, ml_next->v));
ml = ml_next;
ml_next++;
=bmesh= merge from trunk at r36153
2011-04-15 01:19:13 +00:00
}
}
BLI_edgehash_free(hash, NULL);
Constructive modifiers for curves and surfaces Used approach with creating DerivedMesh for curves whet they've got such modifiers. Available modifiers are: array, edge split, mirror, solidify, subsurf.
2010-03-05 16:47:52 +00:00
}
code cleanup: naming - BKE_mesh_*
2012-05-05 21:28:12 +00:00
void BKE_mesh_make_edges(Mesh *me, int old)
Constructive modifiers for curves and surfaces Used approach with creating DerivedMesh for curves whet they've got such modifiers. Available modifiers are: array, edge split, mirror, solidify, subsurf.
2010-03-05 16:47:52 +00:00
{
MEdge *medge;
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
int totedge = 0;
Constructive modifiers for curves and surfaces Used approach with creating DerivedMesh for curves whet they've got such modifiers. Available modifiers are: array, edge split, mirror, solidify, subsurf.
2010-03-05 16:47:52 +00:00
=bmesh= merge from trunk at r36153
2011-04-15 01:19:13 +00:00
make_edges_mdata(me->mvert, me->mface, me->mloop, me->mpoly, me->totvert, me->totface, me->totloop, me->totpoly, old, &medge, &totedge);
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
if (totedge == 0) {
Constructive modifiers for curves and surfaces Used approach with creating DerivedMesh for curves whet they've got such modifiers. Available modifiers are: array, edge split, mirror, solidify, subsurf.
2010-03-05 16:47:52 +00:00
/* flag that mesh has edges */
me->medge = medge;
me->totedge = 0;
return;
}
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
medge = CustomData_add_layer(&me->edata, CD_MEDGE, CD_ASSIGN, medge, totedge);
me->medge = medge;
me->totedge = totedge;
- added mesh_strip_loose_faces, works in conjunction with make_edges to get rid of faces with MFace.v3==0 - change all Mesh's to have ->medge now. This is forced by make_edges on readfile, and in the various exotic important routines, and on conversion back in python. - make python NMesh structure always have medges now (needs testing) - with above two changes it is guarenteed that mf->v3 is never ==0 in main blender code (i.e., all MFace's are actually triangles or quads) and so I went through and removed all the historic tests to deal with MFace.v3==0. Equals lots of deleting, I am in heaven! - removed MEdge edcode flag, no longer needed - added experimental replacement for edge flag system Still are some inconsistencies in FACESELECT mode edge drawing to be ironed out. NOTE: This commit adds an experimental edge flag calc system, based on 10-seconds-of-thought algorithm by yours truly. Would appreciate feedback on how this system works, esp compared to old one and esp on complex or interesting models. To Use: New system is enabled by setting G.rt to a value between 1 and 1000 (Value of 0 uses old system). Value 1000 is reserved for "auto" edge, which is more or less identical to old system but also makes sure that at least 10% of edges are drawn (solves errors for super subdivided meshes). Values between 1 and 999 act as percent (out of 1000) of edges that should be drawn, starting with "most interesting" edges first. Please try it and comment!
2005-08-21 07:19:20 +00:00
code cleanup: naming - BKE_mesh_*
2012-05-05 21:28:12 +00:00
BKE_mesh_strip_loose_faces(me);
Quite a large one this time... but now we have: Edges in Mesh - adds automatic when you use creases. For other situations; call the void make_edges(Mesh *me) in mesh.c. Of course, once in editmode the edges are automatically recreated. - in F9 buttons you can add/remove edges too - both for Mesh and DisplistMesh, so it speeds up drawing quite some in wireframe - render for edges can't work... edges have no material nor tface nor col.. so here still the faces are rendered in wire Creases in Subsurf - based on the code by Chris McFarlen - main changes is that now edges are used, saving quite some data in file - use SHIFT+E in editmode to set edges-sharpness. values go from 0-1 - in F9 buttons you can set draw-crease mode. It draws now blended from wire color to edge-select color (as provided in Theme) Known issue: setting sharpness on 1 cube (subdiv 2) gives weird results with some values... Chris, can you check? Further; code cleanups, changing 0 in NULL when needed, no warnings, etc etc
2004-07-08 20:38:27 +00:00
}
mesh_validate code for bmesh (i.e. polys/loops). Everything seems to work well (many tests making random changes over various meshes went good), but the code is a bit complex and hard to follow, due to the various possibilities of invalid poly/loop combinations… Code also makes more operations than previous tri/quad faces version (hence is a bit slower), but I don’t think we can do otherwise, it’s just the price for bmesh flexibility. ;) Note: added the py script I used to make the tests, under source/tests/...
2012-03-15 20:10:07 +00:00
/* We need to keep this for edge creation (for now?), and some old readfile code... */
code cleanup: naming - BKE_mesh_*
2012-05-05 21:28:12 +00:00
void BKE_mesh_strip_loose_faces(Mesh *me)
- added mesh_strip_loose_faces, works in conjunction with make_edges to get rid of faces with MFace.v3==0 - change all Mesh's to have ->medge now. This is forced by make_edges on readfile, and in the various exotic important routines, and on conversion back in python. - make python NMesh structure always have medges now (needs testing) - with above two changes it is guarenteed that mf->v3 is never ==0 in main blender code (i.e., all MFace's are actually triangles or quads) and so I went through and removed all the historic tests to deal with MFace.v3==0. Equals lots of deleting, I am in heaven! - removed MEdge edcode flag, no longer needed - added experimental replacement for edge flag system Still are some inconsistencies in FACESELECT mode edge drawing to be ironed out. NOTE: This commit adds an experimental edge flag calc system, based on 10-seconds-of-thought algorithm by yours truly. Would appreciate feedback on how this system works, esp compared to old one and esp on complex or interesting models. To Use: New system is enabled by setting G.rt to a value between 1 and 1000 (Value of 0 uses old system). Value 1000 is reserved for "auto" edge, which is more or less identical to old system but also makes sure that at least 10% of edges are drawn (solves errors for super subdivided meshes). Values between 1 and 999 act as percent (out of 1000) of edges that should be drawn, starting with "most interesting" edges first. Please try it and comment!
2005-08-21 07:19:20 +00:00
{
mesh_validate code for bmesh (i.e. polys/loops). Everything seems to work well (many tests making random changes over various meshes went good), but the code is a bit complex and hard to follow, due to the various possibilities of invalid poly/loop combinations… Code also makes more operations than previous tri/quad faces version (hence is a bit slower), but I don’t think we can do otherwise, it’s just the price for bmesh flexibility. ;) Note: added the py script I used to make the tests, under source/tests/...
2012-03-15 20:10:07 +00:00
MFace *f;
int a, b;
- added mesh_strip_loose_faces, works in conjunction with make_edges to get rid of faces with MFace.v3==0 - change all Mesh's to have ->medge now. This is forced by make_edges on readfile, and in the various exotic important routines, and on conversion back in python. - make python NMesh structure always have medges now (needs testing) - with above two changes it is guarenteed that mf->v3 is never ==0 in main blender code (i.e., all MFace's are actually triangles or quads) and so I went through and removed all the historic tests to deal with MFace.v3==0. Equals lots of deleting, I am in heaven! - removed MEdge edcode flag, no longer needed - added experimental replacement for edge flag system Still are some inconsistencies in FACESELECT mode edge drawing to be ironed out. NOTE: This commit adds an experimental edge flag calc system, based on 10-seconds-of-thought algorithm by yours truly. Would appreciate feedback on how this system works, esp compared to old one and esp on complex or interesting models. To Use: New system is enabled by setting G.rt to a value between 1 and 1000 (Value of 0 uses old system). Value 1000 is reserved for "auto" edge, which is more or less identical to old system but also makes sure that at least 10% of edges are drawn (solves errors for super subdivided meshes). Values between 1 and 999 act as percent (out of 1000) of edges that should be drawn, starting with "most interesting" edges first. Please try it and comment!
2005-08-21 07:19:20 +00:00
mesh_validate code for bmesh (i.e. polys/loops). Everything seems to work well (many tests making random changes over various meshes went good), but the code is a bit complex and hard to follow, due to the various possibilities of invalid poly/loop combinations… Code also makes more operations than previous tri/quad faces version (hence is a bit slower), but I don’t think we can do otherwise, it’s just the price for bmesh flexibility. ;) Note: added the py script I used to make the tests, under source/tests/...
2012-03-15 20:10:07 +00:00
for (a = b = 0, f = me->mface; a < me->totface; a++, f++) {
if (f->v3) {
if (a != b) {
memcpy(&me->mface[b], f, sizeof(me->mface[b]));
Added custom vertex/edge/face data for meshes: All data layers, including MVert/MEdge/MFace, are now managed as custom data layers. The pointers like Mesh.mvert, Mesh.dvert or Mesh.mcol are still used of course, but allocating, copying or freeing these arrays should be done through the CustomData API. Work in progress documentation on this is here: http://mediawiki.blender.org/index.php/BlenderDev/BlenderArchitecture/CustomData Replaced TFace by MTFace: This is the same struct, except that it does not contain color, that now always stays separated in MCol. This was not a good design decision to begin with, and it is needed for adding multiple color layers later. Note that this does mean older Blender versions will not be able to read UV coordinates from the next release, due to an SDNA limitation. Removed DispListMesh: This now fully replaced by DerivedMesh. To provide access to arrays of vertices, edges and faces, like DispListMesh does. The semantics of the DerivedMesh.getVertArray() and similar functions were changed to return a pointer to an array if one exists, or otherwise allocate a temporary one. On releasing the DerivedMesh, this temporary array will be removed automatically. Removed ssDM and meshDM DerivedMesh backends: The ssDM backend was for DispListMesh, so that became obsolete automatically. The meshDM backend was replaced by the custom data backend, that now figures out which layers need to be modified, and only duplicates those. This changes code in many places, and overall removes 2514 lines of code. So, there's a good chance this might break some stuff, although I've been testing it for a few days now. The good news is, adding multiple color and uv layers should now become easy.
2006-11-20 04:28:02 +00:00
CustomData_copy_data(&me->fdata, &me->fdata, a, b, 1);
- added mesh_strip_loose_faces, works in conjunction with make_edges to get rid of faces with MFace.v3==0 - change all Mesh's to have ->medge now. This is forced by make_edges on readfile, and in the various exotic important routines, and on conversion back in python. - make python NMesh structure always have medges now (needs testing) - with above two changes it is guarenteed that mf->v3 is never ==0 in main blender code (i.e., all MFace's are actually triangles or quads) and so I went through and removed all the historic tests to deal with MFace.v3==0. Equals lots of deleting, I am in heaven! - removed MEdge edcode flag, no longer needed - added experimental replacement for edge flag system Still are some inconsistencies in FACESELECT mode edge drawing to be ironed out. NOTE: This commit adds an experimental edge flag calc system, based on 10-seconds-of-thought algorithm by yours truly. Would appreciate feedback on how this system works, esp compared to old one and esp on complex or interesting models. To Use: New system is enabled by setting G.rt to a value between 1 and 1000 (Value of 0 uses old system). Value 1000 is reserved for "auto" edge, which is more or less identical to old system but also makes sure that at least 10% of edges are drawn (solves errors for super subdivided meshes). Values between 1 and 999 act as percent (out of 1000) of edges that should be drawn, starting with "most interesting" edges first. Please try it and comment!
2005-08-21 07:19:20 +00:00
}
b++;
}
}
mesh_validate code for bmesh (i.e. polys/loops). Everything seems to work well (many tests making random changes over various meshes went good), but the code is a bit complex and hard to follow, due to the various possibilities of invalid poly/loop combinations… Code also makes more operations than previous tri/quad faces version (hence is a bit slower), but I don’t think we can do otherwise, it’s just the price for bmesh flexibility. ;) Note: added the py script I used to make the tests, under source/tests/...
2012-03-15 20:10:07 +00:00
if (a != b) {
CustomData_free_elem(&me->fdata, b, a - b);
me->totface = b;
}
- added mesh_strip_loose_faces, works in conjunction with make_edges to get rid of faces with MFace.v3==0 - change all Mesh's to have ->medge now. This is forced by make_edges on readfile, and in the various exotic important routines, and on conversion back in python. - make python NMesh structure always have medges now (needs testing) - with above two changes it is guarenteed that mf->v3 is never ==0 in main blender code (i.e., all MFace's are actually triangles or quads) and so I went through and removed all the historic tests to deal with MFace.v3==0. Equals lots of deleting, I am in heaven! - removed MEdge edcode flag, no longer needed - added experimental replacement for edge flag system Still are some inconsistencies in FACESELECT mode edge drawing to be ironed out. NOTE: This commit adds an experimental edge flag calc system, based on 10-seconds-of-thought algorithm by yours truly. Would appreciate feedback on how this system works, esp compared to old one and esp on complex or interesting models. To Use: New system is enabled by setting G.rt to a value between 1 and 1000 (Value of 0 uses old system). Value 1000 is reserved for "auto" edge, which is more or less identical to old system but also makes sure that at least 10% of edges are drawn (solves errors for super subdivided meshes). Values between 1 and 999 act as percent (out of 1000) of edges that should be drawn, starting with "most interesting" edges first. Please try it and comment!
2005-08-21 07:19:20 +00:00
}
Quite a large one this time... but now we have: Edges in Mesh - adds automatic when you use creases. For other situations; call the void make_edges(Mesh *me) in mesh.c. Of course, once in editmode the edges are automatically recreated. - in F9 buttons you can add/remove edges too - both for Mesh and DisplistMesh, so it speeds up drawing quite some in wireframe - render for edges can't work... edges have no material nor tface nor col.. so here still the faces are rendered in wire Creases in Subsurf - based on the code by Chris McFarlen - main changes is that now edges are used, saving quite some data in file - use SHIFT+E in editmode to set edges-sharpness. values go from 0-1 - in F9 buttons you can set draw-crease mode. It draws now blended from wire color to edge-select color (as provided in Theme) Known issue: setting sharpness on 1 cube (subdiv 2) gives weird results with some values... Chris, can you check? Further; code cleanups, changing 0 in NULL when needed, no warnings, etc etc
2004-07-08 20:38:27 +00:00
mesh_validate code for bmesh (i.e. polys/loops). Everything seems to work well (many tests making random changes over various meshes went good), but the code is a bit complex and hard to follow, due to the various possibilities of invalid poly/loop combinations… Code also makes more operations than previous tri/quad faces version (hence is a bit slower), but I don’t think we can do otherwise, it’s just the price for bmesh flexibility. ;) Note: added the py script I used to make the tests, under source/tests/...
2012-03-15 20:10:07 +00:00
/* Works on both loops and polys! */
/* Note: It won't try to guess which loops of an invalid poly to remove!
* this is the work of the caller, to mark those loops...
* See e.g. BKE_mesh_validate_arrays(). */
code cleanup: naming - BKE_mesh_*
2012-05-05 21:28:12 +00:00
void BKE_mesh_strip_loose_polysloops(Mesh *me)
BKE_mesh_validate() now corrects invalid meshes (optionally), added access for python so it can correct for bad imported geometry - mesh.validate().
2011-02-09 15:13:20 +00:00
{
mesh_validate code for bmesh (i.e. polys/loops). Everything seems to work well (many tests making random changes over various meshes went good), but the code is a bit complex and hard to follow, due to the various possibilities of invalid poly/loop combinations… Code also makes more operations than previous tri/quad faces version (hence is a bit slower), but I don’t think we can do otherwise, it’s just the price for bmesh flexibility. ;) Note: added the py script I used to make the tests, under source/tests/...
2012-03-15 20:10:07 +00:00
MPoly *p;
MLoop *l;
int a, b;
/* New loops idx! */
- fix memory leak in mesh_strip_loose_polysloops(), occurred during 3ds import. - updating normals in py/api's mesh.transform() wasn't working and gave annoying print, disable this, script authors can call calc_normals explicitly if they need.
2012-04-22 00:27:38 +00:00
int *new_idx = MEM_mallocN(sizeof(int) * me->totloop, __func__);
mesh_validate code for bmesh (i.e. polys/loops). Everything seems to work well (many tests making random changes over various meshes went good), but the code is a bit complex and hard to follow, due to the various possibilities of invalid poly/loop combinations… Code also makes more operations than previous tri/quad faces version (hence is a bit slower), but I don’t think we can do otherwise, it’s just the price for bmesh flexibility. ;) Note: added the py script I used to make the tests, under source/tests/...
2012-03-15 20:10:07 +00:00
for (a = b = 0, p = me->mpoly; a < me->totpoly; a++, p++) {
int invalid = FALSE;
int i = p->loopstart;
int stop = i + p->totloop;
if (stop > me->totloop || stop < i) {
invalid = TRUE;
}
else {
l = &me->mloop[i];
i = stop - i;
/* If one of the poly's loops is invalid, the whole poly is invalid! */
for (; i--; l++) {
if (l->e == INVALID_LOOP_EDGE_MARKER) {
invalid = TRUE;
break;
}
}
}
if (p->totloop >= 3 && !invalid) {
if (a != b) {
memcpy(&me->mpoly[b], p, sizeof(me->mpoly[b]));
CustomData_copy_data(&me->pdata, &me->pdata, a, b, 1);
}
b++;
}
}
if (a != b) {
CustomData_free_elem(&me->pdata, b, a - b);
me->totpoly = b;
}
BKE_mesh_validate() now corrects invalid meshes (optionally), added access for python so it can correct for bad imported geometry - mesh.validate().
2011-02-09 15:13:20 +00:00
mesh_validate code for bmesh (i.e. polys/loops). Everything seems to work well (many tests making random changes over various meshes went good), but the code is a bit complex and hard to follow, due to the various possibilities of invalid poly/loop combinations… Code also makes more operations than previous tri/quad faces version (hence is a bit slower), but I don’t think we can do otherwise, it’s just the price for bmesh flexibility. ;) Note: added the py script I used to make the tests, under source/tests/...
2012-03-15 20:10:07 +00:00
/* And now, get rid of invalid loops. */
for (a = b = 0, l = me->mloop; a < me->totloop; a++, l++) {
if (l->e != INVALID_LOOP_EDGE_MARKER) {
if (a != b) {
memcpy(&me->mloop[b], l, sizeof(me->mloop[b]));
CustomData_copy_data(&me->ldata, &me->ldata, a, b, 1);
}
new_idx[a] = b;
b++;
}
else {
code cleanup: typos and set gcc attributes for string formatting.
2012-04-25 06:06:40 +00:00
/* XXX Theoretically, we should be able to not do this, as no remaining poly
mesh_validate code for bmesh (i.e. polys/loops). Everything seems to work well (many tests making random changes over various meshes went good), but the code is a bit complex and hard to follow, due to the various possibilities of invalid poly/loop combinations… Code also makes more operations than previous tri/quad faces version (hence is a bit slower), but I don’t think we can do otherwise, it’s just the price for bmesh flexibility. ;) Note: added the py script I used to make the tests, under source/tests/...
2012-03-15 20:10:07 +00:00
* should use any stripped loop. But for security's sake... */
new_idx[a] = -a;
}
}
if (a != b) {
CustomData_free_elem(&me->ldata, b, a - b);
me->totloop = b;
}
/* And now, update polys' start loop index. */
/* Note: At this point, there should never be any poly using a striped loop! */
for (a = 0, p = me->mpoly; a < me->totpoly; a++, p++) {
p->loopstart = new_idx[p->loopstart];
}
- fix memory leak in mesh_strip_loose_polysloops(), occurred during 3ds import. - updating normals in py/api's mesh.transform() wasn't working and gave annoying print, disable this, script authors can call calc_normals explicitly if they need.
2012-04-22 00:27:38 +00:00
MEM_freeN(new_idx);
mesh_validate code for bmesh (i.e. polys/loops). Everything seems to work well (many tests making random changes over various meshes went good), but the code is a bit complex and hard to follow, due to the various possibilities of invalid poly/loop combinations… Code also makes more operations than previous tri/quad faces version (hence is a bit slower), but I don’t think we can do otherwise, it’s just the price for bmesh flexibility. ;) Note: added the py script I used to make the tests, under source/tests/...
2012-03-15 20:10:07 +00:00
}
code cleanup: naming - BKE_mesh_*
2012-05-05 21:28:12 +00:00
void BKE_mesh_strip_loose_edges(Mesh *me)
mesh_validate code for bmesh (i.e. polys/loops). Everything seems to work well (many tests making random changes over various meshes went good), but the code is a bit complex and hard to follow, due to the various possibilities of invalid poly/loop combinations… Code also makes more operations than previous tri/quad faces version (hence is a bit slower), but I don’t think we can do otherwise, it’s just the price for bmesh flexibility. ;) Note: added the py script I used to make the tests, under source/tests/...
2012-03-15 20:10:07 +00:00
{
MEdge *e;
MLoop *l;
int a, b;
fix for bevel modifier creating invalid geometry - simply tell BM_face_split() to check for doubles.
2012-04-26 15:38:16 +00:00
unsigned int *new_idx = MEM_mallocN(sizeof(int) * me->totedge, __func__);
mesh_validate code for bmesh (i.e. polys/loops). Everything seems to work well (many tests making random changes over various meshes went good), but the code is a bit complex and hard to follow, due to the various possibilities of invalid poly/loop combinations… Code also makes more operations than previous tri/quad faces version (hence is a bit slower), but I don’t think we can do otherwise, it’s just the price for bmesh flexibility. ;) Note: added the py script I used to make the tests, under source/tests/...
2012-03-15 20:10:07 +00:00
for (a = b = 0, e = me->medge; a < me->totedge; a++, e++) {
if (e->v1 != e->v2) {
if (a != b) {
memcpy(&me->medge[b], e, sizeof(me->medge[b]));
BKE_mesh_validate() now corrects invalid meshes (optionally), added access for python so it can correct for bad imported geometry - mesh.validate().
2011-02-09 15:13:20 +00:00
CustomData_copy_data(&me->edata, &me->edata, a, b, 1);
}
mesh_validate code for bmesh (i.e. polys/loops). Everything seems to work well (many tests making random changes over various meshes went good), but the code is a bit complex and hard to follow, due to the various possibilities of invalid poly/loop combinations… Code also makes more operations than previous tri/quad faces version (hence is a bit slower), but I don’t think we can do otherwise, it’s just the price for bmesh flexibility. ;) Note: added the py script I used to make the tests, under source/tests/...
2012-03-15 20:10:07 +00:00
new_idx[a] = b;
BKE_mesh_validate() now corrects invalid meshes (optionally), added access for python so it can correct for bad imported geometry - mesh.validate().
2011-02-09 15:13:20 +00:00
b++;
}
mesh_validate code for bmesh (i.e. polys/loops). Everything seems to work well (many tests making random changes over various meshes went good), but the code is a bit complex and hard to follow, due to the various possibilities of invalid poly/loop combinations… Code also makes more operations than previous tri/quad faces version (hence is a bit slower), but I don’t think we can do otherwise, it’s just the price for bmesh flexibility. ;) Note: added the py script I used to make the tests, under source/tests/...
2012-03-15 20:10:07 +00:00
else {
new_idx[a] = INVALID_LOOP_EDGE_MARKER;
}
}
if (a != b) {
CustomData_free_elem(&me->edata, b, a - b);
me->totedge = b;
}
/* And now, update loops' edge indices. */
/* XXX We hope no loop was pointing to a striped edge!
* Else, its e will be set to INVALID_LOOP_EDGE_MARKER :/ */
for (a = 0, l = me->mloop; a < me->totloop; a++, l++) {
l->e = new_idx[l->e];
BKE_mesh_validate() now corrects invalid meshes (optionally), added access for python so it can correct for bad imported geometry - mesh.validate().
2011-02-09 15:13:20 +00:00
}
fix memory leak in validating mesh and remove unneeded knife operator settings store.
2012-04-26 15:20:26 +00:00
MEM_freeN(new_idx);
BKE_mesh_validate() now corrects invalid meshes (optionally), added access for python so it can correct for bad imported geometry - mesh.validate().
2011-02-09 15:13:20 +00:00
}
code cleanup: naming - BKE_mesh_*
2012-05-05 21:28:12 +00:00
void BKE_mesh_from_metaball(ListBase *lb, Mesh *me)
Initial revision
2002-10-12 11:37:38 +00:00
{
DispList *dl;
MVert *mvert;
Port mball_to_mesh to use polys.
2012-03-20 14:23:22 +00:00
MLoop *mloop, *allloop;
MPoly *mpoly;
Initial revision
2002-10-12 11:37:38 +00:00
float *nors, *verts;
int a, *index;
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
dl = lb->first;
if (dl == NULL) return;
if (dl->type == DL_INDEX4) {
mvert = CustomData_add_layer(&me->vdata, CD_MVERT, CD_CALLOC, NULL, dl->nr);
allloop = mloop = CustomData_add_layer(&me->ldata, CD_MLOOP, CD_CALLOC, NULL, dl->parts * 4);
mpoly = CustomData_add_layer(&me->pdata, CD_MPOLY, CD_CALLOC, NULL, dl->parts);
me->mvert = mvert;
me->mloop = mloop;
me->mpoly = mpoly;
me->totvert = dl->nr;
me->totpoly = dl->parts;
a = dl->nr;
nors = dl->nors;
verts = dl->verts;
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
while (a--) {
Various typo cleanups, remove unnecessary code etc, found during recent work and separated to a cleanup change
2011-11-20 16:21:13 +00:00
copy_v3_v3(mvert->co, verts);
- quiet new warnings with gcc 4.6 - use BLI math funcs for normal float/short conversion. - correct some un-intentional float/double promotions.
2011-03-28 02:34:55 +00:00
normal_float_to_short_v3(mvert->no, nors);
Initial revision
2002-10-12 11:37:38 +00:00
mvert++;
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
nors += 3;
verts += 3;
Initial revision
2002-10-12 11:37:38 +00:00
}
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
a = dl->parts;
index = dl->index;
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
while (a--) {
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
int count = index[2] != index[3] ? 4 : 3;
Fix for bug #5288: Converting meta objects crashed, caused by new way of storing quads in DispList for array drawing.
2006-11-23 00:26:39 +00:00
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
mloop[0].v = index[0];
mloop[1].v = index[1];
mloop[2].v = index[2];
Port mball_to_mesh to use polys.
2012-03-20 14:23:22 +00:00
if (count == 4)
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
mloop[3].v = index[3];
Fix for bug #5288: Converting meta objects crashed, caused by new way of storing quads in DispList for array drawing.
2006-11-23 00:26:39 +00:00
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
mpoly->totloop = count;
mpoly->loopstart = (int)(mloop - allloop);
mpoly->flag = ME_SMOOTH;
Port mball_to_mesh to use polys.
2012-03-20 14:23:22 +00:00
mpoly++;
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
mloop += count;
me->totloop += count;
index += 4;
Initial revision
2002-10-12 11:37:38 +00:00
}
Added custom vertex/edge/face data for meshes: All data layers, including MVert/MEdge/MFace, are now managed as custom data layers. The pointers like Mesh.mvert, Mesh.dvert or Mesh.mcol are still used of course, but allocating, copying or freeing these arrays should be done through the CustomData API. Work in progress documentation on this is here: http://mediawiki.blender.org/index.php/BlenderDev/BlenderArchitecture/CustomData Replaced TFace by MTFace: This is the same struct, except that it does not contain color, that now always stays separated in MCol. This was not a good design decision to begin with, and it is needed for adding multiple color layers later. Note that this does mean older Blender versions will not be able to read UV coordinates from the next release, due to an SDNA limitation. Removed DispListMesh: This now fully replaced by DerivedMesh. To provide access to arrays of vertices, edges and faces, like DispListMesh does. The semantics of the DerivedMesh.getVertArray() and similar functions were changed to return a pointer to an array if one exists, or otherwise allocate a temporary one. On releasing the DerivedMesh, this temporary array will be removed automatically. Removed ssDM and meshDM DerivedMesh backends: The ssDM backend was for DispListMesh, so that became obsolete automatically. The meshDM backend was replaced by the custom data backend, that now figures out which layers need to be modified, and only duplicates those. This changes code in many places, and overall removes 2514 lines of code. So, there's a good chance this might break some stuff, although I've been testing it for a few days now. The good news is, adding multiple color and uv layers should now become easy.
2006-11-20 04:28:02 +00:00
code cleanup: name mesh functions more consistently, also use bools for mesh args.
2013-03-17 19:55:10 +00:00
BKE_mesh_update_customdata_pointers(me, true);
remove unneeded re-tessellation converting metaball to mesh.
2012-01-24 00:52:26 +00:00
code cleanup: naming - BKE_mesh_*
2012-05-05 21:28:12 +00:00
BKE_mesh_calc_normals(me->mvert, me->totvert, me->mloop, me->mpoly, me->totloop, me->totpoly, NULL);
Add CD_POLYINDEX layer to reduce need for retesselations
2011-11-13 15:13:59 +00:00
object converting curve/mball to a mesh would give invalid selection state (edges selected but nothing else). add arg to BKE_mesh_calc_edges() so selecting newly created edges is optional.
2013-03-16 01:19:03 +00:00
BKE_mesh_calc_edges(me, true, false);
=bmesh= merge from trunk at r36153
2011-04-15 01:19:13 +00:00
}
Initial revision
2002-10-12 11:37:38 +00:00
}
fix [#35026] Curve build modifier
2013-04-22 12:00:37 +00:00
/**
* Specialized function to use when we _know_ existing edges don't overlap with poly edges.
*/
static void make_edges_mdata_extend(MEdge **r_alledge, int *r_totedge,
const MPoly *mpoly, MLoop *mloop,
const int totpoly)
{
int totedge = *r_totedge;
int totedge_new;
EdgeHash *eh;
const MPoly *mp;
int i;
eh = BLI_edgehash_new();
for (i = 0, mp = mpoly; i < totpoly; i++, mp++) {
BKE_mesh_poly_edgehash_insert(eh, mp, mloop + mp->loopstart);
}
totedge_new = BLI_edgehash_size(eh);
#ifdef DEBUG
/* ensure that theres no overlap! */
if (totedge_new) {
MEdge *medge = *r_alledge;
for (i = 0; i < totedge; i++, medge++) {
BLI_assert(BLI_edgehash_haskey(eh, medge->v1, medge->v2) == false);
}
}
#endif
if (totedge_new) {
EdgeHashIterator *ehi;
MEdge *medge;
unsigned int e_index = totedge;
*r_alledge = medge = (*r_alledge ? MEM_reallocN(*r_alledge, sizeof(MEdge) * (totedge + totedge_new)) :
MEM_callocN(sizeof(MEdge) * totedge_new, __func__));
medge += totedge;
totedge += totedge_new;
/* --- */
for (ehi = BLI_edgehashIterator_new(eh);
BLI_edgehashIterator_isDone(ehi) == FALSE;
BLI_edgehashIterator_step(ehi), ++medge, e_index++)
{
BLI_edgehashIterator_getKey(ehi, &medge->v1, &medge->v2);
BLI_edgehashIterator_setValue(ehi, SET_UINT_IN_POINTER(e_index));
medge->crease = medge->bweight = 0;
medge->flag = ME_EDGEDRAW | ME_EDGERENDER;
}
BLI_edgehashIterator_free(ehi);
*r_totedge = totedge;
for (i = 0, mp = mpoly; i < totpoly; i++, mp++) {
MLoop *l = &mloop[mp->loopstart];
MLoop *l_prev = (l + (mp->totloop - 1));
int j;
for (j = 0; j < mp->totloop; j++, l++) {
/* lookup hashed edge index */
l_prev->e = GET_UINT_FROM_POINTER(BLI_edgehash_lookup(eh, l_prev->v, l->v));
l_prev = l;
}
}
}
BLI_edgehash_free(eh, NULL);
}
Constructive modifiers for curves and surfaces Used approach with creating DerivedMesh for curves whet they've got such modifiers. Available modifiers are: array, edge split, mirror, solidify, subsurf.
2010-03-05 16:47:52 +00:00
/* Initialize mverts, medges and, faces for converting nurbs to mesh and derived mesh */
/* return non-zero on error */
code cleanup: naming - BKE_mesh_*
2012-05-05 21:28:12 +00:00
int BKE_mesh_nurbs_to_mdata(Object *ob, MVert **allvert, int *totvert,
MEdge **alledge, int *totedge, MLoop **allloop, MPoly **allpoly,
int *totloop, int *totpoly)
- Fixed trouble with rendering curves with disabled modifiers, which are disabled for realtime displaying but enabled for rendering. - Calculate tex space for curves before modifiers applying.
2010-03-08 13:49:13 +00:00
{
Fix #31021: Render settings are not taken into account for curves Refactored code a bit to make naming a bit more clear and added a function to create mesh from given display list rather than from object's displist. Tested using plain curves (which doesn't imply using derived meshes) and curves with constructive modifiers (which are using derived meshed).
2012-07-14 17:30:49 +00:00
return BKE_mesh_nurbs_displist_to_mdata(ob, &ob->disp,
code cleanup: naming - BKE_mesh_*
2012-05-05 21:28:12 +00:00
allvert, totvert,
alledge, totedge,
Fix #33752: UV Orco coordinates were wrong for Cycles (and other external render engines). Replaced generating orco_index by filling the UV loop data directly which is easier and all that needed to be done anyway.
2013-01-10 17:37:17 +00:00
allloop, allpoly, NULL,
totloop, totpoly);
- Fixed trouble with rendering curves with disabled modifiers, which are disabled for realtime displaying but enabled for rendering. - Calculate tex space for curves before modifiers applying.
2010-03-08 13:49:13 +00:00
}
fix for crash converting a curve into a mesh (Alt+C conversion), this would crash on entering editmode. now curves convert to polygons directly, rather then faces, and polygons after.
2012-02-03 04:58:55 +00:00
/* BMESH: this doesn't calculate all edges from polygons,
* only free standing edges are calculated */
- Fixed trouble with rendering curves with disabled modifiers, which are disabled for realtime displaying but enabled for rendering. - Calculate tex space for curves before modifiers applying.
2010-03-08 13:49:13 +00:00
/* Initialize mverts, medges and, faces for converting nurbs to mesh and derived mesh */
support for curve orco uv's as UV's in cycles. ideally these would be used as generated coordinates, but this is tricly because cycles calculates its own orco's and doesnt know about curve settings.
2012-07-31 13:43:26 +00:00
/* use specified dispbase */
Fix #31021: Render settings are not taken into account for curves Refactored code a bit to make naming a bit more clear and added a function to create mesh from given display list rather than from object's displist. Tested using plain curves (which doesn't imply using derived meshes) and curves with constructive modifiers (which are using derived meshed).
2012-07-14 17:30:49 +00:00
int BKE_mesh_nurbs_displist_to_mdata(Object *ob, ListBase *dispbase,
code cleanup: naming - BKE_mesh_*
2012-05-05 21:28:12 +00:00
MVert **allvert, int *_totvert,
MEdge **alledge, int *_totedge,
MLoop **allloop, MPoly **allpoly,
Fix #33752: UV Orco coordinates were wrong for Cycles (and other external render engines). Replaced generating orco_index by filling the UV loop data directly which is easier and all that needed to be done anyway.
2013-01-10 17:37:17 +00:00
MLoopUV **alluv,
int *_totloop, int *_totpoly)
Initial revision
2002-10-12 11:37:38 +00:00
{
code cleanup: BKE_mesh_nurbs_displist_to_mdata(), use const bool for 'conv_polys'
2013-05-08 12:53:52 +00:00
Curve *cu = ob->data;
Initial revision
2002-10-12 11:37:38 +00:00
DispList *dl;
MVert *mvert;
=bmesh= merge from trunk at r36153
2011-04-15 01:19:13 +00:00
MPoly *mpoly;
MLoop *mloop;
Fix #33752: UV Orco coordinates were wrong for Cycles (and other external render engines). Replaced generating orco_index by filling the UV loop data directly which is easier and all that needed to be done anyway.
2013-01-10 17:37:17 +00:00
MLoopUV *mloopuv = NULL;
fix for crash converting a curve into a mesh (Alt+C conversion), this would crash on entering editmode. now curves convert to polygons directly, rather then faces, and polygons after.
2012-02-03 04:58:55 +00:00
MEdge *medge;
Initial revision
2002-10-12 11:37:38 +00:00
float *data;
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
int a, b, ofs, vertcount, startvert, totvert = 0, totedge = 0, totloop = 0, totvlak = 0;
Initial revision
2002-10-12 11:37:38 +00:00
int p1, p2, p3, p4, *index;
code cleanup: BKE_mesh_nurbs_displist_to_mdata(), use const bool for 'conv_polys'
2013-05-08 12:53:52 +00:00
const bool conv_polys = ((cu->flag & CU_3D) || /* 2d polys are filled with DL_INDEX3 displists */
(ob->type == OB_SURF)); /* surf polys are never filled */
Fix bug with unneeded outline for filled 2d curves when converted to mesh - Revert of my old change in curve->mesh conversion - Do not ignore DL_POLYs for surfaces -- they will never be filled, but ignore them for 2d curves -- they'll be filled with INDEX3 parts.
2010-11-06 06:22:25 +00:00
The last of the blenkernel files with translated comments
2003-04-26 13:07:59 +00:00
/* count */
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
dl = dispbase->first;
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
while (dl) {
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
if (dl->type == DL_SEGM) {
totvert += dl->parts * dl->nr;
totedge += dl->parts * (dl->nr - 1);
Initial revision
2002-10-12 11:37:38 +00:00
}
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
else if (dl->type == DL_POLY) {
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
if (conv_polys) {
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
totvert += dl->parts * dl->nr;
totedge += dl->parts * dl->nr;
Fix bug with unneeded outline for filled 2d curves when converted to mesh - Revert of my old change in curve->mesh conversion - Do not ignore DL_POLYs for surfaces -- they will never be filled, but ignore them for 2d curves -- they'll be filled with INDEX3 parts.
2010-11-06 06:22:25 +00:00
}
Initial revision
2002-10-12 11:37:38 +00:00
}
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
else if (dl->type == DL_SURF) {
fix for crash converting a curve into a mesh (Alt+C conversion), this would crash on entering editmode. now curves convert to polygons directly, rather then faces, and polygons after.
2012-02-03 04:58:55 +00:00
int tot;
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
totvert += dl->parts * dl->nr;
tot = (dl->parts - 1 + ((dl->flag & DL_CYCL_V) == 2)) * (dl->nr - 1 + (dl->flag & DL_CYCL_U));
fix for crash converting a curve into a mesh (Alt+C conversion), this would crash on entering editmode. now curves convert to polygons directly, rather then faces, and polygons after.
2012-02-03 04:58:55 +00:00
totvlak += tot;
totloop += tot * 4;
Initial revision
2002-10-12 11:37:38 +00:00
}
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
else if (dl->type == DL_INDEX3) {
fix for crash converting a curve into a mesh (Alt+C conversion), this would crash on entering editmode. now curves convert to polygons directly, rather then faces, and polygons after.
2012-02-03 04:58:55 +00:00
int tot;
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
totvert += dl->nr;
fix for crash converting a curve into a mesh (Alt+C conversion), this would crash on entering editmode. now curves convert to polygons directly, rather then faces, and polygons after.
2012-02-03 04:58:55 +00:00
tot = dl->parts;
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
totvlak += tot;
fix for crash converting a curve into a mesh (Alt+C conversion), this would crash on entering editmode. now curves convert to polygons directly, rather then faces, and polygons after.
2012-02-03 04:58:55 +00:00
totloop += tot * 3;
Initial revision
2002-10-12 11:37:38 +00:00
}
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
dl = dl->next;
Initial revision
2002-10-12 11:37:38 +00:00
}
Constructive modifiers for curves and surfaces Used approach with creating DerivedMesh for curves whet they've got such modifiers. Available modifiers are: array, edge split, mirror, solidify, subsurf.
2010-03-05 16:47:52 +00:00
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
if (totvert == 0) {
fix for a crash in Blender.Mesh, getting curve data from an object failed (with only 1 curve vertex) Blender.Mesh didnt check this and crashed.
2007-05-28 16:49:48 +00:00
/* error("can't convert"); */
/* Make Sure you check ob->data is a curve */
Constructive modifiers for curves and surfaces Used approach with creating DerivedMesh for curves whet they've got such modifiers. Available modifiers are: array, edge split, mirror, solidify, subsurf.
2010-03-05 16:47:52 +00:00
return -1;
Initial revision
2002-10-12 11:37:38 +00:00
}
fix for crash converting a curve into a mesh (Alt+C conversion), this would crash on entering editmode. now curves convert to polygons directly, rather then faces, and polygons after.
2012-02-03 04:58:55 +00:00
*allvert = mvert = MEM_callocN(sizeof(MVert) * totvert, "nurbs_init mvert");
*alledge = medge = MEM_callocN(sizeof(MEdge) * totedge, "nurbs_init medge");
*allloop = mloop = MEM_callocN(sizeof(MLoop) * totvlak * 4, "nurbs_init mloop"); // totloop
*allpoly = mpoly = MEM_callocN(sizeof(MPoly) * totvlak, "nurbs_init mloop");
Fix #33752: UV Orco coordinates were wrong for Cycles (and other external render engines). Replaced generating orco_index by filling the UV loop data directly which is easier and all that needed to be done anyway.
2013-01-10 17:37:17 +00:00
if (alluv)
*alluv = mloopuv = MEM_callocN(sizeof(MLoopUV) * totvlak * 4, "nurbs_init mloopuv");
=bmesh= merge from trunk at r36153
2011-04-15 01:19:13 +00:00
The last of the blenkernel files with translated comments
2003-04-26 13:07:59 +00:00
/* verts and faces */
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
vertcount = 0;
Initial revision
2002-10-12 11:37:38 +00:00
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
dl = dispbase->first;
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
while (dl) {
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
int smooth = dl->rt & CU_SMOOTH ? 1 : 0;
Constructive modifiers for curves and surfaces Used approach with creating DerivedMesh for curves whet they've got such modifiers. Available modifiers are: array, edge split, mirror, solidify, subsurf.
2010-03-05 16:47:52 +00:00
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
if (dl->type == DL_SEGM) {
startvert = vertcount;
a = dl->parts * dl->nr;
data = dl->verts;
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
while (a--) {
Various typo cleanups, remove unnecessary code etc, found during recent work and separated to a cleanup change
2011-11-20 16:21:13 +00:00
copy_v3_v3(mvert->co, data);
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
data += 3;
Initial revision
2002-10-12 11:37:38 +00:00
vertcount++;
mvert++;
}
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
for (a = 0; a < dl->parts; a++) {
ofs = a * dl->nr;
for (b = 1; b < dl->nr; b++) {
medge->v1 = startvert + ofs + b - 1;
medge->v2 = startvert + ofs + b;
fix [#31048] converting curve object to mesh makes object disapper from 3D view
2012-04-21 13:08:26 +00:00
medge->flag = ME_LOOSEEDGE | ME_EDGERENDER | ME_EDGEDRAW;
fix for crash converting a curve into a mesh (Alt+C conversion), this would crash on entering editmode. now curves convert to polygons directly, rather then faces, and polygons after.
2012-02-03 04:58:55 +00:00
medge++;
Initial revision
2002-10-12 11:37:38 +00:00
}
}
}
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
else if (dl->type == DL_POLY) {
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
if (conv_polys) {
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
startvert = vertcount;
a = dl->parts * dl->nr;
data = dl->verts;
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
while (a--) {
Various typo cleanups, remove unnecessary code etc, found during recent work and separated to a cleanup change
2011-11-20 16:21:13 +00:00
copy_v3_v3(mvert->co, data);
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
data += 3;
Fix bug with unneeded outline for filled 2d curves when converted to mesh - Revert of my old change in curve->mesh conversion - Do not ignore DL_POLYs for surfaces -- they will never be filled, but ignore them for 2d curves -- they'll be filled with INDEX3 parts.
2010-11-06 06:22:25 +00:00
vertcount++;
mvert++;
}
Constructive modifiers for curves and surfaces Used approach with creating DerivedMesh for curves whet they've got such modifiers. Available modifiers are: array, edge split, mirror, solidify, subsurf.
2010-03-05 16:47:52 +00:00
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
for (a = 0; a < dl->parts; a++) {
ofs = a * dl->nr;
for (b = 0; b < dl->nr; b++) {
medge->v1 = startvert + ofs + b;
if (b == dl->nr - 1) medge->v2 = startvert + ofs;
else medge->v2 = startvert + ofs + b + 1;
fix [#31048] converting curve object to mesh makes object disapper from 3D view
2012-04-21 13:08:26 +00:00
medge->flag = ME_LOOSEEDGE | ME_EDGERENDER | ME_EDGEDRAW;
fix for crash converting a curve into a mesh (Alt+C conversion), this would crash on entering editmode. now curves convert to polygons directly, rather then faces, and polygons after.
2012-02-03 04:58:55 +00:00
medge++;
Fix bug with unneeded outline for filled 2d curves when converted to mesh - Revert of my old change in curve->mesh conversion - Do not ignore DL_POLYs for surfaces -- they will never be filled, but ignore them for 2d curves -- they'll be filled with INDEX3 parts.
2010-11-06 06:22:25 +00:00
}
Initial revision
2002-10-12 11:37:38 +00:00
}
}
}
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
else if (dl->type == DL_INDEX3) {
startvert = vertcount;
a = dl->nr;
data = dl->verts;
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
while (a--) {
Various typo cleanups, remove unnecessary code etc, found during recent work and separated to a cleanup change
2011-11-20 16:21:13 +00:00
copy_v3_v3(mvert->co, data);
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
data += 3;
Initial revision
2002-10-12 11:37:38 +00:00
vertcount++;
mvert++;
}
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
a = dl->parts;
index = dl->index;
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
while (a--) {
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
mloop[0].v = startvert + index[0];
mloop[1].v = startvert + index[2];
mloop[2].v = startvert + index[1];
fix for crash converting a curve into a mesh (Alt+C conversion), this would crash on entering editmode. now curves convert to polygons directly, rather then faces, and polygons after.
2012-02-03 04:58:55 +00:00
mpoly->loopstart = (int)(mloop - (*allloop));
mpoly->totloop = 3;
mpoly->mat_nr = dl->col;
Fix #33752: UV Orco coordinates were wrong for Cycles (and other external render engines). Replaced generating orco_index by filling the UV loop data directly which is easier and all that needed to be done anyway.
2013-01-10 17:37:17 +00:00
if (mloopuv) {
int i;
for (i = 0; i < 3; i++, mloopuv++) {
code cleanup: style and replace (float)sin, (float)cos with sinf, cosf
2013-01-12 14:28:23 +00:00
mloopuv->uv[0] = (mloop[i].v - startvert) / (float)(dl->nr - 1);
Fix #33752: UV Orco coordinates were wrong for Cycles (and other external render engines). Replaced generating orco_index by filling the UV loop data directly which is easier and all that needed to be done anyway.
2013-01-10 17:37:17 +00:00
mloopuv->uv[1] = 0.0f;
}
}
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
if (smooth) mpoly->flag |= ME_SMOOTH;
fix for crash converting a curve into a mesh (Alt+C conversion), this would crash on entering editmode. now curves convert to polygons directly, rather then faces, and polygons after.
2012-02-03 04:58:55 +00:00
mpoly++;
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
mloop += 3;
index += 3;
Initial revision
2002-10-12 11:37:38 +00:00
}
}
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
else if (dl->type == DL_SURF) {
startvert = vertcount;
a = dl->parts * dl->nr;
data = dl->verts;
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
while (a--) {
Various typo cleanups, remove unnecessary code etc, found during recent work and separated to a cleanup change
2011-11-20 16:21:13 +00:00
copy_v3_v3(mvert->co, data);
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
data += 3;
Initial revision
2002-10-12 11:37:38 +00:00
vertcount++;
mvert++;
}
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
for (a = 0; a < dl->parts; a++) {
Initial revision
2002-10-12 11:37:38 +00:00
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
if ( (dl->flag & DL_CYCL_V) == 0 && a == dl->parts - 1) break;
Initial revision
2002-10-12 11:37:38 +00:00
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
if (dl->flag & DL_CYCL_U) { /* p2 -> p1 -> */
p1 = startvert + dl->nr * a; /* p4 -> p3 -> */
p2 = p1 + dl->nr - 1; /* -----> next row */
p3 = p1 + dl->nr;
p4 = p2 + dl->nr;
b = 0;
Initial revision
2002-10-12 11:37:38 +00:00
}
else {
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
p2 = startvert + dl->nr * a;
p1 = p2 + 1;
p4 = p2 + dl->nr;
p3 = p1 + dl->nr;
b = 1;
Initial revision
2002-10-12 11:37:38 +00:00
}
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
if ( (dl->flag & DL_CYCL_V) && a == dl->parts - 1) {
p3 -= dl->parts * dl->nr;
p4 -= dl->parts * dl->nr;
Initial revision
2002-10-12 11:37:38 +00:00
}
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
for (; b < dl->nr; b++) {
mloop[0].v = p1;
mloop[1].v = p3;
mloop[2].v = p4;
mloop[3].v = p2;
fix for crash converting a curve into a mesh (Alt+C conversion), this would crash on entering editmode. now curves convert to polygons directly, rather then faces, and polygons after.
2012-02-03 04:58:55 +00:00
mpoly->loopstart = (int)(mloop - (*allloop));
mpoly->totloop = 4;
mpoly->mat_nr = dl->col;
Fix #33752: UV Orco coordinates were wrong for Cycles (and other external render engines). Replaced generating orco_index by filling the UV loop data directly which is easier and all that needed to be done anyway.
2013-01-10 17:37:17 +00:00
if (mloopuv) {
int orco_sizeu = dl->nr - 1;
int orco_sizev = dl->parts - 1;
int i;
/* exception as handled in convertblender.c too */
if (dl->flag & DL_CYCL_U) {
orco_sizeu++;
if (dl->flag & DL_CYCL_V)
orco_sizev++;
}
for (i = 0; i < 4; i++, mloopuv++) {
/* find uv based on vertex index into grid array */
int v = mloop[i].v - startvert;
code cleanup: style and replace (float)sin, (float)cos with sinf, cosf
2013-01-12 14:28:23 +00:00
mloopuv->uv[0] = (v / dl->nr) / (float)orco_sizev;
mloopuv->uv[1] = (v % dl->nr) / (float)orco_sizeu;
Fix #33752: UV Orco coordinates were wrong for Cycles (and other external render engines). Replaced generating orco_index by filling the UV loop data directly which is easier and all that needed to be done anyway.
2013-01-10 17:37:17 +00:00
/* cyclic correction */
if ((i == 0 || i == 1) && mloopuv->uv[1] == 0.0f)
mloopuv->uv[1] = 1.0f;
}
support for curve orco uv's as UV's in cycles. ideally these would be used as generated coordinates, but this is tricly because cycles calculates its own orco's and doesnt know about curve settings.
2012-07-31 13:43:26 +00:00
}
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
if (smooth) mpoly->flag |= ME_SMOOTH;
fix for crash converting a curve into a mesh (Alt+C conversion), this would crash on entering editmode. now curves convert to polygons directly, rather then faces, and polygons after.
2012-02-03 04:58:55 +00:00
mpoly++;
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
mloop += 4;
Initial revision
2002-10-12 11:37:38 +00:00
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
p4 = p3;
Initial revision
2002-10-12 11:37:38 +00:00
p3++;
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
p2 = p1;
Initial revision
2002-10-12 11:37:38 +00:00
p1++;
}
}
}
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
dl = dl->next;
Initial revision
2002-10-12 11:37:38 +00:00
}
=bmesh= merge from trunk at r36153
2011-04-15 01:19:13 +00:00
fix [#35026] Curve build modifier
2013-04-22 12:00:37 +00:00
if (totvlak) {
make_edges_mdata_extend(alledge, &totedge,
*allpoly, *allloop, totvlak);
}
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
*_totpoly = totvlak;
*_totloop = totloop;
*_totedge = totedge;
*_totvert = totvert;
Constructive modifiers for curves and surfaces Used approach with creating DerivedMesh for curves whet they've got such modifiers. Available modifiers are: array, edge split, mirror, solidify, subsurf.
2010-03-05 16:47:52 +00:00
return 0;
}
support for curve orco uv's as UV's in cycles. ideally these would be used as generated coordinates, but this is tricly because cycles calculates its own orco's and doesnt know about curve settings.
2012-07-31 13:43:26 +00:00
Constructive modifiers for curves and surfaces Used approach with creating DerivedMesh for curves whet they've got such modifiers. Available modifiers are: array, edge split, mirror, solidify, subsurf.
2010-03-05 16:47:52 +00:00
/* this may fail replacing ob->data, be sure to check ob->type */
code cleanup: name mesh functions more consistently, also use bools for mesh args.
2013-03-17 19:55:10 +00:00
void BKE_mesh_from_nurbs_displist(Object *ob, ListBase *dispbase, const bool use_orco_uv)
Constructive modifiers for curves and surfaces Used approach with creating DerivedMesh for curves whet they've got such modifiers. Available modifiers are: array, edge split, mirror, solidify, subsurf.
2010-03-05 16:47:52 +00:00
{
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
Main *bmain = G.main;
Constructive modifiers for curves and surfaces Used approach with creating DerivedMesh for curves whet they've got such modifiers. Available modifiers are: array, edge split, mirror, solidify, subsurf.
2010-03-05 16:47:52 +00:00
Object *ob1;
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
DerivedMesh *dm = ob->derivedFinal;
Constructive modifiers for curves and surfaces Used approach with creating DerivedMesh for curves whet they've got such modifiers. Available modifiers are: array, edge split, mirror, solidify, subsurf.
2010-03-05 16:47:52 +00:00
Mesh *me;
Curve *cu;
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
MVert *allvert = NULL;
MEdge *alledge = NULL;
=bmesh= merge from trunk at r36153
2011-04-15 01:19:13 +00:00
MLoop *allloop = NULL;
Fix #33752: UV Orco coordinates were wrong for Cycles (and other external render engines). Replaced generating orco_index by filling the UV loop data directly which is easier and all that needed to be done anyway.
2013-01-10 17:37:17 +00:00
MLoopUV *alluv = NULL;
=bmesh= merge from trunk at r36153
2011-04-15 01:19:13 +00:00
MPoly *allpoly = NULL;
fix for crash converting a curve into a mesh (Alt+C conversion), this would crash on entering editmode. now curves convert to polygons directly, rather then faces, and polygons after.
2012-02-03 04:58:55 +00:00
int totvert, totedge, totloop, totpoly;
Constructive modifiers for curves and surfaces Used approach with creating DerivedMesh for curves whet they've got such modifiers. Available modifiers are: array, edge split, mirror, solidify, subsurf.
2010-03-05 16:47:52 +00:00
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
cu = ob->data;
Constructive modifiers for curves and surfaces Used approach with creating DerivedMesh for curves whet they've got such modifiers. Available modifiers are: array, edge split, mirror, solidify, subsurf.
2010-03-05 16:47:52 +00:00
if (dm == NULL) {
Fix #31021: Render settings are not taken into account for curves Refactored code a bit to make naming a bit more clear and added a function to create mesh from given display list rather than from object's displist. Tested using plain curves (which doesn't imply using derived meshes) and curves with constructive modifiers (which are using derived meshed).
2012-07-14 17:30:49 +00:00
if (BKE_mesh_nurbs_displist_to_mdata(ob, dispbase, &allvert, &totvert,
&alledge, &totedge, &allloop,
style cleanup
2013-02-02 04:58:03 +00:00
&allpoly, (use_orco_uv) ? &alluv : NULL,
Fix #33752: UV Orco coordinates were wrong for Cycles (and other external render engines). Replaced generating orco_index by filling the UV loop data directly which is easier and all that needed to be done anyway.
2013-01-10 17:37:17 +00:00
&totloop, &totpoly) != 0)
code cleanup: naming - BKE_mesh_*
2012-05-05 21:28:12 +00:00
{
Constructive modifiers for curves and surfaces Used approach with creating DerivedMesh for curves whet they've got such modifiers. Available modifiers are: array, edge split, mirror, solidify, subsurf.
2010-03-05 16:47:52 +00:00
/* Error initializing */
return;
}
/* make mesh */
Fix #34040: Moving Normal Node with enabled Cycles Material Preview crashes Issue was caused by couple of circumstances: - Normal Map node requires tesselated faces to compute tangent space - All temporary meshes needed for Cycles export were adding to G.main - Undo pushes would temporary set meshes tessfaces to NULL - Moving node will cause undo push and tree re-evaluate fr preview All this leads to threading conflict between preview render and undo system. Solved it in way that all temporary meshes are adding to that exact Main which was passed to Cycles via BlendData. This required couple of mechanic changes like adding extra parameter to *_add() functions and adding some *_ex() functions to make it possible RNA adds objects to Main passed to new() RNA function. This was tricky to pass Main to RNA function and IMO that's not so nice to pass main to function, so ended up with such decision: - Object.to_mesh() will add temp mesh to G.main - Added Main.meshes.new_from_object() which does the same as to_mesh, but adds temporary mesh to specified Main. So now all temporary meshes needed for preview render would be added to preview_main which does not conflict with undo pushes. Viewport render shall not be an issue because object sync happens from main thread in this case. It could be some issues with final render, but that's not so much likely to happen, so shall be fine. Thanks to Brecht for review!
2013-02-05 12:46:15 +00:00
me = BKE_mesh_add(G.main, "Mesh");
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
me->totvert = totvert;
me->totedge = totedge;
=bmesh= merge from trunk at r36153
2011-04-15 01:19:13 +00:00
me->totloop = totloop;
me->totpoly = totpoly;
Constructive modifiers for curves and surfaces Used approach with creating DerivedMesh for curves whet they've got such modifiers. Available modifiers are: array, edge split, mirror, solidify, subsurf.
2010-03-05 16:47:52 +00:00
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
me->mvert = CustomData_add_layer(&me->vdata, CD_MVERT, CD_ASSIGN, allvert, me->totvert);
me->medge = CustomData_add_layer(&me->edata, CD_MEDGE, CD_ASSIGN, alledge, me->totedge);
me->mloop = CustomData_add_layer(&me->ldata, CD_MLOOP, CD_ASSIGN, allloop, me->totloop);
me->mpoly = CustomData_add_layer(&me->pdata, CD_MPOLY, CD_ASSIGN, allpoly, me->totpoly);
Constructive modifiers for curves and surfaces Used approach with creating DerivedMesh for curves whet they've got such modifiers. Available modifiers are: array, edge split, mirror, solidify, subsurf.
2010-03-05 16:47:52 +00:00
Fix #33752: UV Orco coordinates were wrong for Cycles (and other external render engines). Replaced generating orco_index by filling the UV loop data directly which is easier and all that needed to be done anyway.
2013-01-10 17:37:17 +00:00
if (alluv) {
const char *uvname = "Orco";
me->mtpoly = CustomData_add_layer_named(&me->pdata, CD_MTEXPOLY, CD_DEFAULT, NULL, me->totpoly, uvname);
me->mloopuv = CustomData_add_layer_named(&me->ldata, CD_MLOOPUV, CD_ASSIGN, alluv, me->totloop, uvname);
}
code cleanup: naming - BKE_mesh_*
2012-05-05 21:28:12 +00:00
BKE_mesh_calc_normals(me->mvert, me->totvert, me->mloop, me->mpoly, me->totloop, me->totpoly, NULL);
style cleanup: follow style guide for formatting of if/for/while loops, and else if's
2012-03-24 06:18:31 +00:00
}
else {
Fix #34040: Moving Normal Node with enabled Cycles Material Preview crashes Issue was caused by couple of circumstances: - Normal Map node requires tesselated faces to compute tangent space - All temporary meshes needed for Cycles export were adding to G.main - Undo pushes would temporary set meshes tessfaces to NULL - Moving node will cause undo push and tree re-evaluate fr preview All this leads to threading conflict between preview render and undo system. Solved it in way that all temporary meshes are adding to that exact Main which was passed to Cycles via BlendData. This required couple of mechanic changes like adding extra parameter to *_add() functions and adding some *_ex() functions to make it possible RNA adds objects to Main passed to new() RNA function. This was tricky to pass Main to RNA function and IMO that's not so nice to pass main to function, so ended up with such decision: - Object.to_mesh() will add temp mesh to G.main - Added Main.meshes.new_from_object() which does the same as to_mesh, but adds temporary mesh to specified Main. So now all temporary meshes needed for preview render would be added to preview_main which does not conflict with undo pushes. Viewport render shall not be an issue because object sync happens from main thread in this case. It could be some issues with final render, but that's not so much likely to happen, so shall be fine. Thanks to Brecht for review!
2013-02-05 12:46:15 +00:00
me = BKE_mesh_add(G.main, "Mesh");
Fix #35209: cycles generated texture coordinates did not stick to deforming meshes.
2013-05-05 05:56:41 +00:00
DM_to_mesh(dm, me, ob, CD_MASK_MESH);
Constructive modifiers for curves and surfaces Used approach with creating DerivedMesh for curves whet they've got such modifiers. Available modifiers are: array, edge split, mirror, solidify, subsurf.
2010-03-05 16:47:52 +00:00
}
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
me->totcol = cu->totcol;
me->mat = cu->mat;
Fix #21594: converting bevel objects to mesh stops displaying them in spacial cases Mesh's boundbox should be re-calculated after curve->mesh conversion. To avoid troubles with displaying texture space i've used tex_space_mesh() for this.
2010-03-14 12:12:21 +00:00
code cleanup: naming - BKE_mesh_*
2012-05-05 21:28:12 +00:00
BKE_mesh_texspace_calc(me);
Fix #21594: converting bevel objects to mesh stops displaying them in spacial cases Mesh's boundbox should be re-calculated after curve->mesh conversion. To avoid troubles with displaying texture space i've used tex_space_mesh() for this.
2010-03-14 12:12:21 +00:00
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
cu->mat = NULL;
cu->totcol = 0;
- added mesh_strip_loose_faces, works in conjunction with make_edges to get rid of faces with MFace.v3==0 - change all Mesh's to have ->medge now. This is forced by make_edges on readfile, and in the various exotic important routines, and on conversion back in python. - make python NMesh structure always have medges now (needs testing) - with above two changes it is guarenteed that mf->v3 is never ==0 in main blender code (i.e., all MFace's are actually triangles or quads) and so I went through and removed all the historic tests to deal with MFace.v3==0. Equals lots of deleting, I am in heaven! - removed MEdge edcode flag, no longer needed - added experimental replacement for edge flag system Still are some inconsistencies in FACESELECT mode edge drawing to be ironed out. NOTE: This commit adds an experimental edge flag calc system, based on 10-seconds-of-thought algorithm by yours truly. Would appreciate feedback on how this system works, esp compared to old one and esp on complex or interesting models. To Use: New system is enabled by setting G.rt to a value between 1 and 1000 (Value of 0 uses old system). Value 1000 is reserved for "auto" edge, which is more or less identical to old system but also makes sure that at least 10% of edges are drawn (solves errors for super subdivided meshes). Values between 1 and 999 act as percent (out of 1000) of edges that should be drawn, starting with "most interesting" edges first. Please try it and comment!
2005-08-21 07:19:20 +00:00
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
if (ob->data) {
code cleanup: function naming, use BKE_*type* prefix.
2012-05-05 14:03:12 +00:00
BKE_libblock_free(&bmain->curve, ob->data);
Initial revision
2002-10-12 11:37:38 +00:00
}
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
ob->data = me;
ob->type = OB_MESH;
Constructive modifiers for curves and surfaces Used approach with creating DerivedMesh for curves whet they've got such modifiers. Available modifiers are: array, edge split, mirror, solidify, subsurf.
2010-03-05 16:47:52 +00:00
The last of the blenkernel files with translated comments
2003-04-26 13:07:59 +00:00
/* other users */
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
ob1 = bmain->object.first;
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
while (ob1) {
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
if (ob1->data == cu) {
ob1->type = OB_MESH;
Initial revision
2002-10-12 11:37:38 +00:00
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
ob1->data = ob->data;
Initial revision
2002-10-12 11:37:38 +00:00
id_us_plus((ID *)ob->data);
}
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
ob1 = ob1->id.next;
Initial revision
2002-10-12 11:37:38 +00:00
}
}
Fix #31021: Render settings are not taken into account for curves Refactored code a bit to make naming a bit more clear and added a function to create mesh from given display list rather than from object's displist. Tested using plain curves (which doesn't imply using derived meshes) and curves with constructive modifiers (which are using derived meshed).
2012-07-14 17:30:49 +00:00
void BKE_mesh_from_nurbs(Object *ob)
{
Fix #33752: UV Orco coordinates were wrong for Cycles (and other external render engines). Replaced generating orco_index by filling the UV loop data directly which is easier and all that needed to be done anyway.
2013-01-10 17:37:17 +00:00
BKE_mesh_from_nurbs_displist(ob, &ob->disp, false);
Fix #31021: Render settings are not taken into account for curves Refactored code a bit to make naming a bit more clear and added a function to create mesh from given display list rather than from object's displist. Tested using plain curves (which doesn't imply using derived meshes) and curves with constructive modifiers (which are using derived meshed).
2012-07-14 17:30:49 +00:00
}
merge with trunk/2.5 at r23876 [[Split portion of a mixed commit.]]
2009-10-22 23:22:05 +00:00
typedef struct EdgeLink {
Link *next, *prev;
void *edge;
} EdgeLink;
typedef struct VertLink {
Link *next, *prev;
remove unneeded casts from 'unsigned int' to 'int'
2011-12-27 03:54:23 +00:00
unsigned int index;
merge with trunk/2.5 at r23876 [[Split portion of a mixed commit.]]
2009-10-22 23:22:05 +00:00
} VertLink;
remove unneeded casts from 'unsigned int' to 'int'
2011-12-27 03:54:23 +00:00
static void prependPolyLineVert(ListBase *lb, unsigned int index)
merge with trunk/2.5 at r23876 [[Split portion of a mixed commit.]]
2009-10-22 23:22:05 +00:00
{
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
VertLink *vl = MEM_callocN(sizeof(VertLink), "VertLink");
merge with trunk/2.5 at r23876 [[Split portion of a mixed commit.]]
2009-10-22 23:22:05 +00:00
vl->index = index;
BLI_addhead(lb, vl);
}
remove unneeded casts from 'unsigned int' to 'int'
2011-12-27 03:54:23 +00:00
static void appendPolyLineVert(ListBase *lb, unsigned int index)
merge with trunk/2.5 at r23876 [[Split portion of a mixed commit.]]
2009-10-22 23:22:05 +00:00
{
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
VertLink *vl = MEM_callocN(sizeof(VertLink), "VertLink");
merge with trunk/2.5 at r23876 [[Split portion of a mixed commit.]]
2009-10-22 23:22:05 +00:00
vl->index = index;
BLI_addtail(lb, vl);
}
code cleanup: rename BKE_mesh_to_curve_ex --> BKE_mesh_to_curve_nurblist, also correct odd indentation.
2013-03-15 10:48:48 +00:00
void BKE_mesh_to_curve_nurblist(DerivedMesh *dm, ListBase *nurblist, const int edge_users_test)
merge with trunk/2.5 at r23876 [[Split portion of a mixed commit.]]
2009-10-22 23:22:05 +00:00
{
code cleanup: shadowing
2013-03-16 14:33:32 +00:00
MVert *mvert = dm->getVertArray(dm);
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
MEdge *med, *medge = dm->getEdgeArray(dm);
converting a mesh to a curve was unnecessarily using tessface's. use mpolys instead and simplify checks for wire edges. Also rename BKE_mesh_from_curve() --> BKE_mesh_to_curve() since this function converts a mesh into a curve.
2013-03-14 18:35:21 +00:00
MPoly *mp, *mpoly = dm->getPolyArray(dm);
MLoop *mloop = dm->getLoopArray(dm);
merge with trunk/2.5 at r23876 [[Split portion of a mixed commit.]]
2009-10-22 23:22:05 +00:00
code cleanup: shadowing
2013-03-16 14:33:32 +00:00
int dm_totedge = dm->getNumEdges(dm);
int dm_totpoly = dm->getNumPolys(dm);
merge with trunk/2.5 at r23876 [[Split portion of a mixed commit.]]
2009-10-22 23:22:05 +00:00
int totedges = 0;
converting a mesh to a curve was unnecessarily using tessface's. use mpolys instead and simplify checks for wire edges. Also rename BKE_mesh_from_curve() --> BKE_mesh_to_curve() since this function converts a mesh into a curve.
2013-03-14 18:35:21 +00:00
int i;
merge with trunk/2.5 at r23876 [[Split portion of a mixed commit.]]
2009-10-22 23:22:05 +00:00
/* only to detect edge polylines */
converting a mesh to a curve was unnecessarily using tessface's. use mpolys instead and simplify checks for wire edges. Also rename BKE_mesh_from_curve() --> BKE_mesh_to_curve() since this function converts a mesh into a curve.
2013-03-14 18:35:21 +00:00
int *edge_users;
merge with trunk/2.5 at r23876 [[Split portion of a mixed commit.]]
2009-10-22 23:22:05 +00:00
ListBase edges = {NULL, NULL};
converting a mesh to a curve was unnecessarily using tessface's. use mpolys instead and simplify checks for wire edges. Also rename BKE_mesh_from_curve() --> BKE_mesh_to_curve() since this function converts a mesh into a curve.
2013-03-14 18:35:21 +00:00
/* get boundary edges */
code cleanup: shadowing
2013-03-16 14:33:32 +00:00
edge_users = MEM_callocN(sizeof(int) * dm_totedge, __func__);
for (i = 0, mp = mpoly; i < dm_totpoly; i++, mp++) {
converting a mesh to a curve was unnecessarily using tessface's. use mpolys instead and simplify checks for wire edges. Also rename BKE_mesh_from_curve() --> BKE_mesh_to_curve() since this function converts a mesh into a curve.
2013-03-14 18:35:21 +00:00
MLoop *ml = &mloop[mp->loopstart];
int j;
for (j = 0; j < mp->totloop; j++, ml++) {
edge_users[ml->e]++;
merge with trunk/2.5 at r23876 [[Split portion of a mixed commit.]]
2009-10-22 23:22:05 +00:00
}
}
converting a mesh to a curve was unnecessarily using tessface's. use mpolys instead and simplify checks for wire edges. Also rename BKE_mesh_from_curve() --> BKE_mesh_to_curve() since this function converts a mesh into a curve.
2013-03-14 18:35:21 +00:00
/* create edges from all faces (so as to find edges not in any faces) */
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
med = medge;
code cleanup: shadowing
2013-03-16 14:33:32 +00:00
for (i = 0; i < dm_totedge; i++, med++) {
code cleanup: rename BKE_mesh_to_curve_ex --> BKE_mesh_to_curve_nurblist, also correct odd indentation.
2013-03-15 10:48:48 +00:00
if (edge_users[i] == edge_users_test) {
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
EdgeLink *edl = MEM_callocN(sizeof(EdgeLink), "EdgeLink");
edl->edge = med;
merge with trunk/2.5 at r23876 [[Split portion of a mixed commit.]]
2009-10-22 23:22:05 +00:00
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
BLI_addtail(&edges, edl); totedges++;
merge with trunk/2.5 at r23876 [[Split portion of a mixed commit.]]
2009-10-22 23:22:05 +00:00
}
}
converting a mesh to a curve was unnecessarily using tessface's. use mpolys instead and simplify checks for wire edges. Also rename BKE_mesh_from_curve() --> BKE_mesh_to_curve() since this function converts a mesh into a curve.
2013-03-14 18:35:21 +00:00
MEM_freeN(edge_users);
merge with trunk/2.5 at r23876 [[Split portion of a mixed commit.]]
2009-10-22 23:22:05 +00:00
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
if (edges.first) {
while (edges.first) {
merge with trunk/2.5 at r23876 [[Split portion of a mixed commit.]]
2009-10-22 23:22:05 +00:00
/* each iteration find a polyline and add this as a nurbs poly spline */
ListBase polyline = {NULL, NULL}; /* store a list of VertLink's */
int closed = FALSE;
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
int totpoly = 0;
MEdge *med_current = ((EdgeLink *)edges.last)->edge;
unsigned int startVert = med_current->v1;
unsigned int endVert = med_current->v2;
int ok = TRUE;
merge with trunk/2.5 at r23876 [[Split portion of a mixed commit.]]
2009-10-22 23:22:05 +00:00
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
appendPolyLineVert(&polyline, startVert); totpoly++;
appendPolyLineVert(&polyline, endVert); totpoly++;
BLI_freelinkN(&edges, edges.last); totedges--;
merge with trunk/2.5 at r23876 [[Split portion of a mixed commit.]]
2009-10-22 23:22:05 +00:00
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
while (ok) { /* while connected edges are found... */
merge with trunk/2.5 at r23876 [[Split portion of a mixed commit.]]
2009-10-22 23:22:05 +00:00
ok = FALSE;
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
i = totedges;
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
while (i) {
merge with trunk/2.5 at r23876 [[Split portion of a mixed commit.]]
2009-10-22 23:22:05 +00:00
EdgeLink *edl;
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
i -= 1;
edl = BLI_findlink(&edges, i);
med = edl->edge;
merge with trunk/2.5 at r23876 [[Split portion of a mixed commit.]]
2009-10-22 23:22:05 +00:00
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
if (med->v1 == endVert) {
merge with trunk/2.5 at r23876 [[Split portion of a mixed commit.]]
2009-10-22 23:22:05 +00:00
endVert = med->v2;
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
appendPolyLineVert(&polyline, med->v2); totpoly++;
BLI_freelinkN(&edges, edl); totedges--;
ok = TRUE;
merge with trunk/2.5 at r23876 [[Split portion of a mixed commit.]]
2009-10-22 23:22:05 +00:00
}
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
else if (med->v2 == endVert) {
merge with trunk/2.5 at r23876 [[Split portion of a mixed commit.]]
2009-10-22 23:22:05 +00:00
endVert = med->v1;
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
appendPolyLineVert(&polyline, endVert); totpoly++;
BLI_freelinkN(&edges, edl); totedges--;
ok = TRUE;
merge with trunk/2.5 at r23876 [[Split portion of a mixed commit.]]
2009-10-22 23:22:05 +00:00
}
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
else if (med->v1 == startVert) {
merge with trunk/2.5 at r23876 [[Split portion of a mixed commit.]]
2009-10-22 23:22:05 +00:00
startVert = med->v2;
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
prependPolyLineVert(&polyline, startVert); totpoly++;
BLI_freelinkN(&edges, edl); totedges--;
ok = TRUE;
merge with trunk/2.5 at r23876 [[Split portion of a mixed commit.]]
2009-10-22 23:22:05 +00:00
}
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
else if (med->v2 == startVert) {
merge with trunk/2.5 at r23876 [[Split portion of a mixed commit.]]
2009-10-22 23:22:05 +00:00
startVert = med->v1;
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
prependPolyLineVert(&polyline, startVert); totpoly++;
BLI_freelinkN(&edges, edl); totedges--;
ok = TRUE;
merge with trunk/2.5 at r23876 [[Split portion of a mixed commit.]]
2009-10-22 23:22:05 +00:00
}
}
}
/* Now we have a polyline, make into a curve */
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
if (startVert == endVert) {
merge with trunk/2.5 at r23876 [[Split portion of a mixed commit.]]
2009-10-22 23:22:05 +00:00
BLI_freelinkN(&polyline, polyline.last);
totpoly--;
closed = TRUE;
}
/* --- nurbs --- */
{
Nurb *nu;
BPoint *bp;
VertLink *vl;
/* create new 'nurb' within the curve */
nu = (Nurb *)MEM_callocN(sizeof(Nurb), "MeshNurb");
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
nu->pntsu = totpoly;
nu->pntsv = 1;
nu->orderu = 4;
nu->flagu = CU_NURB_ENDPOINT | (closed ? CU_NURB_CYCLIC : 0); /* endpoint */
nu->resolu = 12;
merge with trunk/2.5 at r23876 [[Split portion of a mixed commit.]]
2009-10-22 23:22:05 +00:00
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
nu->bp = (BPoint *)MEM_callocN(sizeof(BPoint) * totpoly, "bpoints");
merge with trunk/2.5 at r23876 [[Split portion of a mixed commit.]]
2009-10-22 23:22:05 +00:00
/* add points */
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
vl = polyline.first;
for (i = 0, bp = nu->bp; i < totpoly; i++, bp++, vl = (VertLink *)vl->next) {
code cleanup: shadowing
2013-03-16 14:33:32 +00:00
copy_v3_v3(bp->vec, mvert[vl->index].co);
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
bp->f1 = SELECT;
merge with trunk/2.5 at r23876 [[Split portion of a mixed commit.]]
2009-10-22 23:22:05 +00:00
bp->radius = bp->weight = 1.0;
}
BLI_freelistN(&polyline);
/* add nurb to curve */
split up BKE_mesh_to_curve() into 2 functions, adding BKE_mesh_to_curve_ex() which doesn't do object type conversion.
2013-03-14 18:44:32 +00:00
BLI_addtail(nurblist, nu);
merge with trunk/2.5 at r23876 [[Split portion of a mixed commit.]]
2009-10-22 23:22:05 +00:00
}
/* --- done with nurbs --- */
}
split up BKE_mesh_to_curve() into 2 functions, adding BKE_mesh_to_curve_ex() which doesn't do object type conversion.
2013-03-14 18:44:32 +00:00
}
}
void BKE_mesh_to_curve(Scene *scene, Object *ob)
{
/* make new mesh data from the original copy */
DerivedMesh *dm = mesh_get_derived_final(scene, ob, CD_MASK_MESH);
ListBase nurblist = {NULL, NULL};
bool needsFree = false;
code cleanup: rename BKE_mesh_to_curve_ex --> BKE_mesh_to_curve_nurblist, also correct odd indentation.
2013-03-15 10:48:48 +00:00
BKE_mesh_to_curve_nurblist(dm, &nurblist, 0);
surpport converting boundary edges to curves with BKE_mesh_to_curve(). alt+c convert.
2013-04-08 00:25:44 +00:00
BKE_mesh_to_curve_nurblist(dm, &nurblist, 1);
split up BKE_mesh_to_curve() into 2 functions, adding BKE_mesh_to_curve_ex() which doesn't do object type conversion.
2013-03-14 18:44:32 +00:00
if (nurblist.first) {
Curve *cu = BKE_curve_add(G.main, ob->id.name + 2, OB_CURVE);
cu->flag |= CU_3D;
cu->nurb = nurblist;
merge with trunk/2.5 at r23876 [[Split portion of a mixed commit.]]
2009-10-22 23:22:05 +00:00
((Mesh *)ob->data)->id.us--;
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
ob->data = cu;
ob->type = OB_CURVE;
Fix for convert_exec() "Keep original" option now works for all objects' types
2010-03-07 05:04:22 +00:00
/* curve objects can't contain DM in usual cases, we could free memory */
converting a mesh to a curve was unnecessarily using tessface's. use mpolys instead and simplify checks for wire edges. Also rename BKE_mesh_from_curve() --> BKE_mesh_to_curve() since this function converts a mesh into a curve.
2013-03-14 18:35:21 +00:00
needsFree = true;
merge with trunk/2.5 at r23876 [[Split portion of a mixed commit.]]
2009-10-22 23:22:05 +00:00
}
Fix for convert_exec() "Keep original" option now works for all objects' types
2010-03-07 05:04:22 +00:00
dm->needsFree = needsFree;
merge with trunk/2.5 at r23876 [[Split portion of a mixed commit.]]
2009-10-22 23:22:05 +00:00
dm->release(dm);
Fix for convert_exec() "Keep original" option now works for all objects' types
2010-03-07 05:04:22 +00:00
if (needsFree) {
ob->derivedFinal = NULL;
Fix #22654: Converted curve from mesh disappearing Curve object should have ob->bb=NULL if there is no derivedMesh
2010-06-23 09:58:02 +00:00
/* curve object could have got bounding box only in special cases */
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
if (ob->bb) {
Fix #22654: Converted curve from mesh disappearing Curve object should have ob->bb=NULL if there is no derivedMesh
2010-06-23 09:58:02 +00:00
MEM_freeN(ob->bb);
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
ob->bb = NULL;
Fix #22654: Converted curve from mesh disappearing Curve object should have ob->bb=NULL if there is no derivedMesh
2010-06-23 09:58:02 +00:00
}
Fix for convert_exec() "Keep original" option now works for all objects' types
2010-03-07 05:04:22 +00:00
}
merge with trunk/2.5 at r23876 [[Split portion of a mixed commit.]]
2009-10-22 23:22:05 +00:00
}
code cleanup: naming - BKE_mesh_*
2012-05-05 21:28:12 +00:00
void BKE_mesh_delete_material_index(Mesh *me, short index)
2.5 Think global, act local! The old favorite G.scene gone! Man... that took almost 2 days. Also removed G.curscreen and G.edbo. Not everything could get solved; here's some notes. - modifiers now store current scene in ModifierData. This is not meant for permanent, but it can probably stick there until we cleaned the anim system and depsgraph to cope better with timing issues. - Game engine G.scene should become an argument for staring it. Didn't solve this yet. - Texture nodes should get scene cfra, but the current implementation is too tightly wrapped to do it easily.
2009-01-04 14:14:06 +00:00
{
- added editmesh_[de]select_by_material function - added mesh_set_smooth_flag, mesh_delete_material_index function - isolated some globals - got rid of reliance on meshdata in buttons_editing.c and material.c
2004-03-20 23:59:57 +00:00
int i;
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
for (i = 0; i < me->totpoly; i++) {
MPoly *mp = &((MPoly *) me->mpoly)[i];
if (mp->mat_nr && mp->mat_nr >= index)
=bmesh= fixed material deletion
2011-04-24 08:11:44 +00:00
mp->mat_nr--;
=bmesh= fixed a tesselation bug, and smooth shaded operator in object mode
2011-04-24 08:06:26 +00:00
}
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
for (i = 0; i < me->totface; i++) {
MFace *mf = &((MFace *) me->mface)[i];
if (mf->mat_nr && mf->mat_nr >= index)
- added editmesh_[de]select_by_material function - added mesh_set_smooth_flag, mesh_delete_material_index function - isolated some globals - got rid of reliance on meshdata in buttons_editing.c and material.c
2004-03-20 23:59:57 +00:00
mf->mat_nr--;
}
}
code cleanup: naming - BKE_mesh_*
2012-05-05 21:28:12 +00:00
void BKE_mesh_smooth_flag_set(Object *meshOb, int enableSmooth)
2.5 Think global, act local! The old favorite G.scene gone! Man... that took almost 2 days. Also removed G.curscreen and G.edbo. Not everything could get solved; here's some notes. - modifiers now store current scene in ModifierData. This is not meant for permanent, but it can probably stick there until we cleaned the anim system and depsgraph to cope better with timing issues. - Game engine G.scene should become an argument for staring it. Didn't solve this yet. - Texture nodes should get scene cfra, but the current implementation is too tightly wrapped to do it easily.
2009-01-04 14:14:06 +00:00
{
- split makeDispList into makeDispList{Mesh,MBall,CurveTypes}, there is still a makeDispList that dispatches to the appropriate one. makeDispList is on the way out and this makes it easier to track down exactly which places use makedispList and for what types of objects. - switch calls to makeDispList to appropriate more specific function (if the object type is known by caller). - added mesh_changed function that invalidates cached mesh data (but does not rebuild, mesh data gets rebuilt on access). Most old calls to makeDispListMesh use this instead now.
2005-07-14 15:48:01 +00:00
Mesh *me = meshOb->data;
- added editmesh_[de]select_by_material function - added mesh_set_smooth_flag, mesh_delete_material_index function - isolated some globals - got rid of reliance on meshdata in buttons_editing.c and material.c
2004-03-20 23:59:57 +00:00
int i;
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
for (i = 0; i < me->totpoly; i++) {
MPoly *mp = &((MPoly *) me->mpoly)[i];
=bmesh= fixed a tesselation bug, and smooth shaded operator in object mode
2011-04-24 08:06:26 +00:00
if (enableSmooth) {
mp->flag |= ME_SMOOTH;
style cleanup: follow style guide for formatting of if/for/while loops, and else if's
2012-03-24 06:18:31 +00:00
}
else {
=bmesh= fixed a tesselation bug, and smooth shaded operator in object mode
2011-04-24 08:06:26 +00:00
mp->flag &= ~ME_SMOOTH;
}
}
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
for (i = 0; i < me->totface; i++) {
MFace *mf = &((MFace *) me->mface)[i];
- added editmesh_[de]select_by_material function - added mesh_set_smooth_flag, mesh_delete_material_index function - isolated some globals - got rid of reliance on meshdata in buttons_editing.c and material.c
2004-03-20 23:59:57 +00:00
if (enableSmooth) {
mf->flag |= ME_SMOOTH;
style cleanup: follow style guide for formatting of if/for/while loops, and else if's
2012-03-24 06:18:31 +00:00
}
else {
- added editmesh_[de]select_by_material function - added mesh_set_smooth_flag, mesh_delete_material_index function - isolated some globals - got rid of reliance on meshdata in buttons_editing.c and material.c
2004-03-20 23:59:57 +00:00
mf->flag &= ~ME_SMOOTH;
}
}
}
- missed commit of file with mesh_calc_normals
2005-07-17 21:24:43 +00:00
code cleanup: naming - BKE_mesh_*
2012-05-05 21:28:12 +00:00
void BKE_mesh_calc_normals_mapping(MVert *mverts, int numVerts,
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
MLoop *mloop, MPoly *mpolys, int numLoops, int numPolys, float (*polyNors_r)[3],
MFace *mfaces, int numFaces, int *origIndexFace, float (*faceNors_r)[3])
added mesh_calc_normals_ex() which is mesh_calc_normals() with an option to skip recalculating the vertex normals (only calculate poly/face normals instead). also removed unneeded allocation of face normals. otherwise no functional change.
2011-12-06 22:55:41 +00:00
{
code cleanup: naming - BKE_mesh_*
2012-05-05 21:28:12 +00:00
BKE_mesh_calc_normals_mapping_ex(mverts, numVerts, mloop, mpolys,
numLoops, numPolys, polyNors_r, mfaces, numFaces,
origIndexFace, faceNors_r, FALSE);
added mesh_calc_normals_ex() which is mesh_calc_normals() with an option to skip recalculating the vertex normals (only calculate poly/face normals instead). also removed unneeded allocation of face normals. otherwise no functional change.
2011-12-06 22:55:41 +00:00
}
rename normal calc functions. comparing bmesh to trunk, mesh_calc_normals() in bmesh is a much more comprehensive function, calculating mpoly,mface normals, where trunk only calculated vertex normals. renamed: * mesh_calc_normals() --> mesh_calc_normals_mapping_ex * mesh_calc_tessface_normals --> mesh_calc_normals_tessface() - only calculates normals from tessface * added mesh_calc_normals() - only calculates normals from poltys this way we can have mesh_calc_normals() remain fast for parts of the code which only need vertex normals to be updated. only refactor, no func changes- didnt replace mesh_calc_normals_mapping_ex() with mesh_calc_normals() anywhere yet.
2012-01-06 00:08:37 +00:00
code cleanup: naming - BKE_mesh_*
2012-05-05 21:28:12 +00:00
void BKE_mesh_calc_normals_mapping_ex(MVert *mverts, int numVerts,
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
MLoop *mloop, MPoly *mpolys,
int numLoops, int numPolys, float (*polyNors_r)[3],
MFace *mfaces, int numFaces, int *origIndexFace, float (*faceNors_r)[3],
code cleanup: use booleans for mesh and selection code.
2013-03-19 23:17:44 +00:00
const bool only_face_normals)
=bmesh= merge from trunk at r36153
2011-04-15 01:19:13 +00:00
{
float (*pnors)[3] = polyNors_r, (*fnors)[3] = faceNors_r;
rename normal calc functions. comparing bmesh to trunk, mesh_calc_normals() in bmesh is a much more comprehensive function, calculating mpoly,mface normals, where trunk only calculated vertex normals. renamed: * mesh_calc_normals() --> mesh_calc_normals_mapping_ex * mesh_calc_tessface_normals --> mesh_calc_normals_tessface() - only calculates normals from tessface * added mesh_calc_normals() - only calculates normals from poltys this way we can have mesh_calc_normals() remain fast for parts of the code which only need vertex normals to be updated. only refactor, no func changes- didnt replace mesh_calc_normals_mapping_ex() with mesh_calc_normals() anywhere yet.
2012-01-06 00:08:37 +00:00
int i;
=bmesh= merge from trunk at r36153
2011-04-15 01:19:13 +00:00
MFace *mf;
MPoly *mp;
More normal fixes, this time for object mode calculation of vertex normals
2011-09-30 05:27:44 +00:00
if (numPolys == 0) {
return;
}
Fix for some typos/spelling mistakes
2012-08-18 03:55:19 +00:00
/* if we are not calculating verts and no verts were passes then we have nothing to do */
added mesh_calc_normals_ex() which is mesh_calc_normals() with an option to skip recalculating the vertex normals (only calculate poly/face normals instead). also removed unneeded allocation of face normals. otherwise no functional change.
2011-12-06 22:55:41 +00:00
if ((only_face_normals == TRUE) && (polyNors_r == NULL) && (faceNors_r == NULL)) {
printf("%s: called with nothing to do\n", __func__);
More normal fixes, this time for object mode calculation of vertex normals
2011-09-30 05:27:44 +00:00
return;
}
added mesh_calc_normals_ex() which is mesh_calc_normals() with an option to skip recalculating the vertex normals (only calculate poly/face normals instead). also removed unneeded allocation of face normals. otherwise no functional change.
2011-12-06 22:55:41 +00:00
if (!pnors) pnors = MEM_callocN(sizeof(float) * 3 * numPolys, "poly_nors mesh.c");
/* if (!fnors) fnors = MEM_callocN(sizeof(float) * 3 * numFaces, "face nors mesh.c"); */ /* NO NEED TO ALLOC YET */
if (only_face_normals == FALSE) {
/* vertex normals are optional, they require some extra calculations,
* so make them optional */
code cleanup: naming - BKE_mesh_*
2012-05-05 21:28:12 +00:00
BKE_mesh_calc_normals(mverts, numVerts, mloop, mpolys, numLoops, numPolys, pnors);
=bmesh= merge from trunk at r36153
2011-04-15 01:19:13 +00:00
}
added mesh_calc_normals_ex() which is mesh_calc_normals() with an option to skip recalculating the vertex normals (only calculate poly/face normals instead). also removed unneeded allocation of face normals. otherwise no functional change.
2011-12-06 22:55:41 +00:00
else {
/* only calc poly normals */
mp = mpolys;
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
for (i = 0; i < numPolys; i++, mp++) {
fix [#32646] Duplifaces can have wrong orientation with ngons concave ngons could flip the dupliface, now use the faces normal when calculating the dupli-face.
2012-09-25 00:20:42 +00:00
BKE_mesh_calc_poly_normal(mp, mloop + mp->loopstart, mverts, pnors[i]);
added mesh_calc_normals_ex() which is mesh_calc_normals() with an option to skip recalculating the vertex normals (only calculate poly/face normals instead). also removed unneeded allocation of face normals. otherwise no functional change.
2011-12-06 22:55:41 +00:00
}
}
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
if (origIndexFace &&
style cleanup
2012-05-27 19:40:36 +00:00
/* fnors == faceNors_r */ /* NO NEED TO ALLOC YET */
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
fnors != NULL &&
numFaces)
added mesh_calc_normals_ex() which is mesh_calc_normals() with an option to skip recalculating the vertex normals (only calculate poly/face normals instead). also removed unneeded allocation of face normals. otherwise no functional change.
2011-12-06 22:55:41 +00:00
{
=bmesh= merge from trunk at r36153
2011-04-15 01:19:13 +00:00
mf = mfaces;
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
for (i = 0; i < numFaces; i++, mf++, origIndexFace++) {
fixed a bug with normals
2011-04-15 02:18:24 +00:00
if (*origIndexFace < numPolys) {
Various typo cleanups, remove unnecessary code etc, found during recent work and separated to a cleanup change
2011-11-20 16:21:13 +00:00
copy_v3_v3(fnors[i], pnors[*origIndexFace]);
code cleanup: white space, spelling & ';;' end of lines.
2012-02-25 16:04:03 +00:00
}
else {
/* eek, we're not corresponding to polys */
code cleanup: naming - BKE_mesh_*
2012-05-05 21:28:12 +00:00
printf("error in BKE_mesh_calc_normals; tessellation face indices are incorrect. normals may look bad.\n");
=bmesh= merge from trunk at r36153
2011-04-15 01:19:13 +00:00
}
}
}
More normal fixes, this time for object mode calculation of vertex normals
2011-09-30 05:27:44 +00:00
added mesh_calc_normals_ex() which is mesh_calc_normals() with an option to skip recalculating the vertex normals (only calculate poly/face normals instead). also removed unneeded allocation of face normals. otherwise no functional change.
2011-12-06 22:55:41 +00:00
if (pnors != polyNors_r) MEM_freeN(pnors);
/* if (fnors != faceNors_r) MEM_freeN(fnors); */ /* NO NEED TO ALLOC YET */
=bmesh= merge from trunk at r36153
2011-04-15 01:19:13 +00:00
fnors = pnors = NULL;
- added editmesh_[de]select_by_material function - added mesh_set_smooth_flag, mesh_delete_material_index function - isolated some globals - got rid of reliance on meshdata in buttons_editing.c and material.c
2004-03-20 23:59:57 +00:00
}
- missed commit of file with mesh_calc_normals
2005-07-17 21:24:43 +00:00
code cleanup: naming - BKE_mesh_*
2012-05-05 21:28:12 +00:00
void BKE_mesh_calc_normals(MVert *mverts, int numVerts, MLoop *mloop, MPoly *mpolys,
int UNUSED(numLoops), int numPolys, float (*polyNors_r)[3])
rename normal calc functions. comparing bmesh to trunk, mesh_calc_normals() in bmesh is a much more comprehensive function, calculating mpoly,mface normals, where trunk only calculated vertex normals. renamed: * mesh_calc_normals() --> mesh_calc_normals_mapping_ex * mesh_calc_tessface_normals --> mesh_calc_normals_tessface() - only calculates normals from tessface * added mesh_calc_normals() - only calculates normals from poltys this way we can have mesh_calc_normals() remain fast for parts of the code which only need vertex normals to be updated. only refactor, no func changes- didnt replace mesh_calc_normals_mapping_ex() with mesh_calc_normals() anywhere yet.
2012-01-06 00:08:37 +00:00
{
float (*pnors)[3] = polyNors_r;
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
float (*tnorms)[3], (*edgevecbuf)[3] = NULL;
rename normal calc functions. comparing bmesh to trunk, mesh_calc_normals() in bmesh is a much more comprehensive function, calculating mpoly,mface normals, where trunk only calculated vertex normals. renamed: * mesh_calc_normals() --> mesh_calc_normals_mapping_ex * mesh_calc_tessface_normals --> mesh_calc_normals_tessface() - only calculates normals from tessface * added mesh_calc_normals() - only calculates normals from poltys this way we can have mesh_calc_normals() remain fast for parts of the code which only need vertex normals to be updated. only refactor, no func changes- didnt replace mesh_calc_normals_mapping_ex() with mesh_calc_normals() anywhere yet.
2012-01-06 00:08:37 +00:00
float **vertcos = NULL, **vertnos = NULL;
BLI_array_declare(vertcos);
BLI_array_declare(vertnos);
BLI_array_declare(edgevecbuf);
int i, j;
MPoly *mp;
MLoop *ml;
if (!pnors) pnors = MEM_callocN(sizeof(float) * 3 * numPolys, "poly_nors mesh.c");
Fix for some typos/spelling mistakes
2012-08-18 03:55:19 +00:00
/* first go through and calculate normals for all the polys */
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
tnorms = MEM_callocN(sizeof(float) * 3 * numVerts, "tnorms mesh.c");
rename normal calc functions. comparing bmesh to trunk, mesh_calc_normals() in bmesh is a much more comprehensive function, calculating mpoly,mface normals, where trunk only calculated vertex normals. renamed: * mesh_calc_normals() --> mesh_calc_normals_mapping_ex * mesh_calc_tessface_normals --> mesh_calc_normals_tessface() - only calculates normals from tessface * added mesh_calc_normals() - only calculates normals from poltys this way we can have mesh_calc_normals() remain fast for parts of the code which only need vertex normals to be updated. only refactor, no func changes- didnt replace mesh_calc_normals_mapping_ex() with mesh_calc_normals() anywhere yet.
2012-01-06 00:08:37 +00:00
mp = mpolys;
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
for (i = 0; i < numPolys; i++, mp++) {
fix [#32646] Duplifaces can have wrong orientation with ngons concave ngons could flip the dupliface, now use the faces normal when calculating the dupli-face.
2012-09-25 00:20:42 +00:00
BKE_mesh_calc_poly_normal(mp, mloop + mp->loopstart, mverts, pnors[i]);
rename normal calc functions. comparing bmesh to trunk, mesh_calc_normals() in bmesh is a much more comprehensive function, calculating mpoly,mface normals, where trunk only calculated vertex normals. renamed: * mesh_calc_normals() --> mesh_calc_normals_mapping_ex * mesh_calc_tessface_normals --> mesh_calc_normals_tessface() - only calculates normals from tessface * added mesh_calc_normals() - only calculates normals from poltys this way we can have mesh_calc_normals() remain fast for parts of the code which only need vertex normals to be updated. only refactor, no func changes- didnt replace mesh_calc_normals_mapping_ex() with mesh_calc_normals() anywhere yet.
2012-01-06 00:08:37 +00:00
ml = mloop + mp->loopstart;
BLI_array_empty(vertcos);
BLI_array_empty(vertnos);
style cleanup: format 'for' loop macros the same as for loops, some renaming to BLI_array macros.
2012-04-28 15:14:16 +00:00
BLI_array_grow_items(vertcos, mp->totloop);
BLI_array_grow_items(vertnos, mp->totloop);
Minor Improvements... - more efficient array growing - use BM_NGON_STACK_SIZE for more static arrays - dont use BLI_array for bevel code where size is known.
2012-02-05 23:09:07 +00:00
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
for (j = 0; j < mp->totloop; j++) {
rename normal calc functions. comparing bmesh to trunk, mesh_calc_normals() in bmesh is a much more comprehensive function, calculating mpoly,mface normals, where trunk only calculated vertex normals. renamed: * mesh_calc_normals() --> mesh_calc_normals_mapping_ex * mesh_calc_tessface_normals --> mesh_calc_normals_tessface() - only calculates normals from tessface * added mesh_calc_normals() - only calculates normals from poltys this way we can have mesh_calc_normals() remain fast for parts of the code which only need vertex normals to be updated. only refactor, no func changes- didnt replace mesh_calc_normals_mapping_ex() with mesh_calc_normals() anywhere yet.
2012-01-06 00:08:37 +00:00
int vindex = ml[j].v;
Minor Improvements... - more efficient array growing - use BM_NGON_STACK_SIZE for more static arrays - dont use BLI_array for bevel code where size is known.
2012-02-05 23:09:07 +00:00
vertcos[j] = mverts[vindex].co;
vertnos[j] = tnorms[vindex];
rename normal calc functions. comparing bmesh to trunk, mesh_calc_normals() in bmesh is a much more comprehensive function, calculating mpoly,mface normals, where trunk only calculated vertex normals. renamed: * mesh_calc_normals() --> mesh_calc_normals_mapping_ex * mesh_calc_tessface_normals --> mesh_calc_normals_tessface() - only calculates normals from tessface * added mesh_calc_normals() - only calculates normals from poltys this way we can have mesh_calc_normals() remain fast for parts of the code which only need vertex normals to be updated. only refactor, no func changes- didnt replace mesh_calc_normals_mapping_ex() with mesh_calc_normals() anywhere yet.
2012-01-06 00:08:37 +00:00
}
BLI_array_empty(edgevecbuf);
style cleanup: format 'for' loop macros the same as for loops, some renaming to BLI_array macros.
2012-04-28 15:14:16 +00:00
BLI_array_grow_items(edgevecbuf, mp->totloop);
rename normal calc functions. comparing bmesh to trunk, mesh_calc_normals() in bmesh is a much more comprehensive function, calculating mpoly,mface normals, where trunk only calculated vertex normals. renamed: * mesh_calc_normals() --> mesh_calc_normals_mapping_ex * mesh_calc_tessface_normals --> mesh_calc_normals_tessface() - only calculates normals from tessface * added mesh_calc_normals() - only calculates normals from poltys this way we can have mesh_calc_normals() remain fast for parts of the code which only need vertex normals to be updated. only refactor, no func changes- didnt replace mesh_calc_normals_mapping_ex() with mesh_calc_normals() anywhere yet.
2012-01-06 00:08:37 +00:00
accumulate_vertex_normals_poly(vertnos, pnors[i], vertcos, edgevecbuf, mp->totloop);
}
BLI_array_free(vertcos);
BLI_array_free(vertnos);
BLI_array_free(edgevecbuf);
/* following Mesh convention; we use vertex coordinate itself for normal in this case */
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
for (i = 0; i < numVerts; i++) {
MVert *mv = &mverts[i];
float *no = tnorms[i];
rename normal calc functions. comparing bmesh to trunk, mesh_calc_normals() in bmesh is a much more comprehensive function, calculating mpoly,mface normals, where trunk only calculated vertex normals. renamed: * mesh_calc_normals() --> mesh_calc_normals_mapping_ex * mesh_calc_tessface_normals --> mesh_calc_normals_tessface() - only calculates normals from tessface * added mesh_calc_normals() - only calculates normals from poltys this way we can have mesh_calc_normals() remain fast for parts of the code which only need vertex normals to be updated. only refactor, no func changes- didnt replace mesh_calc_normals_mapping_ex() with mesh_calc_normals() anywhere yet.
2012-01-06 00:08:37 +00:00
code cleanup: typos and set exceptional cases of zero length normals as UNLIKELY().
2012-09-17 22:22:06 +00:00
if (UNLIKELY(normalize_v3(no) == 0.0f)) {
rename normal calc functions. comparing bmesh to trunk, mesh_calc_normals() in bmesh is a much more comprehensive function, calculating mpoly,mface normals, where trunk only calculated vertex normals. renamed: * mesh_calc_normals() --> mesh_calc_normals_mapping_ex * mesh_calc_tessface_normals --> mesh_calc_normals_tessface() - only calculates normals from tessface * added mesh_calc_normals() - only calculates normals from poltys this way we can have mesh_calc_normals() remain fast for parts of the code which only need vertex normals to be updated. only refactor, no func changes- didnt replace mesh_calc_normals_mapping_ex() with mesh_calc_normals() anywhere yet.
2012-01-06 00:08:37 +00:00
normalize_v3_v3(no, mv->co);
code cleanup: typos and set exceptional cases of zero length normals as UNLIKELY().
2012-09-17 22:22:06 +00:00
}
rename normal calc functions. comparing bmesh to trunk, mesh_calc_normals() in bmesh is a much more comprehensive function, calculating mpoly,mface normals, where trunk only calculated vertex normals. renamed: * mesh_calc_normals() --> mesh_calc_normals_mapping_ex * mesh_calc_tessface_normals --> mesh_calc_normals_tessface() - only calculates normals from tessface * added mesh_calc_normals() - only calculates normals from poltys this way we can have mesh_calc_normals() remain fast for parts of the code which only need vertex normals to be updated. only refactor, no func changes- didnt replace mesh_calc_normals_mapping_ex() with mesh_calc_normals() anywhere yet.
2012-01-06 00:08:37 +00:00
normal_float_to_short_v3(mv->no, no);
}
MEM_freeN(tnorms);
if (pnors != polyNors_r) MEM_freeN(pnors);
}
code cleanup: naming - BKE_mesh_*
2012-05-05 21:28:12 +00:00
void BKE_mesh_calc_normals_tessface(MVert *mverts, int numVerts, MFace *mfaces, int numFaces, float (*faceNors_r)[3])
- missed commit of file with mesh_calc_normals
2005-07-17 21:24:43 +00:00
{
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
float (*tnorms)[3] = MEM_callocN(numVerts * sizeof(*tnorms), "tnorms");
float (*fnors)[3] = (faceNors_r) ? faceNors_r : MEM_callocN(sizeof(*fnors) * numFaces, "meshnormals");
- missed commit of file with mesh_calc_normals
2005-07-17 21:24:43 +00:00
int i;
Added custom vertex/edge/face data for meshes: All data layers, including MVert/MEdge/MFace, are now managed as custom data layers. The pointers like Mesh.mvert, Mesh.dvert or Mesh.mcol are still used of course, but allocating, copying or freeing these arrays should be done through the CustomData API. Work in progress documentation on this is here: http://mediawiki.blender.org/index.php/BlenderDev/BlenderArchitecture/CustomData Replaced TFace by MTFace: This is the same struct, except that it does not contain color, that now always stays separated in MCol. This was not a good design decision to begin with, and it is needed for adding multiple color layers later. Note that this does mean older Blender versions will not be able to read UV coordinates from the next release, due to an SDNA limitation. Removed DispListMesh: This now fully replaced by DerivedMesh. To provide access to arrays of vertices, edges and faces, like DispListMesh does. The semantics of the DerivedMesh.getVertArray() and similar functions were changed to return a pointer to an array if one exists, or otherwise allocate a temporary one. On releasing the DerivedMesh, this temporary array will be removed automatically. Removed ssDM and meshDM DerivedMesh backends: The ssDM backend was for DispListMesh, so that became obsolete automatically. The meshDM backend was replaced by the custom data backend, that now figures out which layers need to be modified, and only duplicates those. This changes code in many places, and overall removes 2514 lines of code. So, there's a good chance this might break some stuff, although I've been testing it for a few days now. The good news is, adding multiple color and uv layers should now become easy.
2006-11-20 04:28:02 +00:00
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
for (i = 0; i < numFaces; i++) {
MFace *mf = &mfaces[i];
float *f_no = fnors[i];
float *n4 = (mf->v4) ? tnorms[mf->v4] : NULL;
float *c4 = (mf->v4) ? mverts[mf->v4].co : NULL;
- missed commit of file with mesh_calc_normals
2005-07-17 21:24:43 +00:00
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
if (mf->v4)
Fix/change in normal computation, now the viewport uses the same angle weighted normals as the render engine, and the render engine will copy normals from the mesh rather than always recalculating them. Subsurf/multires still use regular vertex normals, but they are expected to be sufficiently high resolution to not need this. This means that normal maps displayed in the viewport actually match the render engine exactly and don't have artifacts due to this discrepancy. It of course also avoids unexpected surprises where your render normals look different than your viewport normals. Subversion bumped to 4 for version patch to recalculate normals. Patch by Morten Mikkelsen, with some small changes.
2011-03-20 13:35:35 +00:00
normal_quad_v3(f_no, mverts[mf->v1].co, mverts[mf->v2].co, mverts[mf->v3].co, mverts[mf->v4].co);
- added mesh_strip_loose_faces, works in conjunction with make_edges to get rid of faces with MFace.v3==0 - change all Mesh's to have ->medge now. This is forced by make_edges on readfile, and in the various exotic important routines, and on conversion back in python. - make python NMesh structure always have medges now (needs testing) - with above two changes it is guarenteed that mf->v3 is never ==0 in main blender code (i.e., all MFace's are actually triangles or quads) and so I went through and removed all the historic tests to deal with MFace.v3==0. Equals lots of deleting, I am in heaven! - removed MEdge edcode flag, no longer needed - added experimental replacement for edge flag system Still are some inconsistencies in FACESELECT mode edge drawing to be ironed out. NOTE: This commit adds an experimental edge flag calc system, based on 10-seconds-of-thought algorithm by yours truly. Would appreciate feedback on how this system works, esp compared to old one and esp on complex or interesting models. To Use: New system is enabled by setting G.rt to a value between 1 and 1000 (Value of 0 uses old system). Value 1000 is reserved for "auto" edge, which is more or less identical to old system but also makes sure that at least 10% of edges are drawn (solves errors for super subdivided meshes). Values between 1 and 999 act as percent (out of 1000) of edges that should be drawn, starting with "most interesting" edges first. Please try it and comment!
2005-08-21 07:19:20 +00:00
else
Fix/change in normal computation, now the viewport uses the same angle weighted normals as the render engine, and the render engine will copy normals from the mesh rather than always recalculating them. Subsurf/multires still use regular vertex normals, but they are expected to be sufficiently high resolution to not need this. This means that normal maps displayed in the viewport actually match the render engine exactly and don't have artifacts due to this discrepancy. It of course also avoids unexpected surprises where your render normals look different than your viewport normals. Subversion bumped to 4 for version patch to recalculate normals. Patch by Morten Mikkelsen, with some small changes.
2011-03-20 13:35:35 +00:00
normal_tri_v3(f_no, mverts[mf->v1].co, mverts[mf->v2].co, mverts[mf->v3].co);
Revert mesh recalculation change that gives different vertex normals based on smooth/flat flag on faces. This does give better results for low poly game models, but there's just too much functionality that depends on this (modifiers, displacey, editmode tools, extrude, ...), that there's not enough time to fix these before the release.
2011-04-04 13:02:12 +00:00
accumulate_vertex_normals(tnorms[mf->v1], tnorms[mf->v2], tnorms[mf->v3], n4,
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
f_no, mverts[mf->v1].co, mverts[mf->v2].co, mverts[mf->v3].co, c4);
- missed commit of file with mesh_calc_normals
2005-07-17 21:24:43 +00:00
}
Fix/change in normal computation, now the viewport uses the same angle weighted normals as the render engine, and the render engine will copy normals from the mesh rather than always recalculating them. Subsurf/multires still use regular vertex normals, but they are expected to be sufficiently high resolution to not need this. This means that normal maps displayed in the viewport actually match the render engine exactly and don't have artifacts due to this discrepancy. It of course also avoids unexpected surprises where your render normals look different than your viewport normals. Subversion bumped to 4 for version patch to recalculate normals. Patch by Morten Mikkelsen, with some small changes.
2011-03-20 13:35:35 +00:00
/* following Mesh convention; we use vertex coordinate itself for normal in this case */
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
for (i = 0; i < numVerts; i++) {
MVert *mv = &mverts[i];
float *no = tnorms[i];
- missed commit of file with mesh_calc_normals
2005-07-17 21:24:43 +00:00
code cleanup: typos and set exceptional cases of zero length normals as UNLIKELY().
2012-09-17 22:22:06 +00:00
if (UNLIKELY(normalize_v3(no) == 0.0f)) {
use more BLI math functions.
2010-08-15 15:14:08 +00:00
normalize_v3_v3(no, mv->co);
code cleanup: typos and set exceptional cases of zero length normals as UNLIKELY().
2012-09-17 22:22:06 +00:00
}
- change mesh_calc_normals to set vertices with len(no)==0 to normalised coordinate (convention in blender, helps with halo) - removed vertexnormals(), vertexnormals_mesh() - removed CTX_NO_NOR_RECALC (always assume already calculated) - change NMesh.c to call mesh_calc_normals - chance load_editMesh to call mesh_calc_normals after done converting instead of using editmesh normals - update recalc_editnormals to also calc vertex normals (whats 4 more adds and a sqrt among friends) Its hard to believe, but it just might be the case that there are only two places mesh normals are calculated now (renderer and kernel)
2005-07-23 19:03:43 +00:00
use more BLI math functions.
2010-08-15 15:14:08 +00:00
normal_float_to_short_v3(mv->no, no);
- missed commit of file with mesh_calc_normals
2005-07-17 21:24:43 +00:00
}
MEM_freeN(tnorms);
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
if (fnors != faceNors_r)
- missed commit of file with mesh_calc_normals
2005-07-17 21:24:43 +00:00
MEM_freeN(fnors);
}
- moved mesh_getVertexCos to mesh.c and prototyped - make mesh_modifier build vertex locations on demand
2005-07-22 17:03:50 +00:00
Fix #31172: applying boolean removes uv maps The issue was caused by CDDM_tessfaces_to_faces not dealing with CD layers. There was already function BKE_mesh_convert_mfaces_to_mpolys which converted mfaces to mpolys with converting all CD layers. Made it a bit more general so it might work with given arrays of faces/polys and re-used it from CDDM module. Checked with UV and sculpt data from Blender 2.61 and it loaded nice, so hopefully there's no regressions in loading older files.
2012-06-04 12:10:38 +00:00
static void bm_corners_to_loops_ex(ID *id, CustomData *fdata, CustomData *ldata, CustomData *pdata,
MFace *mface, int totloop, int findex, int loopstart, int numTex, int numCol)
=bmesh= merge from trunk at r36153
2011-04-15 01:19:13 +00:00
{
MTFace *texface;
MTexPoly *texpoly;
MCol *mcol;
MLoopCol *mloopcol;
MLoopUV *mloopuv;
MFace *mf;
int i;
Fix #31172: applying boolean removes uv maps The issue was caused by CDDM_tessfaces_to_faces not dealing with CD layers. There was already function BKE_mesh_convert_mfaces_to_mpolys which converted mfaces to mpolys with converting all CD layers. Made it a bit more general so it might work with given arrays of faces/polys and re-used it from CDDM module. Checked with UV and sculpt data from Blender 2.61 and it loaded nice, so hopefully there's no regressions in loading older files.
2012-06-04 12:10:38 +00:00
mf = mface + findex;
set many vars & functions as static, also commented invalid pin theme alpha assignment so bmesh branch builds with -Werror
2011-05-11 02:14:43 +00:00
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
for (i = 0; i < numTex; i++) {
Fix #31172: applying boolean removes uv maps The issue was caused by CDDM_tessfaces_to_faces not dealing with CD layers. There was already function BKE_mesh_convert_mfaces_to_mpolys which converted mfaces to mpolys with converting all CD layers. Made it a bit more general so it might work with given arrays of faces/polys and re-used it from CDDM module. Checked with UV and sculpt data from Blender 2.61 and it loaded nice, so hopefully there's no regressions in loading older files.
2012-06-04 12:10:38 +00:00
texface = CustomData_get_n(fdata, CD_MTFACE, findex, i);
texpoly = CustomData_get_n(pdata, CD_MTEXPOLY, findex, i);
Code Cleanup: macro for copying polygon settings
2012-02-08 09:02:10 +00:00
ME_MTEXFACE_CPY(texpoly, texface);
Fix #31172: applying boolean removes uv maps The issue was caused by CDDM_tessfaces_to_faces not dealing with CD layers. There was already function BKE_mesh_convert_mfaces_to_mpolys which converted mfaces to mpolys with converting all CD layers. Made it a bit more general so it might work with given arrays of faces/polys and re-used it from CDDM module. Checked with UV and sculpt data from Blender 2.61 and it loaded nice, so hopefully there's no regressions in loading older files.
2012-06-04 12:10:38 +00:00
mloopuv = CustomData_get_n(ldata, CD_MLOOPUV, loopstart, i);
Code Cleanup: use vector functions for copying / adding UV's
2012-02-05 13:25:42 +00:00
copy_v2_v2(mloopuv->uv, texface->uv[0]); mloopuv++;
copy_v2_v2(mloopuv->uv, texface->uv[1]); mloopuv++;
copy_v2_v2(mloopuv->uv, texface->uv[2]); mloopuv++;
=bmesh= merge from trunk at r36153
2011-04-15 01:19:13 +00:00
if (mf->v4) {
Code Cleanup: use vector functions for copying / adding UV's
2012-02-05 13:25:42 +00:00
copy_v2_v2(mloopuv->uv, texface->uv[3]); mloopuv++;
=bmesh= merge from trunk at r36153
2011-04-15 01:19:13 +00:00
}
}
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
for (i = 0; i < numCol; i++) {
Fix #31172: applying boolean removes uv maps The issue was caused by CDDM_tessfaces_to_faces not dealing with CD layers. There was already function BKE_mesh_convert_mfaces_to_mpolys which converted mfaces to mpolys with converting all CD layers. Made it a bit more general so it might work with given arrays of faces/polys and re-used it from CDDM module. Checked with UV and sculpt data from Blender 2.61 and it loaded nice, so hopefully there's no regressions in loading older files.
2012-06-04 12:10:38 +00:00
mloopcol = CustomData_get_n(ldata, CD_MLOOPCOL, loopstart, i);
mcol = CustomData_get_n(fdata, CD_MCOL, findex, i);
=bmesh= merge from trunk at r36153
2011-04-15 01:19:13 +00:00
swap BMLoopCol r/b color, requires subversion bump. old mesh MCol 'r' was blue, 'b' was red, but theres no reason to keep this for bmesh with MLoopCol. Loading old files works, saving legacy format works too. What wont work is loading a file after this revision and loading it in an older revision since the bmesh merge. (it wont crash but the blue and red will be swapped on vertex color layers).
2012-03-17 20:39:28 +00:00
MESH_MLOOPCOL_FROM_MCOL(mloopcol, &mcol[0]); mloopcol++;
MESH_MLOOPCOL_FROM_MCOL(mloopcol, &mcol[1]); mloopcol++;
MESH_MLOOPCOL_FROM_MCOL(mloopcol, &mcol[2]); mloopcol++;
=bmesh= merge from trunk at r36153
2011-04-15 01:19:13 +00:00
if (mf->v4) {
swap BMLoopCol r/b color, requires subversion bump. old mesh MCol 'r' was blue, 'b' was red, but theres no reason to keep this for bmesh with MLoopCol. Loading old files works, saving legacy format works too. What wont work is loading a file after this revision and loading it in an older revision since the bmesh merge. (it wont crash but the blue and red will be swapped on vertex color layers).
2012-03-17 20:39:28 +00:00
MESH_MLOOPCOL_FROM_MCOL(mloopcol, &mcol[3]); mloopcol++;
=bmesh= merge from trunk at r36153
2011-04-15 01:19:13 +00:00
}
- missed commit of file with mesh_calc_normals
2005-07-17 21:24:43 +00:00
}
Fix #31172: applying boolean removes uv maps The issue was caused by CDDM_tessfaces_to_faces not dealing with CD layers. There was already function BKE_mesh_convert_mfaces_to_mpolys which converted mfaces to mpolys with converting all CD layers. Made it a bit more general so it might work with given arrays of faces/polys and re-used it from CDDM module. Checked with UV and sculpt data from Blender 2.61 and it loaded nice, so hopefully there's no regressions in loading older files.
2012-06-04 12:10:38 +00:00
if (CustomData_has_layer(fdata, CD_MDISPS)) {
MDisps *ld = CustomData_get(ldata, loopstart, CD_MDISPS);
MDisps *fd = CustomData_get(fdata, findex, CD_MDISPS);
=bmesh= merge from trunk at r36153
2011-04-15 01:19:13 +00:00
float (*disps)[3] = fd->disps;
quiet some -Wshadow warnings
2012-10-12 14:35:10 +00:00
int tot = mf->v4 ? 4 : 3;
=bmesh= merge from trunk at r36153
2011-04-15 01:19:13 +00:00
int side, corners;
Fix loading external MDisps, BMesh merge bug. * When converting mfaces to mpolys, load external MDisp data in, add CustomDataExternal struct to loopdata if needed. * Fix multires modifier's filepath RNA functions to use ldata rather than fdata.
2012-04-13 05:39:27 +00:00
Fix #31172: applying boolean removes uv maps The issue was caused by CDDM_tessfaces_to_faces not dealing with CD layers. There was already function BKE_mesh_convert_mfaces_to_mpolys which converted mfaces to mpolys with converting all CD layers. Made it a bit more general so it might work with given arrays of faces/polys and re-used it from CDDM module. Checked with UV and sculpt data from Blender 2.61 and it loaded nice, so hopefully there's no regressions in loading older files.
2012-06-04 12:10:38 +00:00
if (CustomData_external_test(fdata, CD_MDISPS)) {
fix for crash loading durian file '08.5e_comp.blend' - external data pointer for face data was NULL.
2012-10-02 00:54:41 +00:00
if (id && fdata->external) {
Fix #31172: applying boolean removes uv maps The issue was caused by CDDM_tessfaces_to_faces not dealing with CD layers. There was already function BKE_mesh_convert_mfaces_to_mpolys which converted mfaces to mpolys with converting all CD layers. Made it a bit more general so it might work with given arrays of faces/polys and re-used it from CDDM module. Checked with UV and sculpt data from Blender 2.61 and it loaded nice, so hopefully there's no regressions in loading older files.
2012-06-04 12:10:38 +00:00
CustomData_external_add(ldata, id, CD_MDISPS,
totloop, fdata->external->filename);
}
Fix loading external MDisps, BMesh merge bug. * When converting mfaces to mpolys, load external MDisp data in, add CustomDataExternal struct to loopdata if needed. * Fix multires modifier's filepath RNA functions to use ldata rather than fdata.
2012-04-13 05:39:27 +00:00
}
Fix #31172: applying boolean removes uv maps The issue was caused by CDDM_tessfaces_to_faces not dealing with CD layers. There was already function BKE_mesh_convert_mfaces_to_mpolys which converted mfaces to mpolys with converting all CD layers. Made it a bit more general so it might work with given arrays of faces/polys and re-used it from CDDM module. Checked with UV and sculpt data from Blender 2.61 and it loaded nice, so hopefully there's no regressions in loading older files.
2012-06-04 12:10:38 +00:00
=bmesh= merge from trunk at r36153
2011-04-15 01:19:13 +00:00
corners = multires_mdisp_corners(fd);
Fix #31172: applying boolean removes uv maps The issue was caused by CDDM_tessfaces_to_faces not dealing with CD layers. There was already function BKE_mesh_convert_mfaces_to_mpolys which converted mfaces to mpolys with converting all CD layers. Made it a bit more general so it might work with given arrays of faces/polys and re-used it from CDDM module. Checked with UV and sculpt data from Blender 2.61 and it loaded nice, so hopefully there's no regressions in loading older files.
2012-06-04 12:10:38 +00:00
Fix for 28859 (found and reported with fix by nico_ga from #blendercoders)
2011-10-09 21:59:29 +00:00
if (corners == 0) {
/* Empty MDisp layers appear in at least one of the sintel.blend files.
style cleanup / comment formatting for bli/bke/bmesh
2012-03-03 20:19:11 +00:00
* Not sure why this happens, but it seems fine to just ignore them here.
style cleanup
2012-05-27 19:40:36 +00:00
* If (corners == 0) for a non-empty layer though, something went wrong. */
Fix for 28859 (found and reported with fix by nico_ga from #blendercoders)
2011-10-09 21:59:29 +00:00
BLI_assert(fd->totdisp == 0);
}
else {
side = sqrt(fd->totdisp / corners);
Fix #31172: applying boolean removes uv maps The issue was caused by CDDM_tessfaces_to_faces not dealing with CD layers. There was already function BKE_mesh_convert_mfaces_to_mpolys which converted mfaces to mpolys with converting all CD layers. Made it a bit more general so it might work with given arrays of faces/polys and re-used it from CDDM module. Checked with UV and sculpt data from Blender 2.61 and it loaded nice, so hopefully there's no regressions in loading older files.
2012-06-04 12:10:38 +00:00
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
for (i = 0; i < tot; i++, disps += side * side, ld++) {
ld->totdisp = side * side;
code cleanup: double promotion & some style cleanup
2012-05-03 21:35:04 +00:00
ld->level = (int)(logf(side - 1.0f) / (float)M_LN2) + 1;
Fix #31172: applying boolean removes uv maps The issue was caused by CDDM_tessfaces_to_faces not dealing with CD layers. There was already function BKE_mesh_convert_mfaces_to_mpolys which converted mfaces to mpolys with converting all CD layers. Made it a bit more general so it might work with given arrays of faces/polys and re-used it from CDDM module. Checked with UV and sculpt data from Blender 2.61 and it loaded nice, so hopefully there's no regressions in loading older files.
2012-06-04 12:10:38 +00:00
Fix for 28859 (found and reported with fix by nico_ga from #blendercoders)
2011-10-09 21:59:29 +00:00
if (ld->disps)
remove cellalloc, from my tests jemalloc beats cellalloc, so we better just use a better malloc replacement. See Details: http://wiki.blender.org/index.php/User:Ideasman42/BMeshBranchReview#Update_43694
2012-01-25 20:18:12 +00:00
MEM_freeN(ld->disps);
Fix #31172: applying boolean removes uv maps The issue was caused by CDDM_tessfaces_to_faces not dealing with CD layers. There was already function BKE_mesh_convert_mfaces_to_mpolys which converted mfaces to mpolys with converting all CD layers. Made it a bit more general so it might work with given arrays of faces/polys and re-used it from CDDM module. Checked with UV and sculpt data from Blender 2.61 and it loaded nice, so hopefully there's no regressions in loading older files.
2012-06-04 12:10:38 +00:00
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
ld->disps = MEM_callocN(sizeof(float) * 3 * side * side, "converted loop mdisps");
Fix for 28859 (found and reported with fix by nico_ga from #blendercoders)
2011-10-09 21:59:29 +00:00
if (fd->disps) {
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
memcpy(ld->disps, disps, sizeof(float) * 3 * side * side);
Fix for 28859 (found and reported with fix by nico_ga from #blendercoders)
2011-10-09 21:59:29 +00:00
}
=bmesh: bridge edge loop tool= rough version of a new bridge tool. ctrl-e -> bridge (two) edge loops
2011-08-15 23:38:51 +00:00
}
=bmesh= merge from trunk at r36153
2011-04-15 01:19:13 +00:00
}
}
}
bmesh todo, unlikly but possible - entering editmode with faces and no polys. rather then printing a warning and failing - convert them to polys.
2012-03-27 01:28:25 +00:00
void BKE_mesh_convert_mfaces_to_mpolys(Mesh *mesh)
Fix #31172: applying boolean removes uv maps The issue was caused by CDDM_tessfaces_to_faces not dealing with CD layers. There was already function BKE_mesh_convert_mfaces_to_mpolys which converted mfaces to mpolys with converting all CD layers. Made it a bit more general so it might work with given arrays of faces/polys and re-used it from CDDM module. Checked with UV and sculpt data from Blender 2.61 and it loaded nice, so hopefully there's no regressions in loading older files.
2012-06-04 12:10:38 +00:00
{
BKE_mesh_convert_mfaces_to_mpolys_ex(&mesh->id, &mesh->fdata, &mesh->ldata, &mesh->pdata,
mesh->totedge, mesh->totface, mesh->totloop, mesh->totpoly,
mesh->medge, mesh->mface,
&mesh->totloop, &mesh->totpoly, &mesh->mloop, &mesh->mpoly);
code cleanup: name mesh functions more consistently, also use bools for mesh args.
2013-03-17 19:55:10 +00:00
BKE_mesh_update_customdata_pointers(mesh, true);
Fix #31172: applying boolean removes uv maps The issue was caused by CDDM_tessfaces_to_faces not dealing with CD layers. There was already function BKE_mesh_convert_mfaces_to_mpolys which converted mfaces to mpolys with converting all CD layers. Made it a bit more general so it might work with given arrays of faces/polys and re-used it from CDDM module. Checked with UV and sculpt data from Blender 2.61 and it loaded nice, so hopefully there's no regressions in loading older files.
2012-06-04 12:10:38 +00:00
}
Fix #31725: UV map order is ignored when opening in 2.6+ versions Issue was caused by do_versions being used pdata as reference for active/render/ stencil/clone layer indices instead of fdata. Added some utility functions used only by do_versions to be sure this indices are set from fdata for pre-bmesh files.
2012-06-07 09:11:16 +00:00
/* the same as BKE_mesh_convert_mfaces_to_mpolys but oriented to be used in do_versions from readfile.c
* the difference is how active/render/clone/stencil indices are handled here
*
* normally thay're being set from pdata which totally makes sense for meshes which are already
* converted to bmesh structures, but when loading older files indices shall be updated in other
* way around, so newly added pdata and ldata would have this indices set based on fdata layer
*
* this is normally only needed when reading older files, in all other cases BKE_mesh_convert_mfaces_to_mpolys
* shall be always used
*/
void BKE_mesh_do_versions_convert_mfaces_to_mpolys(Mesh *mesh)
{
BKE_mesh_convert_mfaces_to_mpolys_ex(&mesh->id, &mesh->fdata, &mesh->ldata, &mesh->pdata,
mesh->totedge, mesh->totface, mesh->totloop, mesh->totpoly,
mesh->medge, mesh->mface,
&mesh->totloop, &mesh->totpoly, &mesh->mloop, &mesh->mpoly);
CustomData_bmesh_do_versions_update_active_layers(&mesh->fdata, &mesh->pdata, &mesh->ldata);
code cleanup: name mesh functions more consistently, also use bools for mesh args.
2013-03-17 19:55:10 +00:00
BKE_mesh_update_customdata_pointers(mesh, true);
Fix #31725: UV map order is ignored when opening in 2.6+ versions Issue was caused by do_versions being used pdata as reference for active/render/ stencil/clone layer indices instead of fdata. Added some utility functions used only by do_versions to be sure this indices are set from fdata for pre-bmesh files.
2012-06-07 09:11:16 +00:00
}
Fix #31172: applying boolean removes uv maps The issue was caused by CDDM_tessfaces_to_faces not dealing with CD layers. There was already function BKE_mesh_convert_mfaces_to_mpolys which converted mfaces to mpolys with converting all CD layers. Made it a bit more general so it might work with given arrays of faces/polys and re-used it from CDDM module. Checked with UV and sculpt data from Blender 2.61 and it loaded nice, so hopefully there's no regressions in loading older files.
2012-06-04 12:10:38 +00:00
void BKE_mesh_convert_mfaces_to_mpolys_ex(ID *id, CustomData *fdata, CustomData *ldata, CustomData *pdata,
int totedge_i, int totface_i, int totloop_i, int totpoly_i,
MEdge *medge, MFace *mface,
style cleanup: (indentation)
2012-06-06 14:48:39 +00:00
int *totloop_r, int *totpoly_r,
MLoop **mloop_r, MPoly **mpoly_r)
=bmesh= merge from trunk at r36153
2011-04-15 01:19:13 +00:00
{
MFace *mf;
Fix #31172: applying boolean removes uv maps The issue was caused by CDDM_tessfaces_to_faces not dealing with CD layers. There was already function BKE_mesh_convert_mfaces_to_mpolys which converted mfaces to mpolys with converting all CD layers. Made it a bit more general so it might work with given arrays of faces/polys and re-used it from CDDM module. Checked with UV and sculpt data from Blender 2.61 and it loaded nice, so hopefully there's no regressions in loading older files.
2012-06-04 12:10:38 +00:00
MLoop *ml, *mloop;
MPoly *mp, *mpoly;
=bmesh= merge from trunk at r36153
2011-04-15 01:19:13 +00:00
MEdge *me;
EdgeHash *eh;
int numTex, numCol;
Fix #31172: applying boolean removes uv maps The issue was caused by CDDM_tessfaces_to_faces not dealing with CD layers. There was already function BKE_mesh_convert_mfaces_to_mpolys which converted mfaces to mpolys with converting all CD layers. Made it a bit more general so it might work with given arrays of faces/polys and re-used it from CDDM module. Checked with UV and sculpt data from Blender 2.61 and it loaded nice, so hopefully there's no regressions in loading older files.
2012-06-04 12:10:38 +00:00
int i, j, totloop, totpoly, *polyindex;
=bmesh= merge from trunk at r36153
2011-04-15 01:19:13 +00:00
style cleanup: spelling. also remove large, duplicate comments from sunsky.h
2012-03-09 00:41:09 +00:00
/* just in case some of these layers are filled in (can happen with python created meshes) */
Fix #31172: applying boolean removes uv maps The issue was caused by CDDM_tessfaces_to_faces not dealing with CD layers. There was already function BKE_mesh_convert_mfaces_to_mpolys which converted mfaces to mpolys with converting all CD layers. Made it a bit more general so it might work with given arrays of faces/polys and re-used it from CDDM module. Checked with UV and sculpt data from Blender 2.61 and it loaded nice, so hopefully there's no regressions in loading older files.
2012-06-04 12:10:38 +00:00
CustomData_free(ldata, totloop_i);
CustomData_free(pdata, totpoly_i);
edits to rna/tessface UV layer needed to get OBJ import/export functional. add the function to create new UV layers, this only works when there are no polygon layers already created (to prevent confusion since scripts with polygon layers should be adding MTexPoly and MLoopUV layers)
2012-03-07 21:58:58 +00:00
Fix #31172: applying boolean removes uv maps The issue was caused by CDDM_tessfaces_to_faces not dealing with CD layers. There was already function BKE_mesh_convert_mfaces_to_mpolys which converted mfaces to mpolys with converting all CD layers. Made it a bit more general so it might work with given arrays of faces/polys and re-used it from CDDM module. Checked with UV and sculpt data from Blender 2.61 and it loaded nice, so hopefully there's no regressions in loading older files.
2012-06-04 12:10:38 +00:00
totpoly = totface_i;
mpoly = MEM_callocN(sizeof(MPoly) * totpoly, "mpoly converted");
CustomData_add_layer(pdata, CD_MPOLY, CD_ASSIGN, mpoly, totpoly);
numTex = CustomData_number_of_layers(fdata, CD_MTFACE);
numCol = CustomData_number_of_layers(fdata, CD_MCOL);
=bmesh= merge from trunk at r36153
2011-04-15 01:19:13 +00:00
totloop = 0;
Fix #31172: applying boolean removes uv maps The issue was caused by CDDM_tessfaces_to_faces not dealing with CD layers. There was already function BKE_mesh_convert_mfaces_to_mpolys which converted mfaces to mpolys with converting all CD layers. Made it a bit more general so it might work with given arrays of faces/polys and re-used it from CDDM module. Checked with UV and sculpt data from Blender 2.61 and it loaded nice, so hopefully there's no regressions in loading older files.
2012-06-04 12:10:38 +00:00
mf = mface;
for (i = 0; i < totface_i; i++, mf++) {
=bmesh= merge from trunk at r36153
2011-04-15 01:19:13 +00:00
totloop += mf->v4 ? 4 : 3;
}
Fix #31172: applying boolean removes uv maps The issue was caused by CDDM_tessfaces_to_faces not dealing with CD layers. There was already function BKE_mesh_convert_mfaces_to_mpolys which converted mfaces to mpolys with converting all CD layers. Made it a bit more general so it might work with given arrays of faces/polys and re-used it from CDDM module. Checked with UV and sculpt data from Blender 2.61 and it loaded nice, so hopefully there's no regressions in loading older files.
2012-06-04 12:10:38 +00:00
mloop = MEM_callocN(sizeof(MLoop) * totloop, "mloop converted");
CustomData_add_layer(ldata, CD_MLOOP, CD_ASSIGN, mloop, totloop);
=bmesh= merge from trunk at r36153
2011-04-15 01:19:13 +00:00
Fix #31172: applying boolean removes uv maps The issue was caused by CDDM_tessfaces_to_faces not dealing with CD layers. There was already function BKE_mesh_convert_mfaces_to_mpolys which converted mfaces to mpolys with converting all CD layers. Made it a bit more general so it might work with given arrays of faces/polys and re-used it from CDDM module. Checked with UV and sculpt data from Blender 2.61 and it loaded nice, so hopefully there's no regressions in loading older files.
2012-06-04 12:10:38 +00:00
CustomData_to_bmeshpoly(fdata, pdata, ldata, totloop, totpoly);
if (id) {
/* ensure external data is transferred */
CustomData_external_read(fdata, id, CD_MASK_MDISPS, totface_i);
}
Fix loading external MDisps, BMesh merge bug. * When converting mfaces to mpolys, load external MDisp data in, add CustomDataExternal struct to loopdata if needed. * Fix multires modifier's filepath RNA functions to use ldata rather than fdata.
2012-04-13 05:39:27 +00:00
=bmesh= merge from trunk at r36153
2011-04-15 01:19:13 +00:00
eh = BLI_edgehash_new();
Fix #31172: applying boolean removes uv maps The issue was caused by CDDM_tessfaces_to_faces not dealing with CD layers. There was already function BKE_mesh_convert_mfaces_to_mpolys which converted mfaces to mpolys with converting all CD layers. Made it a bit more general so it might work with given arrays of faces/polys and re-used it from CDDM module. Checked with UV and sculpt data from Blender 2.61 and it loaded nice, so hopefully there's no regressions in loading older files.
2012-06-04 12:10:38 +00:00
/* build edge hash */
me = medge;
for (i = 0; i < totedge_i; i++, me++) {
=bmesh= merge from trunk at r36153
2011-04-15 01:19:13 +00:00
BLI_edgehash_insert(eh, me->v1, me->v2, SET_INT_IN_POINTER(i));
clear the FGON edge flag when updating old meshes to polygons. (we may wan't to reuse the flag later)
2012-04-23 00:58:17 +00:00
/* unrelated but avoid having the FGON flag enabled, so we can reuse it later for something else */
me->flag &= ~ME_FGON;
=bmesh= merge from trunk at r36153
2011-04-15 01:19:13 +00:00
}
remove CD_POLYINDEX customdata layer: reported as [#29376] BMESH_TODO: remove tessface CD_ORIGINDEX layer for a single mesh there could be 3 origindex mappings stored, one on the polygons and 2 on the tessfaces. (CD_POLYINDEX and CD_ORIGINDEX). as Andrew suggests, now tessfaces (which are really a cache of polygons), using origindex to point to polygons on the same derived mesh, and polygons only store the original index values.
2012-10-30 19:20:17 +00:00
polyindex = CustomData_get_layer(fdata, CD_ORIGINDEX);
Fix #31172: applying boolean removes uv maps The issue was caused by CDDM_tessfaces_to_faces not dealing with CD layers. There was already function BKE_mesh_convert_mfaces_to_mpolys which converted mfaces to mpolys with converting all CD layers. Made it a bit more general so it might work with given arrays of faces/polys and re-used it from CDDM module. Checked with UV and sculpt data from Blender 2.61 and it loaded nice, so hopefully there's no regressions in loading older files.
2012-06-04 12:10:38 +00:00
j = 0; /* current loop index */
ml = mloop;
mf = mface;
mp = mpoly;
for (i = 0; i < totface_i; i++, mf++, mp++) {
=bmesh= merge from trunk at r36153
2011-04-15 01:19:13 +00:00
mp->loopstart = j;
Fix #31172: applying boolean removes uv maps The issue was caused by CDDM_tessfaces_to_faces not dealing with CD layers. There was already function BKE_mesh_convert_mfaces_to_mpolys which converted mfaces to mpolys with converting all CD layers. Made it a bit more general so it might work with given arrays of faces/polys and re-used it from CDDM module. Checked with UV and sculpt data from Blender 2.61 and it loaded nice, so hopefully there's no regressions in loading older files.
2012-06-04 12:10:38 +00:00
=bmesh= merge from trunk at r36153
2011-04-15 01:19:13 +00:00
mp->totloop = mf->v4 ? 4 : 3;
mp->mat_nr = mf->mat_nr;
mp->flag = mf->flag;
Fix #31172: applying boolean removes uv maps The issue was caused by CDDM_tessfaces_to_faces not dealing with CD layers. There was already function BKE_mesh_convert_mfaces_to_mpolys which converted mfaces to mpolys with converting all CD layers. Made it a bit more general so it might work with given arrays of faces/polys and re-used it from CDDM module. Checked with UV and sculpt data from Blender 2.61 and it loaded nice, so hopefully there's no regressions in loading older files.
2012-06-04 12:10:38 +00:00
style cleanup: line length and ensure some macros error when not ending with ';'
2012-05-17 07:59:25 +00:00
# define ML(v1, v2) { \
ml->v = mf->v1; ml->e = GET_INT_FROM_POINTER(BLI_edgehash_lookup(eh, mf->v1, mf->v2)); ml++; j++; \
} (void)0
Fix #31172: applying boolean removes uv maps The issue was caused by CDDM_tessfaces_to_faces not dealing with CD layers. There was already function BKE_mesh_convert_mfaces_to_mpolys which converted mfaces to mpolys with converting all CD layers. Made it a bit more general so it might work with given arrays of faces/polys and re-used it from CDDM module. Checked with UV and sculpt data from Blender 2.61 and it loaded nice, so hopefully there's no regressions in loading older files.
2012-06-04 12:10:38 +00:00
=bmesh= merge from trunk at r36153
2011-04-15 01:19:13 +00:00
ML(v1, v2);
ML(v2, v3);
if (mf->v4) {
ML(v3, v4);
ML(v4, v1);
style cleanup: follow style guide for formatting of if/for/while loops, and else if's
2012-03-24 06:18:31 +00:00
}
else {
=bmesh= merge from trunk at r36153
2011-04-15 01:19:13 +00:00
ML(v3, v1);
}
Fix #31172: applying boolean removes uv maps The issue was caused by CDDM_tessfaces_to_faces not dealing with CD layers. There was already function BKE_mesh_convert_mfaces_to_mpolys which converted mfaces to mpolys with converting all CD layers. Made it a bit more general so it might work with given arrays of faces/polys and re-used it from CDDM module. Checked with UV and sculpt data from Blender 2.61 and it loaded nice, so hopefully there's no regressions in loading older files.
2012-06-04 12:10:38 +00:00
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
# undef ML
=bmesh= merge from trunk at r36153
2011-04-15 01:19:13 +00:00
Fix #31172: applying boolean removes uv maps The issue was caused by CDDM_tessfaces_to_faces not dealing with CD layers. There was already function BKE_mesh_convert_mfaces_to_mpolys which converted mfaces to mpolys with converting all CD layers. Made it a bit more general so it might work with given arrays of faces/polys and re-used it from CDDM module. Checked with UV and sculpt data from Blender 2.61 and it loaded nice, so hopefully there's no regressions in loading older files.
2012-06-04 12:10:38 +00:00
bm_corners_to_loops_ex(id, fdata, ldata, pdata, mface, totloop, i, mp->loopstart, numTex, numCol);
if (polyindex) {
*polyindex = i;
polyindex++;
}
=bmesh= merge from trunk at r36153
2011-04-15 01:19:13 +00:00
}
Last spell checking (for now). Only mysterious courant from bpy.types.ParticleSettings.courant_target reamins...
2012-07-04 15:52:07 +00:00
/* note, we don't convert NGons at all, these are not even real ngons,
correct edit some comments
2011-09-09 14:51:30 +00:00
* they have their own UV's, colors etc - its more an editing feature. */
=bmesh= merge from trunk at r36153
2011-04-15 01:19:13 +00:00
BLI_edgehash_free(eh, NULL);
Fix #31172: applying boolean removes uv maps The issue was caused by CDDM_tessfaces_to_faces not dealing with CD layers. There was already function BKE_mesh_convert_mfaces_to_mpolys which converted mfaces to mpolys with converting all CD layers. Made it a bit more general so it might work with given arrays of faces/polys and re-used it from CDDM module. Checked with UV and sculpt data from Blender 2.61 and it loaded nice, so hopefully there's no regressions in loading older files.
2012-06-04 12:10:38 +00:00
*totpoly_r = totpoly;
*totloop_r = totloop;
*mpoly_r = mpoly;
*mloop_r = mloop;
- missed commit of file with mesh_calc_normals
2005-07-17 21:24:43 +00:00
}
- moved mesh_getVertexCos to mesh.c and prototyped - make mesh_modifier build vertex locations on demand
2005-07-22 17:03:50 +00:00
style cleanup: also rename mesh_getVertexCos() --> BKE_mesh_vertexCos_get() to match curve function.
2013-03-26 07:29:01 +00:00
float (*BKE_mesh_vertexCos_get(Mesh *me, int *r_numVerts))[3]
- moved mesh_getVertexCos to mesh.c and prototyped - make mesh_modifier build vertex locations on demand
2005-07-22 17:03:50 +00:00
{
2.5 / Cleanup - remove Verse support. This will be brought back in The Future (probably jiri + me) This means 5k lines less in blenkernel. - fix two small errors for global cleanup, now compiles properly with FFMPEG enabled too.
2009-01-04 18:16:34 +00:00
int i, numVerts = me->totvert;
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
float (*cos)[3] = MEM_mallocN(sizeof(*cos) * numVerts, "vertexcos1");
quiet warnings and possible NULL checking crash fix for indentation functions.
2012-01-20 23:03:41 +00:00
code cleanup: name mesh functions more consistently, also use bools for mesh args.
2013-03-17 19:55:10 +00:00
if (r_numVerts) *r_numVerts = numVerts;
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
for (i = 0; i < numVerts; i++)
Add CD_POLYINDEX layer to reduce need for retesselations
2011-11-13 15:13:59 +00:00
copy_v3_v3(cos[i], me->mvert[i].co);
quiet warnings and possible NULL checking crash fix for indentation functions.
2012-01-20 23:03:41 +00:00
2.5 / Cleanup - remove Verse support. This will be brought back in The Future (probably jiri + me) This means 5k lines less in blenkernel. - fix two small errors for global cleanup, now compiles properly with FFMPEG enabled too.
2009-01-04 18:16:34 +00:00
return cos;
- moved mesh_getVertexCos to mesh.c and prototyped - make mesh_modifier build vertex locations on demand
2005-07-22 17:03:50 +00:00
}
Apply Subsurf to UV's. This fixes most of the UV distortion issues with subsurf. Near seams however there might still be some distortion, but this should at least not be worse than before. Subsurf UV is enabled by default on new meshes, and can be enabled in the modifier panel for existing ones. Before and after: http://users.pandora.be/blendix/notsmooth.png http://users.pandora.be/blendix/smooth.png
2006-01-10 11:36:57 +00:00
move make_uv_vert_map() to bmesh - use MLoopUV's rather than MTFace's. also some formatting on BLI_array
2011-10-30 09:19:07 +00:00
style/name cleanup: have EDBM_* functions match our style guide and also match BM_ function naming conventions
2012-03-27 04:46:52 +00:00
/* ngon version wip, based on EDBM_uv_vert_map_create */
move make_uv_vert_map() to bmesh - use MLoopUV's rather than MTFace's. also some formatting on BLI_array
2011-10-30 09:19:07 +00:00
/* this replaces the non bmesh function (in trunk) which takes MTFace's, if we ever need it back we could
* but for now this replaces it because its unused. */
code cleanup: name mesh functions more consistently, also use bools for mesh args.
2013-03-17 19:55:10 +00:00
UvVertMap *BKE_mesh_uv_vert_map_create(struct MPoly *mpoly, struct MLoop *mloop, struct MLoopUV *mloopuv,
unsigned int totpoly, unsigned int totvert, int selected, float *limit)
Apply Subsurf to UV's. This fixes most of the UV distortion issues with subsurf. Near seams however there might still be some distortion, but this should at least not be worse than before. Subsurf UV is enabled by default on new meshes, and can be enabled in the modifier panel for existing ones. Before and after: http://users.pandora.be/blendix/notsmooth.png http://users.pandora.be/blendix/smooth.png
2006-01-10 11:36:57 +00:00
{
UvVertMap *vmap;
UvMapVert *buf;
move make_uv_vert_map() to bmesh - use MLoopUV's rather than MTFace's. also some formatting on BLI_array
2011-10-30 09:19:07 +00:00
MPoly *mp;
Fix some warning for unsigned vs signed comparisons.
2006-04-03 20:31:10 +00:00
unsigned int a;
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
int i, totuv, nverts;
Apply Subsurf to UV's. This fixes most of the UV distortion issues with subsurf. Near seams however there might still be some distortion, but this should at least not be worse than before. Subsurf UV is enabled by default on new meshes, and can be enabled in the modifier panel for existing ones. Before and after: http://users.pandora.be/blendix/notsmooth.png http://users.pandora.be/blendix/smooth.png
2006-01-10 11:36:57 +00:00
totuv = 0;
/* generate UvMapVert array */
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
mp = mpoly;
for (a = 0; a < totpoly; a++, mp++)
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
if (!selected || (!(mp->flag & ME_HIDE) && (mp->flag & ME_FACE_SEL)))
move make_uv_vert_map() to bmesh - use MLoopUV's rather than MTFace's. also some formatting on BLI_array
2011-10-30 09:19:07 +00:00
totuv += mp->totloop;
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
if (totuv == 0)
Apply Subsurf to UV's. This fixes most of the UV distortion issues with subsurf. Near seams however there might still be some distortion, but this should at least not be worse than before. Subsurf UV is enabled by default on new meshes, and can be enabled in the modifier panel for existing ones. Before and after: http://users.pandora.be/blendix/notsmooth.png http://users.pandora.be/blendix/smooth.png
2006-01-10 11:36:57 +00:00
return NULL;
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
vmap = (UvVertMap *)MEM_callocN(sizeof(*vmap), "UvVertMap");
Apply Subsurf to UV's. This fixes most of the UV distortion issues with subsurf. Near seams however there might still be some distortion, but this should at least not be worse than before. Subsurf UV is enabled by default on new meshes, and can be enabled in the modifier panel for existing ones. Before and after: http://users.pandora.be/blendix/notsmooth.png http://users.pandora.be/blendix/smooth.png
2006-01-10 11:36:57 +00:00
if (!vmap)
return NULL;
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
vmap->vert = (UvMapVert **)MEM_callocN(sizeof(*vmap->vert) * totvert, "UvMapVert*");
buf = vmap->buf = (UvMapVert *)MEM_callocN(sizeof(*vmap->buf) * totuv, "UvMapVert");
Apply Subsurf to UV's. This fixes most of the UV distortion issues with subsurf. Near seams however there might still be some distortion, but this should at least not be worse than before. Subsurf UV is enabled by default on new meshes, and can be enabled in the modifier panel for existing ones. Before and after: http://users.pandora.be/blendix/notsmooth.png http://users.pandora.be/blendix/smooth.png
2006-01-10 11:36:57 +00:00
if (!vmap->vert || !vmap->buf) {
code cleanup: naming - BKE_mesh_*
2012-05-05 21:28:12 +00:00
BKE_mesh_uv_vert_map_free(vmap);
Apply Subsurf to UV's. This fixes most of the UV distortion issues with subsurf. Near seams however there might still be some distortion, but this should at least not be worse than before. Subsurf UV is enabled by default on new meshes, and can be enabled in the modifier panel for existing ones. Before and after: http://users.pandora.be/blendix/notsmooth.png http://users.pandora.be/blendix/smooth.png
2006-01-10 11:36:57 +00:00
return NULL;
}
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
mp = mpoly;
for (a = 0; a < totpoly; a++, mp++) {
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
if (!selected || (!(mp->flag & ME_HIDE) && (mp->flag & ME_FACE_SEL))) {
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
nverts = mp->totloop;
Apply Subsurf to UV's. This fixes most of the UV distortion issues with subsurf. Near seams however there might still be some distortion, but this should at least not be worse than before. Subsurf UV is enabled by default on new meshes, and can be enabled in the modifier panel for existing ones. Before and after: http://users.pandora.be/blendix/notsmooth.png http://users.pandora.be/blendix/smooth.png
2006-01-10 11:36:57 +00:00
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
for (i = 0; i < nverts; i++) {
buf->tfindex = i;
buf->f = a;
Apply Subsurf to UV's. This fixes most of the UV distortion issues with subsurf. Near seams however there might still be some distortion, but this should at least not be worse than before. Subsurf UV is enabled by default on new meshes, and can be enabled in the modifier panel for existing ones. Before and after: http://users.pandora.be/blendix/notsmooth.png http://users.pandora.be/blendix/smooth.png
2006-01-10 11:36:57 +00:00
buf->separate = 0;
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
buf->next = vmap->vert[mloop[mp->loopstart + i].v];
vmap->vert[mloop[mp->loopstart + i].v] = buf;
Apply Subsurf to UV's. This fixes most of the UV distortion issues with subsurf. Near seams however there might still be some distortion, but this should at least not be worse than before. Subsurf UV is enabled by default on new meshes, and can be enabled in the modifier panel for existing ones. Before and after: http://users.pandora.be/blendix/notsmooth.png http://users.pandora.be/blendix/smooth.png
2006-01-10 11:36:57 +00:00
buf++;
}
}
}
/* sort individual uvs for each vert */
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
for (a = 0; a < totvert; a++) {
UvMapVert *newvlist = NULL, *vlist = vmap->vert[a];
Apply Subsurf to UV's. This fixes most of the UV distortion issues with subsurf. Near seams however there might still be some distortion, but this should at least not be worse than before. Subsurf UV is enabled by default on new meshes, and can be enabled in the modifier panel for existing ones. Before and after: http://users.pandora.be/blendix/notsmooth.png http://users.pandora.be/blendix/smooth.png
2006-01-10 11:36:57 +00:00
UvMapVert *iterv, *v, *lastv, *next;
float *uv, *uv2, uvdiff[2];
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
while (vlist) {
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
v = vlist;
vlist = vlist->next;
v->next = newvlist;
newvlist = v;
Apply Subsurf to UV's. This fixes most of the UV distortion issues with subsurf. Near seams however there might still be some distortion, but this should at least not be worse than before. Subsurf UV is enabled by default on new meshes, and can be enabled in the modifier panel for existing ones. Before and after: http://users.pandora.be/blendix/notsmooth.png http://users.pandora.be/blendix/smooth.png
2006-01-10 11:36:57 +00:00
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
uv = mloopuv[mpoly[v->f].loopstart + v->tfindex].uv;
lastv = NULL;
iterv = vlist;
Apply Subsurf to UV's. This fixes most of the UV distortion issues with subsurf. Near seams however there might still be some distortion, but this should at least not be worse than before. Subsurf UV is enabled by default on new meshes, and can be enabled in the modifier panel for existing ones. Before and after: http://users.pandora.be/blendix/notsmooth.png http://users.pandora.be/blendix/smooth.png
2006-01-10 11:36:57 +00:00
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
while (iterv) {
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
next = iterv->next;
Apply Subsurf to UV's. This fixes most of the UV distortion issues with subsurf. Near seams however there might still be some distortion, but this should at least not be worse than before. Subsurf UV is enabled by default on new meshes, and can be enabled in the modifier panel for existing ones. Before and after: http://users.pandora.be/blendix/notsmooth.png http://users.pandora.be/blendix/smooth.png
2006-01-10 11:36:57 +00:00
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
uv2 = mloopuv[mpoly[iterv->f].loopstart + iterv->tfindex].uv;
Math Lib * Convert all code to use new functions. * Branch maintainers may want to skip this commit, and run this conversion script instead, if they use a lot of math functions in new code: http://www.pasteall.org/9052/python
2009-11-10 20:43:45 +00:00
sub_v2_v2v2(uvdiff, uv2, uv);
Apply Subsurf to UV's. This fixes most of the UV distortion issues with subsurf. Near seams however there might still be some distortion, but this should at least not be worse than before. Subsurf UV is enabled by default on new meshes, and can be enabled in the modifier panel for existing ones. Before and after: http://users.pandora.be/blendix/notsmooth.png http://users.pandora.be/blendix/smooth.png
2006-01-10 11:36:57 +00:00
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
if (fabsf(uv[0] - uv2[0]) < limit[0] && fabsf(uv[1] - uv2[1]) < limit[1]) {
if (lastv) lastv->next = next;
else vlist = next;
iterv->next = newvlist;
newvlist = iterv;
Apply Subsurf to UV's. This fixes most of the UV distortion issues with subsurf. Near seams however there might still be some distortion, but this should at least not be worse than before. Subsurf UV is enabled by default on new meshes, and can be enabled in the modifier panel for existing ones. Before and after: http://users.pandora.be/blendix/notsmooth.png http://users.pandora.be/blendix/smooth.png
2006-01-10 11:36:57 +00:00
}
else
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
lastv = iterv;
Apply Subsurf to UV's. This fixes most of the UV distortion issues with subsurf. Near seams however there might still be some distortion, but this should at least not be worse than before. Subsurf UV is enabled by default on new meshes, and can be enabled in the modifier panel for existing ones. Before and after: http://users.pandora.be/blendix/notsmooth.png http://users.pandora.be/blendix/smooth.png
2006-01-10 11:36:57 +00:00
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
iterv = next;
Apply Subsurf to UV's. This fixes most of the UV distortion issues with subsurf. Near seams however there might still be some distortion, but this should at least not be worse than before. Subsurf UV is enabled by default on new meshes, and can be enabled in the modifier panel for existing ones. Before and after: http://users.pandora.be/blendix/notsmooth.png http://users.pandora.be/blendix/smooth.png
2006-01-10 11:36:57 +00:00
}
newvlist->separate = 1;
}
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
vmap->vert[a] = newvlist;
Apply Subsurf to UV's. This fixes most of the UV distortion issues with subsurf. Near seams however there might still be some distortion, but this should at least not be worse than before. Subsurf UV is enabled by default on new meshes, and can be enabled in the modifier panel for existing ones. Before and after: http://users.pandora.be/blendix/notsmooth.png http://users.pandora.be/blendix/smooth.png
2006-01-10 11:36:57 +00:00
}
return vmap;
}
code cleanup: naming - BKE_mesh_*
2012-05-05 21:28:12 +00:00
UvMapVert *BKE_mesh_uv_vert_map_get_vert(UvVertMap *vmap, unsigned int v)
Apply Subsurf to UV's. This fixes most of the UV distortion issues with subsurf. Near seams however there might still be some distortion, but this should at least not be worse than before. Subsurf UV is enabled by default on new meshes, and can be enabled in the modifier panel for existing ones. Before and after: http://users.pandora.be/blendix/notsmooth.png http://users.pandora.be/blendix/smooth.png
2006-01-10 11:36:57 +00:00
{
return vmap->vert[v];
}
code cleanup: naming - BKE_mesh_*
2012-05-05 21:28:12 +00:00
void BKE_mesh_uv_vert_map_free(UvVertMap *vmap)
Apply Subsurf to UV's. This fixes most of the UV distortion issues with subsurf. Near seams however there might still be some distortion, but this should at least not be worse than before. Subsurf UV is enabled by default on new meshes, and can be enabled in the modifier panel for existing ones. Before and after: http://users.pandora.be/blendix/notsmooth.png http://users.pandora.be/blendix/smooth.png
2006-01-10 11:36:57 +00:00
{
if (vmap) {
if (vmap->vert) MEM_freeN(vmap->vert);
if (vmap->buf) MEM_freeN(vmap->buf);
MEM_freeN(vmap);
}
}
add function for getting a polygon map: dm->getPolyMap(ob, dm). polygon version of dm->getFaceMap(ob, dm) sculpt uses this for checking connectivity.
2012-02-05 06:20:51 +00:00
/* Generates a map where the key is the vertex and the value is a list
style cleanup / comment formatting for bli/bke/bmesh
2012-03-03 20:19:11 +00:00
* of polys that use that vertex as a corner. The lists are allocated
* from one memory pool. */
code cleanup: name mesh functions more consistently, also use bools for mesh args.
2013-03-17 19:55:10 +00:00
void BKE_mesh_vert_poly_map_create(MeshElemMap **map, int **mem,
const MPoly *mpoly, const MLoop *mloop,
int totvert, int totpoly, int totloop)
add function for getting a polygon map: dm->getPolyMap(ob, dm). polygon version of dm->getFaceMap(ob, dm) sculpt uses this for checking connectivity.
2012-02-05 06:20:51 +00:00
{
Reduce poly map memory usage (used by sculpt smooth brush.) Changed the create_vert_poly_map function to return a more compact structure. Memory saved will vary depending on the mesh, but typically it should be about one third of the old size.
2012-03-17 04:41:36 +00:00
int i, j;
int *indices;
add function for getting a polygon map: dm->getPolyMap(ob, dm). polygon version of dm->getFaceMap(ob, dm) sculpt uses this for checking connectivity.
2012-02-05 06:20:51 +00:00
Reduce poly map memory usage (used by sculpt smooth brush.) Changed the create_vert_poly_map function to return a more compact structure. Memory saved will vary depending on the mesh, but typically it should be about one third of the old size.
2012-03-17 04:41:36 +00:00
(*map) = MEM_callocN(sizeof(MeshElemMap) * totvert, "vert poly map");
(*mem) = MEM_mallocN(sizeof(int) * totloop, "vert poly map mem");
/* Count number of polys for each vertex */
for (i = 0; i < totpoly; i++) {
const MPoly *p = &mpoly[i];
for (j = 0; j < p->totloop; j++)
(*map)[mloop[p->loopstart + j].v].count++;
}
/* Assign indices mem */
indices = (*mem);
for (i = 0; i < totvert; i++) {
(*map)[i].indices = indices;
indices += (*map)[i].count;
/* Reset 'count' for use as index in last loop */
(*map)[i].count = 0;
}
add function for getting a polygon map: dm->getPolyMap(ob, dm). polygon version of dm->getFaceMap(ob, dm) sculpt uses this for checking connectivity.
2012-02-05 06:20:51 +00:00
/* Find the users */
Reduce poly map memory usage (used by sculpt smooth brush.) Changed the create_vert_poly_map function to return a more compact structure. Memory saved will vary depending on the mesh, but typically it should be about one third of the old size.
2012-03-17 04:41:36 +00:00
for (i = 0; i < totpoly; i++) {
const MPoly *p = &mpoly[i];
for (j = 0; j < p->totloop; j++) {
int v = mloop[p->loopstart + j].v;
(*map)[v].indices[(*map)[v].count] = i;
(*map)[v].count++;
add function for getting a polygon map: dm->getPolyMap(ob, dm). polygon version of dm->getFaceMap(ob, dm) sculpt uses this for checking connectivity.
2012-02-05 06:20:51 +00:00
}
}
}
Brought back sculpt smooth brush. Also added a new brush flag for setting whether to use brush spacing.
2009-01-21 22:40:28 +00:00
/* Generates a map where the key is the vertex and the value is a list
style cleanup / comment formatting for bli/bke/bmesh
2012-03-03 20:19:11 +00:00
* of edges that use that vertex as an endpoint. The lists are allocated
* from one memory pool. */
code cleanup: name mesh functions more consistently, also use bools for mesh args.
2013-03-17 19:55:10 +00:00
void BKE_mesh_vert_edge_map_create(MeshElemMap **map, int **mem,
const MEdge *medge, int totvert, int totedge)
Brought back sculpt smooth brush. Also added a new brush flag for setting whether to use brush spacing.
2009-01-21 22:40:28 +00:00
{
Update create_vert_edge_map() to match create_vert_poly_map().
2012-05-15 16:32:08 +00:00
int i, *indices;
(*map) = MEM_callocN(sizeof(MeshElemMap) * totvert, "vert-edge map");
(*mem) = MEM_mallocN(sizeof(int) * totedge * 2, "vert-edge map mem");
whitespace only, no functional change mixed tabs/spaces --> tabs.
2011-04-21 13:11:51 +00:00
Update create_vert_edge_map() to match create_vert_poly_map().
2012-05-15 16:32:08 +00:00
/* Count number of edges for each vertex */
for (i = 0; i < totedge; i++) {
(*map)[medge[i].v1].count++;
(*map)[medge[i].v2].count++;
}
/* Assign indices mem */
indices = (*mem);
for (i = 0; i < totvert; i++) {
(*map)[i].indices = indices;
indices += (*map)[i].count;
/* Reset 'count' for use as index in last loop */
(*map)[i].count = 0;
}
Brought back sculpt smooth brush. Also added a new brush flag for setting whether to use brush spacing.
2009-01-21 22:40:28 +00:00
/* Find the users */
Update create_vert_edge_map() to match create_vert_poly_map().
2012-05-15 16:32:08 +00:00
for (i = 0; i < totedge; i++) {
const int v[2] = {medge[i].v1, medge[i].v2};
(*map)[v[0]].indices[(*map)[v[0]].count] = i;
(*map)[v[1]].indices[(*map)[v[1]].count] = i;
(*map)[v[0]].count++;
(*map)[v[1]].count++;
Brought back sculpt smooth brush. Also added a new brush flag for setting whether to use brush spacing.
2009-01-21 22:40:28 +00:00
}
}
code cleanup: naming - BKE_mesh_*
2012-05-05 21:28:12 +00:00
void BKE_mesh_loops_to_mface_corners(CustomData *fdata, CustomData *ldata,
CustomData *pdata, int lindex[4], int findex,
const int polyindex,
const int mf_len, /* 3 or 4 */
cache customdata checks to avoid looking up on each call to mesh_loops_to_mface_corners()
2011-12-28 22:37:09 +00:00
code cleanup: naming - BKE_mesh_*
2012-05-05 21:28:12 +00:00
/* cache values to avoid lookups every time */
const int numTex, /* CustomData_number_of_layers(pdata, CD_MTEXPOLY) */
const int numCol, /* CustomData_number_of_layers(ldata, CD_MLOOPCOL) */
const int hasPCol, /* CustomData_has_layer(ldata, CD_PREVIEW_MLOOPCOL) */
const int hasOrigSpace /* CustomData_has_layer(ldata, CD_ORIGSPACE_MLOOP) */
)
vpaint works with the new face structures, yay, though it probably still has issues, needs more testing. also hopefully fixed subsurf crash everyone but me was getting, what I found should have caused crashes even for me, no idea why it did not. also got face flags to work with subsurf, and partially got materials, though theres still a problem there.
2009-08-30 21:30:07 +00:00
{
MTFace *texface;
MTexPoly *texpoly;
MCol *mcol;
MLoopCol *mloopcol;
MLoopUV *mloopuv;
cache customdata checks to avoid looking up on each call to mesh_loops_to_mface_corners()
2011-12-28 22:37:09 +00:00
int i, j;
=bmesh= Coded a new modifier, "Precision UV Interpolation", that triangulates, subdivides, then uses brecht's mean value interpolation to interpolate face data. Textures on ngon faces get interpolated a bit nicer, in other words (though concave cases, e.g. 'N', don't work very well).
2011-03-25 00:32:38 +00:00
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
for (i = 0; i < numTex; i++) {
vpaint works with the new face structures, yay, though it probably still has issues, needs more testing. also hopefully fixed subsurf crash everyone but me was getting, what I found should have caused crashes even for me, no idea why it did not. also got face flags to work with subsurf, and partially got materials, though theres still a problem there.
2009-08-30 21:30:07 +00:00
texface = CustomData_get_n(fdata, CD_MTFACE, findex, i);
texpoly = CustomData_get_n(pdata, CD_MTEXPOLY, polyindex, i);
Code Cleanup: macro for copying polygon settings
2012-02-08 09:02:10 +00:00
ME_MTEXFACE_CPY(texface, texpoly);
vpaint works with the new face structures, yay, though it probably still has issues, needs more testing. also hopefully fixed subsurf crash everyone but me was getting, what I found should have caused crashes even for me, no idea why it did not. also got face flags to work with subsurf, and partially got materials, though theres still a problem there.
2009-08-30 21:30:07 +00:00
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
for (j = 0; j < mf_len; j++) {
vpaint works with the new face structures, yay, though it probably still has issues, needs more testing. also hopefully fixed subsurf crash everyone but me was getting, what I found should have caused crashes even for me, no idea why it did not. also got face flags to work with subsurf, and partially got materials, though theres still a problem there.
2009-08-30 21:30:07 +00:00
mloopuv = CustomData_get_n(ldata, CD_MLOOPUV, lindex[j], i);
Code Cleanup: use vector functions for copying / adding UV's
2012-02-05 13:25:42 +00:00
copy_v2_v2(texface->uv[j], mloopuv->uv);
vpaint works with the new face structures, yay, though it probably still has issues, needs more testing. also hopefully fixed subsurf crash everyone but me was getting, what I found should have caused crashes even for me, no idea why it did not. also got face flags to work with subsurf, and partially got materials, though theres still a problem there.
2009-08-30 21:30:07 +00:00
}
}
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
for (i = 0; i < numCol; i++) {
vpaint works with the new face structures, yay, though it probably still has issues, needs more testing. also hopefully fixed subsurf crash everyone but me was getting, what I found should have caused crashes even for me, no idea why it did not. also got face flags to work with subsurf, and partially got materials, though theres still a problem there.
2009-08-30 21:30:07 +00:00
mcol = CustomData_get_n(fdata, CD_MCOL, findex, i);
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
for (j = 0; j < mf_len; j++) {
vpaint works with the new face structures, yay, though it probably still has issues, needs more testing. also hopefully fixed subsurf crash everyone but me was getting, what I found should have caused crashes even for me, no idea why it did not. also got face flags to work with subsurf, and partially got materials, though theres still a problem there.
2009-08-30 21:30:07 +00:00
mloopcol = CustomData_get_n(ldata, CD_MLOOPCOL, lindex[j], i);
swap BMLoopCol r/b color, requires subversion bump. old mesh MCol 'r' was blue, 'b' was red, but theres no reason to keep this for bmesh with MLoopCol. Loading old files works, saving legacy format works too. What wont work is loading a file after this revision and loading it in an older revision since the bmesh merge. (it wont crash but the blue and red will be swapped on vertex color layers).
2012-03-17 20:39:28 +00:00
MESH_MLOOPCOL_TO_MCOL(mloopcol, &mcol[j]);
vpaint works with the new face structures, yay, though it probably still has issues, needs more testing. also hopefully fixed subsurf crash everyone but me was getting, what I found should have caused crashes even for me, no idea why it did not. also got face flags to work with subsurf, and partially got materials, though theres still a problem there.
2009-08-30 21:30:07 +00:00
}
}
brought weight paint back.
2009-08-31 15:57:13 +00:00
Renaming CD_WEIGHT_MCOL/MLOOPCOL and their masks from WEIGHT to PREVIEW, as this layer is now also used for various preview tasks in Object mode. “Cleanup” commit, no functional changes.
2012-03-22 08:41:50 +00:00
if (hasPCol) {
mcol = CustomData_get(fdata, findex, CD_PREVIEW_MCOL);
brought weight paint back.
2009-08-31 15:57:13 +00:00
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
for (j = 0; j < mf_len; j++) {
Renaming CD_WEIGHT_MCOL/MLOOPCOL and their masks from WEIGHT to PREVIEW, as this layer is now also used for various preview tasks in Object mode. “Cleanup” commit, no functional changes.
2012-03-22 08:41:50 +00:00
mloopcol = CustomData_get(ldata, lindex[j], CD_PREVIEW_MLOOPCOL);
swap BMLoopCol r/b color, requires subversion bump. old mesh MCol 'r' was blue, 'b' was red, but theres no reason to keep this for bmesh with MLoopCol. Loading old files works, saving legacy format works too. What wont work is loading a file after this revision and loading it in an older revision since the bmesh merge. (it wont crash but the blue and red will be swapped on vertex color layers).
2012-03-17 20:39:28 +00:00
MESH_MLOOPCOL_TO_MCOL(mloopcol, &mcol[j]);
brought weight paint back.
2009-08-31 15:57:13 +00:00
}
}
support for 'origspace' data layer - used for hair on subsurf mesh. currently only works for 3/4 sided faces.
2012-02-05 11:30:26 +00:00
if (hasOrigSpace) {
OrigSpaceFace *of = CustomData_get(fdata, findex, CD_ORIGSPACE);
OrigSpaceLoop *lof;
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
for (j = 0; j < mf_len; j++) {
support for 'origspace' data layer - used for hair on subsurf mesh. currently only works for 3/4 sided faces.
2012-02-05 11:30:26 +00:00
lof = CustomData_get(ldata, lindex[j], CD_ORIGSPACE_MLOOP);
code cleanup: * replace 2D vector copy with copy_v2_v2(). * use puts rather then printf for single strings. * style cleanup for drawobject.c indentation.
2012-03-18 06:01:33 +00:00
copy_v2_v2(of->uv[j], lof->uv);
support for 'origspace' data layer - used for hair on subsurf mesh. currently only works for 3/4 sided faces.
2012-02-05 11:30:26 +00:00
}
}
vpaint works with the new face structures, yay, though it probably still has issues, needs more testing. also hopefully fixed subsurf crash everyone but me was getting, what I found should have caused crashes even for me, no idea why it did not. also got face flags to work with subsurf, and partially got materials, though theres still a problem there.
2009-08-30 21:30:07 +00:00
}
The Death Of Editmesh - Part 1 I've removed editmesh altogether (other then scanfill, which is seperate code that happens to reuse the editmesh structures). The compatibility layer I had written for old editmesh tools was more trouble then it was worth, though it did help in the early stages of this project. There's a fair amount of breakage, and there's bunches of tools (mostly minor ones) I need to port over still. Biggest ones are join triangles and loop to region, and spin/screw. This probably isn't really testable, I'll hopefully have more work done on this soon, but might not be before next week.
2010-01-28 00:45:30 +00:00
/*
style cleanup / comment formatting for bli/bke/bmesh
2012-03-03 20:19:11 +00:00
* this function recreates a tessellation.
* returns number of tessellation faces.
The Death Of Editmesh - Part 1 I've removed editmesh altogether (other then scanfill, which is seperate code that happens to reuse the editmesh structures). The compatibility layer I had written for old editmesh tools was more trouble then it was worth, though it did help in the early stages of this project. There's a fair amount of breakage, and there's bunches of tools (mostly minor ones) I need to port over still. Biggest ones are join triangles and loop to region, and spin/screw. This probably isn't really testable, I'll hopefully have more work done on this soon, but might not be before next week.
2010-01-28 00:45:30 +00:00
*/
code cleanup: naming - BKE_mesh_*
2012-05-05 21:28:12 +00:00
int BKE_mesh_recalc_tessellation(CustomData *fdata,
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
CustomData *ldata, CustomData *pdata,
add option to BLI_scanfill_calc() - BLI_SCANFILL_CALC_HOLES, gives some speedup for BMesh ngons which never have holes and ensures predictable triangle count (totvert - 2), which is needed for pre-calculating array size.
2012-12-27 06:39:27 +00:00
MVert *mvert, int totface, int totloop,
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
int totpoly,
/* when tessellating to recalculate normals after
* we can skip copying here */
code cleanup: name mesh functions more consistently, also use bools for mesh args.
2013-03-17 19:55:10 +00:00
const bool do_face_nor_cpy)
vpaint works with the new face structures, yay, though it probably still has issues, needs more testing. also hopefully fixed subsurf crash everyone but me was getting, what I found should have caused crashes even for me, no idea why it did not. also got face flags to work with subsurf, and partially got materials, though theres still a problem there.
2009-08-30 21:30:07 +00:00
{
mesh_recalcTesselation speedup, ski[ check for 3-4 sided faces - dont use scanfill in these cases. overall 6x speedup on an optized build (Suzanne subsurf level 5, applied)
2011-11-18 12:18:44 +00:00
/* use this to avoid locking pthread for _every_ polygon
* and calling the fill function */
#define USE_TESSFACE_SPEEDUP
enable tesselating 4 sided faces to quads. will help for particles and tangents
2012-01-25 21:33:37 +00:00
#define USE_TESSFACE_QUADS // NEEDS FURTHER TESTING
define to enable tesselate to quads, this way files from trunk tesselate back into their original geometry with the same face order. this will be needed for tangents and most likely hair if its to load correctly from trunk. disabled for now until this is working correctly - hair still needs more work.
2012-01-24 20:58:43 +00:00
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
#define TESSFACE_SCANFILL (1 << 0)
#define TESSFACE_IS_QUAD (1 << 1)
mesh_recalcTesselation speedup, ski[ check for 3-4 sided faces - dont use scanfill in these cases. overall 6x speedup on an optized build (Suzanne subsurf level 5, applied)
2011-11-18 12:18:44 +00:00
add option to BLI_scanfill_calc() - BLI_SCANFILL_CALC_HOLES, gives some speedup for BMesh ngons which never have holes and ensures predictable triangle count (totvert - 2), which is needed for pre-calculating array size.
2012-12-27 06:39:27 +00:00
const int looptris_tot = poly_to_tri_count(totpoly, totloop);
vpaint works with the new face structures, yay, though it probably still has issues, needs more testing. also hopefully fixed subsurf crash everyone but me was getting, what I found should have caused crashes even for me, no idea why it did not. also got face flags to work with subsurf, and partially got materials, though theres still a problem there.
2009-08-30 21:30:07 +00:00
MPoly *mp, *mpoly;
MLoop *ml, *mloop;
add option to BLI_scanfill_calc() - BLI_SCANFILL_CALC_HOLES, gives some speedup for BMesh ngons which never have holes and ensures predictable triangle count (totvert - 2), which is needed for pre-calculating array size.
2012-12-27 06:39:27 +00:00
MFace *mface, *mf;
make scanfill threadsafe (wasnt threadsafe before BMesh merge but before the merge it didn't need to be) - now rendering uses its better if its threadsafe.
2012-04-16 06:48:57 +00:00
ScanFillContext sf_ctx;
code cleanup: - use bmesh iterator macros in more places - rename scanfill variables (were using same names as mesh faces/verts which was confusing)
2012-05-13 14:47:53 +00:00
ScanFillVert *sf_vert, *sf_vert_last, *sf_vert_first;
ScanFillFace *sf_tri;
add option to BLI_scanfill_calc() - BLI_SCANFILL_CALC_HOLES, gives some speedup for BMesh ngons which never have holes and ensures predictable triangle count (totvert - 2), which is needed for pre-calculating array size.
2012-12-27 06:39:27 +00:00
int *mface_to_poly_map;
option to save bmesh files in older mesh format so they can load in older versoons of blender. - saves UV's and VCols - skips NGons - resulting files load in both BMesh and Trunk. TODO - add an option in the UI to access this.
2011-12-27 08:39:55 +00:00
int lindex[4]; /* only ever use 3 in this case */
minor refactor to main tesselation function - reserve the array sizes to avoid re-allocing (even though its a lower limit it still helps) - increase array size in larger steps then 1 by 1. - avoid a few array lookups. - use more obvious variable naming to make the function more readable.
2012-01-23 13:36:11 +00:00
int poly_index, j, mface_index;
cache customdata checks to avoid looking up on each call to mesh_loops_to_mface_corners()
2011-12-28 22:37:09 +00:00
const int numTex = CustomData_number_of_layers(pdata, CD_MTEXPOLY);
const int numCol = CustomData_number_of_layers(ldata, CD_MLOOPCOL);
Renaming CD_WEIGHT_MCOL/MLOOPCOL and their masks from WEIGHT to PREVIEW, as this layer is now also used for various preview tasks in Object mode. “Cleanup” commit, no functional changes.
2012-03-22 08:41:50 +00:00
const int hasPCol = CustomData_has_layer(ldata, CD_PREVIEW_MLOOPCOL);
support for 'origspace' data layer - used for hair on subsurf mesh. currently only works for 3/4 sided faces.
2012-02-05 11:30:26 +00:00
const int hasOrigSpace = CustomData_has_layer(ldata, CD_ORIGSPACE_MLOOP);
vpaint works with the new face structures, yay, though it probably still has issues, needs more testing. also hopefully fixed subsurf crash everyone but me was getting, what I found should have caused crashes even for me, no idea why it did not. also got face flags to work with subsurf, and partially got materials, though theres still a problem there.
2009-08-30 21:30:07 +00:00
mpoly = CustomData_get_layer(pdata, CD_MPOLY);
mloop = CustomData_get_layer(ldata, CD_MLOOP);
minor refactor to main tesselation function - reserve the array sizes to avoid re-allocing (even though its a lower limit it still helps) - increase array size in larger steps then 1 by 1. - avoid a few array lookups. - use more obvious variable naming to make the function more readable.
2012-01-23 13:36:11 +00:00
/* allocate the length of totfaces, avoid many small reallocs,
* if all faces are tri's it will be correct, quads == 2x allocs */
add option to BLI_scanfill_calc() - BLI_SCANFILL_CALC_HOLES, gives some speedup for BMesh ngons which never have holes and ensures predictable triangle count (totvert - 2), which is needed for pre-calculating array size.
2012-12-27 06:39:27 +00:00
/* take care. we are _not_ calloc'ing so be sure to initialize each field */
mface_to_poly_map = MEM_mallocN(sizeof(*mface_to_poly_map) * looptris_tot, __func__);
mface = MEM_mallocN(sizeof(*mface) * looptris_tot, __func__);
minor refactor to main tesselation function - reserve the array sizes to avoid re-allocing (even though its a lower limit it still helps) - increase array size in larger steps then 1 by 1. - avoid a few array lookups. - use more obvious variable naming to make the function more readable.
2012-01-23 13:36:11 +00:00
mface_index = 0;
vpaint works with the new face structures, yay, though it probably still has issues, needs more testing. also hopefully fixed subsurf crash everyone but me was getting, what I found should have caused crashes even for me, no idea why it did not. also got face flags to work with subsurf, and partially got materials, though theres still a problem there.
2009-08-30 21:30:07 +00:00
mp = mpoly;
minor refactor to main tesselation function - reserve the array sizes to avoid re-allocing (even though its a lower limit it still helps) - increase array size in larger steps then 1 by 1. - avoid a few array lookups. - use more obvious variable naming to make the function more readable.
2012-01-23 13:36:11 +00:00
for (poly_index = 0; poly_index < totpoly; poly_index++, mp++) {
error with recent commit, thanks Ender79 for finding.
2011-11-18 17:28:19 +00:00
if (mp->totloop < 3) {
mesh_recalcTesselation speedup, ski[ check for 3-4 sided faces - dont use scanfill in these cases. overall 6x speedup on an optized build (Suzanne subsurf level 5, applied)
2011-11-18 12:18:44 +00:00
/* do nothing */
}
#ifdef USE_TESSFACE_SPEEDUP
#define ML_TO_MF(i1, i2, i3) \
minor refactor to main tesselation function - reserve the array sizes to avoid re-allocing (even though its a lower limit it still helps) - increase array size in larger steps then 1 by 1. - avoid a few array lookups. - use more obvious variable naming to make the function more readable.
2012-01-23 13:36:11 +00:00
mface_to_poly_map[mface_index] = poly_index; \
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
mf = &mface[mface_index]; \
mesh_recalcTesselation speedup, ski[ check for 3-4 sided faces - dont use scanfill in these cases. overall 6x speedup on an optized build (Suzanne subsurf level 5, applied)
2011-11-18 12:18:44 +00:00
/* set loop indices, transformed to vert indices later */ \
mf->v1 = mp->loopstart + i1; \
mf->v2 = mp->loopstart + i2; \
mf->v3 = mp->loopstart + i3; \
mf->v4 = 0; \
mf->mat_nr = mp->mat_nr; \
mf->flag = mp->flag; \
add option to BLI_scanfill_calc() - BLI_SCANFILL_CALC_HOLES, gives some speedup for BMesh ngons which never have holes and ensures predictable triangle count (totvert - 2), which is needed for pre-calculating array size.
2012-12-27 06:39:27 +00:00
mf->edcode = 0; \
code cleanup: use uppercase for defines and dont end macro's with ;
2012-03-31 03:36:15 +00:00
(void)0
mesh_recalcTesselation speedup, ski[ check for 3-4 sided faces - dont use scanfill in these cases. overall 6x speedup on an optized build (Suzanne subsurf level 5, applied)
2011-11-18 12:18:44 +00:00
define to enable tesselate to quads, this way files from trunk tesselate back into their original geometry with the same face order. this will be needed for tangents and most likely hair if its to load correctly from trunk. disabled for now until this is working correctly - hair still needs more work.
2012-01-24 20:58:43 +00:00
/* ALMOST IDENTICAL TO DEFINE ABOVE (see EXCEPTION) */
#define ML_TO_MF_QUAD() \
mface_to_poly_map[mface_index] = poly_index; \
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
mf = &mface[mface_index]; \
define to enable tesselate to quads, this way files from trunk tesselate back into their original geometry with the same face order. this will be needed for tangents and most likely hair if its to load correctly from trunk. disabled for now until this is working correctly - hair still needs more work.
2012-01-24 20:58:43 +00:00
/* set loop indices, transformed to vert indices later */ \
mf->v1 = mp->loopstart + 0; /* EXCEPTION */ \
mf->v2 = mp->loopstart + 1; /* EXCEPTION */ \
mf->v3 = mp->loopstart + 2; /* EXCEPTION */ \
mf->v4 = mp->loopstart + 3; /* EXCEPTION */ \
mf->mat_nr = mp->mat_nr; \
mf->flag = mp->flag; \
add option to BLI_scanfill_calc() - BLI_SCANFILL_CALC_HOLES, gives some speedup for BMesh ngons which never have holes and ensures predictable triangle count (totvert - 2), which is needed for pre-calculating array size.
2012-12-27 06:39:27 +00:00
mf->edcode = TESSFACE_IS_QUAD; /* EXCEPTION */ \
code cleanup: use uppercase for defines and dont end macro's with ;
2012-03-31 03:36:15 +00:00
(void)0
define to enable tesselate to quads, this way files from trunk tesselate back into their original geometry with the same face order. this will be needed for tangents and most likely hair if its to load correctly from trunk. disabled for now until this is working correctly - hair still needs more work.
2012-01-24 20:58:43 +00:00
mesh_recalcTesselation speedup, ski[ check for 3-4 sided faces - dont use scanfill in these cases. overall 6x speedup on an optized build (Suzanne subsurf level 5, applied)
2011-11-18 12:18:44 +00:00
else if (mp->totloop == 3) {
code cleanup: use uppercase for defines and dont end macro's with ;
2012-03-31 03:36:15 +00:00
ML_TO_MF(0, 1, 2);
minor refactor to main tesselation function - reserve the array sizes to avoid re-allocing (even though its a lower limit it still helps) - increase array size in larger steps then 1 by 1. - avoid a few array lookups. - use more obvious variable naming to make the function more readable.
2012-01-23 13:36:11 +00:00
mface_index++;
mesh_recalcTesselation speedup, ski[ check for 3-4 sided faces - dont use scanfill in these cases. overall 6x speedup on an optized build (Suzanne subsurf level 5, applied)
2011-11-18 12:18:44 +00:00
}
else if (mp->totloop == 4) {
define to enable tesselate to quads, this way files from trunk tesselate back into their original geometry with the same face order. this will be needed for tangents and most likely hair if its to load correctly from trunk. disabled for now until this is working correctly - hair still needs more work.
2012-01-24 20:58:43 +00:00
#ifdef USE_TESSFACE_QUADS
code cleanup: use uppercase for defines and dont end macro's with ;
2012-03-31 03:36:15 +00:00
ML_TO_MF_QUAD();
define to enable tesselate to quads, this way files from trunk tesselate back into their original geometry with the same face order. this will be needed for tangents and most likely hair if its to load correctly from trunk. disabled for now until this is working correctly - hair still needs more work.
2012-01-24 20:58:43 +00:00
mface_index++;
#else
code cleanup: use uppercase for defines and dont end macro's with ;
2012-03-31 03:36:15 +00:00
ML_TO_MF(0, 1, 2);
minor refactor to main tesselation function - reserve the array sizes to avoid re-allocing (even though its a lower limit it still helps) - increase array size in larger steps then 1 by 1. - avoid a few array lookups. - use more obvious variable naming to make the function more readable.
2012-01-23 13:36:11 +00:00
mface_index++;
code cleanup: use uppercase for defines and dont end macro's with ;
2012-03-31 03:36:15 +00:00
ML_TO_MF(0, 2, 3);
minor refactor to main tesselation function - reserve the array sizes to avoid re-allocing (even though its a lower limit it still helps) - increase array size in larger steps then 1 by 1. - avoid a few array lookups. - use more obvious variable naming to make the function more readable.
2012-01-23 13:36:11 +00:00
mface_index++;
define to enable tesselate to quads, this way files from trunk tesselate back into their original geometry with the same face order. this will be needed for tangents and most likely hair if its to load correctly from trunk. disabled for now until this is working correctly - hair still needs more work.
2012-01-24 20:58:43 +00:00
#endif
mesh_recalcTesselation speedup, ski[ check for 3-4 sided faces - dont use scanfill in these cases. overall 6x speedup on an optized build (Suzanne subsurf level 5, applied)
2011-11-18 12:18:44 +00:00
}
#endif /* USE_TESSFACE_SPEEDUP */
else {
minor refactor to main tesselation function - reserve the array sizes to avoid re-allocing (even though its a lower limit it still helps) - increase array size in larger steps then 1 by 1. - avoid a few array lookups. - use more obvious variable naming to make the function more readable.
2012-01-23 13:36:11 +00:00
int totfilltri;
=bmesh= Fixed join meshes, and an annoying modifier bug (making modifiers not work in editmode). Also fixed a tesselation bug. Also got edge slide to work right, yay! Dunno why I couldn't get it working right before; took me twenty minutes to fix.
2011-02-23 00:01:50 +00:00
ml = mloop + mp->loopstart;
=bmesh= build modifier works now, also made scanfill thread-safe
2011-04-16 23:58:49 +00:00
code cleanup: function naming for BLI functions.
2012-05-05 00:23:55 +00:00
BLI_scanfill_begin(&sf_ctx);
code cleanup: - use bmesh iterator macros in more places - rename scanfill variables (were using same names as mesh faces/verts which was confusing)
2012-05-13 14:47:53 +00:00
sf_vert_first = NULL;
sf_vert_last = NULL;
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
for (j = 0; j < mp->totloop; j++, ml++) {
code cleanup: - use bmesh iterator macros in more places - rename scanfill variables (were using same names as mesh faces/verts which was confusing)
2012-05-13 14:47:53 +00:00
sf_vert = BLI_scanfill_vert_add(&sf_ctx, mvert[ml->v].co);
nothing to see here...
2010-11-10 18:42:53 +00:00
code cleanup: - use bmesh iterator macros in more places - rename scanfill variables (were using same names as mesh faces/verts which was confusing)
2012-05-13 14:47:53 +00:00
sf_vert->keyindex = mp->loopstart + j;
nothing to see here...
2010-11-10 18:42:53 +00:00
code cleanup: - use bmesh iterator macros in more places - rename scanfill variables (were using same names as mesh faces/verts which was confusing)
2012-05-13 14:47:53 +00:00
if (sf_vert_last)
BLI_scanfill_edge_add(&sf_ctx, sf_vert_last, sf_vert);
nothing to see here...
2010-11-10 18:42:53 +00:00
code cleanup: - use bmesh iterator macros in more places - rename scanfill variables (were using same names as mesh faces/verts which was confusing)
2012-05-13 14:47:53 +00:00
if (!sf_vert_first)
sf_vert_first = sf_vert;
sf_vert_last = sf_vert;
nothing to see here...
2010-11-10 18:42:53 +00:00
}
code cleanup: - use bmesh iterator macros in more places - rename scanfill variables (were using same names as mesh faces/verts which was confusing)
2012-05-13 14:47:53 +00:00
BLI_scanfill_edge_add(&sf_ctx, sf_vert_last, sf_vert_first);
nothing to see here...
2010-11-10 18:42:53 +00:00
fix/workaround [#33281] script goes into not responding scanfill remove-doubles pass assumes ordered edges (as with curves), otherwise it can hang. workaround this problem by skipping removing-doubles for mesh ngons, since this isnt such a common case as it is with curves and we can just not support it.
2012-11-26 23:18:04 +00:00
totfilltri = BLI_scanfill_calc(&sf_ctx, 0);
add option to BLI_scanfill_calc() - BLI_SCANFILL_CALC_HOLES, gives some speedup for BMesh ngons which never have holes and ensures predictable triangle count (totvert - 2), which is needed for pre-calculating array size.
2012-12-27 06:39:27 +00:00
BLI_assert(totfilltri <= mp->totloop - 2);
style cleanup: some warnigs & spelling.
2013-02-06 14:02:19 +00:00
(void)totfilltri;
minor refactor to main tesselation function - reserve the array sizes to avoid re-allocing (even though its a lower limit it still helps) - increase array size in larger steps then 1 by 1. - avoid a few array lookups. - use more obvious variable naming to make the function more readable.
2012-01-23 13:36:11 +00:00
add option to BLI_scanfill_calc() - BLI_SCANFILL_CALC_HOLES, gives some speedup for BMesh ngons which never have holes and ensures predictable triangle count (totvert - 2), which is needed for pre-calculating array size.
2012-12-27 06:39:27 +00:00
for (sf_tri = sf_ctx.fillfacebase.first; sf_tri; sf_tri = sf_tri->next, mf++) {
mface_to_poly_map[mface_index] = poly_index;
mf = &mface[mface_index];
minor refactor to main tesselation function - reserve the array sizes to avoid re-allocing (even though its a lower limit it still helps) - increase array size in larger steps then 1 by 1. - avoid a few array lookups. - use more obvious variable naming to make the function more readable.
2012-01-23 13:36:11 +00:00
add option to BLI_scanfill_calc() - BLI_SCANFILL_CALC_HOLES, gives some speedup for BMesh ngons which never have holes and ensures predictable triangle count (totvert - 2), which is needed for pre-calculating array size.
2012-12-27 06:39:27 +00:00
/* set loop indices, transformed to vert indices later */
mf->v1 = sf_tri->v1->keyindex;
mf->v2 = sf_tri->v2->keyindex;
mf->v3 = sf_tri->v3->keyindex;
mf->v4 = 0;
minor refactor to main tesselation function - reserve the array sizes to avoid re-allocing (even though its a lower limit it still helps) - increase array size in larger steps then 1 by 1. - avoid a few array lookups. - use more obvious variable naming to make the function more readable.
2012-01-23 13:36:11 +00:00
add option to BLI_scanfill_calc() - BLI_SCANFILL_CALC_HOLES, gives some speedup for BMesh ngons which never have holes and ensures predictable triangle count (totvert - 2), which is needed for pre-calculating array size.
2012-12-27 06:39:27 +00:00
mf->mat_nr = mp->mat_nr;
mf->flag = mp->flag;
Add CD_POLYINDEX layer to reduce need for retesselations
2011-11-13 15:13:59 +00:00
skip sorting loop indices when tesselating if the original poly is a quad or a tri.
2011-12-29 03:24:28 +00:00
#ifdef USE_TESSFACE_SPEEDUP
add option to BLI_scanfill_calc() - BLI_SCANFILL_CALC_HOLES, gives some speedup for BMesh ngons which never have holes and ensures predictable triangle count (totvert - 2), which is needed for pre-calculating array size.
2012-12-27 06:39:27 +00:00
mf->edcode = TESSFACE_SCANFILL; /* tag for sorting loop indices */
skip sorting loop indices when tesselating if the original poly is a quad or a tri.
2011-12-29 03:24:28 +00:00
#endif
add option to BLI_scanfill_calc() - BLI_SCANFILL_CALC_HOLES, gives some speedup for BMesh ngons which never have holes and ensures predictable triangle count (totvert - 2), which is needed for pre-calculating array size.
2012-12-27 06:39:27 +00:00
mface_index++;
nothing to see here...
2010-11-10 18:42:53 +00:00
}
code cleanup: function naming for BLI functions.
2012-05-05 00:23:55 +00:00
BLI_scanfill_end(&sf_ctx);
vpaint works with the new face structures, yay, though it probably still has issues, needs more testing. also hopefully fixed subsurf crash everyone but me was getting, what I found should have caused crashes even for me, no idea why it did not. also got face flags to work with subsurf, and partially got materials, though theres still a problem there.
2009-08-30 21:30:07 +00:00
}
}
CustomData_free(fdata, totface);
minor refactor to main tesselation function - reserve the array sizes to avoid re-allocing (even though its a lower limit it still helps) - increase array size in larger steps then 1 by 1. - avoid a few array lookups. - use more obvious variable naming to make the function more readable.
2012-01-23 13:36:11 +00:00
totface = mface_index;
avoid storing over allocated arrays in tesselated custom data, was reserving initial arrays wrong the wrong array length.
2012-01-25 23:59:28 +00:00
add option to BLI_scanfill_calc() - BLI_SCANFILL_CALC_HOLES, gives some speedup for BMesh ngons which never have holes and ensures predictable triangle count (totvert - 2), which is needed for pre-calculating array size.
2012-12-27 06:39:27 +00:00
BLI_assert(totface <= looptris_tot);
avoid storing over allocated arrays in tesselated custom data, was reserving initial arrays wrong the wrong array length.
2012-01-25 23:59:28 +00:00
Fix a couple typos in comments.
2012-02-28 20:55:55 +00:00
/* not essential but without this we store over-alloc'd memory in the CustomData layers */
add option to BLI_scanfill_calc() - BLI_SCANFILL_CALC_HOLES, gives some speedup for BMesh ngons which never have holes and ensures predictable triangle count (totvert - 2), which is needed for pre-calculating array size.
2012-12-27 06:39:27 +00:00
if (LIKELY(looptris_tot != totface)) {
avoid storing over allocated arrays in tesselated custom data, was reserving initial arrays wrong the wrong array length.
2012-01-25 23:59:28 +00:00
mface = MEM_reallocN(mface, sizeof(*mface) * totface);
mface_to_poly_map = MEM_reallocN(mface_to_poly_map, sizeof(*mface_to_poly_map) * totface);
}
mesh_recalcTesselation speedup, ski[ check for 3-4 sided faces - dont use scanfill in these cases. overall 6x speedup on an optized build (Suzanne subsurf level 5, applied)
2011-11-18 12:18:44 +00:00
CustomData_add_layer(fdata, CD_MFACE, CD_ASSIGN, mface, totface);
r42101 causes problems. reverting and instead make correct CD_ORIGINDEX for tesselated faces to fix the problem.
2011-11-23 20:44:04 +00:00
remove CD_POLYINDEX customdata layer: reported as [#29376] BMESH_TODO: remove tessface CD_ORIGINDEX layer for a single mesh there could be 3 origindex mappings stored, one on the polygons and 2 on the tessfaces. (CD_POLYINDEX and CD_ORIGINDEX). as Andrew suggests, now tessfaces (which are really a cache of polygons), using origindex to point to polygons on the same derived mesh, and polygons only store the original index values.
2012-10-30 19:20:17 +00:00
/* CD_ORIGINDEX will contain an array of indices from tessfaces to the polygons
spelling cleanup
2012-03-18 07:38:51 +00:00
* they are directly tessellated from */
remove CD_POLYINDEX customdata layer: reported as [#29376] BMESH_TODO: remove tessface CD_ORIGINDEX layer for a single mesh there could be 3 origindex mappings stored, one on the polygons and 2 on the tessfaces. (CD_POLYINDEX and CD_ORIGINDEX). as Andrew suggests, now tessfaces (which are really a cache of polygons), using origindex to point to polygons on the same derived mesh, and polygons only store the original index values.
2012-10-30 19:20:17 +00:00
CustomData_add_layer(fdata, CD_ORIGINDEX, CD_ASSIGN, mface_to_poly_map, totface);
vpaint works with the new face structures, yay, though it probably still has issues, needs more testing. also hopefully fixed subsurf crash everyone but me was getting, what I found should have caused crashes even for me, no idea why it did not. also got face flags to work with subsurf, and partially got materials, though theres still a problem there.
2009-08-30 21:30:07 +00:00
CustomData_from_bmeshpoly(fdata, pdata, ldata, totface);
argument to mesh_recalcTesselation to skip copying normals from polygons.
2012-01-19 17:51:52 +00:00
if (do_face_nor_cpy) {
/* If polys have a normals layer, copying that to faces can help
* avoid the need to recalculate normals later */
if (CustomData_has_layer(pdata, CD_NORMAL)) {
error in last fix, used negate to check it was working.
2012-01-19 22:04:13 +00:00
float (*pnors)[3] = CustomData_get_layer(pdata, CD_NORMAL);
float (*fnors)[3] = CustomData_add_layer(fdata, CD_NORMAL, CD_CALLOC, NULL, totface);
minor refactor to main tesselation function - reserve the array sizes to avoid re-allocing (even though its a lower limit it still helps) - increase array size in larger steps then 1 by 1. - avoid a few array lookups. - use more obvious variable naming to make the function more readable.
2012-01-23 13:36:11 +00:00
for (mface_index = 0; mface_index < totface; mface_index++) {
copy_v3_v3(fnors[mface_index], pnors[mface_to_poly_map[mface_index]]);
argument to mesh_recalcTesselation to skip copying normals from polygons.
2012-01-19 17:51:52 +00:00
}
Add CD_POLYINDEX layer to reduce need for retesselations
2011-11-13 15:13:59 +00:00
}
}
mesh_recalcTesselation speedup, ski[ check for 3-4 sided faces - dont use scanfill in these cases. overall 6x speedup on an optized build (Suzanne subsurf level 5, applied)
2011-11-18 12:18:44 +00:00
mf = mface;
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
for (mface_index = 0; mface_index < totface; mface_index++, mf++) {
skip sorting loop indices when tesselating if the original poly is a quad or a tri.
2011-12-29 03:24:28 +00:00
define to enable tesselate to quads, this way files from trunk tesselate back into their original geometry with the same face order. this will be needed for tangents and most likely hair if its to load correctly from trunk. disabled for now until this is working correctly - hair still needs more work.
2012-01-24 20:58:43 +00:00
#ifdef USE_TESSFACE_QUADS
const int mf_len = mf->edcode & TESSFACE_IS_QUAD ? 4 : 3;
#endif
skip sorting loop indices when tesselating if the original poly is a quad or a tri.
2011-12-29 03:24:28 +00:00
#ifdef USE_TESSFACE_SPEEDUP
/* skip sorting when not using ngons */
define to enable tesselate to quads, this way files from trunk tesselate back into their original geometry with the same face order. this will be needed for tangents and most likely hair if its to load correctly from trunk. disabled for now until this is working correctly - hair still needs more work.
2012-01-24 20:58:43 +00:00
if (UNLIKELY(mf->edcode & TESSFACE_SCANFILL))
skip sorting loop indices when tesselating if the original poly is a quad or a tri.
2011-12-29 03:24:28 +00:00
#endif
{
/* sort loop indices to ensure winding is correct */
fix for type mismatch with SWAP() macro.
2012-08-25 19:43:15 +00:00
if (mf->v1 > mf->v2) SWAP(unsigned int, mf->v1, mf->v2);
if (mf->v2 > mf->v3) SWAP(unsigned int, mf->v2, mf->v3);
if (mf->v1 > mf->v2) SWAP(unsigned int, mf->v1, mf->v2);
skip sorting loop indices when tesselating if the original poly is a quad or a tri.
2011-12-29 03:24:28 +00:00
fix for type mismatch with SWAP() macro.
2012-08-25 19:43:15 +00:00
if (mf->v1 > mf->v2) SWAP(unsigned int, mf->v1, mf->v2);
if (mf->v2 > mf->v3) SWAP(unsigned int, mf->v2, mf->v3);
if (mf->v1 > mf->v2) SWAP(unsigned int, mf->v1, mf->v2);
define to enable tesselate to quads, this way files from trunk tesselate back into their original geometry with the same face order. this will be needed for tangents and most likely hair if its to load correctly from trunk. disabled for now until this is working correctly - hair still needs more work.
2012-01-24 20:58:43 +00:00
}
skip sorting loop indices when tesselating if the original poly is a quad or a tri.
2011-12-29 03:24:28 +00:00
define to enable tesselate to quads, this way files from trunk tesselate back into their original geometry with the same face order. this will be needed for tangents and most likely hair if its to load correctly from trunk. disabled for now until this is working correctly - hair still needs more work.
2012-01-24 20:58:43 +00:00
/* end abusing the edcode */
#if defined(USE_TESSFACE_QUADS) || defined(USE_TESSFACE_SPEEDUP)
mf->edcode = 0;
skip sorting loop indices when tesselating if the original poly is a quad or a tri.
2011-12-29 03:24:28 +00:00
#endif
define to enable tesselate to quads, this way files from trunk tesselate back into their original geometry with the same face order. this will be needed for tangents and most likely hair if its to load correctly from trunk. disabled for now until this is working correctly - hair still needs more work.
2012-01-24 20:58:43 +00:00
skip sorting loop indices when tesselating if the original poly is a quad or a tri.
2011-12-29 03:24:28 +00:00
vpaint works with the new face structures, yay, though it probably still has issues, needs more testing. also hopefully fixed subsurf crash everyone but me was getting, what I found should have caused crashes even for me, no idea why it did not. also got face flags to work with subsurf, and partially got materials, though theres still a problem there.
2009-08-30 21:30:07 +00:00
lindex[0] = mf->v1;
lindex[1] = mf->v2;
lindex[2] = mf->v3;
define to enable tesselate to quads, this way files from trunk tesselate back into their original geometry with the same face order. this will be needed for tangents and most likely hair if its to load correctly from trunk. disabled for now until this is working correctly - hair still needs more work.
2012-01-24 20:58:43 +00:00
#ifdef USE_TESSFACE_QUADS
fix for own error in tesselating as quad
2012-01-25 22:55:12 +00:00
if (mf_len == 4) lindex[3] = mf->v4;
define to enable tesselate to quads, this way files from trunk tesselate back into their original geometry with the same face order. this will be needed for tangents and most likely hair if its to load correctly from trunk. disabled for now until this is working correctly - hair still needs more work.
2012-01-24 20:58:43 +00:00
#endif
vpaint works with the new face structures, yay, though it probably still has issues, needs more testing. also hopefully fixed subsurf crash everyone but me was getting, what I found should have caused crashes even for me, no idea why it did not. also got face flags to work with subsurf, and partially got materials, though theres still a problem there.
2009-08-30 21:30:07 +00:00
/*transform loop indices to vert indices*/
mf->v1 = mloop[mf->v1].v;
mf->v2 = mloop[mf->v2].v;
mf->v3 = mloop[mf->v3].v;
define to enable tesselate to quads, this way files from trunk tesselate back into their original geometry with the same face order. this will be needed for tangents and most likely hair if its to load correctly from trunk. disabled for now until this is working correctly - hair still needs more work.
2012-01-24 20:58:43 +00:00
#ifdef USE_TESSFACE_QUADS
if (mf_len == 4) mf->v4 = mloop[mf->v4].v;
#endif
vpaint works with the new face structures, yay, though it probably still has issues, needs more testing. also hopefully fixed subsurf crash everyone but me was getting, what I found should have caused crashes even for me, no idea why it did not. also got face flags to work with subsurf, and partially got materials, though theres still a problem there.
2009-08-30 21:30:07 +00:00
code cleanup: naming - BKE_mesh_*
2012-05-05 21:28:12 +00:00
BKE_mesh_loops_to_mface_corners(fdata, ldata, pdata,
lindex, mface_index, mface_to_poly_map[mface_index],
define to enable tesselate to quads, this way files from trunk tesselate back into their original geometry with the same face order. this will be needed for tangents and most likely hair if its to load correctly from trunk. disabled for now until this is working correctly - hair still needs more work.
2012-01-24 20:58:43 +00:00
#ifdef USE_TESSFACE_QUADS
code cleanup: naming - BKE_mesh_*
2012-05-05 21:28:12 +00:00
mf_len,
define to enable tesselate to quads, this way files from trunk tesselate back into their original geometry with the same face order. this will be needed for tangents and most likely hair if its to load correctly from trunk. disabled for now until this is working correctly - hair still needs more work.
2012-01-24 20:58:43 +00:00
#else
code cleanup: naming - BKE_mesh_*
2012-05-05 21:28:12 +00:00
3,
define to enable tesselate to quads, this way files from trunk tesselate back into their original geometry with the same face order. this will be needed for tangents and most likely hair if its to load correctly from trunk. disabled for now until this is working correctly - hair still needs more work.
2012-01-24 20:58:43 +00:00
#endif
code cleanup: naming - BKE_mesh_*
2012-05-05 21:28:12 +00:00
numTex, numCol, hasPCol, hasOrigSpace);
define to enable tesselate to quads, this way files from trunk tesselate back into their original geometry with the same face order. this will be needed for tangents and most likely hair if its to load correctly from trunk. disabled for now until this is working correctly - hair still needs more work.
2012-01-24 20:58:43 +00:00
#ifdef USE_TESSFACE_QUADS
svn merge ^/trunk/blender -r43685:43693
2012-01-25 18:13:58 +00:00
test_index_face(mf, fdata, mface_index, mf_len);
define to enable tesselate to quads, this way files from trunk tesselate back into their original geometry with the same face order. this will be needed for tangents and most likely hair if its to load correctly from trunk. disabled for now until this is working correctly - hair still needs more work.
2012-01-24 20:58:43 +00:00
#endif
vpaint works with the new face structures, yay, though it probably still has issues, needs more testing. also hopefully fixed subsurf crash everyone but me was getting, what I found should have caused crashes even for me, no idea why it did not. also got face flags to work with subsurf, and partially got materials, though theres still a problem there.
2009-08-30 21:30:07 +00:00
}
return totface;
speedup for editmesh tesselation (approx 4.4x speedup in optimized builds), this is important because it runs while transforming the mesh in editmode. also made this code a bit more efficient.
2011-11-18 16:06:20 +00:00
#undef USE_TESSFACE_SPEEDUP
vpaint works with the new face structures, yay, though it probably still has issues, needs more testing. also hopefully fixed subsurf crash everyone but me was getting, what I found should have caused crashes even for me, no idea why it did not. also got face flags to work with subsurf, and partially got materials, though theres still a problem there.
2009-08-30 21:30:07 +00:00
}
finished edgesplit, from face angle option now works
2009-09-12 06:47:59 +00:00
option to save bmesh files in older mesh format so they can load in older versoons of blender. - saves UV's and VCols - skips NGons - resulting files load in both BMesh and Trunk. TODO - add an option in the UI to access this.
2011-12-27 08:39:55 +00:00
correct define
2011-12-28 15:07:00 +00:00
#ifdef USE_BMESH_SAVE_AS_COMPAT
option to save bmesh files in older mesh format so they can load in older versoons of blender. - saves UV's and VCols - skips NGons - resulting files load in both BMesh and Trunk. TODO - add an option in the UI to access this.
2011-12-27 08:39:55 +00:00
/*
style cleanup - spelling - turns out we had tessellation spelt wrong all over. - use \directive for doxy (not @directive) - remove BLI_sparsemap.h - was from bmesh merge IIRC but entire file commented and not used.
2012-03-02 16:05:54 +00:00
* this function recreates a tessellation.
* returns number of tessellation faces.
option to save bmesh files in older mesh format so they can load in older versoons of blender. - saves UV's and VCols - skips NGons - resulting files load in both BMesh and Trunk. TODO - add an option in the UI to access this.
2011-12-27 08:39:55 +00:00
*/
code cleanup: naming - BKE_mesh_*
2012-05-05 21:28:12 +00:00
int BKE_mesh_mpoly_to_mface(struct CustomData *fdata, struct CustomData *ldata,
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
struct CustomData *pdata, int totface, int UNUSED(totloop), int totpoly)
option to save bmesh files in older mesh format so they can load in older versoons of blender. - saves UV's and VCols - skips NGons - resulting files load in both BMesh and Trunk. TODO - add an option in the UI to access this.
2011-12-27 08:39:55 +00:00
{
MLoop *mloop;
int lindex[4];
int i;
int k;
MPoly *mp, *mpoly;
MFace *mface = NULL, *mf;
BLI_array_declare(mface);
cache customdata checks to avoid looking up on each call to mesh_loops_to_mface_corners()
2011-12-28 22:37:09 +00:00
const int numTex = CustomData_number_of_layers(pdata, CD_MTEXPOLY);
const int numCol = CustomData_number_of_layers(ldata, CD_MLOOPCOL);
Renaming CD_WEIGHT_MCOL/MLOOPCOL and their masks from WEIGHT to PREVIEW, as this layer is now also used for various preview tasks in Object mode. “Cleanup” commit, no functional changes.
2012-03-22 08:41:50 +00:00
const int hasPCol = CustomData_has_layer(ldata, CD_PREVIEW_MLOOPCOL);
support for 'origspace' data layer - used for hair on subsurf mesh. currently only works for 3/4 sided faces.
2012-02-05 11:30:26 +00:00
const int hasOrigSpace = CustomData_has_layer(ldata, CD_ORIGSPACE_MLOOP);
cache customdata checks to avoid looking up on each call to mesh_loops_to_mface_corners()
2011-12-28 22:37:09 +00:00
option to save bmesh files in older mesh format so they can load in older versoons of blender. - saves UV's and VCols - skips NGons - resulting files load in both BMesh and Trunk. TODO - add an option in the UI to access this.
2011-12-27 08:39:55 +00:00
mpoly = CustomData_get_layer(pdata, CD_MPOLY);
mloop = CustomData_get_layer(ldata, CD_MLOOP);
mp = mpoly;
k = 0;
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
for (i = 0; i < totpoly; i++, mp++) {
option to save bmesh files in older mesh format so they can load in older versoons of blender. - saves UV's and VCols - skips NGons - resulting files load in both BMesh and Trunk. TODO - add an option in the UI to access this.
2011-12-27 08:39:55 +00:00
if (ELEM(mp->totloop, 3, 4)) {
style cleanup: format 'for' loop macros the same as for loops, some renaming to BLI_array macros.
2012-04-28 15:14:16 +00:00
BLI_array_grow_one(mface);
option to save bmesh files in older mesh format so they can load in older versoons of blender. - saves UV's and VCols - skips NGons - resulting files load in both BMesh and Trunk. TODO - add an option in the UI to access this.
2011-12-27 08:39:55 +00:00
mf = &mface[k];
mf->mat_nr = mp->mat_nr;
mf->flag = mp->flag;
mf->v1 = mp->loopstart + 0;
mf->v2 = mp->loopstart + 1;
mf->v3 = mp->loopstart + 2;
mf->v4 = (mp->totloop == 4) ? (mp->loopstart + 3) : 0;
/* abuse edcode for temp storage and clear next loop */
mf->edcode = (char)mp->totloop; /* only ever 3 or 4 */
k++;
}
}
CustomData_free(fdata, totface);
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
totface = k;
option to save bmesh files in older mesh format so they can load in older versoons of blender. - saves UV's and VCols - skips NGons - resulting files load in both BMesh and Trunk. TODO - add an option in the UI to access this.
2011-12-27 08:39:55 +00:00
CustomData_add_layer(fdata, CD_MFACE, CD_ASSIGN, mface, totface);
CustomData_from_bmeshpoly(fdata, pdata, ldata, totface);
mp = mpoly;
k = 0;
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
for (i = 0; i < totpoly; i++, mp++) {
option to save bmesh files in older mesh format so they can load in older versoons of blender. - saves UV's and VCols - skips NGons - resulting files load in both BMesh and Trunk. TODO - add an option in the UI to access this.
2011-12-27 08:39:55 +00:00
if (ELEM(mp->totloop, 3, 4)) {
mf = &mface[k];
if (mf->edcode == 3) {
fix own error in recent smoothview cleanup, also correct some cross references in bmesh docs.
2012-08-17 14:43:20 +00:00
/* sort loop indices to ensure winding is correct */
option to save bmesh files in older mesh format so they can load in older versoons of blender. - saves UV's and VCols - skips NGons - resulting files load in both BMesh and Trunk. TODO - add an option in the UI to access this.
2011-12-27 08:39:55 +00:00
/* NO SORT - looks like we can skip this */
lindex[0] = mf->v1;
lindex[1] = mf->v2;
lindex[2] = mf->v3;
lindex[3] = 0; /* unused */
fix own error in recent smoothview cleanup, also correct some cross references in bmesh docs.
2012-08-17 14:43:20 +00:00
/* transform loop indices to vert indices */
option to save bmesh files in older mesh format so they can load in older versoons of blender. - saves UV's and VCols - skips NGons - resulting files load in both BMesh and Trunk. TODO - add an option in the UI to access this.
2011-12-27 08:39:55 +00:00
mf->v1 = mloop[mf->v1].v;
mf->v2 = mloop[mf->v2].v;
mf->v3 = mloop[mf->v3].v;
code cleanup: naming - BKE_mesh_*
2012-05-05 21:28:12 +00:00
BKE_mesh_loops_to_mface_corners(fdata, ldata, pdata,
lindex, k, i, 3,
numTex, numCol, hasPCol, hasOrigSpace);
fix own error in bmesh -> mesh versioning
2012-01-17 04:54:57 +00:00
test_index_face(mf, fdata, k, 3);
option to save bmesh files in older mesh format so they can load in older versoons of blender. - saves UV's and VCols - skips NGons - resulting files load in both BMesh and Trunk. TODO - add an option in the UI to access this.
2011-12-27 08:39:55 +00:00
}
else {
fix own error in recent smoothview cleanup, also correct some cross references in bmesh docs.
2012-08-17 14:43:20 +00:00
/* sort loop indices to ensure winding is correct */
option to save bmesh files in older mesh format so they can load in older versoons of blender. - saves UV's and VCols - skips NGons - resulting files load in both BMesh and Trunk. TODO - add an option in the UI to access this.
2011-12-27 08:39:55 +00:00
/* NO SORT - looks like we can skip this */
lindex[0] = mf->v1;
lindex[1] = mf->v2;
lindex[2] = mf->v3;
lindex[3] = mf->v4;
fix own error in recent smoothview cleanup, also correct some cross references in bmesh docs.
2012-08-17 14:43:20 +00:00
/* transform loop indices to vert indices */
option to save bmesh files in older mesh format so they can load in older versoons of blender. - saves UV's and VCols - skips NGons - resulting files load in both BMesh and Trunk. TODO - add an option in the UI to access this.
2011-12-27 08:39:55 +00:00
mf->v1 = mloop[mf->v1].v;
mf->v2 = mloop[mf->v2].v;
mf->v3 = mloop[mf->v3].v;
mf->v4 = mloop[mf->v4].v;
code cleanup: naming - BKE_mesh_*
2012-05-05 21:28:12 +00:00
BKE_mesh_loops_to_mface_corners(fdata, ldata, pdata,
lindex, k, i, 4,
numTex, numCol, hasPCol, hasOrigSpace);
fix own error in bmesh -> mesh versioning
2012-01-17 04:54:57 +00:00
test_index_face(mf, fdata, k, 4);
option to save bmesh files in older mesh format so they can load in older versoons of blender. - saves UV's and VCols - skips NGons - resulting files load in both BMesh and Trunk. TODO - add an option in the UI to access this.
2011-12-27 08:39:55 +00:00
}
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
mf->edcode = 0;
option to save bmesh files in older mesh format so they can load in older versoons of blender. - saves UV's and VCols - skips NGons - resulting files load in both BMesh and Trunk. TODO - add an option in the UI to access this.
2011-12-27 08:39:55 +00:00
k++;
}
}
return k;
}
correct define
2011-12-28 15:07:00 +00:00
#endif /* USE_BMESH_SAVE_AS_COMPAT */
option to save bmesh files in older mesh format so they can load in older versoons of blender. - saves UV's and VCols - skips NGons - resulting files load in both BMesh and Trunk. TODO - add an option in the UI to access this.
2011-12-27 08:39:55 +00:00
finished edgesplit, from face angle option now works
2009-09-12 06:47:59 +00:00
/*
* COMPUTE POLY NORMAL
*
* Computes the normal of a planar
* polygon See Graphics Gems for
* computing newell normal.
*
style cleanup / comment formatting for bli/bke/bmesh
2012-03-03 20:19:11 +00:00
*/
finished edgesplit, from face angle option now works
2009-09-12 06:47:59 +00:00
static void mesh_calc_ngon_normal(MPoly *mpoly, MLoop *loopstart,
utility function for getting the center of a polygon, needed for up coming changes
2011-11-28 23:50:40 +00:00
MVert *mvert, float normal[3])
finished edgesplit, from face angle option now works
2009-09-12 06:47:59 +00:00
{
code cleanup: use much simpler (and likely faster) polygon normal calculation in object mode.
2012-05-04 13:13:45 +00:00
const int nverts = mpoly->totloop;
float const *v_prev = mvert[loopstart[nverts - 1].v].co;
fix for own bad logic with polygon normal calculation, was reading one past the loop array (reported as bug #31431).
2012-05-12 21:01:26 +00:00
float const *v_curr;
remove unused vars
2011-05-13 13:17:30 +00:00
int i;
finished edgesplit, from face angle option now works
2009-09-12 06:47:59 +00:00
fix for own bad logic with polygon normal calculation, was reading one past the loop array (reported as bug #31431).
2012-05-12 21:01:26 +00:00
zero_v3(normal);
code cleanup: use much simpler (and likely faster) polygon normal calculation in object mode.
2012-05-04 13:13:45 +00:00
/* Newell's Method */
fix for own bad logic with polygon normal calculation, was reading one past the loop array (reported as bug #31431).
2012-05-12 21:01:26 +00:00
for (i = 0; i < nverts; i++) {
v_curr = mvert[loopstart[i].v].co;
add_newell_cross_v3_v3v3(normal, v_prev, v_curr);
v_prev = v_curr;
finished edgesplit, from face angle option now works
2009-09-12 06:47:59 +00:00
}
fix for own bad logic with polygon normal calculation, was reading one past the loop array (reported as bug #31431).
2012-05-12 21:01:26 +00:00
if (UNLIKELY(normalize_v3(normal) == 0.0f)) {
code cleanup: use much simpler (and likely faster) polygon normal calculation in object mode.
2012-05-04 13:13:45 +00:00
normal[2] = 1.0f; /* other axis set to 0.0 */
style cleanup: follow style guide for formatting of if/for/while loops, and else if's
2012-03-24 06:18:31 +00:00
}
finished edgesplit, from face angle option now works
2009-09-12 06:47:59 +00:00
}
fix [#32646] Duplifaces can have wrong orientation with ngons concave ngons could flip the dupliface, now use the faces normal when calculating the dupli-face.
2012-09-25 00:20:42 +00:00
void BKE_mesh_calc_poly_normal(MPoly *mpoly, MLoop *loopstart,
MVert *mvarray, float no[3])
finished edgesplit, from face angle option now works
2009-09-12 06:47:59 +00:00
{
utility function for getting the center of a polygon, needed for up coming changes
2011-11-28 23:50:40 +00:00
if (mpoly->totloop > 4) {
finished edgesplit, from face angle option now works
2009-09-12 06:47:59 +00:00
mesh_calc_ngon_normal(mpoly, loopstart, mvarray, no);
}
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
else if (mpoly->totloop == 3) {
utility function for getting the center of a polygon, needed for up coming changes
2011-11-28 23:50:40 +00:00
normal_tri_v3(no,
mvarray[loopstart[0].v].co,
mvarray[loopstart[1].v].co,
mvarray[loopstart[2].v].co
);
}
else if (mpoly->totloop == 4) {
normal_quad_v3(no,
mvarray[loopstart[0].v].co,
mvarray[loopstart[1].v].co,
mvarray[loopstart[2].v].co,
mvarray[loopstart[3].v].co
);
}
else { /* horrible, two sided face! */
no[0] = 0.0;
no[1] = 0.0;
no[2] = 1.0;
}
}
update UV project modifier to use MLoopUV's rather then tessface UV's
2012-01-04 14:42:11 +00:00
/* duplicate of function above _but_ takes coords rather then mverts */
static void mesh_calc_ngon_normal_coords(MPoly *mpoly, MLoop *loopstart,
const float (*vertex_coords)[3], float normal[3])
{
code cleanup: use much simpler (and likely faster) polygon normal calculation in object mode.
2012-05-04 13:13:45 +00:00
const int nverts = mpoly->totloop;
float const *v_prev = vertex_coords[loopstart[nverts - 1].v];
fix for own bad logic with polygon normal calculation, was reading one past the loop array (reported as bug #31431).
2012-05-12 21:01:26 +00:00
float const *v_curr;
update UV project modifier to use MLoopUV's rather then tessface UV's
2012-01-04 14:42:11 +00:00
int i;
fix for own bad logic with polygon normal calculation, was reading one past the loop array (reported as bug #31431).
2012-05-12 21:01:26 +00:00
zero_v3(normal);
code cleanup: use much simpler (and likely faster) polygon normal calculation in object mode.
2012-05-04 13:13:45 +00:00
/* Newell's Method */
fix for own bad logic with polygon normal calculation, was reading one past the loop array (reported as bug #31431).
2012-05-12 21:01:26 +00:00
for (i = 0; i < nverts; i++) {
v_curr = vertex_coords[loopstart[i].v];
add_newell_cross_v3_v3v3(normal, v_prev, v_curr);
v_prev = v_curr;
update UV project modifier to use MLoopUV's rather then tessface UV's
2012-01-04 14:42:11 +00:00
}
fix for own bad logic with polygon normal calculation, was reading one past the loop array (reported as bug #31431).
2012-05-12 21:01:26 +00:00
if (UNLIKELY(normalize_v3(normal) == 0.0f)) {
code cleanup: use much simpler (and likely faster) polygon normal calculation in object mode.
2012-05-04 13:13:45 +00:00
normal[2] = 1.0f; /* other axis set to 0.0 */
style cleanup: follow style guide for formatting of if/for/while loops, and else if's
2012-03-24 06:18:31 +00:00
}
update UV project modifier to use MLoopUV's rather then tessface UV's
2012-01-04 14:42:11 +00:00
}
code cleanup: naming - BKE_mesh_*
2012-05-05 21:28:12 +00:00
void BKE_mesh_calc_poly_normal_coords(MPoly *mpoly, MLoop *loopstart,
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
const float (*vertex_coords)[3], float no[3])
update UV project modifier to use MLoopUV's rather then tessface UV's
2012-01-04 14:42:11 +00:00
{
if (mpoly->totloop > 4) {
mesh_calc_ngon_normal_coords(mpoly, loopstart, vertex_coords, no);
}
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
else if (mpoly->totloop == 3) {
update UV project modifier to use MLoopUV's rather then tessface UV's
2012-01-04 14:42:11 +00:00
normal_tri_v3(no,
vertex_coords[loopstart[0].v],
vertex_coords[loopstart[1].v],
vertex_coords[loopstart[2].v]
);
}
else if (mpoly->totloop == 4) {
normal_quad_v3(no,
vertex_coords[loopstart[0].v],
vertex_coords[loopstart[1].v],
vertex_coords[loopstart[2].v],
vertex_coords[loopstart[3].v]
);
}
else { /* horrible, two sided face! */
no[0] = 0.0;
no[1] = 0.0;
no[2] = 1.0;
}
}
utility function for getting the center of a polygon, needed for up coming changes
2011-11-28 23:50:40 +00:00
static void mesh_calc_ngon_center(MPoly *mpoly, MLoop *loopstart,
MVert *mvert, float cent[3])
{
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
const float w = 1.0f / (float)mpoly->totloop;
utility function for getting the center of a polygon, needed for up coming changes
2011-11-28 23:50:40 +00:00
int i;
finished edgesplit, from face angle option now works
2009-09-12 06:47:59 +00:00
utility function for getting the center of a polygon, needed for up coming changes
2011-11-28 23:50:40 +00:00
zero_v3(cent);
for (i = 0; i < mpoly->totloop; i++) {
fix for duplifaces with quads/ngons, bmesh was using triangulated faces so each quad would result in 2 duplis.
2011-11-29 02:58:38 +00:00
madd_v3_v3fl(cent, mvert[(loopstart++)->v].co, w);
finished edgesplit, from face angle option now works
2009-09-12 06:47:59 +00:00
}
utility function for getting the center of a polygon, needed for up coming changes
2011-11-28 23:50:40 +00:00
}
finished edgesplit, from face angle option now works
2009-09-12 06:47:59 +00:00
code cleanup: naming - BKE_mesh_*
2012-05-05 21:28:12 +00:00
void BKE_mesh_calc_poly_center(MPoly *mpoly, MLoop *loopstart,
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
MVert *mvarray, float cent[3])
utility function for getting the center of a polygon, needed for up coming changes
2011-11-28 23:50:40 +00:00
{
if (mpoly->totloop == 3) {
cent_tri_v3(cent,
mvarray[loopstart[0].v].co,
mvarray[loopstart[1].v].co,
mvarray[loopstart[2].v].co
);
}
else if (mpoly->totloop == 4) {
cent_quad_v3(cent,
mvarray[loopstart[0].v].co,
mvarray[loopstart[1].v].co,
mvarray[loopstart[2].v].co,
mvarray[loopstart[3].v].co
);
finished edgesplit, from face angle option now works
2009-09-12 06:47:59 +00:00
}
utility function for getting the center of a polygon, needed for up coming changes
2011-11-28 23:50:40 +00:00
else {
mesh_calc_ngon_center(mpoly, loopstart, mvarray, cent);
finished edgesplit, from face angle option now works
2009-09-12 06:47:59 +00:00
}
}
merge with trunk at r31523
2010-09-04 05:31:25 +00:00
fix for duplifaces with quads/ngons, bmesh was using triangulated faces so each quad would result in 2 duplis.
2011-11-29 02:58:38 +00:00
/* note, passing polynormal is only a speedup so we can skip calculating it */
code cleanup: naming - BKE_mesh_*
2012-05-05 21:28:12 +00:00
float BKE_mesh_calc_poly_area(MPoly *mpoly, MLoop *loopstart,
small improvement to previous commit, use pre-calculated ngon normal to avoid calculating twice when dupli-scale is enabled.
2012-09-25 00:25:17 +00:00
MVert *mvarray, const float polynormal[3])
fix for duplifaces with quads/ngons, bmesh was using triangulated faces so each quad would result in 2 duplis.
2011-11-29 02:58:38 +00:00
{
if (mpoly->totloop == 3) {
return area_tri_v3(mvarray[loopstart[0].v].co,
mvarray[loopstart[1].v].co,
mvarray[loopstart[2].v].co
);
}
else if (mpoly->totloop == 4) {
return area_quad_v3(mvarray[loopstart[0].v].co,
mvarray[loopstart[1].v].co,
mvarray[loopstart[2].v].co,
mvarray[loopstart[3].v].co
);
}
else {
int i;
fix [#30264] B-Mesh: Crash when unwrapping ngon mesh with Smart UV project
2012-02-21 03:43:57 +00:00
MLoop *l_iter = loopstart;
replace BLI_array_fixedstack_declare with() new macro BLI_array_alloca() which uses stack memory always and doesn't need to be freed explicitly.
2012-12-11 15:10:19 +00:00
float area, polynorm_local[3];
float (*vertexcos)[3] = BLI_array_alloca(vertexcos, mpoly->totloop);
small improvement to previous commit, use pre-calculated ngon normal to avoid calculating twice when dupli-scale is enabled.
2012-09-25 00:25:17 +00:00
const float *no = polynormal ? polynormal : polynorm_local;
fix for duplifaces with quads/ngons, bmesh was using triangulated faces so each quad would result in 2 duplis.
2011-11-29 02:58:38 +00:00
/* pack vertex cos into an array for area_poly_v3 */
fix [#30264] B-Mesh: Crash when unwrapping ngon mesh with Smart UV project
2012-02-21 03:43:57 +00:00
for (i = 0; i < mpoly->totloop; i++, l_iter++) {
copy_v3_v3(vertexcos[i], mvarray[l_iter->v].co);
fix for duplifaces with quads/ngons, bmesh was using triangulated faces so each quad would result in 2 duplis.
2011-11-29 02:58:38 +00:00
}
/* need normal for area_poly_v3 as well */
if (polynormal == NULL) {
small improvement to previous commit, use pre-calculated ngon normal to avoid calculating twice when dupli-scale is enabled.
2012-09-25 00:25:17 +00:00
BKE_mesh_calc_poly_normal(mpoly, loopstart, mvarray, polynorm_local);
fix for duplifaces with quads/ngons, bmesh was using triangulated faces so each quad would result in 2 duplis.
2011-11-29 02:58:38 +00:00
}
/* finally calculate the area */
area = area_poly_v3(mpoly->totloop, vertexcos, no);
return area;
}
}
Fix "Origin to Center of Mass" not working well with ngons Now we do simple triangulation and calculate signed area of triangles to account for concave polygons. This only works correct for planar polygons but gives better results overall.
2013-02-14 17:35:46 +00:00
/* note, results won't be correct if polygon is non-planar */
static float mesh_calc_poly_planar_area_centroid(MPoly *mpoly, MLoop *loopstart, MVert *mvarray, float cent[3])
{
int i;
float tri_area;
float total_area = 0.0f;
float v1[3], v2[3], v3[3], normal[3], tri_cent[3];
BKE_mesh_calc_poly_normal(mpoly, loopstart, mvarray, normal);
copy_v3_v3(v1, mvarray[loopstart[0].v].co);
copy_v3_v3(v2, mvarray[loopstart[1].v].co);
zero_v3(cent);
for (i = 2; i < mpoly->totloop; i++) {
copy_v3_v3(v3, mvarray[loopstart[i].v].co);
tri_area = area_tri_signed_v3(v1, v2, v3, normal);
total_area += tri_area;
cent_tri_v3(tri_cent, v1, v2, v3);
madd_v3_v3fl(cent, tri_cent, tri_area);
copy_v3_v3(v2, v3);
}
mul_v3_fl(cent, 1.0f / total_area);
return total_area;
}
add 'deform - integrate' option to mesh-cache, This means the deformation on the input to the modifier can be re-applied ontop of the mesh cache. In practice this is most useful for using corrective shape-keys with mesh-cache.
2013-01-24 04:02:30 +00:00
/**
* This function takes the difference between 2 vertex-coord-arrays
* (\a vert_cos_src, \a vert_cos_dst),
* and applies the difference to \a vert_cos_new relative to \a vert_cos_org.
*
* \param vert_cos_src reference deform source.
* \param vert_cos_dst reference deform destination.
*
* \param vert_cos_org reference for the output location.
* \param vert_cos_new resulting coords.
*/
void BKE_mesh_calc_relative_deform(
const MPoly *mpoly, const int totpoly,
const MLoop *mloop, const int totvert,
const float (*vert_cos_src)[3],
const float (*vert_cos_dst)[3],
const float (*vert_cos_org)[3],
float (*vert_cos_new)[3])
{
const MPoly *mp;
int i;
int *vert_accum = MEM_callocN(sizeof(*vert_accum) * totvert, __func__);
memset(vert_cos_new, '\0', sizeof(*vert_cos_new) * totvert);
for (i = 0, mp = mpoly; i < totpoly; i++, mp++) {
const MLoop *loopstart = mloop + mp->loopstart;
int j;
for (j = 0; j < mp->totloop; j++) {
int v_prev = (loopstart + ((mp->totloop + (j - 1)) % mp->totloop))->v;
int v_curr = (loopstart + j)->v;
int v_next = (loopstart + ((j + 1) % mp->totloop))->v;
float tvec[3];
barycentric_transform(
tvec, vert_cos_dst[v_curr],
vert_cos_org[v_prev], vert_cos_org[v_curr], vert_cos_org[v_next],
vert_cos_src[v_prev], vert_cos_src[v_curr], vert_cos_src[v_next]
);
add_v3_v3(vert_cos_new[v_curr], tvec);
vert_accum[v_curr] += 1;
}
}
for (i = 0; i < totvert; i++) {
if (vert_accum[i]) {
mul_v3_fl(vert_cos_new[i], 1.0f / (float)vert_accum[i]);
}
else {
copy_v3_v3(vert_cos_new[i], vert_cos_org[i]);
}
}
MEM_freeN(vert_accum);
}
Code cleanup for the neighbor_average() sculpt function. Moved some of the code into a couple new mesh functions for searching in poly loops to simplify the function, the rest is just cosmetic changes.
2012-02-28 23:08:40 +00:00
/* Find the index of the loop in 'poly' which references vertex,
style cleanup / comment formatting for bli/bke/bmesh
2012-03-03 20:19:11 +00:00
* returns -1 if not found */
Code cleanup for the neighbor_average() sculpt function. Moved some of the code into a couple new mesh functions for searching in poly loops to simplify the function, the rest is just cosmetic changes.
2012-02-28 23:08:40 +00:00
int poly_find_loop_from_vert(const MPoly *poly, const MLoop *loopstart,
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
unsigned vert)
Code cleanup for the neighbor_average() sculpt function. Moved some of the code into a couple new mesh functions for searching in poly loops to simplify the function, the rest is just cosmetic changes.
2012-02-28 23:08:40 +00:00
{
int j;
for (j = 0; j < poly->totloop; j++, loopstart++) {
if (loopstart->v == vert)
return j;
}
return -1;
}
/* Fill 'adj_r' with the loop indices in 'poly' adjacent to the
style cleanup / comment formatting for bli/bke/bmesh
2012-03-03 20:19:11 +00:00
* vertex. Returns the index of the loop matching vertex, or -1 if the
* vertex is not in 'poly' */
Code cleanup for the neighbor_average() sculpt function. Moved some of the code into a couple new mesh functions for searching in poly loops to simplify the function, the rest is just cosmetic changes.
2012-02-28 23:08:40 +00:00
int poly_get_adj_loops_from_vert(unsigned adj_r[3], const MPoly *poly,
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
const MLoop *mloop, unsigned vert)
Code cleanup for the neighbor_average() sculpt function. Moved some of the code into a couple new mesh functions for searching in poly loops to simplify the function, the rest is just cosmetic changes.
2012-02-28 23:08:40 +00:00
{
int corner = poly_find_loop_from_vert(poly,
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
&mloop[poly->loopstart],
vert);
Code cleanup for the neighbor_average() sculpt function. Moved some of the code into a couple new mesh functions for searching in poly loops to simplify the function, the rest is just cosmetic changes.
2012-02-28 23:08:40 +00:00
style cleanup: follow style guide for formatting of if/for/while loops, and else if's
2012-03-24 06:18:31 +00:00
if (corner != -1) {
Code cleanup for the neighbor_average() sculpt function. Moved some of the code into a couple new mesh functions for searching in poly loops to simplify the function, the rest is just cosmetic changes.
2012-02-28 23:08:40 +00:00
const MLoop *ml = &mloop[poly->loopstart + corner];
/* vertex was found */
adj_r[0] = ME_POLY_LOOP_PREV(mloop, poly, corner)->v;
adj_r[1] = ml->v;
adj_r[2] = ME_POLY_LOOP_NEXT(mloop, poly, corner)->v;
}
return corner;
}
Add Mesh equivalent to BM_edge_other_vert(). /* Return the index of the edge vert that is not equal to 'v'. If * neither edge vertex is equal to 'v', returns -1. */ int BKE_mesh_edge_other_vert(const struct MEdge *e, int v);
2012-05-22 15:28:44 +00:00
/* Return the index of the edge vert that is not equal to 'v'. If
* neither edge vertex is equal to 'v', returns -1. */
int BKE_mesh_edge_other_vert(const MEdge *e, int v)
{
if (e->v1 == v)
return e->v2;
else if (e->v2 == v)
return e->v1;
else
return -1;
}
Add BKE mesh function to update edge/poly hidden flags from verts.
2012-03-14 06:31:14 +00:00
/* update the hide flag for edges and faces from the corresponding
style cleanup: comments
2012-04-22 11:54:53 +00:00
* flag in verts */
code cleanup: naming - BKE_mesh_*
2012-05-05 21:28:12 +00:00
void BKE_mesh_flush_hidden_from_verts(const MVert *mvert,
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
const MLoop *mloop,
MEdge *medge, int totedge,
MPoly *mpoly, int totpoly)
Add BKE mesh function to update edge/poly hidden flags from verts.
2012-03-14 06:31:14 +00:00
{
int i, j;
style cleanup: follow style guide for formatting of if/for/while loops, and else if's
2012-03-24 06:18:31 +00:00
for (i = 0; i < totedge; i++) {
Add BKE mesh function to update edge/poly hidden flags from verts.
2012-03-14 06:31:14 +00:00
MEdge *e = &medge[i];
style cleanup: follow style guide for formatting of if/for/while loops, and else if's
2012-03-24 06:18:31 +00:00
if (mvert[e->v1].flag & ME_HIDE ||
style cleanup: changes to brace placement / newlines - for/while/if/switch
2012-04-28 06:31:57 +00:00
mvert[e->v2].flag & ME_HIDE)
{
Add BKE mesh function to update edge/poly hidden flags from verts.
2012-03-14 06:31:14 +00:00
e->flag |= ME_HIDE;
style cleanup: changes to brace placement / newlines - for/while/if/switch
2012-04-28 06:31:57 +00:00
}
else {
Add BKE mesh function to update edge/poly hidden flags from verts.
2012-03-14 06:31:14 +00:00
e->flag &= ~ME_HIDE;
style cleanup: changes to brace placement / newlines - for/while/if/switch
2012-04-28 06:31:57 +00:00
}
Add BKE mesh function to update edge/poly hidden flags from verts.
2012-03-14 06:31:14 +00:00
}
style cleanup: follow style guide for formatting of if/for/while loops, and else if's
2012-03-24 06:18:31 +00:00
for (i = 0; i < totpoly; i++) {
Add BKE mesh function to update edge/poly hidden flags from verts.
2012-03-14 06:31:14 +00:00
MPoly *p = &mpoly[i];
p->flag &= ~ME_HIDE;
style cleanup: follow style guide for formatting of if/for/while loops, and else if's
2012-03-24 06:18:31 +00:00
for (j = 0; j < p->totloop; j++) {
if (mvert[mloop[p->loopstart + j].v].flag & ME_HIDE)
Add BKE mesh function to update edge/poly hidden flags from verts.
2012-03-14 06:31:14 +00:00
p->flag |= ME_HIDE;
}
}
}
function for flushing polygon -> vert,edge selection (in object mode), currently unused.
2012-12-22 08:13:44 +00:00
/**
* simple poly -> vert/edge selection.
*/
flush selection from vertex paint and weight paint modes when exiting, this isnt fool-proof, will need more work.
2012-12-22 14:20:27 +00:00
void BKE_mesh_flush_select_from_polys_ex(MVert *mvert, const int totvert,
MLoop *mloop,
MEdge *medge, const int totedge,
const MPoly *mpoly, const int totpoly)
function for flushing polygon -> vert,edge selection (in object mode), currently unused.
2012-12-22 08:13:44 +00:00
{
MVert *mv;
MEdge *med;
const MPoly *mp;
int i;
i = totvert;
for (mv = mvert; i--; mv++) {
mv->flag &= ~SELECT;
}
i = totedge;
for (med = medge; i--; med++) {
med->flag &= ~SELECT;
}
i = totpoly;
for (mp = mpoly; i--; mp++) {
/* assume if its selected its not hidden and none of its verts/edges are hidden
* (a common assumption)*/
if (mp->flag & ME_FACE_SEL) {
MLoop *ml;
int j;
j = mp->totloop;
for (ml = &mloop[mp->loopstart]; j--; ml++) {
mvert[ml->v].flag |= SELECT;
medge[ml->e].flag |= SELECT;
}
}
}
}
flush selection from vertex paint and weight paint modes when exiting, this isnt fool-proof, will need more work.
2012-12-22 14:20:27 +00:00
void BKE_mesh_flush_select_from_polys(Mesh *me)
{
BKE_mesh_flush_select_from_polys_ex(me->mvert, me->totvert,
me->mloop,
me->medge, me->totedge,
me->mpoly, me->totpoly);
}
function for flushing polygon -> vert,edge selection (in object mode), currently unused.
2012-12-22 08:13:44 +00:00
flush selection from vertex paint and weight paint modes when exiting, this isnt fool-proof, will need more work.
2012-12-22 14:20:27 +00:00
void BKE_mesh_flush_select_from_verts_ex(const MVert *mvert, const int UNUSED(totvert),
MLoop *mloop,
MEdge *medge, const int totedge,
MPoly *mpoly, const int totpoly)
flush selection when switching weight paint vertex/face selection modes.
2012-12-22 13:42:06 +00:00
{
MEdge *med;
MPoly *mp;
int i;
/* edges */
i = totedge;
for (med = medge; i--; med++) {
if ((med->flag & ME_HIDE) == 0) {
if ((mvert[med->v1].flag & SELECT) && (mvert[med->v2].flag & SELECT)) {
med->flag |= SELECT;
}
else {
med->flag &= ~SELECT;
}
}
}
/* polys */
i = totpoly;
for (mp = mpoly; i--; mp++) {
if ((mp->flag & ME_HIDE) == 0) {
int ok = TRUE;
MLoop *ml;
int j;
j = mp->totloop;
for (ml = &mloop[mp->loopstart]; j--; ml++) {
if ((mvert[ml->v].flag & SELECT) == 0) {
ok = FALSE;
break;
}
}
if (ok) {
mp->flag |= ME_FACE_SEL;
}
else {
mp->flag &= ~ME_FACE_SEL;
}
}
}
}
flush selection from vertex paint and weight paint modes when exiting, this isnt fool-proof, will need more work.
2012-12-22 14:20:27 +00:00
void BKE_mesh_flush_select_from_verts(Mesh *me)
{
BKE_mesh_flush_select_from_verts_ex(me->mvert, me->totvert,
me->mloop,
me->medge, me->totedge,
me->mpoly, me->totpoly);
}
flush selection when switching weight paint vertex/face selection modes.
2012-12-22 13:42:06 +00:00
bugfix's [#23108] bpy.ops.object.origin_set(type='GEOMETRY_ORIGIN') dosen't work in console [#23115] Crash when moving armature origin - setting the armature in editmode would leave editdata in some cases. - transforming selected linked objects to account for the movement of the obdata was only done for meshes, now do for curves and text3d. - added utility functions for getting curve & mesh bounds. - text3d moving center wasn't working at all. - changed drawobject.c to use BLI_math funcs in more places. - remove some unused code from operator object.origin_set.
2010-08-01 11:00:36 +00:00
/* basic vertex data functions */
code cleanup: naming - BKE_mesh_*
2012-05-05 21:28:12 +00:00
int BKE_mesh_minmax(Mesh *me, float r_min[3], float r_max[3])
bugfix's [#23108] bpy.ops.object.origin_set(type='GEOMETRY_ORIGIN') dosen't work in console [#23115] Crash when moving armature origin - setting the armature in editmode would leave editdata in some cases. - transforming selected linked objects to account for the movement of the obdata was only done for meshes, now do for curves and text3d. - added utility functions for getting curve & mesh bounds. - text3d moving center wasn't working at all. - changed drawobject.c to use BLI_math funcs in more places. - remove some unused code from operator object.origin_set.
2010-08-01 11:00:36 +00:00
{
code cleanup: naming - BKE_mesh_*
2012-05-05 21:28:12 +00:00
int i = me->totvert;
bugfix's [#23108] bpy.ops.object.origin_set(type='GEOMETRY_ORIGIN') dosen't work in console [#23115] Crash when moving armature origin - setting the armature in editmode would leave editdata in some cases. - transforming selected linked objects to account for the movement of the obdata was only done for meshes, now do for curves and text3d. - added utility functions for getting curve & mesh bounds. - text3d moving center wasn't working at all. - changed drawobject.c to use BLI_math funcs in more places. - remove some unused code from operator object.origin_set.
2010-08-01 11:00:36 +00:00
MVert *mvert;
code cleanup: naming - BKE_mesh_*
2012-05-05 21:28:12 +00:00
for (mvert = me->mvert; i--; mvert++) {
code cleanup: use vector math function minmax_v3v3_v3() and other minor vector function edits.
2012-05-13 11:05:52 +00:00
minmax_v3v3_v3(r_min, r_max, mvert->co);
bugfix's [#23108] bpy.ops.object.origin_set(type='GEOMETRY_ORIGIN') dosen't work in console [#23115] Crash when moving armature origin - setting the armature in editmode would leave editdata in some cases. - transforming selected linked objects to account for the movement of the obdata was only done for meshes, now do for curves and text3d. - added utility functions for getting curve & mesh bounds. - text3d moving center wasn't working at all. - changed drawobject.c to use BLI_math funcs in more places. - remove some unused code from operator object.origin_set.
2010-08-01 11:00:36 +00:00
}
return (me->totvert != 0);
}
code cleanup: naming - BKE_mesh_*
2012-05-05 21:28:12 +00:00
int BKE_mesh_center_median(Mesh *me, float cent[3])
bugfix's [#23108] bpy.ops.object.origin_set(type='GEOMETRY_ORIGIN') dosen't work in console [#23115] Crash when moving armature origin - setting the armature in editmode would leave editdata in some cases. - transforming selected linked objects to account for the movement of the obdata was only done for meshes, now do for curves and text3d. - added utility functions for getting curve & mesh bounds. - text3d moving center wasn't working at all. - changed drawobject.c to use BLI_math funcs in more places. - remove some unused code from operator object.origin_set.
2010-08-01 11:00:36 +00:00
{
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
int i = me->totvert;
bugfix's [#23108] bpy.ops.object.origin_set(type='GEOMETRY_ORIGIN') dosen't work in console [#23115] Crash when moving armature origin - setting the armature in editmode would leave editdata in some cases. - transforming selected linked objects to account for the movement of the obdata was only done for meshes, now do for curves and text3d. - added utility functions for getting curve & mesh bounds. - text3d moving center wasn't working at all. - changed drawobject.c to use BLI_math funcs in more places. - remove some unused code from operator object.origin_set.
2010-08-01 11:00:36 +00:00
MVert *mvert;
zero_v3(cent);
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
for (mvert = me->mvert; i--; mvert++) {
bugfix's [#23108] bpy.ops.object.origin_set(type='GEOMETRY_ORIGIN') dosen't work in console [#23115] Crash when moving armature origin - setting the armature in editmode would leave editdata in some cases. - transforming selected linked objects to account for the movement of the obdata was only done for meshes, now do for curves and text3d. - added utility functions for getting curve & mesh bounds. - text3d moving center wasn't working at all. - changed drawobject.c to use BLI_math funcs in more places. - remove some unused code from operator object.origin_set.
2010-08-01 11:00:36 +00:00
add_v3_v3(cent, mvert->co);
}
fix [#25994] Meshes with no vertices gets NaN location on setting origin to geometry
2011-02-09 15:32:39 +00:00
/* otherwise we get NAN for 0 verts */
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
if (me->totvert) {
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
mul_v3_fl(cent, 1.0f / (float)me->totvert);
fix [#25994] Meshes with no vertices gets NaN location on setting origin to geometry
2011-02-09 15:32:39 +00:00
}
bugfix's [#23108] bpy.ops.object.origin_set(type='GEOMETRY_ORIGIN') dosen't work in console [#23115] Crash when moving armature origin - setting the armature in editmode would leave editdata in some cases. - transforming selected linked objects to account for the movement of the obdata was only done for meshes, now do for curves and text3d. - added utility functions for getting curve & mesh bounds. - text3d moving center wasn't working at all. - changed drawobject.c to use BLI_math funcs in more places. - remove some unused code from operator object.origin_set.
2010-08-01 11:00:36 +00:00
return (me->totvert != 0);
}
code cleanup: naming - BKE_mesh_*
2012-05-05 21:28:12 +00:00
int BKE_mesh_center_bounds(Mesh *me, float cent[3])
bugfix's [#23108] bpy.ops.object.origin_set(type='GEOMETRY_ORIGIN') dosen't work in console [#23115] Crash when moving armature origin - setting the armature in editmode would leave editdata in some cases. - transforming selected linked objects to account for the movement of the obdata was only done for meshes, now do for curves and text3d. - added utility functions for getting curve & mesh bounds. - text3d moving center wasn't working at all. - changed drawobject.c to use BLI_math funcs in more places. - remove some unused code from operator object.origin_set.
2010-08-01 11:00:36 +00:00
{
float min[3], max[3];
set origin was setting surfaces as 2D curves, added dupli-group support using the dupli's offset value.
2010-08-03 00:56:43 +00:00
INIT_MINMAX(min, max);
code cleanup: naming - BKE_mesh_*
2012-05-05 21:28:12 +00:00
if (BKE_mesh_minmax(me, min, max)) {
bugfix's [#23108] bpy.ops.object.origin_set(type='GEOMETRY_ORIGIN') dosen't work in console [#23115] Crash when moving armature origin - setting the armature in editmode would leave editdata in some cases. - transforming selected linked objects to account for the movement of the obdata was only done for meshes, now do for curves and text3d. - added utility functions for getting curve & mesh bounds. - text3d moving center wasn't working at all. - changed drawobject.c to use BLI_math funcs in more places. - remove some unused code from operator object.origin_set.
2010-08-01 11:00:36 +00:00
mid_v3_v3v3(cent, min, max);
return 1;
}
return 0;
}
Add option to set object origin to the center of mass This uses the weighted average of polygon centroids based on area It work well in most cases but will be slightly wrong when polygons have many vertices.
2012-10-20 16:48:54 +00:00
int BKE_mesh_center_centroid(Mesh *me, float cent[3])
{
int i = me->totpoly;
MPoly *mpoly;
float poly_area;
float total_area = 0.0f;
float poly_cent[3];
zero_v3(cent);
/* calculate a weighted average of polygon centroids */
for (mpoly = me->mpoly; i--; mpoly++) {
Fix "Origin to Center of Mass" not working well with ngons Now we do simple triangulation and calculate signed area of triangles to account for concave polygons. This only works correct for planar polygons but gives better results overall.
2013-02-14 17:35:46 +00:00
poly_area = mesh_calc_poly_planar_area_centroid(mpoly, me->mloop + mpoly->loopstart, me->mvert, poly_cent);
Add option to set object origin to the center of mass This uses the weighted average of polygon centroids based on area It work well in most cases but will be slightly wrong when polygons have many vertices.
2012-10-20 16:48:54 +00:00
madd_v3_v3fl(cent, poly_cent, poly_area);
total_area += poly_area;
}
/* otherwise we get NAN for 0 polys */
if (me->totpoly) {
mul_v3_fl(cent, 1.0f / total_area);
}
return (me->totpoly != 0);
}
code cleanup: name mesh functions more consistently, also use bools for mesh args.
2013-03-17 19:55:10 +00:00
void BKE_mesh_translate(Mesh *me, const float offset[3], const bool do_keys)
bugfix's [#23108] bpy.ops.object.origin_set(type='GEOMETRY_ORIGIN') dosen't work in console [#23115] Crash when moving armature origin - setting the armature in editmode would leave editdata in some cases. - transforming selected linked objects to account for the movement of the obdata was only done for meshes, now do for curves and text3d. - added utility functions for getting curve & mesh bounds. - text3d moving center wasn't working at all. - changed drawobject.c to use BLI_math funcs in more places. - remove some unused code from operator object.origin_set.
2010-08-01 11:00:36 +00:00
{
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
int i = me->totvert;
bugfix's [#23108] bpy.ops.object.origin_set(type='GEOMETRY_ORIGIN') dosen't work in console [#23115] Crash when moving armature origin - setting the armature in editmode would leave editdata in some cases. - transforming selected linked objects to account for the movement of the obdata was only done for meshes, now do for curves and text3d. - added utility functions for getting curve & mesh bounds. - text3d moving center wasn't working at all. - changed drawobject.c to use BLI_math funcs in more places. - remove some unused code from operator object.origin_set.
2010-08-01 11:00:36 +00:00
MVert *mvert;
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
for (mvert = me->mvert; i--; mvert++) {
bugfix's [#23108] bpy.ops.object.origin_set(type='GEOMETRY_ORIGIN') dosen't work in console [#23115] Crash when moving armature origin - setting the armature in editmode would leave editdata in some cases. - transforming selected linked objects to account for the movement of the obdata was only done for meshes, now do for curves and text3d. - added utility functions for getting curve & mesh bounds. - text3d moving center wasn't working at all. - changed drawobject.c to use BLI_math funcs in more places. - remove some unused code from operator object.origin_set.
2010-08-01 11:00:36 +00:00
add_v3_v3(mvert->co, offset);
}
if (do_keys && me->key) {
KeyBlock *kb;
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
for (kb = me->key->block.first; kb; kb = kb->next) {
float *fp = kb->data;
for (i = kb->totelem; i--; fp += 3) {
bugfix's [#23108] bpy.ops.object.origin_set(type='GEOMETRY_ORIGIN') dosen't work in console [#23115] Crash when moving armature origin - setting the armature in editmode would leave editdata in some cases. - transforming selected linked objects to account for the movement of the obdata was only done for meshes, now do for curves and text3d. - added utility functions for getting curve & mesh bounds. - text3d moving center wasn't working at all. - changed drawobject.c to use BLI_math funcs in more places. - remove some unused code from operator object.origin_set.
2010-08-01 11:00:36 +00:00
add_v3_v3(fp, offset);
}
}
}
}
move NavMesh draw code out of being a modifier and into DerivedMesh drawing hack (which IMHO is less bad then mis-using a modifier only to override drawing calls).
2011-10-09 21:11:51 +00:00
void BKE_mesh_ensure_navmesh(Mesh *me)
{
marked navmesh as BMESH_TODO, mixed mface/mpoly functions were being used for navmesh too, now editing funcs use polygons only.
2012-02-13 04:52:41 +00:00
if (!CustomData_has_layer(&me->pdata, CD_RECAST)) {
move NavMesh draw code out of being a modifier and into DerivedMesh drawing hack (which IMHO is less bad then mis-using a modifier only to override drawing calls).
2011-10-09 21:11:51 +00:00
int i;
marked navmesh as BMESH_TODO, mixed mface/mpoly functions were being used for navmesh too, now editing funcs use polygons only.
2012-02-13 04:52:41 +00:00
int numFaces = me->totpoly;
style cleanup: mainly for mesh code, also some WM function use.
2012-03-24 02:51:46 +00:00
int *recastData;
fix for memory leak in BKE_mesh_ensure_navmesh(), it would add 2 navmesh layers, once referencing the other.
2012-07-03 08:16:14 +00:00
recastData = (int *)MEM_mallocN(numFaces * sizeof(int), __func__);
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
for (i = 0; i < numFaces; i++) {
recastData[i] = i + 1;
move NavMesh draw code out of being a modifier and into DerivedMesh drawing hack (which IMHO is less bad then mis-using a modifier only to override drawing calls).
2011-10-09 21:11:51 +00:00
}
fix for memory leak in BKE_mesh_ensure_navmesh(), it would add 2 navmesh layers, once referencing the other.
2012-07-03 08:16:14 +00:00
CustomData_add_layer_named(&me->pdata, CD_RECAST, CD_ASSIGN, recastData, numFaces, "recastData");
move NavMesh draw code out of being a modifier and into DerivedMesh drawing hack (which IMHO is less bad then mis-using a modifier only to override drawing calls).
2011-10-09 21:11:51 +00:00
}
}
ensure tessface's are available while sculpting.
2012-02-05 07:12:46 +00:00
* remove the MFace parts of join (we only need polygon data) * other minor cleanups
2012-02-12 19:11:09 +00:00
void BKE_mesh_tessface_calc(Mesh *mesh)
ensure tessface's are available while sculpting.
2012-02-05 07:12:46 +00:00
{
code cleanup: naming - BKE_mesh_*
2012-05-05 21:28:12 +00:00
mesh->totface = BKE_mesh_recalc_tessellation(&mesh->fdata, &mesh->ldata, &mesh->pdata,
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
mesh->mvert,
mesh->totface, mesh->totloop, mesh->totpoly,
/* calc normals right after, don't copy from polys here */
code cleanup: name mesh functions more consistently, also use bools for mesh args.
2013-03-17 19:55:10 +00:00
false);
ensure tessface's are available while sculpting.
2012-02-05 07:12:46 +00:00
code cleanup: name mesh functions more consistently, also use bools for mesh args.
2013-03-17 19:55:10 +00:00
BKE_mesh_update_customdata_pointers(mesh, true);
ensure tessface's are available while sculpting.
2012-02-05 07:12:46 +00:00
}
* remove the MFace parts of join (we only need polygon data) * other minor cleanups
2012-02-12 19:11:09 +00:00
void BKE_mesh_tessface_ensure(Mesh *mesh)
ensure tessface's are available while sculpting.
2012-02-05 07:12:46 +00:00
{
if (mesh->totpoly && mesh->totface == 0) {
* remove the MFace parts of join (we only need polygon data) * other minor cleanups
2012-02-12 19:11:09 +00:00
BKE_mesh_tessface_calc(mesh);
ensure tessface's are available while sculpting.
2012-02-05 07:12:46 +00:00
}
}
fix [#30101] Vertex colors disappear after leaving edit mode this commit makes vertex paint check if it needs to rebuild the modifier stack when painting. - when painting with no modifiers, do partial updates from polys to tessfaces while painting, skip re-tesselation. - when painting onto a modified mesh, dont bother adjusting tessface colors - since the modifier stack will do this anyway. both cases should be faster then before.
2012-02-08 11:52:44 +00:00
* remove the MFace parts of join (we only need polygon data) * other minor cleanups
2012-02-12 19:11:09 +00:00
void BKE_mesh_tessface_clear(Mesh *mesh)
fix [#30101] Vertex colors disappear after leaving edit mode this commit makes vertex paint check if it needs to rebuild the modifier stack when painting. - when painting with no modifiers, do partial updates from polys to tessfaces while painting, skip re-tesselation. - when painting onto a modified mesh, dont bother adjusting tessface colors - since the modifier stack will do this anyway. both cases should be faster then before.
2012-02-08 11:52:44 +00:00
{
Fix for fracture object crash Issue was caused by incorrect resetting of tesselated fave data in copy_mesh: - CustomData_free will free data from original mesh because layers in new mesh are pointing to the same memory just after copy. So it's needed only to set some pointers to NULL. - It was incorrect filling fdata with zeroes because of incorrect structure size used.
2012-03-06 16:22:41 +00:00
mesh_tessface_clear_intern(mesh, TRUE);
fix [#30101] Vertex colors disappear after leaving edit mode this commit makes vertex paint check if it needs to rebuild the modifier stack when painting. - when painting with no modifiers, do partial updates from polys to tessfaces while painting, skip re-tesselation. - when painting onto a modified mesh, dont bother adjusting tessface colors - since the modifier stack will do this anyway. both cases should be faster then before.
2012-02-08 11:52:44 +00:00
}
optimize ngon angle calculation in solidify modifier (was doing prev/next vector subtract and normalize for every vertex). now store the previous normalized vector for re-use. also add BKE_mesh_poly_calc_angles() which is mostly a reference for now.
2012-05-08 14:58:38 +00:00
#if 0 /* slow version of the function below */
code clenup: rename BKE_mesh_poly_calc_angles -> BKE_mesh_calc_poly_angles
2013-05-08 12:56:51 +00:00
void BKE_mesh_calc_poly_angles(MPoly *mpoly, MLoop *loopstart,
MVert *mvarray, float angles[])
optimize ngon angle calculation in solidify modifier (was doing prev/next vector subtract and normalize for every vertex). now store the previous normalized vector for re-use. also add BKE_mesh_poly_calc_angles() which is mostly a reference for now.
2012-05-08 14:58:38 +00:00
{
MLoop *ml;
code clenup: rename BKE_mesh_poly_calc_angles -> BKE_mesh_calc_poly_angles
2013-05-08 12:56:51 +00:00
MLoop *mloop = &loopstart[-mpoly->loopstart];
optimize ngon angle calculation in solidify modifier (was doing prev/next vector subtract and normalize for every vertex). now store the previous normalized vector for re-use. also add BKE_mesh_poly_calc_angles() which is mostly a reference for now.
2012-05-08 14:58:38 +00:00
int j;
code clenup: rename BKE_mesh_poly_calc_angles -> BKE_mesh_calc_poly_angles
2013-05-08 12:56:51 +00:00
for (j = 0, ml = loopstart; j < mpoly->totloop; j++, ml++) {
MLoop *ml_prev = ME_POLY_LOOP_PREV(mloop, mpoly, j);
MLoop *ml_next = ME_POLY_LOOP_NEXT(mloop, mpoly, j);
optimize ngon angle calculation in solidify modifier (was doing prev/next vector subtract and normalize for every vertex). now store the previous normalized vector for re-use. also add BKE_mesh_poly_calc_angles() which is mostly a reference for now.
2012-05-08 14:58:38 +00:00
float e1[3], e2[3];
code clenup: rename BKE_mesh_poly_calc_angles -> BKE_mesh_calc_poly_angles
2013-05-08 12:56:51 +00:00
sub_v3_v3v3(e1, mvarray[ml_next->v].co, mvarray[ml->v].co);
sub_v3_v3v3(e2, mvarray[ml_prev->v].co, mvarray[ml->v].co);
optimize ngon angle calculation in solidify modifier (was doing prev/next vector subtract and normalize for every vertex). now store the previous normalized vector for re-use. also add BKE_mesh_poly_calc_angles() which is mostly a reference for now.
2012-05-08 14:58:38 +00:00
angles[j] = (float)M_PI - angle_v3v3(e1, e2);
}
}
#else /* equivalent the function above but avoid multiple subtractions + normalize */
code clenup: rename BKE_mesh_poly_calc_angles -> BKE_mesh_calc_poly_angles
2013-05-08 12:56:51 +00:00
void BKE_mesh_calc_poly_angles(MPoly *mpoly, MLoop *loopstart,
MVert *mvarray, float angles[])
optimize ngon angle calculation in solidify modifier (was doing prev/next vector subtract and normalize for every vertex). now store the previous normalized vector for re-use. also add BKE_mesh_poly_calc_angles() which is mostly a reference for now.
2012-05-08 14:58:38 +00:00
{
float nor_prev[3];
float nor_next[3];
code clenup: rename BKE_mesh_poly_calc_angles -> BKE_mesh_calc_poly_angles
2013-05-08 12:56:51 +00:00
int i_this = mpoly->totloop - 1;
optimize ngon angle calculation in solidify modifier (was doing prev/next vector subtract and normalize for every vertex). now store the previous normalized vector for re-use. also add BKE_mesh_poly_calc_angles() which is mostly a reference for now.
2012-05-08 14:58:38 +00:00
int i_next = 0;
code clenup: rename BKE_mesh_poly_calc_angles -> BKE_mesh_calc_poly_angles
2013-05-08 12:56:51 +00:00
sub_v3_v3v3(nor_prev, mvarray[loopstart[i_this - 1].v].co, mvarray[loopstart[i_this].v].co);
optimize ngon angle calculation in solidify modifier (was doing prev/next vector subtract and normalize for every vertex). now store the previous normalized vector for re-use. also add BKE_mesh_poly_calc_angles() which is mostly a reference for now.
2012-05-08 14:58:38 +00:00
normalize_v3(nor_prev);
code clenup: rename BKE_mesh_poly_calc_angles -> BKE_mesh_calc_poly_angles
2013-05-08 12:56:51 +00:00
while (i_next < mpoly->totloop) {
sub_v3_v3v3(nor_next, mvarray[loopstart[i_this].v].co, mvarray[loopstart[i_next].v].co);
optimize ngon angle calculation in solidify modifier (was doing prev/next vector subtract and normalize for every vertex). now store the previous normalized vector for re-use. also add BKE_mesh_poly_calc_angles() which is mostly a reference for now.
2012-05-08 14:58:38 +00:00
normalize_v3(nor_next);
angles[i_this] = angle_normalized_v3v3(nor_prev, nor_next);
/* step */
copy_v3_v3(nor_prev, nor_next);
i_this = i_next;
i_next++;
}
}
#endif
don't store bevel weights or edge crease customdata layers in editmode unless they are needed. configurable in 'Geometry Data' panel, will be added when running crease edges transform for example.
2013-01-10 04:43:31 +00:00
code clenup: rename BKE_mesh_poly_calc_angles -> BKE_mesh_calc_poly_angles
2013-05-08 12:56:51 +00:00
void BKE_mesh_poly_edgehash_insert(EdgeHash *ehash, const MPoly *mp, const MLoop *mloop)
{
const MLoop *ml, *ml_next;
int i = mp->totloop;
ml_next = mloop; /* first loop */
ml = &ml_next[i - 1]; /* last loop */
while (i-- != 0) {
if (!BLI_edgehash_haskey(ehash, ml->v, ml_next->v)) {
BLI_edgehash_insert(ehash, ml->v, ml_next->v, NULL);
}
ml = ml_next;
ml_next++;
}
}
don't store bevel weights or edge crease customdata layers in editmode unless they are needed. configurable in 'Geometry Data' panel, will be added when running crease edges transform for example.
2013-01-10 04:43:31 +00:00
void BKE_mesh_do_versions_cd_flag_init(Mesh *mesh)
{
if (UNLIKELY(mesh->cd_flag)) {
return;
}
else {
MVert *mv;
MEdge *med;
int i;
for (mv = mesh->mvert, i = 0; i < mesh->totvert; mv++, i++) {
if (mv->bweight != 0) {
mesh->cd_flag |= ME_CDFLAG_VERT_BWEIGHT;
break;
}
}
for (med = mesh->medge, i = 0; i < mesh->totedge; med++, i++) {
if (med->bweight != 0) {
mesh->cd_flag |= ME_CDFLAG_EDGE_BWEIGHT;
if (mesh->cd_flag & ME_CDFLAG_EDGE_CREASE) {
break;
}
}
if (med->crease != 0) {
mesh->cd_flag |= ME_CDFLAG_EDGE_CREASE;
if (mesh->cd_flag & ME_CDFLAG_EDGE_BWEIGHT) {
break;
}
}
}
}
}
Copy Permalink