| Age | Commit message (Collapse) | Author |
|---|
|
Conflicts:
source/blender/blenkernel/intern/object.c
|
|
optimization
|
|
The issue was caused by memory optimization marking particle system to recalc,
and because of the way how particle flags works it was possible that it'll
cause particle's re-distribution. Now this memory optimization will act the
same as loading the file.
Would need to review if this fix is to go to master/cycles_memory branches
but for now it'll be cool to figure out what to do with the farm.
|
|
Not sure it's totally correct solution, but it's better than giving
unpredictable results.
|
|
|
|
Conflicts:
intern/cycles/blender/blender_object.cpp
intern/cycles/blender/blender_sync.h
|
|
|
|
synchronized
This happens if all object's smokes are backed to files and rendering is either
happening from command line of with locked interface.
The idea behind this change is to make as much memory available for path tracing
as possible, so after heavy swapping during synchronization period there's loads
of free memory to put important data back to RAM.
|
|
Conflicts:
source/blender/blenkernel/intern/key.c
source/blender/blenlib/intern/path_util.c
source/blender/editors/object/object_shapekey.c
|
|
Conflicts:
intern/cycles/blender/blender_object.cpp
intern/cycles/blender/blender_sync.h
intern/cycles/render/graph.h
intern/cycles/render/mesh.cpp
|
|
It should not add temporary datablocks to the bmain.
|
|
Python had no ability to remove shape keys
Original D1169 from @lichtwerk, with edits
|
|
Issue was caused by passing NULL bmain to the path remap function when
localizing the node tree.
Paths are to be remapped, otherwise mapping of paths to OSL scripts
might happen in a wrong way.
|
|
|
|
|
|
|
|
|
|
|
|
Conflicts:
source/blender/makesdna/DNA_object_types.h
|
|
Reported by pixaal on irc, basically reproducable by inserting bevel
modifier on cube and entering/exiting texture paint mode.
Now object stores last needsMapping variable as well as customdata mask.
Also now texture painting only needs mapping when we are in texture
paint selection mode, so modifiers that don't support mapping can still
be used to paint now.
|
|
Conflicts:
intern/cycles/kernel/svm/svm.h
|
|
|
|
|
|
edge vector stack was left un-cleared.
|
|
Simplify logic and use realloc
|
|
Alembic archives.
Two separate property groups for metadata are used (so that reading
caches does not overwrite metadata for output caches).
|
|
|
|
settings.
|
|
|
|
|
|
|
|
Subframes are necessary when interpolating values.
|
|
|
|
function.
Strands processing now has 3 main steps:
1) apply parent modifiers
2) deform child strands
3) apply child modifiers
|
|
|
|
|
|
Conflicts:
source/blender/windowmanager/intern/wm_playanim.c
|
|
multires.
Code had special guards for such edges to stop this from happening. I
don't see why this is needed though since code above assigns smoothed
positions for all vertices in the grid.
After removing the guards I saw that this in fact was the only place
where grd adjacency was used, so I completely removed it.
|
|
|
|
The cutoff value was off by 1.0, due to an invalid increment for the
first vertex.
|
|
|
|
The previous way of selecting preview ("realtime") and render settings
on the cache library level was complicated and confusing. Now there are
just 2 buttons for baking either the preview or render level.
Technically the cache still works the same way, so a 3rd button could be
added for baking both passes into the same cache, should the need arise.
The preview cache now also uses the preview frame range, which should
help in quick testing of hair simulation settings. Render always uses
the scene frame range, like render buttons do.
For display in the viewport and rendering the cache will now use
whatever data is available in the archive. If the cache contains only
render data, the viewport will also draw full render data. Vice versa,
if the cache contains only preview data, this will also be used for
rendering.
Hair toggles for children and motion now are only used for the viewport
display. This simplifies the settings a lot and removes one potential
button to be overlooked.
|
|
|
|
|
|
|
|
It was possible race condition on empty curves -- it's possible that curve
object is fully updated and path is null in that cases, Proper way to deal
with this is to check curve_cache for non-NULL.
|
|
|
|
Conflicts:
source/blender/editors/object/object_ops.c
|
|
|
|
This will fix exporting of metadata and importing for imbufs, but image
editor will not display these metadata since multilayer gets converted
to renderresult, which does not support metadata display yet.
This commit is more meant for external image editors/viewers.
|
