diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-08-25 03:22:34 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-08-25 03:22:34 +0400 |
| commit | ed0489bb6ed0f711aed90f4e903eb862bae4ff1a (patch) | |
| tree | 581cbff2793d8b3afd2b05191f087dd3efb1d1bc /source/blender/blenkernel/intern/material.c | |
| parent | 3da7e0f3bf04d2814b13a395527f450916eebe1f (diff) | |
style cleanup: also spelling
Diffstat (limited to 'source/blender/blenkernel/intern/material.c')
| -rw-r--r-- | source/blender/blenkernel/intern/material.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/source/blender/blenkernel/intern/material.c b/source/blender/blenkernel/intern/material.c index fd167c69e62..7523c59a879 100644 --- a/source/blender/blenkernel/intern/material.c +++ b/source/blender/blenkernel/intern/material.c @@ -813,7 +813,7 @@ void assign_material(Object *ob, Material *ma, short act, int assign_type) *totcolp = act; } - // Determine the object/mesh linking + /* Determine the object/mesh linking */ if (assign_type == BKE_MAT_ASSIGN_USERPREF && ob->totcol && ob->actcol) { /* copy from previous material */ bit = ob->matbits[ob->actcol - 1]; @@ -1633,7 +1633,7 @@ static void decode_tfaceflag(Material *ma, int flag, int convertall) /* flag is shifted in 1 to make 0 != no flag yet (see encode_tfaceflag) */ flag -= 1; - alphablend = flag >> 15; //encoded in the encode_tfaceflag function + alphablend = flag >> 15; /* encoded in the encode_tfaceflag function */ (*game).flag = 0; /* General Material Options */ @@ -2033,8 +2033,7 @@ int do_version_tface(Main *main, int fileload) nowarning = 0; } else - convert_tfacematerial(main, ma); - continue; + convert_tfacematerial(main, ma); continue; } /* no conflicts in this material - 90% of cases |