diff options
| author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2013-01-27 03:49:13 +0400 |
|---|---|---|
| committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2013-01-27 03:49:13 +0400 |
| commit | 556912792ad3c37c294256a558c96b39f264e7b5 (patch) | |
| tree | 9b6ee8cf1ad92ee89c04f27a89be11599c5b40c0 /source/tests/bl_mesh_modifiers.py | |
| parent | 9251d628db0abe599d927d79170025d8545c8ace (diff) | |
| parent | c84383301c5a2582e95259a7e4468a23a3566401 (diff) | |
Merged changes in the trunk up to revision 54110.
Conflicts resolved:
source/blender/blenfont/SConscript
source/blender/blenkernel/intern/subsurf_ccg.c
source/blender/makesdna/intern/makesdna.c
source/blender/makesrna/intern/rna_scene.c
Diffstat (limited to 'source/tests/bl_mesh_modifiers.py')
| -rw-r--r-- | source/tests/bl_mesh_modifiers.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/tests/bl_mesh_modifiers.py b/source/tests/bl_mesh_modifiers.py index 92fae25df16..2f342f2c65e 100644 --- a/source/tests/bl_mesh_modifiers.py +++ b/source/tests/bl_mesh_modifiers.py @@ -34,7 +34,7 @@ USE_QUICK_RENDER = False IS_BMESH = hasattr(__import__("bpy").types, "LoopColors") # ----------------------------------------------------------------------------- -# utility funcs +# utility functions def render_gl(context, filepath, shade): @@ -147,7 +147,7 @@ def ctx_viewport_camera(context): def ctx_camera_setup(context, location=(0.0, 0.0, 0.0), lookat=(0.0, 0.0, 0.0), - # most likely the followuing vars can be left as defaults + # most likely the following vars can be left as defaults up=(0.0, 0.0, 1.0), lookat_axis='-Z', up_axis='Y', @@ -258,7 +258,7 @@ def mesh_uv_add(obj): uv_lay = obj.data.uv_textures.new() if IS_BMESH: - # XXX, odd that we need to do this. until uvs and texface + # XXX, odd that we need to do this. until UV's and texface # are separated we will need to keep it uv_loops = obj.data.uv_layers[-1] uv_list = uv_loops.data[:] |