diff options
author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2009-08-18 16:58:51 +0400 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2009-08-18 16:58:51 +0400 |
commit | 990dcd0f7f362828eddeaca191640c1680808a6c (patch) | |
tree | c49767c528436e9153fe496b26dd5b6314f19572 /source/blender/editors/space_buttons | |
parent | ac2451c6be437fba14f9c0ceeeaeab382fd9ad58 (diff) |
2.5:
* Split Info and User preferences into two separate spaces.
* Renamed Buttons Window to Properties also in RNA identifiers.
Diffstat (limited to 'source/blender/editors/space_buttons')
-rw-r--r-- | source/blender/editors/space_buttons/buttons_context.c | 3 | ||||
-rw-r--r-- | source/blender/editors/space_buttons/buttons_ops.c | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/source/blender/editors/space_buttons/buttons_context.c b/source/blender/editors/space_buttons/buttons_context.c index 6b89532cdaf..530500cfafa 100644 --- a/source/blender/editors/space_buttons/buttons_context.c +++ b/source/blender/editors/space_buttons/buttons_context.c @@ -311,7 +311,6 @@ static int buttons_context_path_brush(const bContext *C, ButsContextPath *path) ToolSettings *ts; Brush *br= NULL; PointerRNA *ptr= &path->ptr[path->len-1]; - const Object *obact = CTX_data_active_object(C); /* if we already have a (pinned) brush, we're done */ if(RNA_struct_is_a(ptr->type, &RNA_Brush)) { @@ -333,7 +332,7 @@ static int buttons_context_path_brush(const bContext *C, ButsContextPath *path) } } - /* no path to a world possible */ + /* no path to a brush possible */ return 0; } diff --git a/source/blender/editors/space_buttons/buttons_ops.c b/source/blender/editors/space_buttons/buttons_ops.c index e52efe8508d..057f35a2487 100644 --- a/source/blender/editors/space_buttons/buttons_ops.c +++ b/source/blender/editors/space_buttons/buttons_ops.c @@ -916,7 +916,7 @@ static int toolbox_invoke(bContext *C, wmOperator *op, wmEvent *event) uiPopupMenu *pup; uiLayout *layout; - RNA_pointer_create(&sc->id, &RNA_SpaceButtonsWindow, sbuts, &ptr); + RNA_pointer_create(&sc->id, &RNA_SpaceProperties, sbuts, &ptr); pup= uiPupMenuBegin(C, "Align", 0); layout= uiPupMenuLayout(pup); |