Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Szepe <HG1_public@gmx.net>2015-10-11 15:32:20 +0300
committerThomas Szepe <HG1_public@gmx.net>2015-10-11 15:32:20 +0300
commitcdb8bf0c9615a5e53473a4dc8ceaa3be73331f91 (patch)
tree553536f9296157b092e814cf0a904518c05ab1a3 /source/blender/makesrna/intern/rna_rigidbody.c
parent2247ebe16ee8f08755c8ca925167300e78637e18 (diff)
BGE: Add icons to collision shapes.
This patch adds icons to the physic collision shapes. Adding a new capsule shape 'mesh_capsule' icon which represent the shape better then the metaballs icon. And replace the metaballs icon for the Blender collision shape. {F206628} Reviewers: moguri, sybren, agoose77, lordloki, mont29, panzergame, campbellbarton Reviewed By: lordloki, panzergame, campbellbarton Projects: #game_engine, #game_ui, #user_interface Differential Revision: https://developer.blender.org/D1403
Diffstat (limited to 'source/blender/makesrna/intern/rna_rigidbody.c')
-rw-r--r--source/blender/makesrna/intern/rna_rigidbody.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/makesrna/intern/rna_rigidbody.c b/source/blender/makesrna/intern/rna_rigidbody.c
index 58a12f62644..395cb7c443d 100644
--- a/source/blender/makesrna/intern/rna_rigidbody.c
+++ b/source/blender/makesrna/intern/rna_rigidbody.c
@@ -53,7 +53,7 @@ EnumPropertyItem rigidbody_object_type_items[] = {
EnumPropertyItem rigidbody_object_shape_items[] = {
{RB_SHAPE_BOX, "BOX", ICON_MESH_CUBE, "Box", "Box-like shapes (i.e. cubes), including planes (i.e. ground planes)"},
{RB_SHAPE_SPHERE, "SPHERE", ICON_MESH_UVSPHERE, "Sphere", ""},
- {RB_SHAPE_CAPSULE, "CAPSULE", ICON_OUTLINER_OB_META, "Capsule", ""},
+ {RB_SHAPE_CAPSULE, "CAPSULE", ICON_MESH_CAPSULE, "Capsule", ""},
{RB_SHAPE_CYLINDER, "CYLINDER", ICON_MESH_CYLINDER, "Cylinder", ""},
{RB_SHAPE_CONE, "CONE", ICON_MESH_CONE, "Cone", ""},
{RB_SHAPE_CONVEXH, "CONVEX_HULL", ICON_MESH_ICOSPHERE, "Convex Hull",