Tamito Kajiyama 53840c7db5 Merged changes in the trunk up to revision 52546. ...

Conflicts resolved:
release/datafiles/startup.blend
release/scripts/startup/bl_ui/space_view3d.py
source/blender/blenkernel/intern/idcode.c

2012-11-26 02:32:34 +00:00

..

intern

Merged changes in the trunk up to revision 52546.

2012-11-26 02:32:34 +00:00

BKE_action.h

incorrect spelling in comments

2012-09-26 20:05:38 +00:00

BKE_anim.h

Cycles: add "From Dupli" option for texture coordinate node. This gets the

2012-10-04 21:40:39 +00:00

BKE_animsys.h

Fix [#30709] Renaming a bone renames all drivers' targets using a bone of that name, regardless of the armature.

2012-03-30 13:04:29 +00:00

BKE_armature.h

code cleanup: define sizes of vectors for function args and use C style comments

2012-10-15 09:11:17 +00:00

BKE_blender.h

Axis Colours are now Themeable

2012-11-09 06:36:11 +00:00

BKE_bmesh.h

add CDDM_from_bmesh(), avoids using BMEditMesh in modifiers.

2012-10-24 07:24:11 +00:00

BKE_bmfont_types.h

style cleanup / comment formatting for bli/bke/bmesh

2012-03-03 20:19:11 +00:00

BKE_bmfont.h

code cleanup: header cleanup and remove some duplicate defines.

2012-05-12 20:39:39 +00:00

BKE_boids.h

unify include guard defines, __$FILENAME__

2012-02-17 18:59:41 +00:00

BKE_booleanops_mesh.h

code cleanup: header cleanup and remove some duplicate defines.

2012-05-12 20:39:39 +00:00

BKE_brush.h

code cleanup: header cleanup and remove some duplicate defines.

2012-05-12 20:39:39 +00:00

BKE_bullet.h

code cleanup: header cleanup and remove some duplicate defines.

2012-05-12 20:39:39 +00:00

BKE_bvhutils.h

code cleanup: header cleanup and remove some duplicate defines.

2012-05-12 20:39:39 +00:00

BKE_camera.h

code cleanup: header cleanup and remove some duplicate defines.

2012-05-12 20:39:39 +00:00

BKE_ccg.h

style cleanup: block comments

2012-05-16 23:37:23 +00:00

BKE_cdderivedmesh.h

add CDDM_from_bmesh(), avoids using BMEditMesh in modifiers.

2012-10-24 07:24:11 +00:00

BKE_cloth.h

Bugfix: Cloth did not work with Dynamic Paint.

2012-08-10 00:04:15 +00:00

BKE_collision.h

style cleanup

2012-06-06 22:38:39 +00:00

BKE_colortools.h

all remove functions now invalidate the RNA objects passed, to help script authors to avoid bugs with accessing removed data.

2012-11-02 09:41:26 +00:00

BKE_constraint.h

code cleanup: header cleanup and remove some duplicate defines.

2012-05-12 20:39:39 +00:00

BKE_context.h

Code cleanup: comment referenced an outdated file path + spelling error

2012-08-24 05:12:05 +00:00

BKE_curve.h

code cleanup: define sizes of vectors for function args and use C style comments

2012-10-15 09:11:17 +00:00

BKE_customdata_file.h

code cleanup: header cleanup and remove some duplicate defines.

2012-05-12 20:39:39 +00:00

BKE_customdata.h

make use customdata typeoffset more, add an assert to ensure its to date.

2012-10-31 09:50:24 +00:00

BKE_deform.h

minor changes to select similar,

2012-10-30 11:40:36 +00:00

BKE_depsgraph.h

code cleanup: header cleanup and remove some duplicate defines.

2012-05-12 20:39:39 +00:00

BKE_DerivedMesh.h

remove BLI_utildefines from BKE_DerivedMesh.h header

2012-11-01 15:34:38 +00:00

BKE_displist.h

code cleanup: header cleanup and remove some duplicate defines.

2012-05-12 20:39:39 +00:00

BKE_dynamicpaint.h

code cleanup: header cleanup and remove some duplicate defines.

2012-05-12 20:39:39 +00:00

BKE_effect.h

code cleanup: header cleanup and remove some duplicate defines.

2012-05-12 20:39:39 +00:00

BKE_fcurve.h

Bugfix [#32331] Graph editor zoom to selected includes coordinate origin if more

2012-08-18 04:39:15 +00:00

BKE_fluidsim.h

code cleanup: header cleanup and remove some duplicate defines.

2012-05-12 20:39:39 +00:00

BKE_font.h

code cleanup: vfont's used confusing and over complicated method of storing memory for loaded fonts, not store as a temp var in the fonts.

2012-08-21 10:39:02 +00:00

BKE_global.h

fix [#33108] Running save_as_mainfile breaks relative texture paths

2012-11-07 04:13:03 +00:00

BKE_gpencil.h

Grease Pencil notifier/listener cleanup

2012-10-05 19:51:11 +00:00

BKE_group.h

Merged changes in the trunk up to revision 50829.

2012-09-23 18:50:56 +00:00

BKE_icons.h

code cleanup: header cleanup and remove some duplicate defines.

2012-05-12 20:39:39 +00:00

BKE_idcode.h

style cleanup

2012-03-02 16:05:54 +00:00

BKE_idprop.h

code cleanup: float <> double conversion.

2012-11-03 18:23:30 +00:00

BKE_image.h

Image thread safe improvements

2012-11-15 15:59:58 +00:00

BKE_ipo.h

code cleanup: function naming, use BKE_*type* prefix.

2012-05-05 14:03:12 +00:00

BKE_key.h

code cleanup: make header defines more consistent, JOYSENSOR header guard had a typo too.

2012-10-09 13:36:42 +00:00

BKE_lamp.h

Fix #33123: lamp nodes drivers not working, now uses same hacks as material

2012-11-09 13:57:09 +00:00

BKE_lattice.h

code cleanup: define sizes of vectors for function args and use C style comments

2012-10-15 09:11:17 +00:00

BKE_library.h

Fix for freeing node trees that are part of other data blocks (material, world, lamp, texture, scene). These node trees were not properly freeing the IDProperty data, due to not being called from BKE_libblock_free.

2012-10-28 17:09:50 +00:00

BKE_linestyle.h

Implemented a button to make a single-user copy of a line style.

2011-11-14 00:43:37 +00:00

BKE_main.h

Merged changes in the trunk up to revision 50956.

2012-09-30 13:16:55 +00:00

BKE_mask.h

fix incorrect macro for mask handle selection checking.

2012-09-15 06:10:48 +00:00

BKE_material.h

Fixed regression introduced in 50107

2012-08-22 17:22:04 +00:00

BKE_mball.h

toggle cut through in the knife tool now refreshes (before you had to wave the mouse about to see the result).

2012-10-06 03:34:52 +00:00

BKE_mesh.h

style cleanup: indentation

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

BKE_modifier.h

disable applying constructive modifiers when in sculpt mode with multi-res data, since this would crash.

2012-11-13 14:21:55 +00:00

BKE_movieclip.h

fix [#31946] Masking doesn't respect pixel ratio

2012-09-13 05:29:38 +00:00

BKE_multires.h

style cleanup: indentation

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

BKE_navmesh_conversion.h

code cleanup: make header defines more consistent, JOYSENSOR header guard had a typo too.

2012-10-09 13:36:42 +00:00

BKE_nla.h

code cleanup: header cleanup and remove some duplicate defines.

2012-05-12 20:39:39 +00:00

BKE_node.h

Map Range Node (tiles)

2012-11-14 19:53:46 +00:00

BKE_object_deform.h

code clenup: comments and some style edits on ghost/osx (odd indentation)

2012-09-06 02:10:09 +00:00

BKE_object.h

Fix #32667: Curve softbodies doesn't render animation (cycles)

2012-09-27 14:37:20 +00:00

BKE_ocean.h

code cleanup: header cleanup and remove some duplicate defines.

2012-05-12 20:39:39 +00:00

BKE_packedFile.h

code cleanup: minor changes to last commit.

2012-08-21 10:44:10 +00:00

BKE_paint.h

Fix #32522: Object's diffuse color not showing in Sculpt Mode

2012-10-22 17:33:53 +00:00

BKE_particle.h

code cleanup:

2012-10-20 08:02:18 +00:00

BKE_pointcache.h

Fix #32667: Curve softbodies doesn't render animation (cycles)

2012-09-27 14:37:20 +00:00

BKE_property.h

Merged changes in the trunk up to revision 50829.

2012-09-23 18:50:56 +00:00

BKE_report.h

code cleanup: header cleanup and remove some duplicate defines.

2012-05-12 20:39:39 +00:00

BKE_sca.h

Merged changes in the trunk up to revision 50829.

2012-09-23 18:50:56 +00:00

BKE_scene.h

add missing redraw notifier for separate UV operator, also some style cleanup and remove unused define.

2012-10-15 03:17:10 +00:00

BKE_screen.h

Code cleanup: comment referenced an outdated file path + spelling error

2012-08-24 05:12:05 +00:00

BKE_script.h

code cleanup: remove deprecated defines and some struct members

2012-09-06 00:33:59 +00:00

BKE_sequencer.h

code cleanup: spelling,

2012-11-12 07:33:01 +00:00

BKE_shrinkwrap.h

code cleanup: capitalize defines.

2012-09-06 01:31:15 +00:00

BKE_sketch.h

style cleanup

2012-06-06 22:38:39 +00:00

BKE_smoke.h

Google Summer of Code project: "Smoke Simulator Improvements & Fire".

2012-10-10 13:18:07 +00:00

BKE_softbody.h

code cleanup: header cleanup and remove some duplicate defines.

2012-05-12 20:39:39 +00:00

BKE_sound.h

style cleanup: sequencer and scene rna

2012-05-10 15:22:29 +00:00

BKE_speaker.h

code cleanup: naming - pose/armature/image

2012-05-05 16:03:57 +00:00

BKE_subsurf.h

style cleanup: tabs & whitespace

2012-11-03 15:35:03 +00:00

BKE_suggestions.h

style cleanup / comment formatting for bli/bke/bmesh

2012-03-03 20:19:11 +00:00

BKE_tessmesh.h

fix [#32518] Vertex slide crash sometimes.

2012-09-10 03:42:29 +00:00

BKE_text.h

Text Editor: remove text marker functionality. Patch [#33251]

2012-11-23 14:33:14 +00:00

BKE_texture.h

Massive Code cleanup:

2012-05-29 10:21:07 +00:00

BKE_tracking.h

all remove functions now invalidate the RNA objects passed, to help script authors to avoid bugs with accessing removed data.

2012-11-02 09:41:26 +00:00

BKE_unit.h

code cleanup: header cleanup and remove some duplicate defines.

2012-05-12 20:39:39 +00:00

BKE_utildefines.h

fix [#33108] Running save_as_mainfile breaks relative texture paths

2012-11-07 04:13:03 +00:00

BKE_world.h

Fix wrong user counter in world node trees

2012-08-29 12:47:42 +00:00

BKE_writeavi.h

Style cleanup: change ffmpeg, avi and frame server api to rna-ish naming style

2012-05-07 09:30:15 +00:00

BKE_writeffmpeg.h

code cleanup: header cleanup and remove some duplicate defines.

2012-05-12 20:39:39 +00:00

BKE_writeframeserver.h

Style cleanup: change ffmpeg, avi and frame server api to rna-ish naming style

2012-05-07 09:30:15 +00:00

CMakeLists.txt

Merged changes in the trunk up to revision 51718.

2012-10-29 01:09:12 +00:00

depsgraph_private.h

style cleanup: trailing tabs & expand some non prefix tabs into spaces.

2012-10-21 05:46:41 +00:00

nla_private.h

code cleanup: make header defines more consistent, JOYSENSOR header guard had a typo too.

2012-10-09 13:36:42 +00:00

SConscript

Merged changes in the trunk up to revision 52191.

2012-11-14 02:01:02 +00:00