Blender Git Loki
Git Commits -> Revision 29448bd
Revision 29448bd by Campbell Barton (master) June 22, 2016, 21:54 (GMT) |
Fix T48658: Cycles render & render preview corrupts particles Replaces `G.is_rendering` with `use_render_params` argument. This is needed for Cycles, which attempts to restore render-preview settings from particles, after it gets its own particle data, but fails to restore because `G.is_rendering` was being checked in psys_cache_paths (and other places). |
Commit Details:
Full Hash: 29448bd99bb05ae61e4d540981026bab87702f90
Parent Commit: 7547c6a
Lines Changed: +66, -59
15 Modified Paths:
/source/blender/blenkernel/BKE_particle.h (+8, -7) (Diff)
/source/blender/blenkernel/intern/depsgraph.c (+2, -2) (Diff)
/source/blender/blenkernel/intern/dynamicpaint.c (+1, -1) (Diff)
/source/blender/blenkernel/intern/effect.c (+1, -1) (Diff)
/source/blender/blenkernel/intern/object_dupli.c (+1, -1) (Diff)
/source/blender/blenkernel/intern/object_update.c (+2, -2) (Diff)
/source/blender/blenkernel/intern/particle.c (+18, -14) (Diff)
/source/blender/blenkernel/intern/particle_system.c (+19, -17) (Diff)
/source/blender/depsgraph/intern/builder/deg_builder_relations.cc (+1, -1) (Diff)
/source/blender/editors/physics/particle_edit.c (+2, -2) (Diff)
/source/blender/editors/space_view3d/drawobject.c (+2, -2) (Diff)
/source/blender/makesrna/intern/rna_particle.c (+3, -3) (Diff)
/source/blender/modifiers/intern/MOD_particlesystem.c (+3, -3) (Diff)
/source/blender/render/intern/source/convertblender.c (+2, -2) (Diff)
/source/blender/render/intern/source/pointdensity.c (+1, -1) (Diff)
/source/blender/blenkernel/intern/depsgraph.c (+2, -2) (Diff)
/source/blender/blenkernel/intern/dynamicpaint.c (+1, -1) (Diff)
/source/blender/blenkernel/intern/effect.c (+1, -1) (Diff)
/source/blender/blenkernel/intern/object_dupli.c (+1, -1) (Diff)
/source/blender/blenkernel/intern/object_update.c (+2, -2) (Diff)
/source/blender/blenkernel/intern/particle.c (+18, -14) (Diff)
/source/blender/blenkernel/intern/particle_system.c (+19, -17) (Diff)
/source/blender/depsgraph/intern/builder/deg_builder_relations.cc (+1, -1) (Diff)
/source/blender/editors/physics/particle_edit.c (+2, -2) (Diff)
/source/blender/editors/space_view3d/drawobject.c (+2, -2) (Diff)
/source/blender/makesrna/intern/rna_particle.c (+3, -3) (Diff)
/source/blender/modifiers/intern/MOD_particlesystem.c (+3, -3) (Diff)
/source/blender/render/intern/source/convertblender.c (+2, -2) (Diff)
/source/blender/render/intern/source/pointdensity.c (+1, -1) (Diff)