Commit: 9b9978656d80d0343f21d9032278a57322b44b4b
Author: Julian Eisel
Date: Tue Apr 14 17:15:28 2015 +0200
Branches: master
https://developer.blender.org/rB9b9978656d80d0343f21d9032278a57322b44b4b
Fix T44389: Tooltips swapped in Logic Editor
===================================================================
M source/blender/makesrna/intern/rna_sensor.c
===================================================================
diff --git a/source/blender/makesrna/intern/rna_sensor.c
b/source/blender/makesrna/intern/rna_sensor.c
index 5d7bb6d..69dd092 100644
--- a/source/blender/makesrna/intern/rna_sensor.c
+++ b/source/blender/makesrna/intern/rna_sensor.c
@@ -402,8 +402,8 @@ static void rna_def_mouse_sensor(BlenderRNA *brna)
};
static const EnumPropertyItem prop_mouse_type_items[] = {
- {SENS_COLLISION_PROPERTY, "PROPERTY", ICON_LOGIC, "Property",
"Use a material for ray intersections"},
- {SENS_COLLISION_MATERIAL, "MATERIAL", ICON_MATERIAL_DATA,
"Material", "Use a property for ray intersections"},
+ {SENS_COLLISION_PROPERTY, "PROPERTY", ICON_LOGIC, "Property",
"Use a property for ray intersections"},
+ {SENS_COLLISION_MATERIAL, "MATERIAL", ICON_MATERIAL_DATA,
"Material", "Use a material for ray intersections"},
{0, NULL, 0, NULL, NULL}
};
@@ -736,8 +736,8 @@ static void rna_def_ray_sensor(BlenderRNA *brna)
};
static const EnumPropertyItem prop_ray_type_items[] = {
- {SENS_COLLISION_PROPERTY, "PROPERTY", ICON_LOGIC, "Property",
"Use a material for ray intersections"},
- {SENS_COLLISION_MATERIAL, "MATERIAL", ICON_MATERIAL_DATA,
"Material", "Use a property for ray intersections"},
+ {SENS_COLLISION_PROPERTY, "PROPERTY", ICON_LOGIC, "Property",
"Use a property for ray intersections"},
+ {SENS_COLLISION_MATERIAL, "MATERIAL", ICON_MATERIAL_DATA,
"Material", "Use a material for ray intersections"},
{0, NULL, 0, NULL, NULL}
};
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
