April 20, 2015, 11:58 (GMT) |
Merge branch 'master' into alembic |
Revision 20e9602 by Lukas Toenne (alembic, gooseberry, gooseberry_farm, hair_guides, hair_guides_grooming, hair_object, strand_editmode, strand_gpu, strand_nodes, temp_motionpaths, tmp_hair_curves) April 20, 2015, 10:59 (GMT) |
Particle shapekey code is only in the gooseberry branch, disabled here. |
Revision 9cafd3a by Lukas Toenne (alembic, gooseberry, gooseberry_farm, hair_guides, hair_guides_grooming, hair_object, strand_editmode, strand_gpu, strand_nodes, temp_motionpaths, tmp_hair_curves) April 20, 2015, 10:58 (GMT) |
SimDebugData is now global, for easier usage and less intrusive code. |
Revision 0dccffb by Lukas Toenne (alembic, gooseberry, gooseberry_farm, hair_guides, hair_guides_grooming, hair_object, strand_editmode, strand_gpu, strand_nodes, temp_motionpaths, tmp_hair_curves) April 20, 2015, 10:37 (GMT) |
Fix for CustomDataType syntax error from merging. |
Revision 3a3327d by Lukas Toenne (alembic, gooseberry, gooseberry_farm, hair_guides, hair_guides_grooming, hair_object, strand_editmode, strand_gpu, strand_nodes, temp_motionpaths, tmp_hair_curves) April 20, 2015, 10:25 (GMT) |
Cleanup: rename function argument for consistency. |
Revision 7719a63 by Lukas Toenne (alembic, gooseberry, gooseberry_farm, hair_guides, hair_guides_grooming, hair_object, strand_editmode, strand_gpu, strand_nodes, temp_motionpaths, tmp_hair_curves) April 20, 2015, 10:25 (GMT) |
Use the X mirror option in new strand edit stroke brush tools. Note that currently this has virtually no effect, because the mirror option relies on exact positions of vertices, which does not happen with random hair placement (the add brush has no mirror option yet). Eventually topological mirroring should help with this case, but is not implemented for either old or new strand edit yet. |
Revision 8ffcd1f by Lukas Toenne (alembic, gooseberry, gooseberry_farm, hair_guides, hair_guides_grooming, hair_object, strand_editmode, strand_gpu, strand_nodes, temp_motionpaths, tmp_hair_curves) April 20, 2015, 10:25 (GMT) |
Utility methods for mirrored strand editing. These are a modified version of their BMEditMesh counterparts. use_topology is not yet implemented for strands. Native strand topology is not very useful for this. Instead, the topology of the scalp mesh should be used for finding mirrored strand roots, then the arc- or parametric length of a vertex from the root to find mirrored verts. Conflicts: source/blender/blenkernel/BKE_editstrands.h |
Revision 5b9b779 by Lukas Toenne (alembic, gooseberry, gooseberry_farm, hair_guides, hair_guides_grooming, hair_object, strand_editmode, strand_gpu, strand_nodes, temp_motionpaths, tmp_hair_curves) April 20, 2015, 10:24 (GMT) |
Minor code reshuffling. |
Revision ed1dc43 by Lukas Toenne (alembic, gooseberry, gooseberry_farm, hair_guides, hair_guides_grooming, hair_object, strand_editmode, strand_gpu, strand_nodes, temp_motionpaths, tmp_hair_curves) April 20, 2015, 10:24 (GMT) |
Fix for strands undo creating an invalid BMesh. When copying mesh data to bmesh the MVERT and similar customdata types have to be omitted. Otherwise the bmesh instance ends up with NULL pointers in customdata layers, but entries in the typemap != -1. The effect was that when storing new steps after one or more undo, the resulting original data would be copied, and subsequent undo steps are ignored. |
Revision 299859e by Lukas Toenne (alembic, gooseberry, gooseberry_farm, hair_guides, hair_guides_grooming, hair_object, strand_editmode, strand_gpu, strand_nodes, temp_motionpaths, tmp_hair_curves) April 20, 2015, 10:24 (GMT) |
Sanity check: if there is no edited/active object for an undo step, consider it invalid and clean up. |
Revision 3f539c9 by Lukas Toenne (alembic, gooseberry, gooseberry_farm, hair_guides, hair_guides_grooming, hair_object, strand_editmode, strand_gpu, strand_nodes, temp_motionpaths, tmp_hair_curves) April 20, 2015, 10:24 (GMT) |
Removed deprecated UI button for the hair debug flag. |
Revision 4798464 by Lukas Toenne (alembic, gooseberry, gooseberry_farm, hair_guides, hair_guides_grooming, hair_object, strand_editmode, strand_gpu, strand_nodes, temp_motionpaths, tmp_hair_curves) April 20, 2015, 10:24 (GMT) |
Extended Mesh <-> BMesh copy function versions for specifying custom data masks explicitly. A dummy mesh is used for strand edit undo storage like in mesh edit to prevent unnecessary code duplication. However, when copying from/to BMesh only the mesh data layers are copied by default, omitting the new data layers for strands (currently only MSurfaceSample hair root data). |
Revision 5e42aff by Lukas Toenne (alembic, gooseberry, gooseberry_farm, hair_guides, hair_guides_grooming, hair_object, strand_editmode, strand_gpu, strand_nodes, temp_motionpaths, tmp_hair_curves) April 20, 2015, 10:24 (GMT) |
Basic undo support in the new strand edit mode. This uses the generalized undo stack system which is also used for object data edit. An extension is necessary to tell the undo functions which object is specifically used for generating undo data and identifying the stack, since strand editing does not edit the obdata itself. |
Revision 2cddc3c by Lukas Toenne (alembic, gooseberry, gooseberry_farm, hair_guides, hair_guides_grooming, hair_object, strand_editmode, strand_gpu, strand_nodes, temp_motionpaths, tmp_hair_curves) April 20, 2015, 10:24 (GMT) |
Disabled the partial IK strand relaxation for the time being. First goal is to reproduce current particle edit tools in the strand edit mode, then make improvements. |
Revision 410998c by Lukas Toenne (alembic, gooseberry, gooseberry_farm, hair_guides, hair_guides_grooming, hair_object, strand_editmode, strand_gpu, strand_nodes, temp_motionpaths, tmp_hair_curves) April 20, 2015, 10:24 (GMT) |
Border Select operator for hair edit mode. |
Revision 6146b90 by Lukas Toenne (alembic, gooseberry, gooseberry_farm, hair_guides, hair_guides_grooming, hair_object, strand_editmode, strand_gpu, strand_nodes, temp_motionpaths, tmp_hair_curves) April 20, 2015, 10:24 (GMT) |
Select Linked operator for hair edit mode (select all vertices of a strand). |
Revision 62fa5c4 by Lukas Toenne (alembic, gooseberry, gooseberry_farm, hair_guides, hair_guides_grooming, hair_object, strand_editmode, strand_gpu, strand_nodes, temp_motionpaths, tmp_hair_curves) April 20, 2015, 10:24 (GMT) |
Select/Deselect All operator for hair edit mode. |
Revision 8b2ec99 by Lukas Toenne (alembic, gooseberry, gooseberry_farm, hair_guides, hair_guides_grooming, hair_object, strand_editmode, strand_gpu, strand_nodes, temp_motionpaths, tmp_hair_curves) April 20, 2015, 10:24 (GMT) |
Lasso Select operator for hair edit mode. |
Revision b6f4e09 by Lukas Toenne (alembic, gooseberry, gooseberry_farm, hair_guides, hair_guides_grooming, hair_object, strand_editmode, strand_gpu, strand_nodes, temp_motionpaths, tmp_hair_curves) April 20, 2015, 10:24 (GMT) |
Mouse Select operator for hair edit mode. |
Revision 9120df6 by Lukas Toenne (alembic, gooseberry, gooseberry_farm, hair_guides, hair_guides_grooming, hair_object, strand_editmode, strand_gpu, strand_nodes, temp_motionpaths, tmp_hair_curves) April 20, 2015, 10:24 (GMT) |
Missing bmesh include path in scons files. |
|