Blender Git Loki
Git Commits -> Revision 82a4d19
April 8, 2015, 14:32 (GMT) |
Merge branch 'wiggly-widgets' into gooseberry Conflicts: source/blender/blenloader/intern/versioning_270.c source/blender/editors/include/ED_transform.h source/blender/windowmanager/intern/wm_operators.c |
Commit Details:
Full Hash: 82a4d19a6bcd86977a9d93ad020c3ad773aa5db0
Parent Commit: 715c57f
Lines Changed: +543, -24
29 Modified Paths:
/source/blender/blenloader/intern/readfile.c (+2, -0) (Diff)
/source/blender/blenloader/intern/versioning_270.c (+16, -0) (Diff)
/source/blender/blenloader/intern/writefile.c (+4, -1) (Diff)
/source/blender/editors/include/BIF_glutil.h (+4, -3) (Diff)
/source/blender/editors/include/ED_screen.h (+3, -0) (Diff)
/source/blender/editors/include/ED_transform.h (+5, -1) (Diff)
/source/blender/editors/interface/interface_draw.c (+1, -1) (Diff)
/source/blender/editors/render/render_internal.c (+2, -2) (Diff)
/source/blender/editors/screen/area.c (+48, -0) (Diff)
/source/blender/editors/screen/glutil.c (+8, -7) (Diff)
/source/blender/editors/space_clip/clip_draw.c (+1, -1) (Diff)
/source/blender/editors/space_graph/graph_buttons.c (+22, -1) (Diff)
/source/blender/editors/space_graph/graph_edit.c (+151, -0) (Diff)
/source/blender/editors/space_graph/graph_intern.h (+2, -0) (Diff)
/source/blender/editors/space_graph/graph_ops.c (+4, -0) (Diff)
/source/blender/editors/space_graph/space_graph.c (+41, -2) (Diff)
/source/blender/editors/space_image/image_draw.c (+1, -1) (Diff)
/source/blender/editors/space_node/drawnode.c (+2, -2) (Diff)
/source/blender/editors/space_sequencer/sequencer_draw.c (+1, -1) (Diff)
/source/blender/editors/space_sequencer/sequencer_intern.h (+2, -0) (Diff)
/source/blender/editors/space_sequencer/sequencer_ops.c (+3, -0) (Diff)
/source/blender/editors/space_sequencer/sequencer_view.c (+178, -0) (Diff)
/source/blender/editors/space_sequencer/space_sequencer.c (+9, -0) (Diff)
/source/blender/editors/space_view3d/view3d_ops.c (+1, -0) (Diff)
/source/blender/makesdna/DNA_space_types.h (+6, -0) (Diff)
/source/blender/makesrna/intern/rna_space.c (+17, -0) (Diff)
/source/blender/windowmanager/intern/wm_generic_widgets.c (+7, -0) (Diff)
/source/blender/windowmanager/intern/wm_widgets.c (+1, -1) (Diff)
/source/blender/windowmanager/WM_api.h (+1, -0) (Diff)
/source/blender/blenloader/intern/versioning_270.c (+16, -0) (Diff)
/source/blender/blenloader/intern/writefile.c (+4, -1) (Diff)
/source/blender/editors/include/BIF_glutil.h (+4, -3) (Diff)
/source/blender/editors/include/ED_screen.h (+3, -0) (Diff)
/source/blender/editors/include/ED_transform.h (+5, -1) (Diff)
/source/blender/editors/interface/interface_draw.c (+1, -1) (Diff)
/source/blender/editors/render/render_internal.c (+2, -2) (Diff)
/source/blender/editors/screen/area.c (+48, -0) (Diff)
/source/blender/editors/screen/glutil.c (+8, -7) (Diff)
/source/blender/editors/space_clip/clip_draw.c (+1, -1) (Diff)
/source/blender/editors/space_graph/graph_buttons.c (+22, -1) (Diff)
/source/blender/editors/space_graph/graph_edit.c (+151, -0) (Diff)
/source/blender/editors/space_graph/graph_intern.h (+2, -0) (Diff)
/source/blender/editors/space_graph/graph_ops.c (+4, -0) (Diff)
/source/blender/editors/space_graph/space_graph.c (+41, -2) (Diff)
/source/blender/editors/space_image/image_draw.c (+1, -1) (Diff)
/source/blender/editors/space_node/drawnode.c (+2, -2) (Diff)
/source/blender/editors/space_sequencer/sequencer_draw.c (+1, -1) (Diff)
/source/blender/editors/space_sequencer/sequencer_intern.h (+2, -0) (Diff)
/source/blender/editors/space_sequencer/sequencer_ops.c (+3, -0) (Diff)
/source/blender/editors/space_sequencer/sequencer_view.c (+178, -0) (Diff)
/source/blender/editors/space_sequencer/space_sequencer.c (+9, -0) (Diff)
/source/blender/editors/space_view3d/view3d_ops.c (+1, -0) (Diff)
/source/blender/makesdna/DNA_space_types.h (+6, -0) (Diff)
/source/blender/makesrna/intern/rna_space.c (+17, -0) (Diff)
/source/blender/windowmanager/intern/wm_generic_widgets.c (+7, -0) (Diff)
/source/blender/windowmanager/intern/wm_widgets.c (+1, -1) (Diff)
/source/blender/windowmanager/WM_api.h (+1, -0) (Diff)