Tamito Kajiyama 9f243d531c Merged changes in the trunk up to revision 44288. ...

Conflicts resolved:
source/blender/blenkernel/intern/cdderivedmesh.c

2012-02-21 02:19:54 +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

pep/style edits & quiet some warnings

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

properties_data_bone.py

correct spelling errors in comments

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

properties_data_camera.py

pep/style edits & quiet some warnings

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

properties_data_curve.py

Correct mathutils documentation, also correct some python spelling errors and add makefile target check_spelling

2012-02-08 04:37:37 +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

display keyblock mute in the shape key list.

2012-01-30 09:49:30 +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

remove NGon Interp modifier (which was merged as apart of BMesh),

2012-02-20 23:24:57 +00:00

properties_data_speaker.py

pep/style edits & quiet some warnings

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

properties_game.py

picky cleanup to use of bpy.types

2012-01-18 06:11:56 +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: pep8 edits

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

properties_object.py

use props all over for operator properties vars

2012-01-01 13:09:58 +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

Misc picky edits to UI messages.

2012-01-23 22:57:46 +00:00

properties_physics_cloth.py

Cloth: Add "velocity damping" to damping options. This will help with the "cloth wobbling" problem which accurs quite often when having animated characters with cloth.

2012-01-23 01:35:14 +00:00

properties_physics_common.py

Merge with trunk r41197

2011-10-22 16:43:23 +00:00

properties_physics_dynamicpaint.py

Correct mathutils documentation, also correct some python spelling errors and add makefile target check_spelling

2012-02-08 04:37:37 +00:00

properties_physics_field.py

pep/style edits & quiet some warnings

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

properties_physics_fluid.py

Optional offset for fluid cache frame reading.

2012-02-01 15:58:26 +00:00

properties_physics_smoke.py

pep/style edits & quiet some warnings

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

properties_physics_softbody.py

pep/style edits & quiet some warnings

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

properties_render.py

Merged changes in the trunk up to revision 44221.

2012-02-18 11:26:11 +00:00

properties_scene.py

Move FFmpeg and QuickTime settings to own structure inside RenderSettings

2012-01-13 12:34:41 +00:00

properties_texture.py

Correct mathutils documentation, also correct some python spelling errors and add makefile target check_spelling

2012-02-08 04:37:37 +00:00

properties_world.py

Related to #29092: make the working of the Mist Intensity option more clear in

2011-11-02 12:18:51 +00:00

space_clip.py

Camera tracking: configurable filter type for 2d stabilization

2012-02-17 08:27:19 +00:00

space_console.py

2.6 Python UI files:

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

space_dopesheet.py

replace ANIM_OT_time_toggle operator with generic WM_OT_context_toggle operator

2012-01-14 14:17:12 +00:00

space_filebrowser.py

RNA:

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

space_graph.py

replace operator to toggle handles with generic wm operator

2012-01-14 16:26:08 +00:00

space_image.py

Code Cleanup: pep8 edits

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

space_info.py

svn merge ^/trunk/blender -r43934:43976

2012-02-08 05:45:16 +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

Correct mathutils documentation, also correct some python spelling errors and add makefile target check_spelling

2012-02-08 04:37:37 +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

replace ANIM_OT_time_toggle operator with generic WM_OT_context_toggle operator

2012-01-14 14:17:12 +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

Correct mathutils documentation, also correct some python spelling errors and add makefile target check_spelling

2012-02-08 04:37:37 +00:00

space_userpref.py

Fix #30263: tweak threshold option in user preferences was incorrectly placed

2012-02-20 15:29:02 +00:00

space_view3d_toolbar.py

Correct mathutils documentation, also correct some python spelling errors and add makefile target check_spelling

2012-02-08 04:37:37 +00:00

space_view3d.py

Merged changes in the trunk up to revision 44266 (including BMesh).

2012-02-21 01:40:04 +00:00