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 a42ba82f63 Merged changes in the trunk up to revision 50829. ...

Conflicts resolved:
source/blender/blenloader/intern/readfile.c
source/blender/render/intern/source/convertblender.c
source/blender/render/intern/source/pipeline.c

Also addressed code inconsistency due to changes in the trunk revision 50628 (color
management with OCIO) and 50806 (UV project material).  OCIO-related changes are marked
OCIO_TODO as in some other files modified in revision 50628.

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

..

action.c

Merged changes in the trunk up to revision 50829.

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

anim_sys.c

Merged changes in the trunk up to revision 50607.

2012-09-15 00:15:24 +00:00

anim.c

fix [#29616] Crash/infinite loop from missing cyclic check in group/dupligroups (unlikely/intentional)

2012-09-11 10:18:45 +00:00

armature.c

code cleanup: move get_selected_defgroups into object_deform.c and make it behave like similar functions, also when drawing vertex weight colors, only call this function when multi-paint is enabled.

2012-09-05 03:45:32 +00:00

blender.c

Color Management, Stage 2: Switch color pipeline to use OpenColorIO

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

bmfont.c

style cleanup

2012-08-04 12:30:16 +00:00

boids.c

fix own error in recent smoothview cleanup, also correct some cross references in bmesh docs.

2012-08-17 14:43:20 +00:00

booleanops_mesh.c

style cleanup

2012-07-07 22:51:57 +00:00

brush.c

change curve evaluation functions never to modify curve data (ensures thread safety), now initializations has to be done outside evaluation.

2012-08-21 14:43:51 +00:00

bullet.c

style cleanup

2012-05-27 19:40:36 +00:00

bvhutils.c

style cleanup: use c style comments in C code

2012-07-06 23:56:59 +00:00

camera.c

use sensor size when calculating dof rather then hard coded values.

2012-08-09 15:59:32 +00:00

CCGSubSurf.c

Merged changes in the trunk up to revision 50829.

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

CCGSubSurf.h

Fix simple subsurf on wire edges

2012-08-18 19:54:21 +00:00

cdderivedmesh.c

code cleanup: move file string defines into BLI_path_utils.h, BKE_utildefines is now unused but keep incase we want to add defines there later.

2012-09-03 22:04:14 +00:00

cloth.c

quiet -Wmissing-prototypes warnings, and enable this warning by default for C with gcc.

2012-09-15 01:52:28 +00:00

collision.c

Merged changes in the trunk up to revision 50829.

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

colortools.c

Merged changes in the trunk up to revision 50829.

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

constraint.c

Merged changes in the trunk up to revision 50829.

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

context.c

code cleanup:

2012-07-29 17:49:14 +00:00

curve.c

Merged changes in the trunk up to revision 50829.

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

customdata_file.c

array functions for endian switching.

2012-09-03 09:03:25 +00:00

customdata.c

Merged changes in the trunk up to revision 50829.

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

deform.c

fix [#29431] "Normalize All" from Weight Tools don't work correctly

2012-09-05 04:16:09 +00:00

depsgraph.c

Merged changes in the trunk up to revision 50829.

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

DerivedMesh.c

Merged changes in the trunk up to revision 50829.

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

displist.c

code cleanup: rename G.afbreek --> is_break, G.rendering --> is_rendering

2012-08-08 18:37:06 +00:00

dynamicpaint.c

quiet -Wmissing-prototypes warnings, and enable this warning by default for C with gcc.

2012-09-15 01:52:28 +00:00

editderivedmesh.c

Merged changes in the trunk up to revision 50829.

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

effect.c

code cleanup: remove commented includes - mostly from 2.4x

2012-07-18 23:07:07 +00:00

fcurve.c

code cleanup: use min/max inline functions rather than macros & simplify loop

2012-09-11 09:39:37 +00:00

fluidsim.c

Fix related to #31118: ensure tesselated faces are available when exporting

2012-05-04 08:00:55 +00:00

fmodifier.c

Merged changes in the trunk up to revision 50829.

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

font.c

code cleanup: move file string defines into BLI_path_utils.h, BKE_utildefines is now unused but keep incase we want to add defines there later.

2012-09-03 22:04:14 +00:00

gpencil.c

fix own error in recent smoothview cleanup, also correct some cross references in bmesh docs.

2012-08-17 14:43:20 +00:00

group.c

Merged changes in the trunk up to revision 50829.

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

icons.c

Merged changes in the trunk up to revision 50829.

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

idcode.c

Merged changes in the trunk up to revision 47700.

2012-06-10 20:50:43 +00:00

idprop.c

Merged changes in the trunk up to revision 50829.

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

image_gen.c

Color Management, Stage 2: Switch color pipeline to use OpenColorIO

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

image.c

Merged changes in the trunk up to revision 50829.

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

implicit.c

Merged changes in the trunk up to revision 50829.

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

ipo.c

style cleanup: also correct some doxy comments

2012-08-18 13:07:48 +00:00

key.c

Merged changes in the trunk up to revision 50829.

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

lamp.c

all areas of blender now do node tree id user count management, except for some exceptions like making a node tree local and material clipboard.

2012-08-22 09:35:46 +00:00

lattice.c

fixes for NULL checks, remove some redundant checks and add some in that have been removed by accident as code has been updated.

2012-09-14 06:17:14 +00:00

library.c

Merged changes in the trunk up to revision 50607.

2012-09-15 00:15:24 +00:00

linestyle.c

Merged changes in the trunk up to revision 46557.

2012-05-11 22:48:41 +00:00

mask_evaluate.c

code cleanup: move file string defines into BLI_path_utils.h, BKE_utildefines is now unused but keep incase we want to add defines there later.

2012-09-03 22:04:14 +00:00

mask_rasterize.c

Merged changes in the trunk up to revision 50829.

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

mask.c

quiet -Wmissing-prototypes warnings, and enable this warning by default for C with gcc.

2012-09-15 01:52:28 +00:00

material.c

Merged changes in the trunk up to revision 50829.

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

mball.c

Merged changes in the trunk up to revision 50829.

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

mesh_validate.c

Cosmetic updates to mesh validate messages.

2012-07-05 13:02:42 +00:00

mesh.c

Merged changes in the trunk up to revision 50829.

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

modifier.c

Merged changes in the trunk up to revision 50829.

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

modifiers_bmesh.c

style cleanup

2012-06-27 18:29:47 +00:00

movieclip.c

Color Management, Stage 2: Switch color pipeline to use OpenColorIO

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

multires.c

style cleanup

2012-07-29 00:20:28 +00:00

navmesh_conversion.c

style cleanup: (indentation)

2012-06-06 14:48:39 +00:00

nla.c

style cleanup: also spelling

2012-08-24 23:22:34 +00:00

node.c

Cycles: merge of changes from tomato branch.

2012-09-04 13:29:07 +00:00

object_deform.c

code cleanup: move get_selected_defgroups into object_deform.c and make it behave like similar functions, also when drawing vertex weight colors, only call this function when multi-paint is enabled.

2012-09-05 03:45:32 +00:00

object.c

Merged changes in the trunk up to revision 50829.

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

ocean.c

Color Management, Stage 2: Switch color pipeline to use OpenColorIO

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

packedFile.c

code cleanup: move file string defines into BLI_path_utils.h, BKE_utildefines is now unused but keep incase we want to add defines there later.

2012-09-03 22:04:14 +00:00

paint.c

code cleanup: use BKE_pain_ prefix for paint funcs. also minor style edits

2012-07-25 22:37:52 +00:00

particle_system.c

quiet -Wmissing-prototypes warnings, and enable this warning by default for C with gcc.

2012-09-15 01:52:28 +00:00

particle.c

Merged changes in the trunk up to revision 50829.

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

pointcache.c

fix [#29616] Crash/infinite loop from missing cyclic check in group/dupligroups (unlikely/intentional)

2012-09-11 10:18:45 +00:00

property.c

Merged changes in the trunk up to revision 50829.

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

report.c

style cleanup: whitespace

2012-05-12 16:11:34 +00:00

sca.c

Merged changes in the trunk up to revision 50829.

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

scene.c

Merged changes in the trunk up to revision 50829.

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

screen.c

code cleanup: remove unneeded 'struct' qualifiers

2012-07-26 22:47:05 +00:00

script.c

…

seqcache.c

Sequencer: invalidate current frame cache on sequence transform

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

seqeffects.c

Color Management, Stage 2: Switch color pipeline to use OpenColorIO

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

seqmodifier.c

Color Management, Stage 2: Switch color pipeline to use OpenColorIO

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

sequencer.c

Color Management, Stage 2: Switch color pipeline to use OpenColorIO

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

shrinkwrap.c

code cleanup: capitalize defines.

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

sketch.c

style cleanup: whitespace

2012-05-12 16:11:34 +00:00

smoke.c

quiet -Wmissing-prototypes warnings, and enable this warning by default for C with gcc.

2012-09-15 01:52:28 +00:00

softbody.c

Merged changes in the trunk up to revision 50829.

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

sound.c

Merged changes in the trunk up to revision 50829.

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

speaker.c

style cleanup: BKE_*.c files which deal with library functions

2012-05-06 15:15:33 +00:00

subsurf_ccg.c

Merged changes in the trunk up to revision 50829.

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

suggestions.c

style cleanup: whitespace

2012-05-12 16:11:34 +00:00

text.c

Merged changes in the trunk up to revision 50829.

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

texture.c

quiet -Wmissing-prototypes warnings, and enable this warning by default for C with gcc.

2012-09-15 01:52:28 +00:00

tracking.c

Merged changes in the trunk up to revision 50829.

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

unit.c

style cleanup

2012-08-11 22:12:32 +00:00

world.c

Fix wrong user counter in world node trees

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

writeavi.c

Code cleanup:

2012-08-02 21:50:49 +00:00

writeffmpeg.c

quiet -Wmissing-prototypes warnings, and enable this warning by default for C with gcc.

2012-09-15 01:52:28 +00:00

writeframeserver.c

code cleanup: rename G.afbreek --> is_break, G.rendering --> is_rendering

2012-08-08 18:37:06 +00:00