merge with 2.5/trunk at r23271
This commit is contained in:
@@ -57,18 +57,24 @@
|
||||
|
||||
static void rna_Mesh_update_data(bContext *C, PointerRNA *ptr)
|
||||
{
|
||||
Main *bmain= CTX_data_main(C);
|
||||
Scene *scene= CTX_data_scene(C);
|
||||
ID *id= ptr->id.data;
|
||||
Object *ob;
|
||||
|
||||
for(ob=bmain->object.first; ob; ob= ob->id.next) {
|
||||
if(ob->data == id) {
|
||||
/* XXX this will loop over all objects again (slow) */
|
||||
DAG_object_flush_update(scene, ob, OB_RECALC_DATA);
|
||||
WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_DATA, ob);
|
||||
}
|
||||
}
|
||||
DAG_id_flush_update(id, OB_RECALC_DATA);
|
||||
WM_event_add_notifier(C, NC_GEOM|ND_DATA, id);
|
||||
}
|
||||
|
||||
static void rna_Mesh_update_select(bContext *C, PointerRNA *ptr)
|
||||
{
|
||||
ID *id= ptr->id.data;
|
||||
|
||||
WM_event_add_notifier(C, NC_GEOM|ND_SELECT, id);
|
||||
}
|
||||
|
||||
void rna_Mesh_update_draw(bContext *C, PointerRNA *ptr)
|
||||
{
|
||||
ID *id= ptr->id.data;
|
||||
|
||||
WM_event_add_notifier(C, NC_GEOM|ND_DATA, id);
|
||||
}
|
||||
|
||||
static void rna_MeshVertex_normal_get(PointerRNA *ptr, float *value)
|
||||
@@ -381,18 +387,12 @@ static int rna_CustomDataData_numverts(PointerRNA *ptr, int type)
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int rna_MeshTextureFace_uv_get_length(PointerRNA *ptr)
|
||||
static int rna_MeshTextureFace_uv_get_length(PointerRNA *ptr, int length[RNA_MAX_ARRAY_DIMENSION])
|
||||
{
|
||||
//return rna_CustomDataData_numverts(ptr, CD_MTFACE) * 2;
|
||||
return 0; //BMESH_TODO
|
||||
}
|
||||
|
||||
static int rna_MeshTextureFace_uv_set_length(PointerRNA *ptr, int length)
|
||||
{
|
||||
//return length == rna_MeshTextureFace_uv_get_length(ptr);
|
||||
return 0; //BMESH_TODO
|
||||
}
|
||||
|
||||
static void rna_MeshTextureFace_uv_get(PointerRNA *ptr, float *values)
|
||||
{
|
||||
//MTFace *mtface= (MTFace*)ptr->data;
|
||||
@@ -676,32 +676,22 @@ static void rna_TextureFace_image_set(PointerRNA *ptr, PointerRNA value)
|
||||
tf->tpage= (struct Image*)id;
|
||||
}
|
||||
|
||||
static int rna_MeshFace_verts_get_length(PointerRNA *ptr)
|
||||
static int rna_MeshFace_verts_get_length(PointerRNA *ptr, int length[RNA_MAX_ARRAY_DIMENSION])
|
||||
{
|
||||
MFace *face= (MFace*)ptr->data;
|
||||
return face->v4 ? 4 : 3;
|
||||
}
|
||||
|
||||
static int rna_MeshFace_verts_set_length(PointerRNA *ptr, int length)
|
||||
{
|
||||
MFace *face= (MFace*)ptr->data;
|
||||
if (length == 3) {
|
||||
face->v4= 0;
|
||||
}
|
||||
else if(length == 4) {
|
||||
face->v4= 1;
|
||||
}
|
||||
if(face)
|
||||
length[0]= (face->v4)? 4: 3;
|
||||
else
|
||||
return 0;
|
||||
|
||||
return 1;
|
||||
length[0]= 4; // XXX rna_raw_access wants the length of a dummy face. this needs fixing. - Campbell
|
||||
|
||||
return length[0];
|
||||
}
|
||||
|
||||
static void rna_MeshFace_verts_get(PointerRNA *ptr, int *values)
|
||||
{
|
||||
MFace *face= (MFace*)ptr->data;
|
||||
int verts[4] = {face->v1, face->v2, face->v3, face->v4};
|
||||
memcpy(values, verts, (face->v4 ? 4 : 3) * sizeof(int));
|
||||
memcpy(values, &face->v1, (face->v4 ? 4 : 3) * sizeof(int));
|
||||
}
|
||||
|
||||
static void rna_MeshFace_verts_set(PointerRNA *ptr, const int *values)
|
||||
@@ -835,10 +825,12 @@ static void rna_def_mvert_group(BlenderRNA *brna)
|
||||
RNA_def_property_int_sdna(prop, NULL, "def_nr");
|
||||
RNA_def_property_clear_flag(prop, PROP_EDITABLE);
|
||||
RNA_def_property_ui_text(prop, "Group Index", "");
|
||||
RNA_def_property_update(prop, 0, "rna_Mesh_update_data");
|
||||
|
||||
prop= RNA_def_property(srna, "weight", PROP_FLOAT, PROP_NONE);
|
||||
RNA_def_property_range(prop, 0.0f, 1.0f);
|
||||
RNA_def_property_ui_text(prop, "Weight", "Vertex Weight");
|
||||
RNA_def_property_update(prop, 0, "rna_Mesh_update_data");
|
||||
}
|
||||
|
||||
static void rna_def_mvert(BlenderRNA *brna)
|
||||
@@ -854,6 +846,7 @@ static void rna_def_mvert(BlenderRNA *brna)
|
||||
|
||||
prop= RNA_def_property(srna, "co", PROP_FLOAT, PROP_TRANSLATION);
|
||||
RNA_def_property_ui_text(prop, "Location", "");
|
||||
RNA_def_property_update(prop, 0, "rna_Mesh_update_data");
|
||||
|
||||
prop= RNA_def_property(srna, "normal", PROP_FLOAT, PROP_DIRECTION);
|
||||
RNA_def_property_float_sdna(prop, NULL, "no");
|
||||
@@ -864,14 +857,17 @@ static void rna_def_mvert(BlenderRNA *brna)
|
||||
prop= RNA_def_property(srna, "selected", PROP_BOOLEAN, PROP_NONE);
|
||||
RNA_def_property_boolean_sdna(prop, NULL, "flag", SELECT);
|
||||
RNA_def_property_ui_text(prop, "Selected", "");
|
||||
RNA_def_property_update(prop, 0, "rna_Mesh_update_select");
|
||||
|
||||
prop= RNA_def_property(srna, "hidden", PROP_BOOLEAN, PROP_NONE);
|
||||
RNA_def_property_boolean_sdna(prop, NULL, "flag", ME_HIDE);
|
||||
RNA_def_property_ui_text(prop, "Hidden", "");
|
||||
RNA_def_property_update(prop, 0, "rna_Mesh_update_select");
|
||||
|
||||
prop= RNA_def_property(srna, "bevel_weight", PROP_FLOAT, PROP_NONE);
|
||||
RNA_def_property_float_funcs(prop, "rna_MeshVertex_bevel_weight_get", "rna_MeshVertex_bevel_weight_set", NULL);
|
||||
RNA_def_property_ui_text(prop, "Bevel Weight", "Weight used by the Bevel modifier 'Only Vertices' option");
|
||||
RNA_def_property_update(prop, 0, "rna_Mesh_update_data");
|
||||
|
||||
prop= RNA_def_property(srna, "groups", PROP_COLLECTION, PROP_NONE);
|
||||
RNA_def_property_collection_funcs(prop, "rna_MeshVertex_groups_begin", "rna_iterator_array_next", "rna_iterator_array_end", "rna_iterator_array_get", 0, 0, 0, 0, 0);
|
||||
@@ -899,26 +895,32 @@ static void rna_def_medge(BlenderRNA *brna)
|
||||
prop= RNA_def_property(srna, "crease", PROP_FLOAT, PROP_NONE);
|
||||
RNA_def_property_float_funcs(prop, "rna_MEdge_crease_get", "rna_MEdge_crease_set", NULL);
|
||||
RNA_def_property_ui_text(prop, "Crease", "Weight used by the Subsurf modifier for creasing");
|
||||
RNA_def_property_update(prop, 0, "rna_Mesh_update_data");
|
||||
|
||||
prop= RNA_def_property(srna, "bevel_weight", PROP_FLOAT, PROP_NONE);
|
||||
RNA_def_property_float_funcs(prop, "rna_MEdge_bevel_weight_get", "rna_MEdge_bevel_weight_set", NULL);
|
||||
RNA_def_property_ui_text(prop, "Bevel Weight", "Weight used by the Bevel modifier");
|
||||
RNA_def_property_update(prop, 0, "rna_Mesh_update_data");
|
||||
|
||||
prop= RNA_def_property(srna, "selected", PROP_BOOLEAN, PROP_NONE);
|
||||
RNA_def_property_boolean_sdna(prop, NULL, "flag", SELECT);
|
||||
RNA_def_property_ui_text(prop, "Selected", "");
|
||||
RNA_def_property_update(prop, 0, "rna_Mesh_update_select");
|
||||
|
||||
prop= RNA_def_property(srna, "hidden", PROP_BOOLEAN, PROP_NONE);
|
||||
RNA_def_property_boolean_sdna(prop, NULL, "flag", ME_HIDE);
|
||||
RNA_def_property_ui_text(prop, "Hidden", "");
|
||||
RNA_def_property_update(prop, 0, "rna_Mesh_update_select");
|
||||
|
||||
prop= RNA_def_property(srna, "seam", PROP_BOOLEAN, PROP_NONE);
|
||||
RNA_def_property_boolean_sdna(prop, NULL, "flag", ME_SEAM);
|
||||
RNA_def_property_ui_text(prop, "Seam", "Seam edge for UV unwrapping");
|
||||
RNA_def_property_update(prop, 0, "rna_Mesh_update_select");
|
||||
|
||||
prop= RNA_def_property(srna, "sharp", PROP_BOOLEAN, PROP_NONE);
|
||||
RNA_def_property_boolean_sdna(prop, NULL, "flag", ME_SHARP);
|
||||
RNA_def_property_ui_text(prop, "Sharp", "Sharp edge for the EdgeSplit modifier");
|
||||
RNA_def_property_update(prop, 0, "rna_Mesh_update_data");
|
||||
}
|
||||
|
||||
static void rna_def_mface(BlenderRNA *brna)
|
||||
@@ -932,19 +934,11 @@ static void rna_def_mface(BlenderRNA *brna)
|
||||
RNA_def_struct_path_func(srna, "rna_MeshFace_path");
|
||||
RNA_def_struct_ui_icon(srna, ICON_FACESEL);
|
||||
|
||||
/*
|
||||
// XXX allows creating invalid meshes
|
||||
prop= RNA_def_property(srna, "verts", PROP_INT, PROP_UNSIGNED);
|
||||
RNA_def_property_int_sdna(prop, NULL, "v1");
|
||||
RNA_def_property_array(prop, 4);
|
||||
RNA_def_property_ui_text(prop, "Vertices", "Vertex indices");
|
||||
*/
|
||||
|
||||
// XXX allows creating invalid meshes
|
||||
prop= RNA_def_property(srna, "verts", PROP_INT, PROP_UNSIGNED);
|
||||
RNA_def_property_array(prop, 4);
|
||||
RNA_def_property_flag(prop, PROP_DYNAMIC);
|
||||
RNA_def_property_dynamic_array_funcs(prop, "rna_MeshFace_verts_get_length", "rna_MeshFace_verts_set_length");
|
||||
RNA_def_property_dynamic_array_funcs(prop, "rna_MeshFace_verts_get_length");
|
||||
RNA_def_property_int_funcs(prop, "rna_MeshFace_verts_get", "rna_MeshFace_verts_set", NULL);
|
||||
RNA_def_property_ui_text(prop, "Vertices", "Vertex indices");
|
||||
|
||||
@@ -952,18 +946,22 @@ static void rna_def_mface(BlenderRNA *brna)
|
||||
RNA_def_property_int_sdna(prop, NULL, "mat_nr");
|
||||
RNA_def_property_ui_text(prop, "Material Index", "");
|
||||
RNA_def_property_int_funcs(prop, NULL, NULL, "rna_MeshFace_material_index_range");
|
||||
RNA_def_property_update(prop, 0, "rna_Mesh_update_data");
|
||||
|
||||
prop= RNA_def_property(srna, "selected", PROP_BOOLEAN, PROP_NONE);
|
||||
RNA_def_property_boolean_sdna(prop, NULL, "flag", ME_FACE_SEL);
|
||||
RNA_def_property_ui_text(prop, "Selected", "");
|
||||
RNA_def_property_update(prop, 0, "rna_Mesh_update_select");
|
||||
|
||||
prop= RNA_def_property(srna, "hidden", PROP_BOOLEAN, PROP_NONE);
|
||||
RNA_def_property_boolean_sdna(prop, NULL, "flag", ME_HIDE);
|
||||
RNA_def_property_ui_text(prop, "Hidden", "");
|
||||
RNA_def_property_update(prop, 0, "rna_Mesh_update_select");
|
||||
|
||||
prop= RNA_def_property(srna, "smooth", PROP_BOOLEAN, PROP_NONE);
|
||||
RNA_def_property_boolean_sdna(prop, NULL, "flag", ME_SMOOTH);
|
||||
RNA_def_property_ui_text(prop, "Smooth", "");
|
||||
RNA_def_property_update(prop, 0, "rna_Mesh_update_data");
|
||||
|
||||
prop= RNA_def_property(srna, "normal", PROP_FLOAT, PROP_DIRECTION);
|
||||
RNA_def_property_array(prop, 3);
|
||||
@@ -983,26 +981,30 @@ static void rna_def_mtexpoly(BlenderRNA *brna)
|
||||
{TF_ALPHA, "ALPHA", 0, "Alpha", "Render polygon transparent, depending on alpha channel of the texture"},
|
||||
{TF_CLIP, "CLIPALPHA", 0, "Clip Alpha", "Use the images alpha values clipped with no blending (binary alpha)"},
|
||||
{0, NULL, 0, NULL, NULL}};
|
||||
unsigned short uv_dim[1]= {2};
|
||||
int uv_dim[]= {4, 2};
|
||||
|
||||
srna= RNA_def_struct(brna, "MeshTextureFaceLayer", NULL);
|
||||
RNA_def_struct_ui_text(srna, "Mesh Texture Face Layer", "Layer of texture faces in a Mesh datablock.");
|
||||
RNA_def_struct_sdna(srna, "CustomDataLayer");
|
||||
RNA_def_struct_path_func(srna, "rna_MeshTextureFaceLayer_path");
|
||||
RNA_def_struct_ui_icon(srna, ICON_GROUP_UVS);
|
||||
|
||||
prop= RNA_def_property(srna, "name", PROP_STRING, PROP_NONE);
|
||||
RNA_def_struct_name_property(srna, prop);
|
||||
RNA_def_property_string_funcs(prop, NULL, NULL, "rna_MeshTextureFaceLayer_name_set");
|
||||
RNA_def_property_ui_text(prop, "Name", "");
|
||||
RNA_def_property_update(prop, 0, "rna_Mesh_update_data");
|
||||
|
||||
prop= RNA_def_property(srna, "active", PROP_BOOLEAN, PROP_NONE);
|
||||
RNA_def_property_boolean_funcs(prop, "rna_MeshTextureFaceLayer_active_get", "rna_MeshTextureFaceLayer_active_set");
|
||||
RNA_def_property_ui_text(prop, "Active", "Sets the layer as active for display and editing");
|
||||
RNA_def_property_update(prop, 0, "rna_Mesh_update_data");
|
||||
|
||||
prop= RNA_def_property(srna, "active_render", PROP_BOOLEAN, PROP_NONE);
|
||||
RNA_def_property_boolean_sdna(prop, NULL, "active_rnd", 0);
|
||||
RNA_def_property_boolean_funcs(prop, "rna_MeshTextureFaceLayer_active_render_get", "rna_MeshTextureFaceLayer_active_render_set");
|
||||
RNA_def_property_ui_text(prop, "Active Render", "Sets the layer as active for rendering");
|
||||
RNA_def_property_update(prop, 0, "rna_Mesh_update_data");
|
||||
|
||||
prop= RNA_def_property(srna, "data", PROP_COLLECTION, PROP_NONE);
|
||||
RNA_def_property_struct_type(prop, "MeshTextureFace");
|
||||
@@ -1020,75 +1022,93 @@ static void rna_def_mtexpoly(BlenderRNA *brna)
|
||||
RNA_def_property_pointer_funcs(prop, NULL, "rna_TextureFace_image_set", NULL);
|
||||
RNA_def_property_flag(prop, PROP_EDITABLE);
|
||||
RNA_def_property_ui_text(prop, "Image", "");
|
||||
RNA_def_property_update(prop, 0, "rna_Mesh_update_data");
|
||||
|
||||
prop= RNA_def_property(srna, "tex", PROP_BOOLEAN, PROP_NONE);
|
||||
RNA_def_property_boolean_sdna(prop, NULL, "mode", TF_TEX);
|
||||
RNA_def_property_ui_text(prop, "Tex", "Render face with texture");
|
||||
RNA_def_property_update(prop, 0, "rna_Mesh_update_data");
|
||||
|
||||
prop= RNA_def_property(srna, "light", PROP_BOOLEAN, PROP_NONE);
|
||||
RNA_def_property_boolean_sdna(prop, NULL, "mode", TF_LIGHT);
|
||||
RNA_def_property_ui_text(prop, "Light", "Use light for face");
|
||||
RNA_def_property_update(prop, 0, "rna_Mesh_update_data");
|
||||
RNA_def_property_update(prop, 0, "rna_Mesh_update_data");
|
||||
|
||||
prop= RNA_def_property(srna, "invisible", PROP_BOOLEAN, PROP_NONE);
|
||||
RNA_def_property_boolean_sdna(prop, NULL, "mode", TF_INVISIBLE);
|
||||
RNA_def_property_ui_text(prop, "Invisible", "Make face invisible");
|
||||
RNA_def_property_update(prop, 0, "rna_Mesh_update_data");
|
||||
|
||||
prop= RNA_def_property(srna, "collision", PROP_BOOLEAN, PROP_NONE);
|
||||
RNA_def_property_boolean_sdna(prop, NULL, "mode", TF_DYNAMIC);
|
||||
RNA_def_property_ui_text(prop, "Collision", "Use face for collision and ray-sensor detection");
|
||||
RNA_def_property_update(prop, 0, "rna_Mesh_update_data");
|
||||
|
||||
prop= RNA_def_property(srna, "shared", PROP_BOOLEAN, PROP_NONE);
|
||||
RNA_def_property_boolean_sdna(prop, NULL, "mode", TF_SHAREDCOL);
|
||||
RNA_def_property_ui_text(prop, "Shared", "Blend vertex colors across face when vertices are shared");
|
||||
RNA_def_property_update(prop, 0, "rna_Mesh_update_data");
|
||||
|
||||
prop= RNA_def_property(srna, "twoside", PROP_BOOLEAN, PROP_NONE);
|
||||
RNA_def_property_boolean_sdna(prop, NULL, "mode", TF_TWOSIDE);
|
||||
RNA_def_property_ui_text(prop, "Twoside", "Render face twosided");
|
||||
RNA_def_property_update(prop, 0, "rna_Mesh_update_data");
|
||||
|
||||
prop= RNA_def_property(srna, "object_color", PROP_BOOLEAN, PROP_NONE);
|
||||
RNA_def_property_boolean_sdna(prop, NULL, "mode", TF_OBCOL);
|
||||
RNA_def_property_ui_text(prop, "Object Color", "Use ObColor instead of vertex colors");
|
||||
RNA_def_property_update(prop, 0, "rna_Mesh_update_data");
|
||||
|
||||
prop= RNA_def_property(srna, "halo", PROP_BOOLEAN, PROP_NONE);
|
||||
RNA_def_property_boolean_sdna(prop, NULL, "mode", TF_BILLBOARD);
|
||||
RNA_def_property_ui_text(prop, "Halo", "Screen aligned billboard");
|
||||
RNA_def_property_update(prop, 0, "rna_Mesh_update_data");
|
||||
|
||||
prop= RNA_def_property(srna, "billboard", PROP_BOOLEAN, PROP_NONE);
|
||||
RNA_def_property_boolean_sdna(prop, NULL, "mode", TF_BILLBOARD2);
|
||||
RNA_def_property_ui_text(prop, "Billboard", "Billboard with Z-axis constraint");
|
||||
RNA_def_property_update(prop, 0, "rna_Mesh_update_data");
|
||||
|
||||
prop= RNA_def_property(srna, "shadow", PROP_BOOLEAN, PROP_NONE);
|
||||
RNA_def_property_boolean_sdna(prop, NULL, "mode", TF_SHADOW);
|
||||
RNA_def_property_ui_text(prop, "Shadow", "Face is used for shadow");
|
||||
RNA_def_property_update(prop, 0, "rna_Mesh_update_data");
|
||||
|
||||
prop= RNA_def_property(srna, "text", PROP_BOOLEAN, PROP_NONE);
|
||||
RNA_def_property_boolean_sdna(prop, NULL, "mode", TF_BMFONT);
|
||||
RNA_def_property_ui_text(prop, "Text", "Enable bitmap text on face");
|
||||
RNA_def_property_update(prop, 0, "rna_Mesh_update_data");
|
||||
|
||||
prop= RNA_def_property(srna, "alpha_sort", PROP_BOOLEAN, PROP_NONE);
|
||||
RNA_def_property_boolean_sdna(prop, NULL, "mode", TF_ALPHASORT);
|
||||
RNA_def_property_ui_text(prop, "Alpha Sort", "Enable sorting of faces for correct alpha drawing (slow, use Clip Alpha instead when possible)");
|
||||
RNA_def_property_update(prop, 0, "rna_Mesh_update_data");
|
||||
|
||||
prop= RNA_def_property(srna, "transp", PROP_ENUM, PROP_NONE);
|
||||
RNA_def_property_enum_items(prop, transp_items);
|
||||
RNA_def_property_ui_text(prop, "Transparency", "Transparency blending mode");
|
||||
RNA_def_property_update(prop, 0, "rna_Mesh_update_data");
|
||||
|
||||
prop= RNA_def_property(srna, "uv_selected", PROP_BOOLEAN, PROP_NONE);
|
||||
RNA_def_property_boolean_sdna(prop, NULL, "flag", TF_SEL1);
|
||||
RNA_def_property_array(prop, 4);
|
||||
RNA_def_property_ui_text(prop, "UV Selected", "");
|
||||
RNA_def_property_update(prop, 0, "rna_Mesh_update_select");
|
||||
|
||||
prop= RNA_def_property(srna, "uv_pinned", PROP_BOOLEAN, PROP_NONE);
|
||||
RNA_def_property_boolean_sdna(prop, NULL, "unwrap", TF_PIN1);
|
||||
RNA_def_property_array(prop, 4);
|
||||
RNA_def_property_ui_text(prop, "UV Pinned", "");
|
||||
RNA_def_property_update(prop, 0, "rna_Mesh_update_select");
|
||||
|
||||
prop= RNA_def_property(srna, "uv", PROP_FLOAT, PROP_XYZ);
|
||||
RNA_def_property_multidimensional_array(prop, 4 * 2, 2, uv_dim);
|
||||
prop= RNA_def_property(srna, "uv", PROP_FLOAT, PROP_NONE);
|
||||
RNA_def_property_multi_array(prop, 2, uv_dim);
|
||||
RNA_def_property_flag(prop, PROP_DYNAMIC);
|
||||
RNA_def_property_dynamic_array_funcs(prop, "rna_MeshTextureFace_uv_get_length", "rna_MeshTextureFace_uv_set_length");
|
||||
RNA_def_property_dynamic_array_funcs(prop, "rna_MeshTextureFace_uv_get_length");
|
||||
RNA_def_property_float_funcs(prop, "rna_MeshTextureFace_uv_get", "rna_MeshTextureFace_uv_set", NULL);
|
||||
RNA_def_property_ui_text(prop, "UV", "");
|
||||
RNA_def_property_update(prop, 0, "rna_Mesh_update_data");
|
||||
}
|
||||
|
||||
static void rna_def_msticky(BlenderRNA *brna)
|
||||
@@ -1103,6 +1123,7 @@ static void rna_def_msticky(BlenderRNA *brna)
|
||||
|
||||
prop= RNA_def_property(srna, "co", PROP_FLOAT, PROP_XYZ);
|
||||
RNA_def_property_ui_text(prop, "Location", "Sticky texture coordinate location.");
|
||||
RNA_def_property_update(prop, 0, "rna_Mesh_update_data");
|
||||
}
|
||||
|
||||
static void rna_def_mloopcol(BlenderRNA *brna)
|
||||
@@ -1114,20 +1135,37 @@ static void rna_def_mloopcol(BlenderRNA *brna)
|
||||
RNA_def_struct_ui_text(srna, "Mesh Vertex Color Layer", "Layer of vertex colors in a Mesh datablock.");
|
||||
RNA_def_struct_sdna(srna, "CustomDataLayer");
|
||||
RNA_def_struct_path_func(srna, "rna_MeshColorLayer_path");
|
||||
RNA_def_struct_ui_icon(srna, ICON_GROUP_VCOL);
|
||||
|
||||
prop= RNA_def_property(srna, "name", PROP_STRING, PROP_NONE);
|
||||
RNA_def_struct_name_property(srna, prop);
|
||||
RNA_def_property_string_funcs(prop, NULL, NULL, "rna_MeshColorLayer_name_set");
|
||||
RNA_def_property_ui_text(prop, "Name", "");
|
||||
RNA_def_property_update(prop, 0, "rna_Mesh_update_data");
|
||||
|
||||
prop= RNA_def_property(srna, "active", PROP_BOOLEAN, PROP_NONE);
|
||||
RNA_def_property_boolean_funcs(prop, "rna_MeshColorLayer_active_get", "rna_MeshColorLayer_active_set");
|
||||
RNA_def_property_ui_text(prop, "Active", "Sets the layer as active for display and editing");
|
||||
RNA_def_property_update(prop, 0, "rna_Mesh_update_data");
|
||||
|
||||
prop= RNA_def_property(srna, "active_render", PROP_BOOLEAN, PROP_NONE);
|
||||
RNA_def_property_boolean_sdna(prop, NULL, "active_rnd", 0);
|
||||
RNA_def_property_boolean_funcs(prop, "rna_MeshColorLayer_active_render_get", "rna_MeshColorLayer_active_render_set");
|
||||
RNA_def_property_ui_text(prop, "Active Render", "Sets the layer as active for rendering");
|
||||
|
||||
RNA_def_property_update(prop, 0, "rna_Mesh_update_data");
|
||||
|
||||
prop= RNA_def_property(srna, "data", PROP_COLLECTION, PROP_NONE);
|
||||
RNA_def_property_struct_type(prop, "MeshColor");
|
||||
RNA_def_property_ui_text(prop, "Data", "");
|
||||
RNA_def_property_collection_funcs(prop, "rna_MeshColorLayer_data_begin", "rna_iterator_array_next", "rna_iterator_array_end", "rna_iterator_array_get", "rna_MeshColorLayer_data_length", 0, 0, 0, 0);
|
||||
|
||||
srna= RNA_def_struct(brna, "MeshColor", NULL);
|
||||
RNA_def_struct_sdna(srna, "MCol");
|
||||
RNA_def_struct_ui_text(srna, "Mesh Vertex Color", "Vertex colors for a face in a Mesh.");
|
||||
RNA_def_struct_path_func(srna, "rna_MeshColor_path");
|
||||
|
||||
RNA_def_property_update(prop, 0, "rna_Mesh_update_data");
|
||||
}
|
||||
|
||||
static void rna_def_mproperties(BlenderRNA *brna)
|
||||
@@ -1144,6 +1182,7 @@ static void rna_def_mproperties(BlenderRNA *brna)
|
||||
prop= RNA_def_property(srna, "name", PROP_STRING, PROP_NONE);
|
||||
RNA_def_struct_name_property(srna, prop);
|
||||
RNA_def_property_ui_text(prop, "Name", "");
|
||||
RNA_def_property_update(prop, 0, "rna_Mesh_update_data");
|
||||
|
||||
prop= RNA_def_property(srna, "data", PROP_COLLECTION, PROP_NONE);
|
||||
RNA_def_property_struct_type(prop, "MeshFloatProperty");
|
||||
@@ -1158,6 +1197,7 @@ static void rna_def_mproperties(BlenderRNA *brna)
|
||||
prop= RNA_def_property(srna, "value", PROP_FLOAT, PROP_NONE);
|
||||
RNA_def_property_float_sdna(prop, NULL, "f");
|
||||
RNA_def_property_ui_text(prop, "Value", "");
|
||||
RNA_def_property_update(prop, 0, "rna_Mesh_update_data");
|
||||
|
||||
/* Int */
|
||||
srna= RNA_def_struct(brna, "MeshIntPropertyLayer", NULL);
|
||||
@@ -1168,6 +1208,7 @@ static void rna_def_mproperties(BlenderRNA *brna)
|
||||
prop= RNA_def_property(srna, "name", PROP_STRING, PROP_NONE);
|
||||
RNA_def_struct_name_property(srna, prop);
|
||||
RNA_def_property_ui_text(prop, "Name", "");
|
||||
RNA_def_property_update(prop, 0, "rna_Mesh_update_data");
|
||||
|
||||
prop= RNA_def_property(srna, "data", PROP_COLLECTION, PROP_NONE);
|
||||
RNA_def_property_struct_type(prop, "MeshIntProperty");
|
||||
@@ -1182,6 +1223,7 @@ static void rna_def_mproperties(BlenderRNA *brna)
|
||||
prop= RNA_def_property(srna, "value", PROP_INT, PROP_NONE);
|
||||
RNA_def_property_int_sdna(prop, NULL, "i");
|
||||
RNA_def_property_ui_text(prop, "Value", "");
|
||||
RNA_def_property_update(prop, 0, "rna_Mesh_update_data");
|
||||
|
||||
/* String */
|
||||
srna= RNA_def_struct(brna, "MeshStringPropertyLayer", NULL);
|
||||
@@ -1192,6 +1234,7 @@ static void rna_def_mproperties(BlenderRNA *brna)
|
||||
prop= RNA_def_property(srna, "name", PROP_STRING, PROP_NONE);
|
||||
RNA_def_struct_name_property(srna, prop);
|
||||
RNA_def_property_ui_text(prop, "Name", "");
|
||||
RNA_def_property_update(prop, 0, "rna_Mesh_update_data");
|
||||
|
||||
prop= RNA_def_property(srna, "data", PROP_COLLECTION, PROP_NONE);
|
||||
RNA_def_property_struct_type(prop, "MeshStringProperty");
|
||||
@@ -1206,6 +1249,7 @@ static void rna_def_mproperties(BlenderRNA *brna)
|
||||
prop= RNA_def_property(srna, "value", PROP_STRING, PROP_NONE);
|
||||
RNA_def_property_string_sdna(prop, NULL, "s");
|
||||
RNA_def_property_ui_text(prop, "Value", "");
|
||||
RNA_def_property_update(prop, 0, "rna_Mesh_update_data");
|
||||
}
|
||||
|
||||
void rna_def_texmat_common(StructRNA *srna, const char *texspace_editable)
|
||||
@@ -1221,17 +1265,20 @@ void rna_def_texmat_common(StructRNA *srna, const char *texspace_editable)
|
||||
RNA_def_property_float_sdna(prop, NULL, "loc");
|
||||
RNA_def_property_ui_text(prop, "Texure Space Location", "Texture space location.");
|
||||
RNA_def_property_editable_func(prop, texspace_editable);
|
||||
RNA_def_property_update(prop, 0, "rna_Mesh_update_draw");
|
||||
|
||||
prop= RNA_def_property(srna, "texspace_size", PROP_FLOAT, PROP_XYZ);
|
||||
RNA_def_property_float_sdna(prop, NULL, "size");
|
||||
RNA_def_property_ui_text(prop, "Texture Space Size", "Texture space size.");
|
||||
RNA_def_property_editable_func(prop, texspace_editable);
|
||||
RNA_def_property_update(prop, 0, "rna_Mesh_update_draw");
|
||||
|
||||
/* not supported yet
|
||||
prop= RNA_def_property(srna, "texspace_rot", PROP_FLOAT, PROP_EULER);
|
||||
RNA_def_property_float(prop, NULL, "rot");
|
||||
RNA_def_property_ui_text(prop, "Texture Space Rotation", "Texture space rotation");
|
||||
RNA_def_property_editable_func(prop, texspace_editable);*/
|
||||
RNA_def_property_editable_func(prop, texspace_editable);
|
||||
RNA_def_property_update(prop, 0, "rna_Mesh_update_draw");*/
|
||||
|
||||
/* materials */
|
||||
prop= RNA_def_property(srna, "materials", PROP_COLLECTION, PROP_NONE);
|
||||
@@ -1359,58 +1406,58 @@ static void rna_def_mesh(BlenderRNA *brna)
|
||||
prop= RNA_def_property(srna, "draw_edges", PROP_BOOLEAN, PROP_NONE);
|
||||
RNA_def_property_boolean_sdna(prop, NULL, "drawflag", ME_DRAWEDGES);
|
||||
RNA_def_property_ui_text(prop, "Draw Edges", "Displays selected edges using hilights in the 3d view and UV editor");
|
||||
RNA_def_property_update(prop, 0, "rna_Mesh_update_data");
|
||||
RNA_def_property_update(prop, 0, "rna_Mesh_update_draw");
|
||||
|
||||
prop= RNA_def_property(srna, "draw_faces", PROP_BOOLEAN, PROP_NONE);
|
||||
RNA_def_property_boolean_sdna(prop, NULL, "drawflag", ME_DRAWFACES);
|
||||
RNA_def_property_ui_text(prop, "Draw Faces", "Displays all faces as shades in the 3d view and UV editor");
|
||||
RNA_def_property_update(prop, 0, "rna_Mesh_update_data");
|
||||
RNA_def_property_update(prop, 0, "rna_Mesh_update_draw");
|
||||
|
||||
prop= RNA_def_property(srna, "draw_normals", PROP_BOOLEAN, PROP_NONE);
|
||||
RNA_def_property_boolean_sdna(prop, NULL, "drawflag", ME_DRAWNORMALS);
|
||||
RNA_def_property_ui_text(prop, "Draw Normals", "Displays face normals as lines");
|
||||
RNA_def_property_update(prop, 0, "rna_Mesh_update_data");
|
||||
RNA_def_property_update(prop, 0, "rna_Mesh_update_draw");
|
||||
|
||||
prop= RNA_def_property(srna, "draw_vertex_normals", PROP_BOOLEAN, PROP_NONE);
|
||||
RNA_def_property_boolean_sdna(prop, NULL, "drawflag", ME_DRAW_VNORMALS);
|
||||
RNA_def_property_ui_text(prop, "Draw Vertex Normals", "Displays vertex normals as lines");
|
||||
RNA_def_property_update(prop, 0, "rna_Mesh_update_data");
|
||||
RNA_def_property_update(prop, 0, "rna_Mesh_update_draw");
|
||||
|
||||
prop= RNA_def_property(srna, "draw_creases", PROP_BOOLEAN, PROP_NONE);
|
||||
RNA_def_property_boolean_sdna(prop, NULL, "drawflag", ME_DRAWCREASES);
|
||||
RNA_def_property_ui_text(prop, "Draw Creases", "Displays creases created for subsurf weighting");
|
||||
RNA_def_property_update(prop, 0, "rna_Mesh_update_data");
|
||||
RNA_def_property_update(prop, 0, "rna_Mesh_update_draw");
|
||||
|
||||
prop= RNA_def_property(srna, "draw_bevel_weights", PROP_BOOLEAN, PROP_NONE);
|
||||
RNA_def_property_boolean_sdna(prop, NULL, "drawflag", ME_DRAWBWEIGHTS);
|
||||
RNA_def_property_ui_text(prop, "Draw Bevel Weights", "Displays weights created for the Bevel modifier");
|
||||
RNA_def_property_update(prop, 0, "rna_Mesh_update_data");
|
||||
RNA_def_property_update(prop, 0, "rna_Mesh_update_draw");
|
||||
|
||||
prop= RNA_def_property(srna, "draw_seams", PROP_BOOLEAN, PROP_NONE);
|
||||
RNA_def_property_boolean_sdna(prop, NULL, "drawflag", ME_DRAWSEAMS);
|
||||
RNA_def_property_ui_text(prop, "Draw Seams", "Displays UV unwrapping seams");
|
||||
RNA_def_property_update(prop, 0, "rna_Mesh_update_data");
|
||||
RNA_def_property_update(prop, 0, "rna_Mesh_update_draw");
|
||||
|
||||
prop= RNA_def_property(srna, "draw_sharp", PROP_BOOLEAN, PROP_NONE);
|
||||
RNA_def_property_boolean_sdna(prop, NULL, "drawflag", ME_DRAWSHARP);
|
||||
RNA_def_property_ui_text(prop, "Draw Sharp", "Displays sharp edges, used with the EdgeSplit modifier");
|
||||
RNA_def_property_update(prop, 0, "rna_Mesh_update_data");
|
||||
RNA_def_property_update(prop, 0, "rna_Mesh_update_draw");
|
||||
|
||||
|
||||
prop= RNA_def_property(srna, "draw_edge_lenght", PROP_BOOLEAN, PROP_NONE);
|
||||
RNA_def_property_boolean_sdna(prop, NULL, "drawflag", ME_DRAW_EDGELEN);
|
||||
RNA_def_property_ui_text(prop, "Edge Length", "Displays selected edge lengths");
|
||||
RNA_def_property_update(prop, 0, "rna_Mesh_update_data");
|
||||
RNA_def_property_update(prop, 0, "rna_Mesh_update_draw");
|
||||
|
||||
prop= RNA_def_property(srna, "draw_edge_angle", PROP_BOOLEAN, PROP_NONE);
|
||||
RNA_def_property_boolean_sdna(prop, NULL, "drawflag", ME_DRAW_EDGEANG);
|
||||
RNA_def_property_ui_text(prop, "Edge Angles", "Displays the angles in the selected edges in degrees");
|
||||
RNA_def_property_update(prop, 0, "rna_Mesh_update_data");
|
||||
RNA_def_property_update(prop, 0, "rna_Mesh_update_draw");
|
||||
|
||||
prop= RNA_def_property(srna, "draw_face_area", PROP_BOOLEAN, PROP_NONE);
|
||||
RNA_def_property_boolean_sdna(prop, NULL, "drawflag", ME_DRAW_FACEAREA);
|
||||
RNA_def_property_ui_text(prop, "Face Area", "Displays the area of selected faces");
|
||||
RNA_def_property_update(prop, 0, "rna_Mesh_update_data");
|
||||
RNA_def_property_update(prop, 0, "rna_Mesh_update_draw");
|
||||
|
||||
prop= RNA_def_property(srna, "draw_pins", PROP_BOOLEAN, PROP_NONE);
|
||||
RNA_def_property_boolean_sdna(prop, NULL, "drawflag", ME_DRAW_PINS);
|
||||
|
||||
Reference in New Issue
Block a user