Tamito Kajiyama 68ae82bb47 Merged changes in the trunk up to revision 43585. ...

Conflicts resolved:
source/blender/editors/include/UI_resources.h
source/blender/editors/interface/resources.c
source/blender/makesrna/intern/rna_scene.c

2012-01-21 23:01:25 +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

Whitespace cleanup in curve properties script

2012-01-06 21:24:10 +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

weight paint buttons now work in weight paint vertex select mode

2012-01-02 16:59:46 +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

Remesh Modifier UI:

2012-01-19 17:30:29 +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

Camera tracking: added depth object to Follow Track constraint

2012-01-04 17:20:08 +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

pep8 edits

2012-01-01 08:52:54 +00:00

properties_physics_cloth.py

pep/style edits & quiet some warnings

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

properties_physics_common.py

Merge with trunk r41197

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

properties_physics_dynamicpaint.py

Dynamic Paint:

2012-01-19 11:13:41 +00:00

properties_physics_field.py

pep/style edits & quiet some warnings

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

properties_physics_fluid.py

fix own bug [#29875] Due to operators now reusing there last-used settings, some UI options are more or less broken (esp. in shortcuts and menu entries)

2012-01-14 06:30:27 +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 43585.

2012-01-21 23:01:25 +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

picky cleanup to use of bpy.types

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

picky cleanup to use of bpy.types

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

Add missing labels to sculpt/paint sliders.

2012-01-19 18:22:55 +00:00

space_info.py

adding metaballs and lamps in local mode was broken.

2012-01-13 10:14:48 +00:00

space_logic.py

ui typo + small fix

2012-01-09 20:13:03 +00:00

space_nla.py

replace ANIM_OT_time_toggle operator with generic WM_OT_context_toggle operator

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

space_node.py

Fix for last commit, missed check for ob, could cause errors when object was removed.

2012-01-06 22:55:15 +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

py scripts - replace bad uses of len(),

2012-01-02 16:18:39 +00:00

space_userpref.py

Uv Tools branch GSOC 2011

2012-01-17 16:31:13 +00:00

space_view3d_toolbar.py

Add missing labels to sculpt/paint sliders.

2012-01-19 18:22:55 +00:00

space_view3d.py

Merged changes in the trunk up to revision 43585.

2012-01-21 23:01:25 +00:00