diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-09-20 10:25:15 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-09-20 10:25:15 +0400 |
| commit | 13dfd8299758a5248613624e99a1643f35e2ff4e (patch) | |
| tree | 6e10f1aa1c9fab187cae0172890153bb6ff5d252 /source/blender/makesrna/intern/rna_curve.c | |
| parent | 2b1513dbdad785c0f95acbe195215706a2ee873b (diff) | |
changes for materials to treat them as shorts not int/chars (since they are stored as shorts intermally)
- converting nurbs to mesh was casting the material to unsigned char.
- subsurf was casting to char, then int -> short in a loop.
- have material functions take & return shorts.
Diffstat (limited to 'source/blender/makesrna/intern/rna_curve.c')
| -rw-r--r-- | source/blender/makesrna/intern/rna_curve.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/makesrna/intern/rna_curve.c b/source/blender/makesrna/intern/rna_curve.c index 99473d13daa..5d0c1db572d 100644 --- a/source/blender/makesrna/intern/rna_curve.c +++ b/source/blender/makesrna/intern/rna_curve.c @@ -296,7 +296,8 @@ static EnumPropertyItem *rna_Curve_fill_mode_itemf(bContext *UNUSED(C), PointerR { Curve *cu= (Curve*)ptr->id.data; - return (cu->flag&CU_3D) ? curve3d_fill_mode_items : curve2d_fill_mode_items; + /* cast to quiet warning it IS a const still */ + return (EnumPropertyItem *)((cu->flag & CU_3D) ? curve3d_fill_mode_items : curve2d_fill_mode_items); } static int rna_Nurb_length(PointerRNA *ptr) |