[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [59324] trunk/blender/source/blender/ makesrna/intern/rna_mesh.c: disable material index clamping, fbx importer doesn' t know the total number of materials when meshes are loading,
Campbell Barton
ideasman42 at gmail.com
Tue Aug 20 14:48:44 CEST 2013
Revision: 59324
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=59324
Author: campbellbarton
Date: 2013-08-20 12:48:44 +0000 (Tue, 20 Aug 2013)
Log Message:
-----------
disable material index clamping, fbx importer doesn't know the total number of materials when meshes are loading,
also, its possible to have values outside this range by removing materials (though not from the UI)
Modified Paths:
--------------
trunk/blender/source/blender/makesrna/intern/rna_mesh.c
Modified: trunk/blender/source/blender/makesrna/intern/rna_mesh.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_mesh.c 2013-08-20 11:22:26 UTC (rev 59323)
+++ trunk/blender/source/blender/makesrna/intern/rna_mesh.c 2013-08-20 12:48:44 UTC (rev 59324)
@@ -1108,12 +1108,15 @@
}
}
+/* disabling, some importers don't know the total material count when assigning materials */
+#if 0
static void rna_MeshPoly_material_index_range(PointerRNA *ptr, int *min, int *max, int *softmin, int *softmax)
{
Mesh *me = rna_mesh(ptr);
*min = 0;
*max = max_ii(0, me->totcol - 1);
}
+#endif
static int rna_MeshVertex_index_get(PointerRNA *ptr)
{
@@ -1773,7 +1776,9 @@
prop = RNA_def_property(srna, "material_index", PROP_INT, PROP_UNSIGNED);
RNA_def_property_int_sdna(prop, NULL, "mat_nr");
RNA_def_property_ui_text(prop, "Material Index", "");
+#if 0
RNA_def_property_int_funcs(prop, NULL, NULL, "rna_MeshPoly_material_index_range"); /* reuse for tessface is ok */
+#endif
RNA_def_property_update(prop, 0, "rna_Mesh_update_data");
prop = RNA_def_property(srna, "select", PROP_BOOLEAN, PROP_NONE);
@@ -1870,7 +1875,9 @@
prop = RNA_def_property(srna, "material_index", PROP_INT, PROP_UNSIGNED);
RNA_def_property_int_sdna(prop, NULL, "mat_nr");
RNA_def_property_ui_text(prop, "Material Index", "");
+#if 0
RNA_def_property_int_funcs(prop, NULL, NULL, "rna_MeshPoly_material_index_range");
+#endif
RNA_def_property_update(prop, 0, "rna_Mesh_update_data");
prop = RNA_def_property(srna, "select", PROP_BOOLEAN, PROP_NONE);
More information about the Bf-blender-cvs
mailing list