Commit: ed2c89a077940177d4153d54283e0e759f8ef6ec
Author: Nicholas Bishop
Date: Mon Jan 19 15:59:55 2015 +0100
Branches: cycles-ptex-08
https://developer.blender.org/rBed2c89a077940177d4153d54283e0e759f8ef6ec
Add a couple new CustomData layers for Ptex
===================================================================
M source/blender/blenkernel/intern/customdata.c
M source/blender/makesdna/DNA_customdata_types.h
===================================================================
diff --git a/source/blender/blenkernel/intern/customdata.c
b/source/blender/blenkernel/intern/customdata.c
index 89ebed2..ad4f150 100644
--- a/source/blender/blenkernel/intern/customdata.c
+++ b/source/blender/blenkernel/intern/customdata.c
@@ -1255,6 +1255,10 @@ static const LayerTypeInfo LAYERTYPEINFO[CD_NUMTYPES] = {
{sizeof(float[4]), "", 0, NULL, NULL, NULL, NULL, NULL, NULL},
/* 40: CD_TESSLOOPNORMAL */
{sizeof(short[4][3]), "", 0, NULL, NULL, NULL, NULL, layerSwap_flnor,
NULL},
+ /* 41: CD_PTEX_LOOP */
+ {sizeof(MPtexLoop), "MPtexLoop", 1, NULL, NULL, NULL, NULL, NULL, NULL},
+ /* 42: CD_PTEX_TESSFACE */
+ {sizeof(MPtexTessFace), "MPtexTessFace", 1, NULL, NULL, NULL, NULL,
NULL, NULL},
};
/* note, numbers are from trunk and need updating for bmesh */
@@ -1271,6 +1275,7 @@ static const char *LAYERTYPENAMES[CD_NUMTYPES] = {
/* 30-34 */ "CDSubSurfCrease", "CDOrigSpaceLoop", "CDPreviewLoopCol",
"CDBMElemPyPtr", "CDPaintMask",
/* 35-36 */ "CDGridPaintMask", "CDMVertSkin",
/* 37-40 */ "CDFreestyleEdge", "CDFreestyleFace", "CDMLoopTangent",
"CDTessLoopNormal",
+ /* 41-42 */ "CDPtexLoop", "CDPtexTessFace",
};
@@ -1282,7 +1287,7 @@ const CustomDataMask CD_MASK_MESH =
CD_MASK_PROP_FLT | CD_MASK_PROP_INT | CD_MASK_PROP_STR | CD_MASK_MDISPS |
CD_MASK_MLOOPUV | CD_MASK_MLOOPCOL | CD_MASK_MPOLY | CD_MASK_MLOOP |
CD_MASK_MTEXPOLY | CD_MASK_RECAST | CD_MASK_PAINT_MASK |
- CD_MASK_GRID_PAINT_MASK | CD_MASK_MVERT_SKIN | CD_MASK_FREESTYLE_EDGE |
CD_MASK_FREESTYLE_FACE;
+ CD_MASK_GRID_PAINT_MASK | CD_MASK_MVERT_SKIN | CD_MASK_FREESTYLE_EDGE |
CD_MASK_FREESTYLE_FACE | CD_MASK_PTEX_TESSFACE | CD_MASK_PTEX_LOOP;
const CustomDataMask CD_MASK_EDITMESH =
CD_MASK_MSTICKY | CD_MASK_MDEFORMVERT | CD_MASK_MTFACE | CD_MASK_MLOOPUV |
CD_MASK_MLOOPCOL | CD_MASK_MTEXPOLY | CD_MASK_SHAPE_KEYINDEX |
@@ -1295,7 +1300,8 @@ const CustomDataMask CD_MASK_DERIVEDMESH =
CD_MASK_MLOOPUV | CD_MASK_MLOOPCOL | CD_MASK_MTEXPOLY |
CD_MASK_PREVIEW_MLOOPCOL |
CD_MASK_PROP_STR | CD_MASK_ORIGSPACE | CD_MASK_ORIGSPACE_MLOOP |
CD_MASK_ORCO | CD_MASK_TANGENT |
CD_MASK_PREVIEW_MCOL | CD_MASK_SHAPEKEY | CD_MASK_RECAST |
- CD_MASK_ORIGINDEX | CD_MASK_MVERT_SKIN | CD_MASK_FREESTYLE_EDGE |
CD_MASK_FREESTYLE_FACE;
+ CD_MASK_ORIGINDEX | CD_MASK_MVERT_SKIN | CD_MASK_FREESTYLE_EDGE |
CD_MASK_FREESTYLE_FACE |
+ CD_MASK_PTEX_TESSFACE | CD_MASK_PTEX_LOOP;
const CustomDataMask CD_MASK_BMESH =
CD_MASK_MLOOPUV | CD_MASK_MLOOPCOL | CD_MASK_MTEXPOLY |
CD_MASK_MSTICKY | CD_MASK_MDEFORMVERT | CD_MASK_PROP_FLT |
CD_MASK_PROP_INT |
@@ -1316,7 +1322,7 @@ const CustomDataMask CD_MASK_EVERYTHING =
/* BMESH ONLY END */
CD_MASK_PAINT_MASK | CD_MASK_GRID_PAINT_MASK | CD_MASK_MVERT_SKIN |
CD_MASK_FREESTYLE_EDGE | CD_MASK_FREESTYLE_FACE |
- CD_MASK_MLOOPTANGENT | CD_MASK_TESSLOOPNORMAL;
+ CD_MASK_MLOOPTANGENT | CD_MASK_TESSLOOPNORMAL | CD_MASK_PTEX_TESSFACE |
CD_MASK_PTEX_LOOP;
static const LayerTypeInfo *layerType_getInfo(int type)
{
@@ -2407,6 +2413,9 @@ void CustomData_from_bmeshpoly(CustomData *fdata,
CustomData *pdata, CustomData
else if (ldata->layers[i].type == CD_NORMAL) {
CustomData_add_layer_named(fdata, CD_TESSLOOPNORMAL,
CD_CALLOC, NULL, total, ldata->layers[i].name);
}
+ else if (ldata->layers[i].type == CD_PTEX_LOOP) {
+ CustomData_add_layer_named(fdata, CD_PTEX_TESSFACE,
CD_CALLOC, NULL, total, ldata->layers[i].name);
+ }
}
CustomData_bmesh_update_active_layers(fdata, pdata, ldata);
diff --git a/source/blender/makesdna/DNA_customdata_types.h
b/source/blender/makesdna/DNA_customdata_types.h
index 70dc436..0a1e998 100644
--- a/source/blender/makesdna/DNA_customdata_types.h
+++ b/source/blender/makesdna/DNA_customdata_types.h
@@ -63,7 +63,7 @@ typedef struct CustomDataExternal {
* layers, each with a data type (e.g. MTFace, MDeformVert, etc.). */
typedef struct CustomData {
CustomDataLayer *layers; /* CustomDataLayers, ordered by type */
- int typemap[41]; /* runtime only! - maps types to indices
of first layer of that type,
+ int typemap[43]; /* runtime only! - maps types to indices
of first layer of that type,
* MUST be >= CD_NUMTYPES, but we cant
use a define here.
* Correct size is ensured in
CustomData_update_typemap assert() */
int totlayer, maxlayer; /* number of layers, size of layers array
*/
@@ -120,7 +120,10 @@ enum {
CD_MLOOPTANGENT = 39,
CD_TESSLOOPNORMAL = 40,
- CD_NUMTYPES = 41
+ CD_PTEX_LOOP = 41,
+ CD_PTEX_TESSFACE = 42,
+
+ CD_NUMTYPES = 43
};
/* Bits for CustomDataMask */
@@ -168,6 +171,9 @@ enum {
#define CD_MASK_MLOOPTANGENT (1LL << CD_MLOOPTANGENT)
#define CD_MASK_TESSLOOPNORMAL (1LL << CD_TESSLOOPNORMAL)
+#define CD_MASK_PTEX_LOOP (1LL << CD_PTEX_LOOP)
+#define CD_MASK_PTEX_TESSFACE (1LL << CD_PTEX_TESSFACE)
+
/* CustomData.flag */
enum {
/* Indicates layer should not be copied by CustomData_from_template or
CustomData_copy_data */
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
