patch [#17856] Correction on docs for Ipo module. from Lucas Vella (lvella) + some other minor changes.

3 files changed, 28 insertions, 28 deletions

diff --git a/release/scripts/import_web3d.py b/release/scripts/import_web3d.py
index 157af62338e..e934d06e9ef 100755
--- a/release/scripts/import_web3d.py
+++ b/release/scripts/import_web3d.py
@@ -3,7 +3,7 @@
 Name: 'X3D & VRML97 (.x3d / wrl)...'
 Blender: 248
 Group: 'Import'
-Tooltip: 'Load a VRML97 File'
+Tooltip: 'Load an X3D or VRML97 file'
 """
 
 # ***** BEGIN GPL LICENSE BLOCK *****
@@ -36,6 +36,30 @@ __bpydoc__ = """\
 This script is an importer for the X3D and VRML97 file formats.
 """
 
+# This should work without a blender at all
+try:
+	from Blender.sys import exists
+except:
+	from os.path import exists
+
+def baseName(path):
+	return path.split('/')[-1].split('\\')[-1]
+
+def dirName(path):
+	return path[:-len(baseName(path))]
+
+# notes
+# transform are relative 
+# order dosnt matter for loc/size/rot
+# right handed rotation
+# angles are in radians
+# rotation first defines axis then ammount in deg
+
+
+
+# =============================== VRML Spesific
+
+
 def vrmlFormat(data):
 	'''
 	Keep this as a valid vrml file, but format in a way we can pradict.
@@ -98,30 +122,6 @@ def vrmlFormat(data):
 	
 	return [l for l in data.split('\n') if l]
 
-
-# This should work without a blender at all
-try:
-	from Blender.sys import exists
-except:
-	from os.path import exists
-
-def baseName(path):
-	return path.split('/')[-1].split('\\')[-1]
-
-def dirName(path):
-	return path[:-len(baseName(path))]
-
-# notes
-# transform are relative 
-# order dosnt matter for loc/size/rot
-# right handed rotation
-# angles are in radians
-# rotation first defines axis then ammount in deg
-
-
-
-# =============================== VRML Spesific
-
 NODE_NORMAL = 1 # {}
 NODE_ARRAY = 2 # []
 NODE_REFERENCE = 3 # USE foobar
diff --git a/release/scripts/scripttemplate_gamelogic_basic.py b/release/scripts/scripttemplate_gamelogic_basic.py
index dfd52a9f749..1584659d317 100644
--- a/release/scripts/scripttemplate_gamelogic_basic.py
+++ b/release/scripts/scripttemplate_gamelogic_basic.py
@@ -27,7 +27,7 @@ def main():
 main()
 '''
 
-new_text = bpy.data.texts.new('gamelogic_example.py')
+new_text = bpy.data.texts.new('gamelogic_simple.py')
 new_text.write(script_data)
 bpy.data.texts.active = new_text
 Window.RedrawAll()
diff --git a/source/blender/python/api2_2x/doc/Ipo.py b/source/blender/python/api2_2x/doc/Ipo.py
index d1c72f8cb86..507592ce8a6 100644
--- a/source/blender/python/api2_2x/doc/Ipo.py
+++ b/source/blender/python/api2_2x/doc/Ipo.py
@@ -57,8 +57,8 @@ The valid IpoCurve constants are:
 			TE_DISTA, TE_MGTYPE, TE_MGH, TE_LACU, TE_OCT, TE_MGOFF,
 			TE_MGGAIN, TE_NBASE1, TE_NBASE2, TE_COLR, TE_COLG, TE_COLB,
 			TE_BRIGHT, TE_CONTRAS
-			9. Pose/Action Ipo: PO_LOCX, PO_LOCY, PO_LOCZ, PO_SIZEX, PO_SIZEY,
-			PO_SIZEZ, PO_QUATW, PO_QUATX, PO_QUATY, PO_QUATZ
+			9. Pose/Action Ipo: PO_LOCX, PO_LOCY, PO_LOCZ, PO_SCALEX, PO_SCALEY,
+			PO_SCALEZ, PO_QUATW, PO_QUATX, PO_QUATY, PO_QUATZ
 			10. Sequence Ipo: SQ_FAC
 
 Shape Key Ipos are handled differently from other Ipos.  The user can rename