Blender Git Loki

Blender Git "gooseberry_farm" branch commits.

Page: 56 / 93

February 16, 2015, 13:30 (GMT)
Store particle index and randomized value from particle instance
modifiers, for use in shaders.

The particle instance modifier can now store 2 custom data layers:
- Index: the integer index of the particle
- Value: a randomized floating point number for shader variation

These layers have user-defined names, so multiple particle instance
modifiers can be used without overwriting customdata layers. In Cycles
the data can be accessed using an Attribute node with the same names.
February 16, 2015, 12:02 (GMT)
Merge branch 'master' into gooseberry

Conflicts:
source/blender/editors/space_sequencer/sequencer_draw.c
February 13, 2015, 11:48 (GMT)
Painstakingly merge branch 'master' into gooseberry

Conflicts:
release/scripts/startup/bl_ui/space_view3d.py
source/blender/blenkernel/BKE_camera.h
source/blender/blenkernel/BKE_screen.h
source/blender/blenkernel/intern/camera.c
source/blender/blenkernel/intern/screen.c
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/versioning_270.c
source/blender/blenloader/intern/writefile.c
source/blender/editors/include/ED_view3d.h
source/blender/editors/render/render_opengl.c
source/blender/editors/space_view3d/space_view3d.c
source/blender/editors/space_view3d/view3d_draw.c
source/blender/gpu/CMakeLists.txt
source/blender/gpu/GPU_compositing.h
source/blender/gpu/GPU_extensions.h
source/blender/gpu/intern/gpu_compositing.c
source/blender/gpu/intern/gpu_extensions.c
source/blender/gpu/shaders/gpu_shader_fx_dof_frag.glsl
source/blender/gpu/shaders/gpu_shader_fx_dof_vert.glsl
source/blender/gpu/shaders/gpu_shader_fx_lib.glsl
source/blender/gpu/shaders/gpu_shader_fx_ssao_frag.glsl
source/blender/gpu/shaders/gpu_shader_fx_vert.glsl
source/blender/makesdna/DNA_camera_types.h
source/blender/makesdna/DNA_gpu_types.h
source/blender/makesdna/DNA_view3d_types.h
source/blender/makesdna/intern/makesdna.c
source/blender/makesrna/intern/rna_camera.c
source/blender/makesrna/intern/rna_scene.c
source/blender/makesrna/intern/rna_space.c
February 12, 2015, 19:20 (GMT)
Partial instancing feature for the ParticleInstance modifier.

This allows using the same particle system for multiple objects without
creating too much repetitiveness. Each instance object can select a
range of the particles to actually use for instancing (default 1.0 means
all particles are used). To further avoid overlap with multiple
instancing objects, the offset value can be used to make each system
use a specific range of particles.
February 11, 2015, 19:01 (GMT)
Merge branch 'master' into gooseberry
February 11, 2015, 16:27 (GMT)
Merge branch 'master' into gooseberry
February 11, 2015, 13:29 (GMT)
Merge branch 'master' into gooseberry
February 11, 2015, 10:19 (GMT)
Merge branch 'master' into gooseberry
February 11, 2015, 10:07 (GMT)
Merge branch 'master' into wiggly-widgets

Conflicts:
source/blender/blenloader/intern/versioning_270.c
February 10, 2015, 23:46 (GMT)
Merge branch 'master' into gooseberry
February 10, 2015, 23:46 (GMT)
Minor optimization for mask modifier

- don't resize ghash buckets (reserve maximum size)
- get vert, edge arrays instead of DM getVert, getEdge
- calloc -> malloc
February 10, 2015, 23:29 (GMT)
Merge branch 'master' into gooseberry

Conflicts:
source/blender/blenloader/intern/versioning_270.c
February 10, 2015, 19:24 (GMT)
Merge branch 'master' into gooseberry
February 10, 2015, 16:40 (GMT)
Merge branch 'master' into gooseberry
February 10, 2015, 16:01 (GMT)
Merge branch 'master' into gooseberry
February 10, 2015, 15:12 (GMT)
Add second widget call in-scene
February 10, 2015, 11:53 (GMT)
Fix error in last commit
February 10, 2015, 11:52 (GMT)
Separate widget drawing to update and draw phase to make in-scene widget
drawing possible (need to update once, draw twice).
February 10, 2015, 09:57 (GMT)
Support dupli transparency pass.

Only for gooseberry for now, since it's slightly hacky and adds extra
cost to duplis.
February 10, 2015, 08:19 (GMT)
Merge branch 'master' into gooseberry
Tehnyt: Miika HämäläinenViimeksi päivitetty: 07.11.2014 14:18MiikaH:n Sivut a.k.a. MiikaHweb | 2003-2021