Index: release/scripts/ui/properties_data_mesh.py =================================================================== --- release/scripts/ui/properties_data_mesh.py (revision 27778) +++ release/scripts/ui/properties_data_mesh.py (working copy) @@ -281,6 +281,48 @@ lay = me.active_uv_texture if lay: layout.prop(lay, "name") + +class DATA_PT_texface(DataButtonsPanel): + bl_label = "Texture Face" + + def draw(self, context): + layout = self.layout + col = layout.column() + + wide_ui = context.region.width > narrowui + + me = context.mesh + + tf = me.faces.active_tface + + if tf: + col.label(text="Active Face Mode") + split = layout.split() + col = split.column() + + col.prop(tf, "tex") + col.prop(tf, "light") + col.prop(tf, "invisible") + col.prop(tf, "collision") + + col.prop(tf, "shared") + col.prop(tf, "twoside") + col.prop(tf, "object_color") + + if wide_ui: + col = split.column() + + col.prop(tf, "halo") + col.prop(tf, "billboard") + col.prop(tf, "shadow") + col.prop(tf, "text") + col.prop(tf, "alpha_sort") + + col = layout.column() + col.prop(tf, "transp") + + + class DATA_PT_vertex_colors(DataButtonsPanel): @@ -315,6 +357,7 @@ DATA_PT_vertex_groups, DATA_PT_shape_keys, DATA_PT_uv_texture, + DATA_PT_texface, DATA_PT_vertex_colors, DATA_PT_custom_props_mesh] Index: source/blender/makesrna/intern/rna_mesh.c =================================================================== --- source/blender/makesrna/intern/rna_mesh.c (revision 27778) +++ source/blender/makesrna/intern/rna_mesh.c (working copy) @@ -46,6 +46,8 @@ #include "BKE_mesh.h" #include "BKE_utildefines.h" +#include "ED_mesh.h" /* XXX Bad level call */ + #include "WM_api.h" #include "WM_types.h" @@ -458,6 +460,22 @@ *max= MAX2(0, *max); } +static PointerRNA rna_Mesh_active_mtface_get(PointerRNA *ptr) +{ + Mesh *me= (Mesh*)ptr->data; + EditMesh *em= BKE_mesh_get_editmesh(me); + MTFace *tf; + + if (em && EM_texFaceCheck(em)) + { + tf = EM_get_active_mtface(em, NULL, NULL, 1); + + return rna_pointer_inherit_refine(ptr, &RNA_MeshTextureFace, tf); + } + + return rna_pointer_inherit_refine(ptr, &RNA_MeshTextureFace, NULL); +} + static void rna_MeshTextureFace_uv1_get(PointerRNA *ptr, float *values) { MTFace *mtface= (MTFace*)ptr->data; @@ -1599,6 +1617,12 @@ prop= RNA_def_property(srna, "active", PROP_INT, PROP_NONE); RNA_def_property_int_sdna(prop, NULL, "act_face"); RNA_def_property_ui_text(prop, "Active Face", "The active face for this mesh"); + + prop= RNA_def_property(srna, "active_tface", PROP_POINTER, PROP_UNSIGNED); + RNA_def_property_struct_type(prop, "MeshTextureFace"); + RNA_def_property_pointer_funcs(prop, "rna_Mesh_active_mtface_get", NULL, NULL); + RNA_def_property_ui_text(prop, "Active Texture Face", "Active Texture Face"); + RNA_def_property_update(prop, 0, "rna_Mesh_update_data"); } Index: source/blenderplayer/bad_level_call_stubs/stubs.c =================================================================== --- source/blenderplayer/bad_level_call_stubs/stubs.c (revision 27778) +++ source/blenderplayer/bad_level_call_stubs/stubs.c (working copy) @@ -241,6 +241,8 @@ float ED_rollBoneToVector(struct EditBone *bone, float new_up_axis[3]){return 0.0f;} void EM_selectmode_set(struct EditMesh *em){} +int EM_texFaceCheck(struct EditMesh *em){return 0;} +struct MTFace *EM_get_active_mtface(struct EditMesh *em, struct EditFace **act_efa, struct MCol **mcol, int sloopy){return (struct MTFace *)NULL;} void make_editMesh(struct Scene *scene, struct Object *ob){} void load_editMesh(struct Scene *scene, struct Object *ob){}