weightpaint_envelope_assign - was making an error checking a null vgroup

API_intro - changed URL from elysuin
others - added __copy__() docs.

12 files changed, 68 insertions, 8 deletions

diff --git a/release/scripts/weightpaint_envelope_assign.py b/release/scripts/weightpaint_envelope_assign.py
index 33475294b2d..f383633995a 100644
--- a/release/scripts/weightpaint_envelope_assign.py
+++ b/release/scripts/weightpaint_envelope_assign.py
@@ -141,7 +141,7 @@ def env_from_group(ob_act, grp, PREF_UPDATE_ACT=True):
 	
 	if PREF_UPDATE_ACT:
 		act_group = me.activeGroup
-		if act_group == 'None':
+		if act_group == None:
 			Draw.PupMenu('Error%t|No active vertex group.')
 			return
 		
diff --git a/source/blender/python/api2_2x/doc/API_intro.py b/source/blender/python/api2_2x/doc/API_intro.py
index 5b3c55bfbb7..011e79a0695 100644
--- a/source/blender/python/api2_2x/doc/API_intro.py
+++ b/source/blender/python/api2_2x/doc/API_intro.py
@@ -35,11 +35,11 @@ The Blender Python API Reference
   - L{Mathutils} (*)
   - L{Mesh} (*)
     - L{MeshPrimitives} (*)
-  - L{Metaball}
-  - L{Modifier} (*)
+  - L{Metaball} (*)
   - L{NMesh} (*)
   - L{Noise}
   - L{Object} (*)
+     - L{Modifier} (*)
      - L{Pose}
      - L{Constraint} (*)
      - L{ActionStrips<NLA>} (*)
@@ -226,7 +226,7 @@ A note to newbie script writers:
 @version: 2.42
 @see: U{www.blender3d.org<http://www.blender3d.org>}: main site
 @see: U{www.blender.org<http://www.blender.org>}: documentation and forum
-@see: U{www.elysiun.com<http://www.elysiun.com>}: user forum
+@see: U{blenderartists.org<http://blenderartists.org>}: user forum
 @see: U{projects.blender.org<http://projects.blender.org>}
 @see: U{blender architecture<http://www.blender3d.org/cms/Blender_Architecture.336.0.html>}: blender architecture document
 @see: U{www.python.org<http://www.python.org>}
diff --git a/source/blender/python/api2_2x/doc/Camera.py b/source/blender/python/api2_2x/doc/Camera.py
index e867d28da15..0ced68670c4 100644
--- a/source/blender/python/api2_2x/doc/Camera.py
+++ b/source/blender/python/api2_2x/doc/Camera.py
@@ -247,3 +247,10 @@ class Camera:
            -CLIPPING
     @return: py_none
     """  
+
+  def __copy__ ():
+    """
+    Make a copy of this camera
+    @rtype: Camera
+    @return:  a copy of this camera
+    """
\ No newline at end of file
diff --git a/source/blender/python/api2_2x/doc/Curve.py b/source/blender/python/api2_2x/doc/Curve.py
index 5ea624b5886..f65ce0ad00f 100644
--- a/source/blender/python/api2_2x/doc/Curve.py
+++ b/source/blender/python/api2_2x/doc/Curve.py
@@ -489,6 +489,12 @@ class Curve:
       @rtype: L{Key<Key.Key>} object or None
       """
 
+  def __copy__ ():
+    """
+    Make a copy of this curve
+    @rtype: Curve
+    @return:  a copy of this curve
+    """
 
 class CurNurb:
     """
diff --git a/source/blender/python/api2_2x/doc/Group.py b/source/blender/python/api2_2x/doc/Group.py
index 6500df54f2c..8e04518fe35 100644
--- a/source/blender/python/api2_2x/doc/Group.py
+++ b/source/blender/python/api2_2x/doc/Group.py
@@ -122,3 +122,9 @@ class Group:
   @type objects: custom object sequence
   """
 
+  def __copy__ ():
+    """
+    Make a copy of this group
+    @rtype: Group
+    @return:  a copy of this group
+    """
\ No newline at end of file
diff --git a/source/blender/python/api2_2x/doc/Lamp.py b/source/blender/python/api2_2x/doc/Lamp.py
index c1442565cd5..7f509ec2e45 100644
--- a/source/blender/python/api2_2x/doc/Lamp.py
+++ b/source/blender/python/api2_2x/doc/Lamp.py
@@ -513,3 +513,10 @@ class Lamp:
            -SIZE
     @return: py_none
     """    
+
+  def __copy__ ():
+    """
+    Make a copy of this lamp
+    @rtype: Lamp
+    @return:  a copy of this lamp
+    """
\ No newline at end of file
diff --git a/source/blender/python/api2_2x/doc/Lattice.py b/source/blender/python/api2_2x/doc/Lattice.py
index adfddf7e25c..f6b84746950 100644
--- a/source/blender/python/api2_2x/doc/Lattice.py
+++ b/source/blender/python/api2_2x/doc/Lattice.py
@@ -202,5 +202,11 @@ class Lattice:
     @param frame: the frame at which the Lattice will be set as a keyframe
     """
 
+  def __copy__ ():
+    """
+    Make a copy of this lattice
+    @rtype: Lattice
+    @return:  a copy of this lattice
+    """
 
 
diff --git a/source/blender/python/api2_2x/doc/Material.py b/source/blender/python/api2_2x/doc/Material.py
index b3beafbe228..757a3d8710a 100644
--- a/source/blender/python/api2_2x/doc/Material.py
+++ b/source/blender/python/api2_2x/doc/Material.py
@@ -993,3 +993,10 @@ class Material:
     @type event: string
     @param event: "FrameChanged" or "Redraw".
     """
+
+  def __copy__ ():
+    """
+    Make a copy of this material
+    @rtype: Material
+    @return:  a copy of this material
+    """
\ No newline at end of file
diff --git a/source/blender/python/api2_2x/doc/Mesh.py b/source/blender/python/api2_2x/doc/Mesh.py
index 3871a6eaa08..8eae6dfe1ae 100644
--- a/source/blender/python/api2_2x/doc/Mesh.py
+++ b/source/blender/python/api2_2x/doc/Mesh.py
@@ -1167,3 +1167,10 @@ class Mesh:
     @param direction: specifies outward (0) or inward (1) normals.  Outward
     is the default.  Value must be in the range [0,1].
     """
+
+  def __copy__ ():
+    """
+    Make a copy of this mesh
+    @rtype: Mesh
+    @return:  a copy of this mesh
+    """
\ No newline at end of file
diff --git a/source/blender/python/api2_2x/doc/Metaball.py b/source/blender/python/api2_2x/doc/Metaball.py
index 8629c4862b1..3b40b5f6ea9 100644
--- a/source/blender/python/api2_2x/doc/Metaball.py
+++ b/source/blender/python/api2_2x/doc/Metaball.py
@@ -154,7 +154,7 @@ class Metaball:
   @type materials: list
   """
 
-  def copy():
+  def __copy__():
     """
     Return a copy of this metaball object data.
     @rtype: Metaball
diff --git a/source/blender/python/api2_2x/doc/Object.py b/source/blender/python/api2_2x/doc/Object.py
index 97d3730098a..7e8e692b122 100644
--- a/source/blender/python/api2_2x/doc/Object.py
+++ b/source/blender/python/api2_2x/doc/Object.py
@@ -1795,11 +1795,18 @@ class Property:
 	"""
 
   def copyNLA(obj):
-	"""
-	Copies all NLA strips from another object to this object.
+    """
+    Copies all NLA strips from another object to this object.
     @param obj: an object to copy NLA strips from.
     @type obj: L{Object}
-	"""
+    """
+
+  def __copy__ ():
+    """
+    Make a copy of this object
+    @rtype: Object
+    @return:  a copy of this object
+    """
 
   def convertActionToStrip():
 	"""
diff --git a/source/blender/python/api2_2x/doc/World.py b/source/blender/python/api2_2x/doc/World.py
index 41d5d8aa506..e2b73f98c2e 100644
--- a/source/blender/python/api2_2x/doc/World.py
+++ b/source/blender/python/api2_2x/doc/World.py
@@ -340,3 +340,10 @@ class World:
            -SIZE
     @return: py_none
     """   
+
+  def __copy__ ():
+    """
+    Make a copy of this world
+    @rtype: World
+    @return:  a copy of this world
+    """