5c5685f6c5 
					 
					
						
						
							
							Merged changes in the trunk up to revision 44039.  
						
						
						
						
					 
					
						2012-02-12 00:09:48 +00:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						387ce06732 
					 
					
						
						
							
							Disable PDF doc since its giving errors with latex indentation.  
						
						... 
						
						
						
						upload the zipped version of HTML docs instead. 
						
						
					 
					
						2012-02-10 15:00:55 +00:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						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 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						4c93e0ada3 
					 
					
						
						
							
							include mathutils.noise in sphinx docs  
						
						
						
						
					 
					
						2011-12-04 06:55:32 +00:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						b6569ee4e7 
					 
					
						
						
							
							Merged changes in the trunk up to revision 42116.  
						
						
						
						
					 
					
						2011-11-26 13:11:55 +00:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						1c6dc61d17 
					 
					
						
						
							
							blacklist language property for sphinx docs, encoding was messing up PDF generation.  
						
						
						
						
					 
					
						2011-11-24 22:24:07 +00:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						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 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						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 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						747f06d3d2 
					 
					
						
						
							
							set cycles scripts as pep8 & make some minor changes.  
						
						... 
						
						
						
						also update sphinx doc generator. 
						
						
					 
					
						2011-11-15 02:58:01 +00:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						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 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						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 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						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 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						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 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						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 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						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 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						f8d0c8b11e 
					 
					
						
						
							
							patch [ #29049 ] Minor phrasing and grammar patch  
						
						
						
						
					 
					
						2011-10-28 01:10:46 +00:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						617d3cb852 
					 
					
						
						
							
							pass -noaudio when running blender for various utilities - doc-gen and tests.  
						
						
						
						
					 
					
						2011-10-19 21:55:27 +00:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						b4e7451cb0 
					 
					
						
						
							
							Merged changes in the trunk up to revision 41099.  
						
						
						
						
					 
					
						2011-10-18 23:36:43 +00:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						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 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						e3be5aacf8 
					 
					
						
						
							
							fix [ #28873 ] Blenders Python API Sphinx Build Script give exceptions  
						
						
						
						
					 
					
						2011-10-11 23:27:01 +00:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						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 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						081543fee8 
					 
					
						
						
							
							fix for error generating docs, write all files as utf-8  
						
						
						
						
					 
					
						2011-09-29 12:11:58 +00:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						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 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						8f5112f191 
					 
					
						
						
							
							pep8 update & some minor cmake edits.  
						
						
						
						
					 
					
						2011-09-20 18:29:19 +00:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						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 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						70821c6b24 
					 
					
						
						
							
							Merged changes in the trunk up to revision 40299.  
						
						
						
						
					 
					
						2011-09-17 18:54:16 +00:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						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 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						e2818f1b92 
					 
					
						
						
							
							- include enum names and descriptions in sphinx generated documentation  
						
						... 
						
						
						
						- add descriptions for operator bl_options 
						
						
					 
					
						2011-09-15 16:15:24 +00:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						353713afe8 
					 
					
						
						
							
							Merged changes in the trunk up to revision 40096.  
						
						... 
						
						
						
						Conflicts resolved:
source/blender/makesrna/intern/rna_scene.c
source/blender/python/intern/CMakeLists.txt
Note for branch builders: Enabling Blender Player may cause linker errors. 
						
						
					 
					
						2011-09-10 13:36:27 +00:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						4eb9b9e4f1 
					 
					
						
						
							
							bpy api - add new page for best-practice (so Thomas has something to point to when kicking devs for writing shoddy UI layouts)  
						
						
						
						
					 
					
						2011-09-08 23:59:47 +00:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						290ad64a22 
					 
					
						
						
							
							finished tips and tricks section of blender/python api docs, now included in generated docs.  
						
						
						
						
					 
					
						2011-09-08 01:26:23 +00:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						67712c10c4 
					 
					
						
						
							
							fix for doc building after pepper merge, also WIP tips/tricks.  
						
						
						
						
					 
					
						2011-09-06 00:12:34 +00:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						7db432d29d 
					 
					
						
						
							
							Merged changes in the trunk up to revision 39826.  
						
						... 
						
						
						
						Made a major amount of conflict resolution for code adaptation to
the animation system updates introduced in the Pepper branch recently
merged to the trunk.
Resolved conflicts:
source/blender/blenkernel/intern/anim_sys.c
source/blender/blenkernel/intern/library.c
source/blender/editors/animation/anim_channels_defines.c
source/blender/editors/animation/anim_channels_edit.c
source/blender/editors/animation/anim_filter.c
source/blender/editors/animation/keyframes_draw.c
source/blender/editors/animation/keyframes_edit.c
source/blender/editors/include/ED_anim_api.h
source/blender/editors/space_nla/nla_buttons.c
source/blender/editors/space_nla/nla_channels.c
source/blender/makesdna/DNA_action_types.h
source/blender/makesdna/intern/makesdna.c
source/blender/makesrna/intern/rna_main_api.c 
						
						
					 
					
						2011-09-03 20:48:43 +00:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						b20c9b0ba3 
					 
					
						
						
							
							minor edits, pep8 - also correct float -> double promotion for blf.  
						
						
						
						
					 
					
						2011-08-30 10:49:58 +00:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						1c153b011d 
					 
					
						
						
							
							Merged changes in the trunk up to revision 39759.  
						
						
						
						
					 
					
						2011-08-28 23:25:13 +00:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						e9ca846018 
					 
					
						
						
							
							document some of the pitfalls in the blender python api (taken from frequent mails and bug reports)  
						
						
						
						
					 
					
						2011-08-26 04:00:55 +00:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						50a9454e0f 
					 
					
						
						
							
							move wiki api intro and overview docs into the api reference docs.  
						
						... 
						
						
						
						Updated docs since some parts still were from beta still. 
						
						
					 
					
						2011-08-25 04:25:33 +00:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						33bb1ed53e 
					 
					
						
						
							
							Merged changes in the trunk up to revision 39661.  
						
						
						
						
					 
					
						2011-08-24 00:18:26 +00:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						75a63981cd 
					 
					
						
						
							
							add warning about misuse of ID.user_clear() since it can crash blender.  
						
						
						
						
					 
					
						2011-08-23 11:28:18 +00:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						0ddf5b1da5 
					 
					
						
						
							
							Restored the Python API documentation of the Freestyle module.  
						
						
						
						
					 
					
						2011-08-15 00:34:26 +00:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						9a0b816416 
					 
					
						
						
							
							Merged changes in the trunk up to revision 38893.  
						
						
						
						
					 
					
						2011-08-01 20:18:02 +00:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						f4293067c1 
					 
					
						
						
							
							py api: sphinx doc corrections, pep8 cleanup and style edits, also added __all__ to some modules which were missing it.  
						
						
						
						
					 
					
						2011-07-31 03:15:37 +00:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						ce03ec4b86 
					 
					
						
						
							
							Merged changes in the trunk up to revision 38543.  
						
						... 
						
						
						
						Conflicts resolved:
doc/python_api/sphinx_doc_gen.py
source/blender/blenkernel/CMakeLists.txt
source/blender/makesdna/DNA_material_types.h
source/blender/render/intern/source/pipeline.c
source/creator/CMakeLists.txt 
						
						
					 
					
						2011-07-20 23:33:10 +00:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						6aae2698ac 
					 
					
						
						
							
							patch [ #27885 ] bge.constraints documentation  
						
						... 
						
						
						
						by Solano Felicio (solano) 
						
						
					 
					
						2011-07-08 02:59:25 +00:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						af27622a87 
					 
					
						
						
							
							some corrections to bge.texture docs  
						
						
						
						
					 
					
						2011-07-07 19:23:51 +00:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						01550f880e 
					 
					
						
						
							
							add 'bgl' OpenGL doc to sphinx  
						
						
						
						
					 
					
						2011-07-01 11:16:42 +00:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						69ff819a2e 
					 
					
						
						
							
							print the help message if running from python directly.  
						
						
						
						
					 
					
						2011-06-27 04:50:08 +00:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						32c7e22d36 
					 
					
						
						
							
							Merged changes in the trunk up to revision 37388.  
						
						... 
						
						
						
						Conflicts resolved:
release/scripts/startup/bl_ui/properties_render.py
source/creator/SConscript
source/blender/blenlib/intern/bpath.c
source/blender/editors/space_outliner/outliner.c 
						
						
					 
					
						2011-06-11 00:22:10 +00:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						a9dd90be78 
					 
					
						
						
							
							move load_image into image_utils and add some docstrings to bpy_extras module.  
						
						
						
						
					 
					
						2011-05-28 09:34:45 +00:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						ecf2d1ff4e 
					 
					
						
						
							
							- generate sphinx docs for bpy_extras module  
						
						... 
						
						
						
						- add in support to doc generator for automatically generating docs for submodules. 
						
						
					 
					
						2011-05-28 07:47:58 +00:00