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
diff options
context:
space:
mode:
authorNicholas Bishop <nicholasbishop@gmail.com>2009-08-16 06:35:44 +0400
committerNicholas Bishop <nicholasbishop@gmail.com>2009-08-16 06:35:44 +0400
commit88294d7fa2a590674ec006da7fd9e8bd7a733fc3 (patch)
treebcec98791b71af0abbbb29a76a86fa3dbe8d7c40 /source/blender/editors/screen/screen_context.c
parentb257acfed11e8d98eb7c86e0908acf80fb9e27af (diff)
2.5/Particle edit:
* Made particle edit object-localized.
Diffstat (limited to 'source/blender/editors/screen/screen_context.c')
-rw-r--r--source/blender/editors/screen/screen_context.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/screen/screen_context.c b/source/blender/editors/screen/screen_context.c
index 1d6235eec18..1e36a32b9e1 100644
--- a/source/blender/editors/screen/screen_context.c
+++ b/source/blender/editors/screen/screen_context.c
@@ -140,8 +140,8 @@ int ed_screen_context(const bContext *C, const char *member, bContextDataResult
return 1;
}
else if(CTX_data_equals(member, "particle_edit_object")) {
- if(G.f & G_PARTICLEEDIT && scene->basact)
- CTX_data_id_pointer_set(result, &scene->basact->object->id);
+ if(ob && (ob->mode & OB_MODE_PARTICLE_EDIT))
+ CTX_data_id_pointer_set(result, &ob->id);
return 1;
}