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-15 22:58:01 +0400
committerNicholas Bishop <nicholasbishop@gmail.com>2009-08-15 22:58:01 +0400
commitbe1efd74d120068a9a650feddf512b50e5e6c2b8 (patch)
treee1232b3256b84165f9194fe5287bf620cf174c18 /source/blender/editors/screen
parente63d4d2bea06075ef666d613d1136236bb09ae79 (diff)
2.5/Sculpt:
* Made sculpt mode local to object. * This also fixes loading files from 2.4x saved in sculptmode Touched a lot of things here, let me know if anything breaks TODO: * The other paint modes should be converted as well
Diffstat (limited to 'source/blender/editors/screen')
-rw-r--r--source/blender/editors/screen/screen_context.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/screen/screen_context.c b/source/blender/editors/screen/screen_context.c
index 3842dd3d62f..ba91502dcbb 100644
--- a/source/blender/editors/screen/screen_context.c
+++ b/source/blender/editors/screen/screen_context.c
@@ -112,7 +112,7 @@ int ed_screen_context(const bContext *C, const char *member, bContextDataResult
return 1;
}
else if(CTX_data_equals(member, "sculpt_object")) {
- if(G.f & G_SCULPTMODE && scene->basact)
+ if(scene->basact && (scene->basact->object->mode & OB_MODE_SCULPT))
CTX_data_id_pointer_set(result, &scene->basact->object->id);
return 1;