Blender Git Loki

Kaikki Blender Git kommitit.

Page: 4939 / 8462

April 4, 2015, 12:30 (GMT)
Merge branch 'cycles_point_density' into gooseberry

Conflicts:
source/blender/blenkernel/intern/particle.c
source/blender/editors/space_view3d/drawobject.c
source/blender/makesdna/DNA_particle_types.h
source/blender/makesdna/DNA_texture_types.h
source/blender/makesrna/intern/rna_particle.c
April 4, 2015, 12:27 (GMT)
Fix T44259: Secondary strokes get terminated early when drawing in Continuous Drawing mode
April 4, 2015, 12:23 (GMT)
Support for particle texture color in point density textures.

This works for all pointdensity use cases, BI as well as Cycles.
April 4, 2015, 11:35 (GMT)
Particle color influence option for particle textures.

This color is currently only displayed in the viewport (when enabling
"Texture" color mode in the Display settings). It will be used for
controlling the smoke color when using particles for smoke emission.

Conflicts:
source/blender/blenkernel/intern/particle.c
source/blender/editors/space_view3d/drawobject.c
source/blender/makesdna/DNA_particle_types.h
source/blender/makesdna/DNA_texture_types.h
source/blender/makesrna/intern/rna_particle.c
April 4, 2015, 11:19 (GMT)
Merge branch 'asset-experiments' into asset-engine

Conflicts:
source/blender/editors/space_file/filelist.c
April 4, 2015, 11:17 (GMT)
FileBrowser: block caching: minor tweak (mostly needed in ae branch actually).
April 4, 2015, 11:15 (GMT)
Merge branch 'asset-experiments' into asset-engine

Conflicts:
source/blender/editors/space_file/file_ops.c
source/blender/editors/space_file/filelist.c
source/blender/editors/space_file/filelist.h
April 4, 2015, 10:43 (GMT)
FileBrowser: rewrite 'entry selection' code.

Since we do not store anymore ell entries, we cannot use them to hold selection status.

So we now use a ghash in FileList struct, with entry UUID's as keys.

Also cleanuped up / refactored selection handling, filelist.c now features a nice intern
api and all other code uses it instead of accessing directly entries' selflag!
April 4, 2015, 09:05 (GMT)
Depagraph: Fix for strict compiler flags in release builds
April 4, 2015, 08:50 (GMT)
Merge branch 'master' into asset-experiments

Conflicts:
source/blender/blenlib/intern/storage.c
source/blender/editors/space_file/filesel.c
April 4, 2015, 08:50 (GMT)
Merge branch 'master' into depsgraph_refactor
April 4, 2015, 08:41 (GMT)
Merge branch 'master' into cycles_kernel_split

Conflicts:
intern/cycles/kernel/svm/svm_light_path.h
April 4, 2015, 08:40 (GMT)
Cycles kernel split: Fix for progressive refine
April 4, 2015, 07:58 (GMT)
Missed in recent cleanup
April 4, 2015, 07:53 (GMT)
fix compilation when TRUST_NO_ONE is disabled
April 4, 2015, 06:21 (GMT)
Ghost: update tests for recent changes
April 4, 2015, 06:21 (GMT)
Cleanup: move filelist out of storage

Depends on imbuf, problematic for tests
April 4, 2015, 05:50 (GMT)
Cleanup: Typo fix in HSV code.
April 4, 2015, 04:19 (GMT)
Cleanup: use BKE_ocean_* prefix
April 4, 2015, 04:19 (GMT)
Cleanup: use BKE_sculptsession_* prefix
Tehnyt: Miika HämäläinenViimeksi päivitetty: 07.11.2014 14:18MiikaH:n Sivut a.k.a. MiikaHweb | 2003-2021