[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [34867] trunk/blender/source/blender/ editors: moving dir strings into global namespace for doc access (coming up )
Campbell Barton
ideasman42 at gmail.com
Tue Feb 15 15:38:44 CET 2011
Revision: 34867
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=34867
Author: campbellbarton
Date: 2011-02-15 14:38:43 +0000 (Tue, 15 Feb 2011)
Log Message:
-----------
moving dir strings into global namespace for doc access (coming up)
Modified Paths:
--------------
trunk/blender/source/blender/editors/screen/screen_context.c
trunk/blender/source/blender/editors/screen/screen_intern.h
trunk/blender/source/blender/editors/space_buttons/buttons_context.c
trunk/blender/source/blender/editors/space_buttons/buttons_intern.h
trunk/blender/source/blender/editors/space_image/image_intern.h
trunk/blender/source/blender/editors/space_image/space_image.c
trunk/blender/source/blender/editors/space_node/node_intern.h
trunk/blender/source/blender/editors/space_node/space_node.c
trunk/blender/source/blender/editors/space_text/space_text.c
trunk/blender/source/blender/editors/space_text/text_intern.h
trunk/blender/source/blender/editors/space_view3d/space_view3d.c
trunk/blender/source/blender/editors/space_view3d/view3d_intern.h
Modified: trunk/blender/source/blender/editors/screen/screen_context.c
===================================================================
--- trunk/blender/source/blender/editors/screen/screen_context.c 2011-02-15 13:18:33 UTC (rev 34866)
+++ trunk/blender/source/blender/editors/screen/screen_context.c 2011-02-15 14:38:43 UTC (rev 34867)
@@ -49,6 +49,18 @@
#include "screen_intern.h"
+const char *screen_context_dir[] = {
+ "scene", "visible_objects", "visible_bases", "selectable_objects", "selectable_bases",
+ "selected_objects", "selected_bases",
+ "selected_editable_objects", "selected_editable_bases",
+ "visible_bones", "editable_bones", "selected_bones", "selected_editable_bones",
+ "visible_pose_bones", "selected_pose_bones", "active_bone", "active_pose_bone",
+ "active_base", "active_object", "object", "edit_object",
+ "sculpt_object", "vertex_paint_object", "weight_paint_object",
+ "texture_paint_object", "particle_edit_object",
+ "sequences", "selected_sequences", "selected_editable_sequences", /* sequencer */
+ NULL};
+
int ed_screen_context(const bContext *C, const char *member, bContextDataResult *result)
{
bScreen *sc= CTX_wm_screen(C);
@@ -67,19 +79,7 @@
#endif
if(CTX_data_dir(member)) {
- static const char *dir[] = {
- "scene", "visible_objects", "visible_bases", "selectable_objects", "selectable_bases",
- "selected_objects", "selected_bases",
- "selected_editable_objects", "selected_editable_bases",
- "visible_bones", "editable_bones", "selected_bones", "selected_editable_bones",
- "visible_pose_bones", "selected_pose_bones", "active_bone", "active_pose_bone",
- "active_base", "active_object", "object", "edit_object",
- "sculpt_object", "vertex_paint_object", "weight_paint_object",
- "texture_paint_object", "particle_edit_object",
- "sequences", "selected_sequences", "selected_editable_sequences", /* sequencer */
- NULL};
-
- CTX_data_dir_set(result, dir);
+ CTX_data_dir_set(result, screen_context_dir);
return 1;
}
else if(CTX_data_equals(member, "scene")) {
Modified: trunk/blender/source/blender/editors/screen/screen_intern.h
===================================================================
--- trunk/blender/source/blender/editors/screen/screen_intern.h 2011-02-15 13:18:33 UTC (rev 34866)
+++ trunk/blender/source/blender/editors/screen/screen_intern.h 2011-02-15 14:38:43 UTC (rev 34867)
@@ -56,6 +56,8 @@
/* screen_context.c */
int ed_screen_context(const bContext *C, const char *member, bContextDataResult *result);
+extern const char *screen_context_dir[]; /* doc access */
+
/* screendump.c */
void SCREEN_OT_screenshot(struct wmOperatorType *ot);
void SCREEN_OT_screencast(struct wmOperatorType *ot);
Modified: trunk/blender/source/blender/editors/space_buttons/buttons_context.c
===================================================================
--- trunk/blender/source/blender/editors/space_buttons/buttons_context.c 2011-02-15 13:18:33 UTC (rev 34866)
+++ trunk/blender/source/blender/editors/space_buttons/buttons_context.c 2011-02-15 14:38:43 UTC (rev 34867)
@@ -617,6 +617,12 @@
/************************* Context Callback ************************/
+const char *buttons_context_dir[] = {
+ "world", "object", "mesh", "armature", "lattice", "curve",
+ "meta_ball", "lamp", "camera", "material", "material_slot",
+ "texture", "texture_slot", "bone", "edit_bone", "pose_bone", "particle_system", "particle_system_editable",
+ "cloth", "soft_body", "fluid", "smoke", "collision", "brush", NULL};
+
int buttons_context(const bContext *C, const char *member, bContextDataResult *result)
{
SpaceButs *sbuts= CTX_wm_space_buts(C);
@@ -627,13 +633,7 @@
/* here we handle context, getting data from precomputed path */
if(CTX_data_dir(member)) {
- static const char *dir[] = {
- "world", "object", "mesh", "armature", "lattice", "curve",
- "meta_ball", "lamp", "camera", "material", "material_slot",
- "texture", "texture_slot", "bone", "edit_bone", "pose_bone", "particle_system", "particle_system_editable",
- "cloth", "soft_body", "fluid", "smoke", "collision", "brush", NULL};
-
- CTX_data_dir_set(result, dir);
+ CTX_data_dir_set(result, buttons_context_dir);
return 1;
}
else if(CTX_data_equals(member, "world")) {
Modified: trunk/blender/source/blender/editors/space_buttons/buttons_intern.h
===================================================================
--- trunk/blender/source/blender/editors/space_buttons/buttons_intern.h 2011-02-15 13:18:33 UTC (rev 34866)
+++ trunk/blender/source/blender/editors/space_buttons/buttons_intern.h 2011-02-15 14:38:43 UTC (rev 34867)
@@ -65,6 +65,8 @@
void buttons_context_register(struct ARegionType *art);
struct ID *buttons_context_id_path(const struct bContext *C);
+extern const char *buttons_context_dir[]; /* doc access */
+
/* buttons_ops.c */
void BUTTONS_OT_file_browse(struct wmOperatorType *ot);
void BUTTONS_OT_toolbox(struct wmOperatorType *ot);
Modified: trunk/blender/source/blender/editors/space_image/image_intern.h
===================================================================
--- trunk/blender/source/blender/editors/space_image/image_intern.h 2011-02-15 13:18:33 UTC (rev 34866)
+++ trunk/blender/source/blender/editors/space_image/image_intern.h 2011-02-15 14:38:43 UTC (rev 34867)
@@ -46,6 +46,8 @@
struct ARegion *image_has_buttons_region(struct ScrArea *sa);
struct ARegion *image_has_scope_region(struct ScrArea *sa);
+extern const char *image_context_dir[]; /* doc access */
+
/* image_header.c */
void image_header_buttons(const struct bContext *C, struct ARegion *ar);
Modified: trunk/blender/source/blender/editors/space_image/space_image.c
===================================================================
--- trunk/blender/source/blender/editors/space_image/space_image.c 2011-02-15 13:18:33 UTC (rev 34866)
+++ trunk/blender/source/blender/editors/space_image/space_image.c 2011-02-15 14:38:43 UTC (rev 34867)
@@ -665,13 +665,14 @@
}
}
+const char *image_context_dir[] = {"edit_image", NULL};
+
static int image_context(const bContext *C, const char *member, bContextDataResult *result)
{
SpaceImage *sima= CTX_wm_space_image(C);
if(CTX_data_dir(member)) {
- static const char *dir[] = {"edit_image", NULL};
- CTX_data_dir_set(result, dir);
+ CTX_data_dir_set(result, image_context_dir);
}
else if(CTX_data_equals(member, "edit_image")) {
CTX_data_id_pointer_set(result, (ID*)ED_space_image(sima));
Modified: trunk/blender/source/blender/editors/space_node/node_intern.h
===================================================================
--- trunk/blender/source/blender/editors/space_node/node_intern.h 2011-02-15 13:18:33 UTC (rev 34866)
+++ trunk/blender/source/blender/editors/space_node/node_intern.h 2011-02-15 14:38:43 UTC (rev 34867)
@@ -121,6 +121,8 @@
void NODE_OT_add_file(struct wmOperatorType *ot);
+extern const char *node_context_dir[];
+
// XXXXXX
// XXX from BSE_node.h
Modified: trunk/blender/source/blender/editors/space_node/space_node.c
===================================================================
--- trunk/blender/source/blender/editors/space_node/space_node.c 2011-02-15 13:18:33 UTC (rev 34866)
+++ trunk/blender/source/blender/editors/space_node/space_node.c 2011-02-15 14:38:43 UTC (rev 34867)
@@ -411,13 +411,14 @@
}
}
+const char *node_context_dir[] = {"selected_nodes", NULL};
+
static int node_context(const bContext *C, const char *member, bContextDataResult *result)
{
SpaceNode *snode= CTX_wm_space_node(C);
if(CTX_data_dir(member)) {
- static const char *dir[] = {"selected_nodes", NULL};
- CTX_data_dir_set(result, dir);
+ CTX_data_dir_set(result, node_context_dir);
return 1;
}
else if(CTX_data_equals(member, "selected_nodes")) {
Modified: trunk/blender/source/blender/editors/space_text/space_text.c
===================================================================
--- trunk/blender/source/blender/editors/space_text/space_text.c 2011-02-15 13:18:33 UTC (rev 34866)
+++ trunk/blender/source/blender/editors/space_text/space_text.c 2011-02-15 14:38:43 UTC (rev 34867)
@@ -351,13 +351,14 @@
WM_keymap_add_item(keymap, "TEXT_OT_insert", KM_TEXTINPUT, KM_ANY, KM_ANY, 0); // last!
}
+const char *text_context_dir[] = {"edit_text", NULL};
+
static int text_context(const bContext *C, const char *member, bContextDataResult *result)
{
SpaceText *st= CTX_wm_space_text(C);
if(CTX_data_dir(member)) {
- static const char *dir[] = {"edit_text", NULL};
- CTX_data_dir_set(result, dir);
+ CTX_data_dir_set(result, text_context_dir);
return 1;
}
else if(CTX_data_equals(member, "edit_text")) {
Modified: trunk/blender/source/blender/editors/space_text/text_intern.h
===================================================================
--- trunk/blender/source/blender/editors/space_text/text_intern.h 2011-02-15 13:18:33 UTC (rev 34866)
+++ trunk/blender/source/blender/editors/space_text/text_intern.h 2011-02-15 14:38:43 UTC (rev 34867)
@@ -157,5 +157,8 @@
void TEXT_OT_resolve_conflict(struct wmOperatorType *ot);
+/* space_text.c */
+extern const char *text_context_dir[]; /* doc access */
+
#endif /* ED_TEXT_INTERN_H */
Modified: trunk/blender/source/blender/editors/space_view3d/space_view3d.c
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/space_view3d.c 2011-02-15 13:18:33 UTC (rev 34866)
+++ trunk/blender/source/blender/editors/space_view3d/space_view3d.c 2011-02-15 14:38:43 UTC (rev 34867)
@@ -951,6 +951,11 @@
#endif
}
+const char *view3d_context_dir[] = {
+ "selected_objects", "selected_bases", "selected_editable_objects",
+ "selected_editable_bases", "visible_objects", "visible_bases", "selectable_objects", "selectable_bases",
+ "active_base", "active_object", NULL};
+
static int view3d_context(const bContext *C, const char *member, bContextDataResult *result)
{
View3D *v3d= CTX_wm_view3d(C);
@@ -959,12 +964,7 @@
unsigned int lay = v3d ? v3d->lay:scene->lay; /* fallback to the scene layer, allows duplicate and other oject operators to run outside the 3d view */
if(CTX_data_dir(member)) {
- static const char *dir[] = {
- "selected_objects", "selected_bases", "selected_editable_objects",
- "selected_editable_bases", "visible_objects", "visible_bases", "selectable_objects", "selectable_bases",
- "active_base", "active_object", NULL};
-
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list