Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/source
diff options
context:
space:
mode:
authorNicholas Bishop <nicholasbishop@gmail.com>2009-08-17 21:34:15 +0400
committerNicholas Bishop <nicholasbishop@gmail.com>2009-08-17 21:34:15 +0400
commit77f60458e28f154b8f3e0b377ef6c8d11b9627f8 (patch)
tree4a924b286526314da8b5179aa54c56e06f6ac959 /source
parentb0508659f650bce8ed7e7142aa362088c6597d62 (diff)
2.5 Particle edit:
* Fixed cursor poll, so the cursor won't show up outside the 3d view
Diffstat (limited to 'source')
-rw-r--r--source/blender/editors/physics/editparticle.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/source/blender/editors/physics/editparticle.c b/source/blender/editors/physics/editparticle.c
index 83bf12d651e..0317a500196 100644
--- a/source/blender/editors/physics/editparticle.c
+++ b/source/blender/editors/physics/editparticle.c
@@ -109,7 +109,8 @@ static int PE_poll(bContext *C)
static int PE_poll_3dview(bContext *C)
{
- return PE_poll(C) && CTX_wm_region_view3d(C);
+ return PE_poll(C) && CTX_wm_area(C)->spacetype == SPACE_VIEW3D &&
+ CTX_wm_region(C)->regiontype == RGN_TYPE_WINDOW;
}
static void PE_free_particle_edit(ParticleSystem *psys)
@@ -2260,7 +2261,7 @@ static void toggle_particle_cursor(bContext *C, int enable)
pset->paintcursor = NULL;
}
else if(enable)
- pset->paintcursor= WM_paint_cursor_activate(CTX_wm_manager(C), PE_poll, brush_drawcursor, NULL);
+ pset->paintcursor= WM_paint_cursor_activate(CTX_wm_manager(C), PE_poll_3dview, brush_drawcursor, NULL);
}
/********************* radial control operator *********************/