Revision: 27834
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=27834
Author: campbellbarton
Date: 2010-03-29 14:44:44 +0200 (Mon, 29 Mar 2010)
Log Message:
-----------
no-functional changes. new function for id path.
Modified Paths:
--------------
branches/render25/source/blender/editors/space_buttons/buttons_context.c
branches/render25/source/blender/editors/space_buttons/buttons_intern.h
Modified:
branches/render25/source/blender/editors/space_buttons/buttons_context.c
===================================================================
--- branches/render25/source/blender/editors/space_buttons/buttons_context.c
2010-03-29 12:33:33 UTC (rev 27833)
+++ branches/render25/source/blender/editors/space_buttons/buttons_context.c
2010-03-29 12:44:44 UTC (rev 27834)
@@ -816,21 +816,9 @@
static void pin_cb(bContext *C, void *arg1, void *arg2)
{
SpaceButs *sbuts= CTX_wm_space_buts(C);
- ButsContextPath *path= sbuts->path;
- PointerRNA *ptr;
- int a;
if(sbuts->flag & SB_PIN_CONTEXT) {
- if(path->len) {
- for(a=path->len-1; a>=0; a--) {
- ptr= &path->ptr[a];
-
- if(ptr->id.data) {
- sbuts->pinid= ptr->id.data;
- break;
- }
- }
- }
+ sbuts->pinid= buttons_context_id_path(C);
}
else
sbuts->pinid= NULL;
@@ -901,3 +889,24 @@
pt->flag= PNL_NO_HEADER;
BLI_addtail(&art->paneltypes, pt);
}
+
+ID *buttons_context_id_path(const bContext *C)
+{
+ SpaceButs *sbuts= CTX_wm_space_buts(C);
+ ButsContextPath *path= sbuts->path;
+ PointerRNA *ptr;
+ int a;
+
+ if(path->len) {
+ for(a=path->len-1; a>=0; a--) {
+ ptr= &path->ptr[a];
+
+ if(ptr->id.data) {
+ return ptr->id.data;
+ break;
+ }
+ }
+ }
+
+ return NULL;
+}
Modified:
branches/render25/source/blender/editors/space_buttons/buttons_intern.h
===================================================================
--- branches/render25/source/blender/editors/space_buttons/buttons_intern.h
2010-03-29 12:33:33 UTC (rev 27833)
+++ branches/render25/source/blender/editors/space_buttons/buttons_intern.h
2010-03-29 12:44:44 UTC (rev 27834)
@@ -35,6 +35,7 @@
struct SpaceButs;
struct uiLayout;
struct wmOperatorType;
+struct ID;
/* buts->scaflag */
#define BUTS_SENS_SEL 1
@@ -62,6 +63,7 @@
int buttons_context(const struct bContext *C, const char *member, struct
bContextDataResult *result);
void buttons_context_draw(const struct bContext *C, struct uiLayout *layout);
void buttons_context_register(struct ARegionType *art);
+struct ID *buttons_context_id_path(const struct bContext *C);
/* buttons_ops.c */
void BUTTONS_OT_file_browse(struct wmOperatorType *ot);
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
