diff options
author | Dalai Felinto <dfelinto@gmail.com> | 2010-12-22 18:10:42 +0300 |
---|---|---|
committer | Dalai Felinto <dfelinto@gmail.com> | 2010-12-22 18:10:42 +0300 |
commit | d729c0cff75e5bcff6dec2b277c23777156d07ab (patch) | |
tree | e65dfe81ea0506b930756b9dea98055d9e7f6eaa /source/blender/makesrna/intern/rna_actuator.c | |
parent | 51a79952699b3d18257434fbd94c0b3a00c9c759 (diff) |
svn merge -r 33849:33848 [overcommitted due to the server problems we had early today]
Diffstat (limited to 'source/blender/makesrna/intern/rna_actuator.c')
-rw-r--r-- | source/blender/makesrna/intern/rna_actuator.c | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/source/blender/makesrna/intern/rna_actuator.c b/source/blender/makesrna/intern/rna_actuator.c index dc3c597780b..2fa93bcecdd 100644 --- a/source/blender/makesrna/intern/rna_actuator.c +++ b/source/blender/makesrna/intern/rna_actuator.c @@ -438,15 +438,6 @@ static void rna_Actuator_Armature_update(Main *bmain, Scene *scene, PointerRNA * constraint[0] = 0; } -static void rna_Actuator_sound_sound_set(PointerRNA *ptr, PointerRNA value) -{ - bActuator *act = (bActuator *)ptr->data; - bSoundActuator *sa = (bSoundActuator *) act->data; - - sa->sound = value.data; - ((ID *)value.data)->us += 1; -} - /* note: the following set functions exists only to avoid id refcounting */ static void rna_Actuator_editobject_mesh_set(PointerRNA *ptr, PointerRNA value) { @@ -904,7 +895,6 @@ static void rna_def_sound_actuator(BlenderRNA *brna) RNA_def_property_struct_type(prop, "Sound"); RNA_def_property_flag(prop, PROP_EDITABLE); RNA_def_struct_ui_text(srna, "Sound", "Sound file"); - RNA_def_property_pointer_funcs(prop, NULL, "rna_Actuator_sound_sound_set", NULL, NULL); RNA_def_property_update(prop, NC_LOGIC, NULL); prop= RNA_def_property(srna, "mode", PROP_ENUM, PROP_NONE); |