diff options
author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-03-03 05:43:44 +0400 |
---|---|---|
committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-03-03 05:43:44 +0400 |
commit | 9e93fc1e8acacb99b4b7638590ca4f1491e8b587 (patch) | |
tree | e42fb8ecc337a617a98e01f6c882b890ab9387e6 /source/blender/makesrna/intern/rna_mesh.c | |
parent | 00782aae1f5f3159c7afb1cb227bd8de1bc4b9c4 (diff) | |
parent | 95bba22af075148f9cbdb5a9b1ef41aeff1f560f (diff) |
Merged changes in the trunk up to revision 44612.
Conflicts resolved:
source/blender/blenloader/intern/readfile.c
source/blender/bmesh/bmesh.h
Diffstat (limited to 'source/blender/makesrna/intern/rna_mesh.c')
-rw-r--r-- | source/blender/makesrna/intern/rna_mesh.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/makesrna/intern/rna_mesh.c b/source/blender/makesrna/intern/rna_mesh.c index 7d412fead72..212088849ec 100644 --- a/source/blender/makesrna/intern/rna_mesh.c +++ b/source/blender/makesrna/intern/rna_mesh.c @@ -1462,7 +1462,7 @@ static void rna_def_mpolygon(BlenderRNA *brna) RNA_def_struct_ui_icon(srna, ICON_FACESEL); /* faked, actually access to loop vertex values, dont this way because manually setting up vertex/edge per loop is very low level - * instead we setup poly sizes, assign indicies, then calc edges automatic when creating meshes from rna/py */ + * instead we setup poly sizes, assign indices, then calc edges automatic when creating meshes from rna/py */ prop= RNA_def_property(srna, "vertices", PROP_INT, PROP_UNSIGNED); RNA_def_property_array(prop, 3); // eek, this is still used in some cases but infact we dont want to use it at all here. RNA_def_property_flag(prop, PROP_DYNAMIC); |