Blender Git Loki
Git Commits -> Revision aad2446
Revision aad2446 by Bastien Montagne (master) January 4, 2016, 11:19 (GMT) |
Fix T47038: Particles in Particle Edit Mode get added in completely wrong location. It also fixes another issue (crash) related to symmetric editing. Quite involved, we (try to!) fix complete broken logic of parts of particle code, which would use poly index as tessface one (or vice-versa). Issue most probably goes back to BMesh integration time... This patch mostly fixes particle editing mode: - Adding/removing particles when using generative modifiers (like subsurf) should now work. - Adding/removing particles with a non-tessellated mesh (i.e. one having ngons) should also mostly work. - X-axis-mirror-editing particles over ngons does not really work, not sure why currently. - All this in both 'modes' (with or without using modifier stack for particles). Tech side: - Store a deformed-only DM in particle modifier data. - Rename existing DM to make it clear it's a final one. - Use deformed-only DM's tessface2poly mapping to 'solve' poly/tessface mismatches. - Make (part of) mirror-editing code able to use a DM instead of raw mesh, so that we can mirror based on final DM when editing particles using modifier stack (mandatory, since there is no way currently to find orig tessface from an final DM tessface index). Note that this patch is not really nice and clean (current particles are beyond hope on this side anyway), it's more like some urgency bandage. Whole crap needs complete rewrite anyway, BMesh's polygons make it really hard to work with current system (and looptri would not help much here). Also, did not test everything possibly affected by those changes, so it needs some users' testing & validation too. Reviewers: psy-fi Subscribers: dfelinto, eyecandy Maniphest Tasks: T47038 Differential Revision: https://developer.blender.org/D1685 |
Commit Details:
Full Hash: aad24468e2d32d46e2c3b3b4a37302a4f1f27ab6
Parent Commit: e83b3e5
Lines Changed: +501, -361
33 Modified Paths:
/source/blender/blenkernel/BKE_particle.h (+4, -4) (Diff)
/source/blender/blenkernel/intern/DerivedMesh.c (+53, -5) (Diff)
/source/blender/blenkernel/intern/object.c (+9, -4) (Diff)
/source/blender/blenkernel/intern/particle.c (+131, -85) (Diff)
/source/blender/blenkernel/intern/particle_distribute.c (+7, -7) (Diff)
/source/blender/blenkernel/intern/particle_system.c (+20, -21) (Diff)
/source/blender/blenlib/BLI_math_vector.h (+2, -0) (Diff)
/source/blender/blenlib/intern/math_vector_inline.c (+7, -0) (Diff)
/source/blender/blenloader/intern/readfile.c (+2, -1) (Diff)
/source/blender/editors/armature/armature_skinning.c (+2, -2) (Diff)
/source/blender/editors/armature/meshlaplacian.c (+1, -1) (Diff)
/source/blender/editors/include/ED_mesh.h (+7, -6) (Diff)
/source/blender/editors/mesh/editface.c (+16, -12) (Diff)
/source/blender/editors/mesh/editmesh_utils.c (+3, -3) (Diff)
/source/blender/editors/mesh/meshtools.c (+45, -47) (Diff)
/source/blender/editors/object/object_edit.c (+2, -2) (Diff)
/source/blender/editors/object/object_shapekey.c (+3, -3) (Diff)
/source/blender/editors/object/object_vgroup.c (+2, -2) (Diff)
/source/blender/editors/physics/particle_edit.c (+71, -60) (Diff)
/source/blender/editors/physics/particle_object.c (+10, -11) (Diff)
/source/blender/editors/sculpt_paint/paint_vertex.c (+5, -5) (Diff)
/source/blender/editors/transform/transform_conversions.c (+3, -3) (Diff)
/source/blender/editors/util/ed_util.c (+2, -2) (Diff)
/source/blender/makesdna/DNA_modifier_types.h (+2, -1) (Diff)
/source/blender/makesdna/DNA_particle_types.h (+1, -0) (Diff)
/source/blender/makesrna/intern/rna_object_api.c (+1, -1) (Diff)
/source/blender/makesrna/intern/rna_particle.c (+18, -21) (Diff)
/source/blender/modifiers/intern/MOD_explode.c (+1, -1) (Diff)
/source/blender/modifiers/intern/MOD_particleinstance.c (+1, -1) (Diff)
/source/blender/modifiers/intern/MOD_particlesystem.c (+40, -20) (Diff)
/source/blender/render/intern/source/convertblender.c (+25, -25) (Diff)
/source/blender/render/intern/source/pointdensity.c (+3, -3) (Diff)
/source/blenderplayer/bad_level_call_stubs/stubs.c (+2, -2) (Diff)
/source/blender/blenkernel/intern/DerivedMesh.c (+53, -5) (Diff)
/source/blender/blenkernel/intern/object.c (+9, -4) (Diff)
/source/blender/blenkernel/intern/particle.c (+131, -85) (Diff)
/source/blender/blenkernel/intern/particle_distribute.c (+7, -7) (Diff)
/source/blender/blenkernel/intern/particle_system.c (+20, -21) (Diff)
/source/blender/blenlib/BLI_math_vector.h (+2, -0) (Diff)
/source/blender/blenlib/intern/math_vector_inline.c (+7, -0) (Diff)
/source/blender/blenloader/intern/readfile.c (+2, -1) (Diff)
/source/blender/editors/armature/armature_skinning.c (+2, -2) (Diff)
/source/blender/editors/armature/meshlaplacian.c (+1, -1) (Diff)
/source/blender/editors/include/ED_mesh.h (+7, -6) (Diff)
/source/blender/editors/mesh/editface.c (+16, -12) (Diff)
/source/blender/editors/mesh/editmesh_utils.c (+3, -3) (Diff)
/source/blender/editors/mesh/meshtools.c (+45, -47) (Diff)
/source/blender/editors/object/object_edit.c (+2, -2) (Diff)
/source/blender/editors/object/object_shapekey.c (+3, -3) (Diff)
/source/blender/editors/object/object_vgroup.c (+2, -2) (Diff)
/source/blender/editors/physics/particle_edit.c (+71, -60) (Diff)
/source/blender/editors/physics/particle_object.c (+10, -11) (Diff)
/source/blender/editors/sculpt_paint/paint_vertex.c (+5, -5) (Diff)
/source/blender/editors/transform/transform_conversions.c (+3, -3) (Diff)
/source/blender/editors/util/ed_util.c (+2, -2) (Diff)
/source/blender/makesdna/DNA_modifier_types.h (+2, -1) (Diff)
/source/blender/makesdna/DNA_particle_types.h (+1, -0) (Diff)
/source/blender/makesrna/intern/rna_object_api.c (+1, -1) (Diff)
/source/blender/makesrna/intern/rna_particle.c (+18, -21) (Diff)
/source/blender/modifiers/intern/MOD_explode.c (+1, -1) (Diff)
/source/blender/modifiers/intern/MOD_particleinstance.c (+1, -1) (Diff)
/source/blender/modifiers/intern/MOD_particlesystem.c (+40, -20) (Diff)
/source/blender/render/intern/source/convertblender.c (+25, -25) (Diff)
/source/blender/render/intern/source/pointdensity.c (+3, -3) (Diff)
/source/blenderplayer/bad_level_call_stubs/stubs.c (+2, -2) (Diff)
Master Commits
MiikaH:n Sivut a.k.a. MiikaHweb | 2003-2021