Blender Git Loki

Kaikki Blender Git kommitit.

Page: 5098 / 8462

January 24, 2015, 12:15 (GMT)
Merge remote-tracking branch 'refs/remotes/origin/master' into fracture_modifier

Conflicts:
source/blender/editors/space_outliner/outliner_draw.c
source/blender/makesdna/DNA_modifier_types.h
source/blender/makesrna/intern/rna_modifier.c
source/blender/modifiers/MOD_modifiertypes.h
source/blender/modifiers/intern/MOD_util.c (reverse-merged from commit 4401500cac4d3ff6e29d8ba4cbc476df49d88424)
January 24, 2015, 11:58 (GMT)
Revert "Merge remote-tracking branch 'refs/remotes/origin/master' into fracture_modifier"

This reverts commit 4401500cac4d3ff6e29d8ba4cbc476df49d88424, reversing
changes made to bdb170ca60e272500789f89c63d3393b040e5c8b.
January 24, 2015, 08:21 (GMT)
Merge branch 'master' into multiview

Conflicts:
source/blender/blenkernel/BKE_image.h
source/blender/blenkernel/intern/image.c
source/blender/blenkernel/intern/ocean.c
source/blender/blenkernel/intern/writeavi.c
source/blender/compositor/operations/COM_OutputFileOperation.cpp
source/blender/editors/object/object_bake_api.c
source/blender/editors/render/render_opengl.c
source/blender/editors/screen/screendump.c
source/blender/makesrna/intern/rna_scene_api.c
source/blender/render/intern/source/pipeline.c
January 24, 2015, 06:26 (GMT)
BKE_image: use BKE_image_*** prefix

use bools for return values and some api naming consistency.
January 24, 2015, 06:09 (GMT)
Cleanup: style
January 24, 2015, 06:07 (GMT)
cleanup: strict warnings
January 24, 2015, 05:52 (GMT)
Merge branch 'master' into multiview

Conflicts:
source/blender/render/intern/source/render_result.c
January 24, 2015, 05:50 (GMT)
Cleanup: style
January 23, 2015, 23:48 (GMT)
Depsgraph: Ensure Scene ID block has a corresponding ID block
January 23, 2015, 23:39 (GMT)
Depsgraph: Inserting keyframes for the first time now rebuilds the depsgraph

Since animation playback now works only if there's a link to the time source node,
it is necessary to rebuild the depsgraph when animation gets added to a datablock
for the first time (i.e. when keyframing on a previously unkeyed datablock) to
ensure that such a link gets added. It is not however needed to keep adding this
on subsequent keyframing attempts.
January 23, 2015, 17:58 (GMT)
Add a 'lnor spaceset clear' func too (avoids freeing the memarena).

Not crucial currently, but could be later, and for sake of consistency...
January 23, 2015, 17:45 (GMT)
Cleanup: rename 'spaces' -> 'spaceset'

Not a good idea to make names like MLoopNorSpace/MLoopNorSpaces...
January 23, 2015, 16:47 (GMT)
Experimental: random colors for child hulls.
January 23, 2015, 16:46 (GMT)
Revert "Squashed commit of temp_custom_loop_normals branch."

This reverts commit 622e3f15c7d034f7d1b1f419c5ed39339eb2ade8.
January 23, 2015, 16:45 (GMT)
Squashed commit of temp_custom_loop_normals branch.
January 23, 2015, 16:45 (GMT)
Merge branch 'master' into experimental-build
January 23, 2015, 16:44 (GMT)
Merge branch 'master' into temp_custom_loop_normals
January 23, 2015, 16:43 (GMT)
Cleanup, and do not execute the modifier when 'autosmooth' is disabled.
January 23, 2015, 16:10 (GMT)
Fix for invalid cache index -1 in some cases, like virtual parents.

The code was assuming that child 0 is always valid, but in fact has to
be treated like all others that can be disable due to preview percentage,
virtual parents, etc.
January 23, 2015, 15:56 (GMT)
Don't add Cycles tests if tests folder does not exist

Also print message about those tests being disabled.
Tehnyt: Miika HämäläinenViimeksi päivitetty: 07.11.2014 14:18MiikaH:n Sivut a.k.a. MiikaHweb | 2003-2021