Commit: 8ab0d0e3990881bf66e9cdd2f62cd2a464015496
Author: Dalai Felinto
Date: Tue Aug 18 14:55:44 2020 +0200
Branches: master
https://developer.blender.org/rB8ab0d0e3990881bf66e9cdd2f62cd2a464015496
Merge remote-tracking branch 'origin/blender-v2.90-release'
===================================================================
===================================================================
diff --cc source/blender/editors/space_buttons/buttons_context.c
index 5885d3dcbb0,044fadb9a50..3976e18d70c
--- a/source/blender/editors/space_buttons/buttons_context.c
+++ b/source/blender/editors/space_buttons/buttons_context.c
@@@ -223,40 -223,44 +223,44 @@@ static bool buttons_context_path_data(B
}
if (RNA_struct_is_a(ptr->type, &RNA_Curve) &&
(type == -1 || ELEM(type, OB_CURVE, OB_SURF, OB_FONT))) {
- return 1;
+ return true;
}
if (RNA_struct_is_a(ptr->type, &RNA_Armature) && (type == -1 || type ==
OB_ARMATURE)) {
- return 1;
+ return true;
}
if (RNA_struct_is_a(ptr->type, &RNA_MetaBall) && (type == -1 || type ==
OB_MBALL)) {
- return 1;
+ return true;
}
if (RNA_struct_is_a(ptr->type, &RNA_Lattice) && (type == -1 || type ==
OB_LATTICE)) {
- return 1;
+ return true;
}
if (RNA_struct_is_a(ptr->type, &RNA_Camera) && (type == -1 || type ==
OB_CAMERA)) {
- return 1;
+ return true;
}
if (RNA_struct_is_a(ptr->type, &RNA_Light) && (type == -1 || type ==
OB_LAMP)) {
- return 1;
+ return true;
}
if (RNA_struct_is_a(ptr->type, &RNA_Speaker) && (type == -1 || type ==
OB_SPEAKER)) {
- return 1;
+ return true;
}
if (RNA_struct_is_a(ptr->type, &RNA_LightProbe) && (type == -1 || type ==
OB_LIGHTPROBE)) {
- return 1;
+ return true;
}
if (RNA_struct_is_a(ptr->type, &RNA_GreasePencil) && (type == -1 || type ==
OB_GPENCIL)) {
- return 1;
+ return true;
}
+ #ifdef WITH_HAIR_NODES
if (RNA_struct_is_a(ptr->type, &RNA_Hair) && (type == -1 || type ==
OB_HAIR)) {
- return 1;
+ return true;
}
+ #endif
+ #ifdef WITH_PARTICLE_NODES
if (RNA_struct_is_a(ptr->type, &RNA_PointCloud) && (type == -1 || type ==
OB_POINTCLOUD)) {
- return 1;
+ return true;
}
+ #endif
if (RNA_struct_is_a(ptr->type, &RNA_Volume) && (type == -1 || type ==
OB_VOLUME)) {
- return 1;
+ return true;
}
/* try to get an object in the path, no pinning supported here */
if (buttons_context_path_object(path)) {
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
