Blender Git Loki
Git Commits -> Revision 9151d46
Revision 9151d46 by Sergey Sharybin (master) April 30, 2012, 07:43 (GMT) |
Tomato: initial commit of mask editing tools into SVN - Added new dtaablock called Mask which might be re-used in any area. Currently editing of masks happens in clip editor and they might be used in compositor nodes only. - Added new mode to clip clip editor to interact with masks. Implemented basic tools to create shapes, splines and points. Also implemented idea of UW points for feather which means feather points are have got U coordinate along spline (which is measured from 0 to 1) and W is it's weight meaning distance from main spline. - Spline points might be parented to movie tracks. Interface for this isn't best yet. - Rasterisaztion of masks happens in compositor node (Input -> Mask) Input image of this ode is used as reference for mask resolution. Currently all splines of all shapes are rasterizing independently which means shapes with holes are not supported. Also feather rasterization is not implemented. Rasterized was implemented by Pete Larbell, thanks! Do not consider this is something finished, there's still lots of things to be done (especially from interface and usability points of view). |
Commit Details:
Full Hash: 9151d46d7dbab7c978604656c146245aaf8f4ce3
SVN Revision: 46098
Parent Commit: 16f06d4
Lines Changed: +5498, -42
16 Added Paths:
/intern/raskter/CMakeLists.txt (+40, -0) (View)
/intern/raskter/raskter.c (+367, -0) (View)
/intern/raskter/raskter.h (+55, -0) (View)
/intern/raskter/SConscript (+10, -0) (View)
/source/blender/blenkernel/BKE_mask.h (+95, -0) (View)
/source/blender/blenkernel/intern/mask.c (+890, -0) (View)
/source/blender/editors/include/ED_mask.h (+44, -0) (View)
/source/blender/editors/mask/CMakeLists.txt (+47, -0) (View)
/source/blender/editors/mask/mask_draw.c (+270, -0) (View)
/source/blender/editors/mask/mask_editor.c (+218, -0) (View)
/source/blender/editors/mask/mask_intern.h (+69, -0) (View)
/source/blender/editors/mask/mask_ops.c (+1653, -0) (View)
/source/blender/editors/mask/SConscript (+9, -0) (View)
/source/blender/makesdna/DNA_mask_types.h (+108, -0) (View)
/source/blender/makesrna/intern/rna_mask.c (+600, -0) (View)
/source/blender/nodes/composite/nodes/node_composite_mask.c (+124, -0) (View)
/intern/raskter/raskter.c (+367, -0) (View)
/intern/raskter/raskter.h (+55, -0) (View)
/intern/raskter/SConscript (+10, -0) (View)
/source/blender/blenkernel/BKE_mask.h (+95, -0) (View)
/source/blender/blenkernel/intern/mask.c (+890, -0) (View)
/source/blender/editors/include/ED_mask.h (+44, -0) (View)
/source/blender/editors/mask/CMakeLists.txt (+47, -0) (View)
/source/blender/editors/mask/mask_draw.c (+270, -0) (View)
/source/blender/editors/mask/mask_editor.c (+218, -0) (View)
/source/blender/editors/mask/mask_intern.h (+69, -0) (View)
/source/blender/editors/mask/mask_ops.c (+1653, -0) (View)
/source/blender/editors/mask/SConscript (+9, -0) (View)
/source/blender/makesdna/DNA_mask_types.h (+108, -0) (View)
/source/blender/makesrna/intern/rna_mask.c (+600, -0) (View)
/source/blender/nodes/composite/nodes/node_composite_mask.c (+124, -0) (View)
55 Modified Paths:
/intern/CMakeLists.txt (+1, -0) (Diff)
/intern/SConscript (+2, -1) (Diff)
/release/scripts/modules/bpy_extras/keyconfig_utils.py (+1, -0) (Diff)
/release/scripts/startup/bl_ui/space_clip.py (+119, -2) (Diff)
/source/blender/blenkernel/BKE_context.h (+1, -0) (Diff)
/source/blender/blenkernel/BKE_library.h (+1, -1) (Diff)
/source/blender/blenkernel/BKE_main.h (+1, -0) (Diff)
/source/blender/blenkernel/BKE_node.h (+1, -0) (Diff)
/source/blender/blenkernel/CMakeLists.txt (+2, -0) (Diff)
/source/blender/blenkernel/intern/context.c (+5, -0) (Diff)
/source/blender/blenkernel/intern/depsgraph.c (+12, -0) (Diff)
/source/blender/blenkernel/intern/idcode.c (+1, -0) (Diff)
/source/blender/blenkernel/intern/library.c (+11, -0) (Diff)
/source/blender/blenkernel/intern/node.c (+1, -0) (Diff)
/source/blender/blenkernel/intern/scene.c (+6, -0) (Diff)
/source/blender/blenloader/intern/readfile.c (+91, -0) (Diff)
/source/blender/blenloader/intern/writefile.c (+50, -0) (Diff)
/source/blender/CMakeLists.txt (+1, -0) (Diff)
/source/blender/editors/CMakeLists.txt (+1, -0) (Diff)
/source/blender/editors/include/ED_clip.h (+9, -0) (Diff)
/source/blender/editors/include/ED_screen.h (+1, -0) (Diff)
/source/blender/editors/include/ED_transform.h (+1, -0) (Diff)
/source/blender/editors/interface/interface_templates.c (+4, -2) (Diff)
/source/blender/editors/SConscript (+1, -0) (Diff)
/source/blender/editors/screen/screen_ops.c (+8, -0) (Diff)
/source/blender/editors/space_api/spacetypes.c (+4, -0) (Diff)
/source/blender/editors/space_clip/clip_editor.c (+91, -0) (Diff)
/source/blender/editors/space_clip/space_clip.c (+51, -2) (Diff)
/source/blender/editors/space_node/drawnode.c (+8, -0) (Diff)
/source/blender/editors/space_node/space_node.c (+7, -0) (Diff)
/source/blender/editors/transform/transform.c (+49, -12) (Diff)
/source/blender/editors/transform/transform.h (+1, -0) (Diff)
/source/blender/editors/transform/transform_conversions.c (+207, -0) (Diff)
/source/blender/editors/transform/transform_generics.c (+32, -22) (Diff)
/source/blender/editors/transform/transform_ops.c (+1, -0) (Diff)
/source/blender/makesdna/DNA_ID.h (+1, -0) (Diff)
/source/blender/makesdna/DNA_space_types.h (+5, -0) (Diff)
/source/blender/makesdna/intern/makesdna.c (+2, -0) (Diff)
/source/blender/makesrna/intern/CMakeLists.txt (+1, -0) (Diff)
/source/blender/makesrna/intern/makesrna.c (+1, -0) (Diff)
/source/blender/makesrna/intern/rna_ID.c (+2, -0) (Diff)
/source/blender/makesrna/intern/rna_internal.h (+2, -0) (Diff)
/source/blender/makesrna/intern/rna_main.c (+7, -0) (Diff)
/source/blender/makesrna/intern/rna_main_api.c (+51, -0) (Diff)
/source/blender/makesrna/intern/rna_nodetree.c (+12, -0) (Diff)
/source/blender/makesrna/intern/rna_nodetree_types.h (+1, -0) (Diff)
/source/blender/makesrna/intern/rna_space.c (+16, -0) (Diff)
/source/blender/makesrna/RNA_access.h (+2, -0) (Diff)
/source/blender/nodes/CMakeLists.txt (+2, -0) (Diff)
/source/blender/nodes/composite/node_composite_tree.c (+4, -0) (Diff)
/source/blender/nodes/NOD_composite.h (+2, -0) (Diff)
/source/blender/windowmanager/WM_types.h (+1, -0) (Diff)
/source/blenderplayer/bad_level_call_stubs/stubs.c (+1, -0) (Diff)
/source/blenderplayer/CMakeLists.txt (+1, -0) (Diff)
/source/creator/CMakeLists.txt (+2, -0) (Diff)
/intern/SConscript (+2, -1) (Diff)
/release/scripts/modules/bpy_extras/keyconfig_utils.py (+1, -0) (Diff)
/release/scripts/startup/bl_ui/space_clip.py (+119, -2) (Diff)
/source/blender/blenkernel/BKE_context.h (+1, -0) (Diff)
/source/blender/blenkernel/BKE_library.h (+1, -1) (Diff)
/source/blender/blenkernel/BKE_main.h (+1, -0) (Diff)
/source/blender/blenkernel/BKE_node.h (+1, -0) (Diff)
/source/blender/blenkernel/CMakeLists.txt (+2, -0) (Diff)
/source/blender/blenkernel/intern/context.c (+5, -0) (Diff)
/source/blender/blenkernel/intern/depsgraph.c (+12, -0) (Diff)
/source/blender/blenkernel/intern/idcode.c (+1, -0) (Diff)
/source/blender/blenkernel/intern/library.c (+11, -0) (Diff)
/source/blender/blenkernel/intern/node.c (+1, -0) (Diff)
/source/blender/blenkernel/intern/scene.c (+6, -0) (Diff)
/source/blender/blenloader/intern/readfile.c (+91, -0) (Diff)
/source/blender/blenloader/intern/writefile.c (+50, -0) (Diff)
/source/blender/CMakeLists.txt (+1, -0) (Diff)
/source/blender/editors/CMakeLists.txt (+1, -0) (Diff)
/source/blender/editors/include/ED_clip.h (+9, -0) (Diff)
/source/blender/editors/include/ED_screen.h (+1, -0) (Diff)
/source/blender/editors/include/ED_transform.h (+1, -0) (Diff)
/source/blender/editors/interface/interface_templates.c (+4, -2) (Diff)
/source/blender/editors/SConscript (+1, -0) (Diff)
/source/blender/editors/screen/screen_ops.c (+8, -0) (Diff)
/source/blender/editors/space_api/spacetypes.c (+4, -0) (Diff)
/source/blender/editors/space_clip/clip_editor.c (+91, -0) (Diff)
/source/blender/editors/space_clip/space_clip.c (+51, -2) (Diff)
/source/blender/editors/space_node/drawnode.c (+8, -0) (Diff)
/source/blender/editors/space_node/space_node.c (+7, -0) (Diff)
/source/blender/editors/transform/transform.c (+49, -12) (Diff)
/source/blender/editors/transform/transform.h (+1, -0) (Diff)
/source/blender/editors/transform/transform_conversions.c (+207, -0) (Diff)
/source/blender/editors/transform/transform_generics.c (+32, -22) (Diff)
/source/blender/editors/transform/transform_ops.c (+1, -0) (Diff)
/source/blender/makesdna/DNA_ID.h (+1, -0) (Diff)
/source/blender/makesdna/DNA_space_types.h (+5, -0) (Diff)
/source/blender/makesdna/intern/makesdna.c (+2, -0) (Diff)
/source/blender/makesrna/intern/CMakeLists.txt (+1, -0) (Diff)
/source/blender/makesrna/intern/makesrna.c (+1, -0) (Diff)
/source/blender/makesrna/intern/rna_ID.c (+2, -0) (Diff)
/source/blender/makesrna/intern/rna_internal.h (+2, -0) (Diff)
/source/blender/makesrna/intern/rna_main.c (+7, -0) (Diff)
/source/blender/makesrna/intern/rna_main_api.c (+51, -0) (Diff)
/source/blender/makesrna/intern/rna_nodetree.c (+12, -0) (Diff)
/source/blender/makesrna/intern/rna_nodetree_types.h (+1, -0) (Diff)
/source/blender/makesrna/intern/rna_space.c (+16, -0) (Diff)
/source/blender/makesrna/RNA_access.h (+2, -0) (Diff)
/source/blender/nodes/CMakeLists.txt (+2, -0) (Diff)
/source/blender/nodes/composite/node_composite_tree.c (+4, -0) (Diff)
/source/blender/nodes/NOD_composite.h (+2, -0) (Diff)
/source/blender/windowmanager/WM_types.h (+1, -0) (Diff)
/source/blenderplayer/bad_level_call_stubs/stubs.c (+1, -0) (Diff)
/source/blenderplayer/CMakeLists.txt (+1, -0) (Diff)
/source/creator/CMakeLists.txt (+2, -0) (Diff)