diff options
| author | Joshua Leung <aligorith@gmail.com> | 2011-01-18 04:04:14 +0300 |
|---|---|---|
| committer | Joshua Leung <aligorith@gmail.com> | 2011-01-18 04:04:14 +0300 |
| commit | e49df9e09fca37fc1c85392574f9b68c48e92e57 (patch) | |
| tree | 060cb27b133840b4f67915df0728e1b21eb6696d /source/blender/editors/space_view3d | |
| parent | 86baf7c937c4bcac1c9ebf516e2aa2a79ec2f6fc (diff) | |
Bugfix [#25684b] Surface and Stroke options are not working with Use
Sketching Sessions.
Fix for secondary issue noted in this bug report. Some of the code for
the fancy 3d view sketching options needed to be moved around so that
there is a clearer "paint/sketch session" and "stroke" separation
between various stages. There's still some more stuff that needs to be
done here before I think it's totally cleaned up.
Diffstat (limited to 'source/blender/editors/space_view3d')
| -rw-r--r-- | source/blender/editors/space_view3d/view3d_view.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/source/blender/editors/space_view3d/view3d_view.c b/source/blender/editors/space_view3d/view3d_view.c index 2f7a24d600f..49071af8bdd 100644 --- a/source/blender/editors/space_view3d/view3d_view.c +++ b/source/blender/editors/space_view3d/view3d_view.c @@ -69,15 +69,21 @@ opengl drawing context */ void view3d_operator_needs_opengl(const bContext *C) { + wmWindow *win = CTX_wm_window(C); ARegion *ar= CTX_wm_region(C); + + view3d_region_operator_needs_opengl(win, ar); +} +void view3d_region_operator_needs_opengl(wmWindow *win, ARegion *ar) +{ /* for debugging purpose, context should always be OK */ - if(ar->regiontype!=RGN_TYPE_WINDOW) - printf("view3d_operator_needs_opengl error, wrong region\n"); + if ((ar == NULL) || (ar->regiontype!=RGN_TYPE_WINDOW)) + printf("view3d_region_operator_needs_opengl error, wrong region\n"); else { RegionView3D *rv3d= ar->regiondata; - wmSubWindowSet(CTX_wm_window(C), ar->swinid); + wmSubWindowSet(win, ar->swinid); glMatrixMode(GL_PROJECTION); glLoadMatrixf(rv3d->winmat); glMatrixMode(GL_MODELVIEW); |