Blender Git Commit Log

All Blender Git commits.

Page: 5319 / 8462

September 24, 2014, 17:02 (GMT)
Merge branch 'master' into hair_immediate_fixes

Conflicts:
source/blender/blenkernel/intern/implicit.c
September 24, 2014, 16:38 (GMT)
Merge remote-tracking branch 'refs/remotes/origin/master' into fracture_modifier_oldsim

Conflicts:
source/blender/bmesh/intern/bmesh_operators.c
September 24, 2014, 16:30 (GMT)
Merge branch 'master' into wiggly-widgets
September 24, 2014, 16:22 (GMT)
Merge pull request #4 from JT-a/fracture_modifier_oldsim

Updated and added GPL headers w/Scorpion81 as contributor.
September 24, 2014, 16:22 (GMT)
gooseberry request:

Attempt to select closest bones when possible.

Occlusion query selection does't support this well because we can't
really derive depth information from occlusion tests. May be possible to
improve this somewhat in the future.
September 24, 2014, 16:13 (GMT)
Change Viewport "stereo 3d" option for Multi-View scene setup

This may not be clear enough, and I still want to run this by Francesco Siddi. But basically the idea here is that when using the Multi-View option you should only get the option to see the "Stereo 3D" (when there is a left and right cameras) or the "views" which is the current selected view
September 24, 2014, 16:00 (GMT)
Have to include BLI_utildefines before BKE_collision now to have bool
defined.
September 24, 2014, 15:44 (GMT)
Merge branch 'mesh_samples' into hair_system_solver

Conflicts:
source/blender/blenkernel/BKE_mesh_sample.h
source/blender/blenkernel/intern/implicit.c
source/blender/blenkernel/intern/mesh_sample.c
September 24, 2014, 15:35 (GMT)
Minor syntax fix.
September 24, 2014, 15:04 (GMT)
Shifted the dispatch from the algorithm side to the storage side of the
sampling system to keep the code simple.

Now there is a MSurfaceSampleStorage struct that encodes the storage
details, which the algorithms don't have to care about.
September 24, 2014, 15:03 (GMT)
Store the waveforms between undo steps when they exist.
September 24, 2014, 14:28 (GMT)
Fix compilation in MacOSX
September 24, 2014, 14:21 (GMT)
More undo issue solving.

This commit moves sound loading out of library linking. The approach
chosen here is to do lazy initialization by basically validating the
sound before attaching to the scene.

Loading the sound buffer requires a valid Main pointer, which means we
have to pass this around in many places. We might also consider caching
the waveforms in this way too, but for now we're still using the
threaded update.

We'll have to test this somewhat to see if it behaves well..There are
corner cases which might not be covered. Sounds are muted if we undo
during an animation, but this bug existed in master as well.
September 24, 2014, 13:58 (GMT)
Added generalized method for creating an array of mesh samples with
arbitrary stride.
September 24, 2014, 13:54 (GMT)
Merge branch 'master' into mesh_samples
September 24, 2014, 12:29 (GMT)
Fix T41885, muting broken for Blender Internal nodes in rendering.

Nodes don't have muting callbacks any more, so now have to check the
flag to prevent overwriting values on the stack that they share with
inputs.
September 24, 2014, 12:15 (GMT)
Missing file from the last renamse (basic stereo > stereo 3d / advanced stereo > multiview)
September 24, 2014, 12:12 (GMT)
Set up the main API of the mass spring solver for hair.
September 24, 2014, 11:34 (GMT)
make "tri_shader" an int instead of a float

tri_shader does no longer need to a float.

Reviewers: dingto, sergey

Reviewed By: dingto, sergey

Subscribers: dingto

Projects: #cycles

Differential Revision: https://developer.blender.org/D789
September 24, 2014, 10:52 (GMT)
Cycles: Shader Graph Optimization for Mix RGB nodes.

Basically the same as AC2c58e96685e8, but for Mix RGB Shaders, in case we use the Mix type. This way the node can be used as texture switch for example, setting the Factor to 0.0 or 1.0, without wasting extra memory / render time.
By: Miika HämäläinenLast update: Nov-07-2014 14:18MiikaHweb | 2003-2021