[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [26368] trunk/blender/source/blender/ editors/animation: Fix RMB menu insert driver not working on some buttons, passing

[Brecht Van Lommel]

Revision: 26368
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=26368
Author:   blendix
Date:     2010-01-28 17:13:12 +0100 (Thu, 28 Jan 2010)

Log Message:
-----------
Fix RMB menu insert driver not working on some buttons, passing
wrong pointer into RNA.

Modified Paths:
--------------
    trunk/blender/source/blender/editors/animation/drivers.c
    trunk/blender/source/blender/editors/animation/keyingsets.c

Modified: trunk/blender/source/blender/editors/animation/drivers.c
===================================================================
--- trunk/blender/source/blender/editors/animation/drivers.c	2010-01-28 16:02:26 UTC (rev 26367)
+++ trunk/blender/source/blender/editors/animation/drivers.c	2010-01-28 16:13:12 UTC (rev 26368)
@@ -390,7 +390,7 @@
 	if (all)
 		index= -1;
 
-	if (ptr.data && prop && RNA_property_animateable(ptr.data, prop)) {
+	if (ptr.data && prop && RNA_property_animateable(&ptr, prop)) {
 		path= RNA_path_from_ID_to_property(&ptr, prop);
 		
 		if (path) {			
@@ -505,7 +505,7 @@
 	memset(&ptr, 0, sizeof(PointerRNA));
 	uiAnimContextProperty(C, &ptr, &prop, &index);
 	
-	if (ptr.data && prop && RNA_property_animateable(ptr.data, prop)) {
+	if (ptr.data && prop && RNA_property_animateable(&ptr, prop)) {
 		path= RNA_path_from_ID_to_property(&ptr, prop);
 		
 		if (path) {
@@ -549,7 +549,7 @@
 	memset(&ptr, 0, sizeof(PointerRNA));
 	uiAnimContextProperty(C, &ptr, &prop, &index);
 	
-	if (ptr.data && prop && RNA_property_animateable(ptr.data, prop)) {
+	if (ptr.data && prop && RNA_property_animateable(&ptr, prop)) {
 		path= RNA_path_from_ID_to_property(&ptr, prop);
 		
 		if (path) {

Modified: trunk/blender/source/blender/editors/animation/keyingsets.c
===================================================================
--- trunk/blender/source/blender/editors/animation/keyingsets.c	2010-01-28 16:02:26 UTC (rev 26367)
+++ trunk/blender/source/blender/editors/animation/keyingsets.c	2010-01-28 16:13:12 UTC (rev 26368)
@@ -339,7 +339,7 @@
 	uiAnimContextProperty(C, &ptr, &prop, &index);
 	
 	/* check if property is able to be added */
-	if (ptr.data && prop && RNA_property_animateable(ptr.data, prop)) {
+	if (ptr.data && prop && RNA_property_animateable(&ptr, prop)) {
 		path= RNA_path_from_ID_to_property(&ptr, prop);
 		
 		if (path) {