diff options
author | Campbell Barton <ideasman42@gmail.com> | 2011-09-15 11:06:45 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2011-09-15 11:06:45 +0400 |
commit | 101937e2ddf4d0453868373b644873586febf6e2 (patch) | |
tree | c834d88b1c2265b44c7234de1c387b2120267fc3 /source/blender/makesrna | |
parent | 3585808bdbfdd54eceb52171cf0c5c0ea57ec27b (diff) |
replace rna_update_active_object with NC_GEOM|ND_DATA notifier (as pointed out by Matt Ebb), also some whitespace edits to match trunk.
Diffstat (limited to 'source/blender/makesrna')
-rw-r--r-- | source/blender/makesrna/intern/rna_internal.h | 2 | ||||
-rw-r--r-- | source/blender/makesrna/intern/rna_object.c | 10 | ||||
-rw-r--r-- | source/blender/makesrna/intern/rna_scene.c | 4 |
3 files changed, 2 insertions, 14 deletions
diff --git a/source/blender/makesrna/intern/rna_internal.h b/source/blender/makesrna/intern/rna_internal.h index b9682b7ee7f..78b8c67d92c 100644 --- a/source/blender/makesrna/intern/rna_internal.h +++ b/source/blender/makesrna/intern/rna_internal.h @@ -215,8 +215,6 @@ int rna_object_shapekey_index_set(struct ID *id, PointerRNA value, int current); void rna_Object_internal_update_data(struct Main *bmain, struct Scene *scene, struct PointerRNA *ptr); void rna_Mesh_update_draw(struct Main *bmain, struct Scene *scene, struct PointerRNA *ptr); void rna_TextureSlot_update(struct Main *bmain, struct Scene *scene, struct PointerRNA *ptr); -//Jason -void rna_update_active_object(struct Main *bmain, struct Scene *scene, struct PointerRNA *ptr); /* basic poll functions for object types */ int rna_Armature_object_poll(struct PointerRNA *ptr, struct PointerRNA value); diff --git a/source/blender/makesrna/intern/rna_object.c b/source/blender/makesrna/intern/rna_object.c index c460432c1b3..59f5173f7ef 100644 --- a/source/blender/makesrna/intern/rna_object.c +++ b/source/blender/makesrna/intern/rna_object.c @@ -220,16 +220,6 @@ void rna_Object_internal_update_data(Main *UNUSED(bmain), Scene *UNUSED(scene), DAG_id_tag_update(ptr->id.data, OB_RECALC_DATA); WM_main_add_notifier(NC_OBJECT|ND_DRAW, ptr->id.data); } -// Jason -void rna_update_active_object(Main *bmain, Scene *scene, PointerRNA *ptr) -{ - Object *ob; - Base *basact = scene->basact; - if(basact && (ob = basact->object)) { - DAG_id_tag_update(&ob->id, OB_RECALC_DATA); - WM_main_add_notifier(NC_OBJECT|ND_DRAW, &ob->id); - } -} void rna_Object_active_shape_update(Main *bmain, Scene *scene, PointerRNA *ptr) { diff --git a/source/blender/makesrna/intern/rna_scene.c b/source/blender/makesrna/intern/rna_scene.c index 7718651a767..3a0183d70fb 100644 --- a/source/blender/makesrna/intern/rna_scene.c +++ b/source/blender/makesrna/intern/rna_scene.c @@ -1120,14 +1120,14 @@ static void rna_def_tool_settings(BlenderRNA *brna) RNA_def_property_ui_text(prop, "WPaint Auto-Normalize", "Ensure all bone-deforming vertex groups add up to 1.0 while " "weight painting"); - RNA_def_property_update(prop, 0, "rna_update_active_object"); + RNA_def_property_update(prop, NC_GEOM|ND_DATA, 0); prop = RNA_def_property(srna, "use_multipaint", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "multipaint", 1); RNA_def_property_ui_text(prop, "WPaint Multi-Paint", "Paint across all selected bones while " "weight painting"); - RNA_def_property_update(prop, 0, "rna_update_active_object"); + RNA_def_property_update(prop, NC_GEOM|ND_DATA, 0); prop= RNA_def_property(srna, "vertex_paint", PROP_POINTER, PROP_NONE); RNA_def_property_pointer_sdna(prop, NULL, "vpaint"); |