Tamito Kajiyama 2585d52405 Merged changes in the trunk up to revision 46045. ...

Conflicts resolved:
doc/python_api/sphinx_doc_gen.py
source/blender/blenkernel/intern/subsurf_ccg.c
source/blender/editors/mesh/editmesh_tools.c
source/blender/makesdna/DNA_scene_types.h

2012-04-29 00:59:04 +00:00

..

__init__.py

picky cleanup to use of bpy.types

2012-01-18 06:11:56 +00:00

properties_animviz.py

correct spelling errors in comments

2011-10-17 06:58:07 +00:00

properties_data_armature.py

fix [#30937] Pose UI hack needed to be undone, alternate fix is needed.

2012-04-23 09:17:37 +00:00

properties_data_bone.py

Patch #30611: grey out bone show wireframe option if no custom shape is set,

2012-03-20 20:06:10 +00:00

properties_data_camera.py

Fix #30421: Panorama option in camera properties always disabled

2012-03-02 15:14:42 +00:00

properties_data_curve.py

code cleanup: remove unused imports/defines + other redundant code.

2012-04-08 13:11:25 +00:00

properties_data_empty.py

remove use of gettext: _("...") style translation now its handled by rna.

2011-09-21 15:18:38 +00:00

properties_data_lamp.py

cmake & pep8 tidy up, also some style edits.

2011-11-08 01:32:34 +00:00

properties_data_lattice.py

Fixing issues with i18n stuff:

2011-09-15 13:20:18 +00:00

properties_data_mesh.py

there was no way to reset timing for absolute shape keys, add an operator to do so.

2012-04-05 06:10:15 +00:00

properties_data_metaball.py

remove use of gettext: _("...") style translation now its handled by rna.

2011-09-21 15:18:38 +00:00

properties_data_modifier.py

2.6 Ocean Modifier UI:

2012-04-25 18:12:41 +00:00

properties_data_speaker.py

pep/style edits & quiet some warnings

2011-11-11 03:28:46 +00:00

properties_game.py

style cleanup: pep8, also quiet compiler warning.

2012-04-20 18:50:18 +00:00

properties_material.py

pep/style edits & quiet some warnings

2011-11-11 03:28:46 +00:00

properties_object_constraint.py

code cleanup: remove unused imports/defines + other redundant code.

2012-04-08 13:11:25 +00:00

properties_object.py

Fix own typo in previous commit for dupligroup offset

2012-04-13 12:51:26 +00:00

properties_paint_common.py

de-duplicate paint parent class, added new py module for common paint UI classes/funcs --- since we'll likely have more of these.

2012-01-18 05:54:19 +00:00

properties_particle.py

style cleanup: pep8, also quiet compiler warning.

2012-04-20 18:50:18 +00:00

properties_physics_cloth.py

UI:

2012-04-15 21:10:14 +00:00

properties_physics_common.py

Point Cache: allow baking external smoke caches. This needs to be cleaned up

2012-04-28 09:00:11 +00:00

properties_physics_dynamicpaint.py

replace relative imports with absolute imports so scritps can be executed directly (live editing).

2012-04-04 14:39:52 +00:00

properties_physics_field.py

replace relative imports with absolute imports so scritps can be executed directly (live editing).

2012-04-04 14:39:52 +00:00

properties_physics_fluid.py

Fix [#30954] Fluid obstacle checkbox has no effect

2012-04-21 22:09:09 +00:00

properties_physics_smoke.py

replace relative imports with absolute imports so scritps can be executed directly (live editing).

2012-04-04 14:39:52 +00:00

properties_physics_softbody.py

replace relative imports with absolute imports so scritps can be executed directly (live editing).

2012-04-04 14:39:52 +00:00

properties_render.py

New options for specifying unit line thickness.

2012-04-10 23:53:46 +00:00

properties_scene.py

Fixing several issues with keyingsets:

2012-03-08 14:04:06 +00:00

properties_texture.py

replace relative imports with absolute imports so scritps can be executed directly (live editing).

2012-04-04 14:39:52 +00:00

properties_world.py

2.6 UI:

2012-03-10 20:30:05 +00:00

space_clip.py

Camera tracking: support of tripod motion solving

2012-04-28 14:54:45 +00:00

space_console.py

2.6 Python UI files:

2011-09-22 19:50:41 +00:00

space_dopesheet.py

replace relative imports with absolute imports so scritps can be executed directly (live editing).

2012-04-04 14:39:52 +00:00

space_filebrowser.py

RNA:

2011-11-07 16:26:53 +00:00

space_graph.py

replace relative imports with absolute imports so scritps can be executed directly (live editing).

2012-04-04 14:39:52 +00:00

space_image.py

replace relative imports with absolute imports so scritps can be executed directly (live editing).

2012-04-04 14:39:52 +00:00

space_info.py

Fix #30892: File > New is easy to hit accidentally, now it asks for confirmation.

2012-04-10 15:56:33 +00:00

space_logic.py

Fix #30132: "Add Game Property" works incorrect after "Add Text Game Property"

2012-02-12 10:23:06 +00:00

space_nla.py

replace relative imports with absolute imports so scritps can be executed directly (live editing).

2012-04-04 14:39:52 +00:00

space_node.py

Code Cleanup: pep8 edits

2012-02-04 11:10:41 +00:00

space_outliner.py

Fixing issues with i18n stuff:

2011-09-15 13:20:18 +00:00

space_sequencer.py

Plugin system:

2012-04-28 08:27:09 +00:00

space_text.py

Fix #29655: keyboard shortcuts missing from text editor text menu, and removed

2011-12-19 14:23:19 +00:00

space_time.py

pep8 edits, also remove unused vars

2012-01-17 17:57:20 +00:00

space_userpref_keymap.py

code cleanup: remove unused imports/defines + other redundant code.

2012-04-08 13:11:25 +00:00

space_userpref.py

User Preferences/ Themes

2012-04-28 17:16:38 +00:00

space_view3d_toolbar.py

knife tool modifications

2012-04-20 10:52:13 +00:00

space_view3d.py

Merged changes in the trunk up to revision 46045.

2012-04-29 00:59:04 +00:00