[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [33285] trunk/blender/source/blender/ makesrna/intern/rna_actuator.c: Bugfix #23576

Ton Roosendaal ton at blender.org
Wed Nov 24 15:34:16 CET 2010


Revision: 33285
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=33285
Author:   ton
Date:     2010-11-24 15:34:16 +0100 (Wed, 24 Nov 2010)

Log Message:
-----------
Bugfix #23576

Logic Window: Actuator type options in menu didn't show special options
for Armature or Mesh when 'show selected' was used.

Dalai proposed a nice new RNA feature for inherited types, but with
only two exceptions handled, it was easy to code this check.

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-11-24 14:05:53 UTC (rev 33284)
+++ trunk/blender/source/blender/makesrna/intern/rna_actuator.c	2010-11-24 14:34:16 UTC (rev 33285)
@@ -360,7 +360,9 @@
 	Object *ob= NULL;
 	int totitem= 0;
 	
-	if (ptr->type == &RNA_Actuator) {
+	/* hardcoded exceptions, for these cases code below needs to find the id.data */
+	/* otherwise buttons never give all options for selected */
+	if (ptr->type==&RNA_Actuator || ptr->type==&RNA_ArmatureActuator || ptr->type==RNA_ShapeActionActuator) {
 		ob = (Object *)ptr->id.data;
 	} else {
 		/* can't use ob from ptr->id.data because that enum is also used by operators */





More information about the Bf-blender-cvs mailing list