Brecht Van Lommel f4a9215d7c Cycles: svn merge -r39870:r40266 https://svn.blender.org/svnroot/bf-blender/trunk/blender ...

Merging the node changes required a lot of conflict resolution, fixed the
issues I could find but if you want stability you might want to wait a bit
before updating.

2011-09-17 13:28:40 +00:00

..

__init__.py

Merging trunk up to r39637.

2011-08-22 20:31:46 +00:00

properties_animviz.py

fix for various python bugs and remove unused var.

2011-07-10 17:26:15 +00:00

properties_data_armature.py

fix for misc py errors + some pep8 edits.

2011-09-08 05:42:44 +00:00

properties_data_bone.py

Cycles: svn merge -r39132:39457 https://svn.blender.org/svnroot/bf-blender/trunk/blender

2011-08-16 18:59:45 +00:00

properties_data_camera.py

Cycles: tweaks to properties and nodes

2011-09-16 13:14:02 +00:00

properties_data_curve.py

Cycles: svn merge -r39132:39457 https://svn.blender.org/svnroot/bf-blender/trunk/blender

2011-08-16 18:59:45 +00:00

properties_data_empty.py

Cycles: svn merge -r39132:39457 https://svn.blender.org/svnroot/bf-blender/trunk/blender

2011-08-16 18:59:45 +00:00

properties_data_lamp.py

Cycles: svn merge -r39132:39457 https://svn.blender.org/svnroot/bf-blender/trunk/blender

2011-08-16 18:59:45 +00:00

properties_data_lattice.py

Cycles: svn merge -r39132:39457 https://svn.blender.org/svnroot/bf-blender/trunk/blender

2011-08-16 18:59:45 +00:00

properties_data_mesh.py

Revert a part of 39385.

2011-08-22 22:26:25 +00:00

properties_data_metaball.py

Cycles: svn merge -r39132:39457 https://svn.blender.org/svnroot/bf-blender/trunk/blender

2011-08-16 18:59:45 +00:00

properties_data_modifier.py

Cycles: svn merge -r39870:r40266 https://svn.blender.org/svnroot/bf-blender/trunk/blender

2011-09-17 13:28:40 +00:00

properties_data_speaker.py

fix for misc py errors + some pep8 edits.

2011-09-08 05:42:44 +00:00

properties_game.py

pep8 edits

2011-09-11 15:36:11 +00:00

properties_material.py

Cycles: svn merge -r39132:39457 https://svn.blender.org/svnroot/bf-blender/trunk/blender

2011-08-16 18:59:45 +00:00

properties_object_constraint.py

minor edits, pep8 - also correct float -> double promotion for blf.

2011-08-30 10:49:58 +00:00

properties_object.py

Cycles: svn merge -r39132:39457 https://svn.blender.org/svnroot/bf-blender/trunk/blender

2011-08-16 18:59:45 +00:00

properties_particle.py

Cycles: svn merge -r39457:39669 https://svn.blender.org/svnroot/bf-blender/trunk/blender

2011-08-24 09:44:08 +00:00

properties_physics_cloth.py

Cycles: svn merge -r39132:39457 https://svn.blender.org/svnroot/bf-blender/trunk/blender

2011-08-16 18:59:45 +00:00

properties_physics_common.py

Cycles: svn merge -r39132:39457 https://svn.blender.org/svnroot/bf-blender/trunk/blender

2011-08-16 18:59:45 +00:00

properties_physics_field.py

Cycles: svn merge -r39132:39457 https://svn.blender.org/svnroot/bf-blender/trunk/blender

2011-08-16 18:59:45 +00:00

properties_physics_fluid.py

Small comment change, when built without Fluids.

2011-09-10 08:29:50 +00:00

properties_physics_smoke.py

Cycles: svn merge -r39132:39457 https://svn.blender.org/svnroot/bf-blender/trunk/blender

2011-08-16 18:59:45 +00:00

properties_physics_softbody.py

Cycles: svn merge -r39132:39457 https://svn.blender.org/svnroot/bf-blender/trunk/blender

2011-08-16 18:59:45 +00:00

properties_render.py

2.5 UI Files:

2011-08-30 10:44:02 +00:00

properties_scene.py

Fixing bugs after Recast & Detour branch merge!!

2011-09-09 22:47:26 +00:00

properties_texture.py

Cycles: svn merge -r39669:39870 https://svn.blender.org/svnroot/bf-blender/trunk/blender

2011-09-02 12:33:29 +00:00

properties_world.py

Cycles: svn merge -r39132:39457 https://svn.blender.org/svnroot/bf-blender/trunk/blender

2011-08-16 18:59:45 +00:00

space_console.py

pep8 edits and change '!= None' to 'is not None'

2011-08-22 09:01:49 +00:00

space_dopesheet.py

minor edits, pep8 - also correct float -> double promotion for blf.

2011-08-30 10:49:58 +00:00

space_filebrowser.py

Cycles: svn merge -r39132:39457 https://svn.blender.org/svnroot/bf-blender/trunk/blender

2011-08-16 18:59:45 +00:00

space_graph.py

Cycles: svn merge -r39132:39457 https://svn.blender.org/svnroot/bf-blender/trunk/blender

2011-08-16 18:59:45 +00:00

space_image.py

pep8 edits and change '!= None' to 'is not None'

2011-08-22 09:01:49 +00:00

space_info.py

Merging trunk up to r39637.

2011-08-22 20:31:46 +00:00

space_logic.py

Cycles: svn merge -r39132:39457 https://svn.blender.org/svnroot/bf-blender/trunk/blender

2011-08-16 18:59:45 +00:00

space_nla.py

minor edits, pep8 - also correct float -> double promotion for blf.

2011-08-30 10:49:58 +00:00

space_node.py

Cycles: svn merge -r39132:39457 https://svn.blender.org/svnroot/bf-blender/trunk/blender

2011-08-16 18:59:45 +00:00

space_outliner.py

Cycles: svn merge -r39132:39457 https://svn.blender.org/svnroot/bf-blender/trunk/blender

2011-08-16 18:59:45 +00:00

space_sequencer.py

minor edits, pep8 - also correct float -> double promotion for blf.

2011-08-30 10:49:58 +00:00

space_text.py

Do not show confirm message when creating text block from menu.

2011-08-27 12:01:01 +00:00

space_time.py

Cycles: svn merge -r39132:39457 https://svn.blender.org/svnroot/bf-blender/trunk/blender

2011-08-16 18:59:45 +00:00

space_userpref_keymap.py

py style change only - make property definitions consistent

2011-08-19 19:25:20 +00:00

space_userpref.py

Apply patch [#28415] 3d mouse orbit mode individual axes enhancement

2011-09-07 10:33:46 +00:00

space_view3d_toolbar.py

Fix #28590: Sculpt Overlay Texture in Viewport Glitched and Wrong icon for Overlay Option?

2011-09-09 13:42:22 +00:00

space_view3d.py

Cycles: svn merge -r39669:39870 https://svn.blender.org/svnroot/bf-blender/trunk/blender

2011-09-02 12:33:29 +00:00