diff options
| author | Dalai Felinto <dfelinto@gmail.com> | 2015-09-24 18:24:20 +0300 |
|---|---|---|
| committer | Dalai Felinto <dfelinto@gmail.com> | 2015-09-24 18:24:20 +0300 |
| commit | 27b3ea622f8bd313a8e2827dfec752bf2125566c (patch) | |
| tree | f212e49d224ce8e1cfc3b17a64ae524711494391 /source/blender/editors/space_action/space_action.c | |
| parent | 372dff8d1dc7e24d4b2cd37de245588ecfce8bfa (diff) | |
| parent | de80e687689032cb85179a1f7e89750573631d5d (diff) | |
Merge remote-tracking branch 'origin/master' into cycles_camera_nodescycles_camera_nodes
Note: the branch currently crashes in blender_camera_nodes.cpp:
BL::NodeTree b_ntree = b_data.node_groups[nodes_tree_name];
The crash was introduced in:
cb7cf523e5c000609f32a382e2c0fcc57f635a42
Conflicts:
intern/cycles/SConscript
intern/cycles/blender/addon/__init__.py
intern/cycles/blender/addon/properties.py
intern/cycles/blender/blender_camera.cpp
intern/cycles/kernel/kernel_types.h
intern/cycles/kernel/svm/svm.h
intern/cycles/kernel/svm/svm_types.h
intern/cycles/render/camera.cpp
intern/cycles/render/camera.h
Diffstat (limited to 'source/blender/editors/space_action/space_action.c')
| -rw-r--r-- | source/blender/editors/space_action/space_action.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/space_action/space_action.c b/source/blender/editors/space_action/space_action.c index 7ca8968a705..5d0b34a2e0c 100644 --- a/source/blender/editors/space_action/space_action.c +++ b/source/blender/editors/space_action/space_action.c @@ -197,8 +197,8 @@ static void action_main_area_draw(const bContext *C, ARegion *ar) /* markers */ UI_view2d_view_orthoSpecial(ar, v2d, 1); - flag = (ac.markers && (ac.markers != &ac.scene->markers)) ? DRAW_MARKERS_LOCAL : 0; - draw_markers_time(C, flag); + flag = ((ac.markers && (ac.markers != &ac.scene->markers)) ? DRAW_MARKERS_LOCAL : 0) | DRAW_MARKERS_MARGIN; + ED_markers_draw(C, flag); /* preview range */ UI_view2d_view_ortho(v2d); |