[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [33851] trunk/blender/source/blender/ makesrna/intern/rna_actuator.c: svn merge -r 33849:33848 [ overcommitted due to the server problems we had early today]

[Dalai Felinto]

Revision: 33851
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=33851
Author:   dfelinto
Date:     2010-12-22 16:10:42 +0100 (Wed, 22 Dec 2010)

Log Message:
-----------
svn merge -r 33849:33848 [overcommitted due to the server problems we had early today]

Modified Paths:
--------------
    trunk/blender/source/blender/makesrna/intern/rna_actuator.c

Modified: trunk/blender/source/blender/makesrna/intern/rna_actuator.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_actuator.c	2010-12-22 14:43:24 UTC (rev 33850)
+++ trunk/blender/source/blender/makesrna/intern/rna_actuator.c	2010-12-22 15:10:42 UTC (rev 33851)
@@ -438,15 +438,6 @@
 	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 @@
 	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);