archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Scene.c - Removed redraw when in non UI mode.

Browse Source 
Lamp.py - Example indent
Object.py - Improved join documentation.
This commit is contained in:
Campbell Barton
2006-01-06 01:53:26 +00:00
parent 39fcd3586f
commit ef520a8cc9
3 changed files with 20 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/python/api2_2x/Scene.c
View File

@@ -934,7 +934,7 @@ static PyObject *Scene_setCurrentCamera( BPy_Scene * self, PyObject * args )
scene->camera = object; /* set the current Camera */
/* if this is the current scene, update its window now */
if( scene == G.scene )
if( !G.background && scene == G.scene ) /* Traced a crash to redrawing while in background mode -Campbell */
copy_view3d_lock( REDRAW );
/* XXX copy_view3d_lock(REDRAW) prints "bad call to addqueue: 0 (18, 1)".

2
source/blender/python/api2_2x/doc/Lamp.py
View File

@@ -39,7 +39,7 @@ Example::
- 'NoDiffuse'
- 'RayShadow'
Example::
Example::
from Blender import Lamp, Object
# Change the mode of selected lamp objects.
for ob in Object.GetSelected(): # Loop through the current selection

15
source/blender/python/api2_2x/doc/Object.py
View File

@@ -556,12 +556,17 @@ class Object:
@type objects: Sequence of Blender Object
@param objects: A list of objects matching the objects type.
@note: Objects in the list will not be removed, to avoid duplicate data you may want to remove them manualy after joining.
@note: Join modifies the object in place so that other objects are joined into it. no new object or data is created.
@note: Join will only work for object types Mesh, Armature, Curve and Surface, an error will be raised if the object is not of this type.
@note: Objects in the list will not be removed from the scene,
to avoid overlapping data you may want to remove them manualy after joining.
@note: Join modifies the base objects data in place so that
other objects are joined into it. no new object or data is created.
@note: Join will only work for object types Mesh, Armature, Curve and Surface,
an error will be raised if the object is not of this type.
@note: objects in the list will be ignored if they to not match the base object.
@note: An error in the join function input will raise a TypeError, otherwise an error in the data input is raised is a RuntimeError,
for situations where you do not have tight control on the data that is being joined, you should handel the RuntimeError error.
@note: An error in the join function input will raise a TypeError,
otherwise an error in the data input will raise a RuntimeError,
for situations where you don't have tight control on the data that is being joined,
you should handel the RuntimeError error, litting the user know the data cant be joined.
"""
def makeParentDeform(objects, noninverse = 0, fast = 0):