Tamito Kajiyama a42ba82f63 Merged changes in the trunk up to revision 50829. ...

Conflicts resolved:
source/blender/blenloader/intern/readfile.c
source/blender/render/intern/source/convertblender.c
source/blender/render/intern/source/pipeline.c

Also addressed code inconsistency due to changes in the trunk revision 50628 (color
management with OCIO) and 50806 (UV project material).  OCIO-related changes are marked
OCIO_TODO as in some other files modified in revision 50628.

2012-09-23 18:50:56 +00:00

..

batch_import.py

print how many times the operator failed.

2011-03-20 09:38:25 +00:00

bl_load_addons.py

style cleanup: spelling.

2012-03-09 00:41:09 +00:00

bl_load_py_modules.py

pep8 update & some minor cmake edits.

2011-09-20 18:29:19 +00:00

bl_mesh_modifiers.py

rename Mesh.uv_loop_layers --> uv_layers

2012-04-22 23:51:50 +00:00

bl_mesh_validate.py

mesh_validate code for bmesh (i.e. polys/loops).

2012-03-15 20:10:07 +00:00

bl_pyapi_mathutils.py

use ValueError when vector/matrix multiplications sizes are not supported, was using TypeError for mat*vec and ValueError for vec*mat.

2012-02-11 14:27:36 +00:00

bl_rna_wiki_reference.py

Merged changes in the trunk up to revision 50829.

2012-09-23 18:50:56 +00:00

bl_run_operators.py

Merged changes in the trunk up to revision 50829.

2012-09-23 18:50:56 +00:00

bl_test.py

quiet warning & minor pep8 edits.

2011-04-04 22:42:43 +00:00

check_deprecated.py

remove $Id: tags after discussion on the mailign list: http://markmail.org/message/fp7ozcywxum3ar7n

2011-10-23 17:52:20 +00:00

CMakeLists.txt

code cleanup: remove mode comments, these were applied very un-evenly across a few files.

2012-05-27 13:22:43 +00:00

pep8.py

code cleanup: python - pass multiple args to string startswith() / endswith() functions rather than calling multiple times.

2012-09-04 20:26:42 +00:00

rna_array.py

- fix problem with cmake, windows 'RelWithDebInfo' target, was giving error: "ImportError: No module named _socket" because of copying wrong files over.

2011-01-23 11:42:29 +00:00

rna_info_dump.py

modifications needed to get a URL from an RNA id from the testing script

2012-09-13 00:26:01 +00:00