[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [28635] trunk/blender/source/blender: Logic UI: small fixes: order of sensor type enum + state actuator showing used states now

[Dalai Felinto]

Revision: 28635
          
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=28635
Author:   dfelinto
Date:     2010-05-07 04:37:05 +0200 (Fri, 07 May 2010)

Log Message:
-----------
Logic UI: small fixes: order of sensor type enum + state actuator showing used 
states now

Modified Paths:
--------------
    trunk/blender/source/blender/editors/space_logic/logic_window.c
    trunk/blender/source/blender/makesrna/intern/rna_sensor.c

Modified: trunk/blender/source/blender/editors/space_logic/logic_window.c
===================================================================
--- trunk/blender/source/blender/editors/space_logic/logic_window.c     
2010-05-07 02:01:50 UTC (rev 28634)
+++ trunk/blender/source/blender/editors/space_logic/logic_window.c     
2010-05-07 02:37:05 UTC (rev 28635)
@@ -4171,10 +4171,14 @@
 static void draw_actuator_state(uiLayout *layout, PointerRNA *ptr)
 {
        uiLayout *split;
+       Object *ob = (Object *)ptr->id.data;
+       PointerRNA settings_ptr;
+       RNA_pointer_create((ID *)ob, &RNA_GameObjectSettings, ob, 
&settings_ptr);
+
        split = uiLayoutSplit(layout, 0.35, 0);
        uiItemR(split, ptr, "operation", 0, NULL, 0);
 
-       uiTemplateLayers(split, ptr, "state", NULL, NULL, 0);
+       uiTemplateLayers(split, ptr, "state", &settings_ptr, "used_state", 0);
 }
 
 static void draw_actuator_visibility(uiLayout *layout, PointerRNA *ptr)

Modified: trunk/blender/source/blender/makesrna/intern/rna_sensor.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_sensor.c   2010-05-07 
02:01:50 UTC (rev 28634)
+++ trunk/blender/source/blender/makesrna/intern/rna_sensor.c   2010-05-07 
02:37:05 UTC (rev 28635)
@@ -125,7 +125,6 @@
                        RNA_enum_items_add_value(&item, &totitem, 
sensor_type_items, SENS_ARMATURE);
                } else if(ob->type==OB_MESH) {
                        RNA_enum_items_add_value(&item, &totitem, 
sensor_type_items, SENS_COLLISION);
-                       RNA_enum_items_add_value(&item, &totitem, 
sensor_type_items, SENS_TOUCH);
                }
        }
        
@@ -139,7 +138,12 @@
        RNA_enum_items_add_value(&item, &totitem, sensor_type_items, 
SENS_RADAR);
        RNA_enum_items_add_value(&item, &totitem, sensor_type_items, 
SENS_RANDOM);
        RNA_enum_items_add_value(&item, &totitem, sensor_type_items, SENS_RAY);
-//     RNA_enum_items_add_value(&item, &totitem, sensor_type_items, 
SENS_TOUCH);
+
+       if (ob != NULL) {
+               if(ob->type==OB_MESH) {
+                       RNA_enum_items_add_value(&item, &totitem, 
sensor_type_items, SENS_TOUCH);
+               }
+       }
        
        RNA_enum_item_end(&item, &totitem);
        *free= 1;


_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs