This repository has been archived on 2023-10-09. You can view files and clone it. You cannot open issues or pull requests or push a commit.

Tamito Kajiyama feccbaabbd Merged changes in the trunk up to revision 53584. ...

Conflicts resolved:
release/scripts/startup/bl_ui/properties_render.py
source/blender/blenloader/intern/readfile.c
source/blender/editors/interface/interface_templates.c
source/blender/makesrna/RNA_enum_types.h

Also made additional code updates for:
r53355 UIList - Python-extendable list of UI items
r53460 Alpha premul pipeline cleanup

2013-01-05 22:24:05 +00:00

..

intern

Merged changes in the trunk up to revision 53584.

2013-01-05 22:24:05 +00:00

BKE_action.h

incorrect spelling in comments

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

BKE_addon.h

user-preferences for addons. currently unused, example & docs still to come.

2012-12-29 10:24:42 +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

…

BKE_armature.h

define the size of matrix args for both rows/cols.

2012-12-11 14:29:01 +00:00

BKE_blender.h

Alpha premul pipeline cleanup

2012-12-31 13:52:13 +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

…

BKE_bmfont.h

…

BKE_boids.h

…

BKE_booleanops_mesh.h

…

BKE_bpath.h

minor edits with recent commits, also avoid calling BKE_mesh_from_object() in vertex paint, just pass the mesh.

2012-12-15 16:31:25 +00:00

BKE_brush.h

Code cleanup:

2013-01-01 21:23:12 +00:00

BKE_bullet.h

…

BKE_bvhutils.h

…

BKE_camera.h

…

BKE_ccg.h

…

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

…

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: add usual 'BKE_' prefix to 'public' constraint functions from blenkernel...

2012-12-23 11:31:15 +00:00

BKE_context.h

improve info view property output for properties.

2012-12-19 02:08:58 +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

…

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

code cleanup:

2012-12-28 09:06:48 +00:00

BKE_depsgraph.h

…

BKE_DerivedMesh.h

use struct type for VPaintData.vertexcosnos rather then float*.

2012-12-15 16:13:27 +00:00

BKE_displist.h

display the number of tri's in object mode status, often requested feature from users who model for realtime/game-engine output,

2012-12-27 03:51:45 +00:00

BKE_dynamicpaint.h

…

BKE_effect.h

…

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

define the size of matrix args for both rows/cols.

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

New command-line option --debug-freestyle to enable verbose debug messages

2013-01-03 23:27:20 +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

R/G/B icons in node space backgroud channel selector all had same color wheel icon which didnt make much sense.

2012-12-03 13:01:07 +00:00

BKE_idcode.h

…

BKE_idprop.h

add id property clear function (matching the same python function for dicts/lists)

2013-01-02 23:10:14 +00:00

BKE_image.h

Added support of J2K codec for Jpeg2000 writing

2012-12-23 13:57:09 +00:00

BKE_ipo.h

…

BKE_key.h

fix [#33682] Animation not updated when the active shape index isnt set

2013-01-03 06:47:44 +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

define the size of matrix args for both rows/cols.

2012-12-11 14:29:01 +00:00

BKE_library.h

fix [#33580] Masking keyframes disappear from dope sheet when using undo.

2012-12-18 08:41:38 +00:00

BKE_linestyle.h

Another big patch set by Bastien Montagne, thanks a lot!

2012-12-20 07:57:26 +00:00

BKE_main.h

Another big patch set by Bastien Montagne, thanks a lot!

2012-12-20 07:57:26 +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

code cleanup:

2012-12-28 09:06:48 +00:00

BKE_modifier.h

remove modifiers_indexInObject(), just call BLI_findindex directly.

2012-12-15 05:46:41 +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

…

BKE_node.h

New feature

2012-12-28 14:21:30 +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 #33487: game engine did not convert objects with rotation modes other than

2012-12-17 21:40:28 +00:00

BKE_ocean.h

…

BKE_packedFile.h

New features!

2012-12-27 15:07:19 +00:00

BKE_paint.h

Add DNA/RNA/BKE infrastructure for dynamic-topology sculpt mode

2012-12-30 18:27:33 +00:00

BKE_particle.h

Adding a new SPH solver that is more physically accurate. See patch #29681

2012-12-14 04:57:26 +00:00

BKE_pbvh.h

style cleanup

2013-01-02 01:49:07 +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

replace strcpy with BLI_strncpy or memcpy when the size is known.

2012-12-16 08:43:05 +00:00

BKE_report.h

…

BKE_sca.h

Merged changes in the trunk up to revision 50829.

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

BKE_scene.h

remove BKE_main_scene_add(), just add main arg to BKE_scene_add()

2012-12-13 01:17:22 +00:00

BKE_screen.h

This commit frees list ui items from their dependencies to Panel, and hence from all the limitations this implied (mostly, the "only one list per panel" one).

2012-12-28 09:20:16 +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

Sequencer: add textured solid option for opengl preview

2012-12-12 12:42:12 +00:00

BKE_shrinkwrap.h

style cleanup: wrap long lines (>200)

2012-12-23 01:18:35 +00:00

BKE_sketch.h

…

BKE_smoke.h

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

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

BKE_softbody.h

…

BKE_sound.h

…

BKE_speaker.h

…

BKE_subsurf.h

style cleanup: tabs & whitespace

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

BKE_suggestions.h

minor updates to text autocomplete api

2012-12-31 14:49:27 +00:00

BKE_tessmesh.h

make EDBM_index_arrays's stay in memory, blender was allocating an array and filling it for verts/edges/faces on every redraw.

2012-12-12 06:53:39 +00:00

BKE_text.h

text autocomplete

2012-12-31 16:24:49 +00:00

BKE_texture.h

…

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

…

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

…

BKE_writeffmpeg.h

…

BKE_writeframeserver.h

…

CMakeLists.txt

Merged changes in the trunk up to revision 53584.

2013-01-05 22:24:05 +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

Another big patch set by Bastien Montagne, thanks a lot!

2012-12-20 07:57:26 +00:00