diff options
| author | Dalai Felinto <dfelinto@gmail.com> | 2011-01-21 11:59:08 +0300 |
|---|---|---|
| committer | Dalai Felinto <dfelinto@gmail.com> | 2011-01-21 11:59:08 +0300 |
| commit | 0f794b130d57dca49424c153d26ce98a70469fe7 (patch) | |
| tree | fe67c7256dfdebd53c7cebb83f7ef0ec4426d9a1 /source/blender | |
| parent | 1f099087c3f9e3792d6b3df9d5c5a352a2e0c8f5 (diff) | |
Logic UI + missing listener in Outliner - changes on Armature Sensor and Visibility Actuator
* fix for armature sensor (Status Changed doesn't use any value to evaluate itself) + renamed "Test Type" to "Test"
* visibility tooltip was wrong - now we can change visibility from the physic buttons instead of the outliner
* bonus * when you change the visibility from the physics panel the icon in the outliner wasn't changing
Diffstat (limited to 'source/blender')
4 files changed, 5 insertions, 3 deletions
diff --git a/source/blender/editors/space_logic/logic_window.c b/source/blender/editors/space_logic/logic_window.c index c8766f5c4c1..ec8f21065f5 100644 --- a/source/blender/editors/space_logic/logic_window.c +++ b/source/blender/editors/space_logic/logic_window.c @@ -3263,7 +3263,8 @@ static void draw_sensor_armature(uiLayout *layout, PointerRNA *ptr) } row = uiLayoutRow(layout, 1); uiItemR(row, ptr, "test_type", 0, NULL, ICON_NULL); - uiItemR(row, ptr, "value", 0, NULL, ICON_NULL); + if (RNA_enum_get(ptr, "test_type") != SENS_ARM_STATE_CHANGED) + uiItemR(row, ptr, "value", 0, NULL, ICON_NULL); } static void draw_sensor_collision(uiLayout *layout, PointerRNA *ptr, bContext *C) diff --git a/source/blender/editors/space_outliner/space_outliner.c b/source/blender/editors/space_outliner/space_outliner.c index 74c2dd5db1c..0b941e910f8 100644 --- a/source/blender/editors/space_outliner/space_outliner.c +++ b/source/blender/editors/space_outliner/space_outliner.c @@ -117,6 +117,7 @@ static void outliner_main_area_listener(ARegion *ar, wmNotifier *wmn) break; case ND_BONE_ACTIVE: case ND_BONE_SELECT: + case ND_DRAW: case ND_PARENT: case ND_OB_SHADING: ED_region_tag_redraw(ar); diff --git a/source/blender/makesrna/intern/rna_actuator.c b/source/blender/makesrna/intern/rna_actuator.c index 2fa93bcecdd..3c71319a322 100644 --- a/source/blender/makesrna/intern/rna_actuator.c +++ b/source/blender/makesrna/intern/rna_actuator.c @@ -1591,7 +1591,7 @@ static void rna_def_visibility_actuator(BlenderRNA *brna) prop= RNA_def_property(srna, "use_visible", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_negative_sdna(prop, NULL, "flag", ACT_VISIBILITY_INVISIBLE); - RNA_def_property_ui_text(prop, "Visible", "Set the objects visible. Initialized from the objects render restriction toggle (access in the outliner)"); + RNA_def_property_ui_text(prop, "Visible", "Set the objects visible. Initialized from the object render restriction toggle in physics button"); RNA_def_property_update(prop, NC_LOGIC, NULL); prop= RNA_def_property(srna, "use_occlusion", PROP_BOOLEAN, PROP_NONE); diff --git a/source/blender/makesrna/intern/rna_sensor.c b/source/blender/makesrna/intern/rna_sensor.c index 8cf7c38698c..7073923b05e 100644 --- a/source/blender/makesrna/intern/rna_sensor.c +++ b/source/blender/makesrna/intern/rna_sensor.c @@ -502,7 +502,7 @@ static void rna_def_armature_sensor(BlenderRNA *brna) prop= RNA_def_property(srna, "test_type", PROP_ENUM, PROP_NONE); RNA_def_property_enum_sdna(prop, NULL, "type"); RNA_def_property_enum_items(prop, prop_type_items); - RNA_def_property_ui_text(prop, "Test Type", "Type of value and test"); + RNA_def_property_ui_text(prop, "Test", "Type of value and test"); RNA_def_property_update(prop, NC_LOGIC, NULL); prop= RNA_def_property(srna, "bone", PROP_STRING, PROP_NONE); |