merge own commits into render branch into trunk since 27560
authorCampbell Barton <ideasman42@gmail.com>
Sat, 20 Mar 2010 16:41:01 +0000 (16:41 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Sat, 20 Mar 2010 16:41:01 +0000 (16:41 +0000)
commit391cc2d004c5fc231ac546d89f64ae4ba5c062c0
treea89e10b9b3d496e99079cd0778c09495ccc8ad1b
parent7178f10b81006082937de8fa8be90076f478da64
merge own commits into render branch into trunk since 27560
27562, 27570, 27571, 27574, 27576, 27577, 27579, 27590, 27591, 27594, 27595, 27596, 27599, 27605, 27611, 27612, 27613, 27614, 27623
44 files changed:
CMakeLists.txt
release/scripts/io/import_scene_obj.py
release/scripts/op/image.py
release/scripts/ui/properties_data_curve.py
release/scripts/ui/space_image.py
release/scripts/ui/space_userpref.py
source/blender/blenkernel/BKE_curve.h
source/blender/blenkernel/intern/anim_sys.c
source/blender/blenkernel/intern/curve.c
source/blender/blenkernel/intern/displist.c
source/blender/blenkernel/intern/font.c
source/blender/blenkernel/intern/mesh.c
source/blender/blenlib/BLI_listbase.h
source/blender/blenlib/intern/freetypefont.c
source/blender/blenlib/intern/listbase.c
source/blender/editors/armature/editarmature.c
source/blender/editors/curve/editcurve.c
source/blender/editors/gpencil/gpencil_edit.c
source/blender/editors/include/ED_object.h
source/blender/editors/interface/interface_regions.c
source/blender/editors/object/object_add.c
source/blender/editors/object/object_edit.c
source/blender/editors/object/object_relations.c
source/blender/editors/object/object_transform.c
source/blender/editors/render/render_shading.c
source/blender/editors/space_nla/nla_buttons.c
source/blender/editors/space_view3d/drawobject.c
source/blender/editors/space_view3d/view3d_draw.c
source/blender/editors/space_view3d/view3d_edit.c
source/blender/editors/space_view3d/view3d_view.c
source/blender/makesdna/DNA_anim_types.h
source/blender/makesdna/DNA_curve_types.h
source/blender/makesrna/RNA_types.h
source/blender/makesrna/intern/rna_curve.c
source/blender/makesrna/intern/rna_main_api.c
source/blender/makesrna/intern/rna_nla.c
source/blender/makesrna/intern/rna_object.c
source/blender/makesrna/intern/rna_scene.c
source/blender/python/doc/sphinx_doc_gen.py
source/blender/python/doc/sphinx_doc_gen.sh [new file with mode: 0644]
source/blender/python/generic/IDProp.c
source/blender/python/intern/bpy_rna.c
source/blenderplayer/bad_level_call_stubs/stubs.c
source/creator/creator.c