archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

RNA:

Browse Source 
* Property update functions no longer get context, instead they get only
  Main and Scene. The RNA api was intended to be as context-less as
  possible, since it doesn't really matter who is changing the property,
  everything that uses the property should be updated.
* There's still one exception case that use it now, screen operations
  still depend on context too much. It also revealed a few places using
  context where they shouldn't.
* Ideally Scene shouldn't be passed, but much of Blender still depends on
  it, should be dropped when we try to support multiple scene editing.

Change was planned for a while, but need this now to be able to call
update without a context pointer.
This commit is contained in:
Brecht Van Lommel
2009-12-08 17:23:48 +00:00
parent ee74e720a8
commit 07904712e8
49 changed files with 318 additions and 318 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
source/blender/makesrna/intern/rna_nodetree.c
View File

@@ -149,9 +149,8 @@ static void rna_Matte_t2_set(PointerRNA *ptr, float value)
chroma->t2 = value;
}
static void node_update(bContext *C, bNodeTree *ntree, bNode *node)
static void node_update(Main *bmain, Scene *scene, bNodeTree *ntree, bNode *node)
{
Main *bmain= CTX_data_main(C);
Material *ma;
Tex *tex;
Scene *sce;
@@ -170,15 +169,15 @@ static void node_update(bContext *C, bNodeTree *ntree, bNode *node)
ED_node_changed_update(&sce->id, node);
}
static void rna_Node_update(bContext *C, PointerRNA *ptr)
static void rna_Node_update(Main *bmain, Scene *scene, PointerRNA *ptr)
{
bNodeTree *ntree= (bNodeTree*)ptr->id.data;
bNode *node= (bNode*)ptr->data;
node_update(C, ntree, node);
node_update(bmain, scene, ntree, node);
}
static void rna_Node_update_name(bContext *C, PointerRNA *ptr)
static void rna_Node_update_name(Main *bmain, Scene *scene, PointerRNA *ptr)
{
bNodeTree *ntree= (bNodeTree*)ptr->id.data;
bNode *node= (bNode*)ptr->data;
@@ -193,12 +192,12 @@ static void rna_Node_update_name(bContext *C, PointerRNA *ptr)
/* fix all the animation data which may link to this */
BKE_all_animdata_fix_paths_rename("nodes", oldname, node->name);
node_update(C, ntree, node);
node_update(bmain, scene, ntree, node);
}
/* this should be done at display time! if no custom names are set */
#if 0
static void rna_Node_update_username(bContext *C, PointerRNA *ptr)
static void rna_Node_update_username(Main *bmain, Scene *scene, PointerRNA *ptr)
{
bNode *node= (bNode*)ptr->data;
const char *name;
@@ -241,18 +240,18 @@ static void rna_Node_update_username(bContext *C, PointerRNA *ptr)
}
}
rna_Node_update(C, ptr);
rna_Node_update(bmain, scene, ptr);
}
#endif
static void rna_NodeSocket_update(bContext *C, PointerRNA *ptr)
static void rna_NodeSocket_update(Main *bmain, Scene *scene, PointerRNA *ptr)
{
bNodeTree *ntree= (bNodeTree*)ptr->id.data;
bNodeSocket *sock= (bNodeSocket*)ptr->data;
bNode *node;
if (nodeFindNode(ntree, sock, &node, NULL))
node_update(C, ntree, node);
node_update(bmain, scene, ntree, node);
}
static void rna_NodeSocket_defvalue_range(PointerRNA *ptr, float *min, float *max)
@@ -263,16 +262,16 @@ static void rna_NodeSocket_defvalue_range(PointerRNA *ptr, float *min, float *ma
*max = sock->ns.max;
}
static void rna_Node_mapping_update(bContext *C, PointerRNA *ptr)
static void rna_Node_mapping_update(Main *bmain, Scene *scene, PointerRNA *ptr)
{
bNode *node= (bNode*)ptr->data;
init_mapping((TexMapping *)node->storage);
rna_Node_update(C, ptr);
rna_Node_update(bmain, scene, ptr);
}
static void rna_Node_image_layer_update(bContext *C, PointerRNA *ptr)
static void rna_Node_image_layer_update(Main *bmain, Scene *scene, PointerRNA *ptr)
{
bNode *node= (bNode*)ptr->data;
Image *ima = (Image *)node->id;
@@ -281,7 +280,7 @@ static void rna_Node_image_layer_update(bContext *C, PointerRNA *ptr)
BKE_image_multilayer_index(ima->rr, iuser);
BKE_image_signal(ima, iuser, IMA_SIGNAL_SRC_CHANGE);
rna_Node_update(C, ptr);
rna_Node_update(bmain, scene, ptr);
}
static EnumPropertyItem *renderresult_layers_add_enum(RenderLayer *rl)