griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
34,913 Commits 1 Branch 0 Tags
76a211d80947a453f594e4cf0a1e0acc6786eddf
Commit Graph

200 Commits

Author SHA1 Message Date
Tamito Kajiyama
76a211d809 Merged changes in the trunk up to revision 43219. 
Conflicts resolved:
source/blender/blenkernel/intern/scene.c
source/blender/blenloader/intern/readfile.c
source/blender/render/intern/source/pipeline.c
 2012-01-08 11:57:53 +00:00
Campbell Barton
cce9c43295 correct api doc examples and a typo 2012-01-05 05:43:35 +00:00
Campbell Barton
9a0bf1ffa4 Correct use of your vs you're in py api docs 2012-01-04 03:22:37 +00:00
Tamito Kajiyama
0896a22723 Merged changes in the trunk up to revision 42902. 
Conflicts resolved:
source/blender/editors/space_view3d/drawobject.c
source/blender/makesdna/DNA_mesh_types.h
source/blender/python/intern/bpy.c
 2011-12-27 22:12:46 +00:00
Campbell Barton
3c480e85e3 update the api changelog 2.60 --> 2.61 2011-12-22 21:44:52 +00:00
Tamito Kajiyama
3197796cf7 Merged changes in the trunk up to revision 42425. 
Conflicts resolved:
doc/python_api/sphinx_doc_gen.py
source/blender/blenkernel/intern/DerivedMesh.c
source/blender/blenloader/intern/readfile.c
source/blender/editors/mesh/editmesh.c
source/blender/editors/space_view3d/drawobject.c
 2011-12-05 02:12:49 +00:00
Campbell Barton
4c93e0ada3 include mathutils.noise in sphinx docs 2011-12-04 06:55:32 +00:00
Campbell Barton
9aaa67cc4c corrections for docs 2011-11-28 17:19:25 +00:00
Tamito Kajiyama
b6569ee4e7 Merged changes in the trunk up to revision 42116. 2011-11-26 13:11:55 +00:00
Campbell Barton
1c6dc61d17 blacklist language property for sphinx docs, encoding was messing up PDF generation. 2011-11-24 22:24:07 +00:00
Campbell Barton
6e28ac2d7b pep8 edits and avoid naming conflicts with python builtins 2011-11-24 19:36:12 +00:00
Brecht Van Lommel
2345efc6c5 Patch #29336: renaming UV (Texture) Layer to UV Map in the user interface, 
by Gaia Clary.

Rationale: the name was confusing and not always used consistently, and this
map itself is not something that can be layered, rather the map can be used
as texture coordinates in some layered setup.

The original intent was to indicate this contained more than just UV's, but
the game engine settings have already been moved out, and apparently users
didn't really get this from the name anyway.
 2011-11-23 17:25:25 +00:00
Tamito Kajiyama
2676f2d58f Merged changes in the trunk up to revision 42021. 
Conflicts resolved:
source/blender/blenkernel/intern/scene.c
source/blender/blenloader/intern/readfile.c
source/blender/editors/interface/resources.c
source/blender/render/intern/source/pipeline.c
 2011-11-20 21:02:12 +00:00
Campbell Barton
d9e99abe37 hide overly picky warnings from 'pylint' for pep8 script, indentation edits. 2011-11-19 16:17:35 +00:00
Campbell Barton
c6c6a3578b tab -> spaces 2011-11-18 04:55:43 +00:00
Campbell Barton
e9be8b4a0a document py gotchas 
- dont assume you get the data names you ask for
- beware of collisions with library names
- beware of py modules calling sys.exit
 2011-11-18 04:48:27 +00:00
Campbell Barton
1cfbde0eb4 pass encoding to uses of decode() incase the default isnt utf-8. ignore decode errors in some cases. 
This should fix an error with generated qtcreator projects.

also replace decoded bytes for unicode escape sequences in the VIEW3D_MT_edit_text_chars menu.
 2011-11-17 04:05:54 +00:00
Campbell Barton
747f06d3d2 set cycles scripts as pep8 & make some minor changes. 
also update sphinx doc generator.
 2011-11-15 02:58:01 +00:00
Tamito Kajiyama
80e398e7b2 Merged changes in the trunk up to revision 41638. 
Conflicts resolved:
doc/python_api/sphinx_doc_gen.py
source/blender/blenkernel/BKE_main.h
source/blender/blenkernel/intern/library.c
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c
source/blender/editors/include/UI_resources.h
source/blender/editors/interface/resources.c
source/blender/makesdna/DNA_ID.h
source/blender/makesdna/intern/makesdna.c
source/blender/makesrna/intern/rna_internal.h
source/blender/makesrna/intern/rna_main.c
source/blender/makesrna/intern/rna_main_api.c
source/blender/makesrna/intern/rna_scene.c
 2011-11-08 06:30:02 +00:00
Campbell Barton
f086201518 cmake & pep8 tidy up, also some style edits. 
remove unneeded collection length function.
 2011-11-08 01:32:34 +00:00
Guillermo S. Romero
95948d0e0e SVN maintenance. 2011-11-07 23:50:12 +00:00
Campbell Barton
057bf2a02b misc doc edits 
- remove recently added sphinx reference workaround.
- tested doxygen, correct some warnings, set tab width and added pymathutils group.
- added convenience target 'make doc_doxy'
 2011-11-05 01:48:10 +00:00
Campbell Barton
209ceb6969 correct some warnings, also sensor_x was being paassed to object_camera_matrix(...) for x and y args, looks like an accident 2011-11-04 15:21:34 +00:00
Campbell Barton
87cd81b162 - added docs and examples for bpy.app.handlers 
- correct error in own last commit for BKE_screen_find_big_area()
 2011-11-04 04:27:46 +00:00
Tamito Kajiyama
65668dc5eb Merged changes in the trunk up to revision 41368. 
Conflicts resolved:
source/blender/blenkernel/intern/library.c
source/blender/blenlib/intern/bpath.c
source/blender/render/intern/source/convertblender.c
 2011-10-30 02:03:40 +00:00
Tamito Kajiyama
16702c1729 Merged changes in the trunk up to revision 41225. 
Conflicts resolved:
source/blender/render/intern/source/pipeline.c
 2011-10-29 15:46:14 +00:00
Campbell Barton
f8d0c8b11e patch [#29049] Minor phrasing and grammar patch 2011-10-28 01:10:46 +00:00
Campbell Barton
617d3cb852 pass -noaudio when running blender for various utilities - doc-gen and tests. 2011-10-19 21:55:27 +00:00
Tamito Kajiyama
b4e7451cb0 Merged changes in the trunk up to revision 41099. 2011-10-18 23:36:43 +00:00
Campbell Barton
cc1ed7cbc5 fix/update for credits script and bad formatting in sphinx docs. 2011-10-17 13:54:47 +00:00
Campbell Barton
2dc6ca49b3 py docs: 
added python doc section on script performance and a note on relative file paths in the gotcha's page.
also added script for spell checking py comments.
 2011-10-17 10:43:55 +00:00
Campbell Barton
67c15da97d docs / clenup (no functional code changes) 
- added API examples for mathutils.Color/Euler/Quaternion/Matrix.
- corrected own bad spelling matricies --> matrices.
- minor pep8 edits.
- update CMake ignore file list.
 2011-10-17 02:20:53 +00:00
Campbell Barton
6d5891e7ea fix bad URL in bgl doc 2011-10-16 15:01:13 +00:00
Campbell Barton
c40b976ea8 py docs - gpu module wasn't included in docs. 
also added convenience target to build sphinx api docs:
 make doc_py
 2011-10-13 06:59:09 +00:00
Campbell Barton
e3be5aacf8 fix [#28873] Blenders Python API Sphinx Build Script give exceptions 2011-10-11 23:27:01 +00:00
Tamito Kajiyama
d546002476 Merged changes in the trunk up to revision 40911. 
Conflicts resolved:
source/blender/blenloader/intern/readfile.c
 2011-10-10 21:15:11 +00:00
Campbell Barton
14dd4d19ed update generated api changelog for edits since 2.59 2011-10-05 22:43:00 +00:00
Campbell Barton
78968a0fc9 fix for mistake in api changelog script with function names. 2011-10-02 23:53:41 +00:00
Campbell Barton
a80520804a add '2.58 to 2.59' to changelog (should have done this for 2.59 release) and texface changes for 2.59 -> 2.60. 2011-10-02 23:47:05 +00:00
Campbell Barton
447a60b7c4 svn merge -rHEAD:40523 doc/python_api/rst/change_log.rst 
revert changes for texface, will apply manually after.
 2011-10-02 23:23:45 +00:00
Joerg Mueller
a4a09fc638 Fix for [#28792] Invalid 'aud' documentation examples. 2011-10-02 18:00:06 +00:00
Campbell Barton
081543fee8 fix for error generating docs, write all files as utf-8 2011-09-29 12:11:58 +00:00
Dalai Felinto
11a0e00819 BGE Material settings renaming Back Culling to Backface Culling and make it on by default 
under suggestion of Mitchell Stokes (Moguri)
 2011-09-26 06:39:19 +00:00
Dalai Felinto
51555877b0 manual update on changelog (python API) 
Change as suggested by Campbell.
I'm not sure if this is the way to do for enums, I will check with him later
 2011-09-24 23:50:00 +00:00
Dalai Felinto
e5b98f7a2f Python API changelog r37840-40524 (HEAD) 
updating the doc.

I'm also including the latest API dump with it. This helps to keep track of the revisions to update and the next person updating doesnt need to build an old Blender for that (as I just had to).

I updated the sphinx_changelog_gen.py with this info as well.
I'll update changelog.rst manually next. I'm not so sure how to indicate that the properties were replaced instead of only removed.
 2011-09-24 22:40:56 +00:00
Tamito Kajiyama
9c42afb1c0 Merged changes in the trunk up to revision 40413. 
Conflicts resolved:
source/blender/makesrna/intern/rna_scene.c
 2011-09-20 21:22:15 +00:00
Campbell Barton
8f5112f191 pep8 update & some minor cmake edits. 2011-09-20 18:29:19 +00:00
Campbell Barton
00de0cd6a7 fix for warnings after texface commit, also comment blender sphinx theme for api reference until we get an update for 'Naiad' 2011-09-20 01:35:39 +00:00
Tamito Kajiyama
70821c6b24 Merged changes in the trunk up to revision 40299. 2011-09-17 18:54:16 +00:00
Campbell Barton
862aababb3 - remove deprecated pose channel members 
- change short -> char for flags that support it.
- add pose 'temp' pointer to use for outliner drawing (was using 'prev' and restoring which seems dodjy)
 2011-09-16 02:42:50 +00:00