forked from bartvdbraak/blender
code cleanup:
- incorrect NULL check in logic UI drawing - incorrect NULL check in octree quad test
This commit is contained in:
parent
5302469834
commit
efe690a3a5
@ -1009,8 +1009,6 @@ static void draw_sensor_armature(uiLayout *layout, PointerRNA *ptr)
|
||||
bSensor *sens = (bSensor *)ptr->data;
|
||||
bArmatureSensor *as = (bArmatureSensor *) sens->data;
|
||||
Object *ob = (Object *)ptr->id.data;
|
||||
PointerRNA pose_ptr, pchan_ptr;
|
||||
PropertyRNA *bones_prop= NULL;
|
||||
uiLayout *row;
|
||||
|
||||
if (ob->type != OB_ARMATURE) {
|
||||
@ -1019,11 +1017,12 @@ static void draw_sensor_armature(uiLayout *layout, PointerRNA *ptr)
|
||||
}
|
||||
|
||||
if (ob->pose) {
|
||||
PointerRNA pose_ptr, pchan_ptr;
|
||||
PropertyRNA *bones_prop;
|
||||
|
||||
RNA_pointer_create((ID *)ob, &RNA_Pose, ob->pose, &pose_ptr);
|
||||
bones_prop = RNA_struct_find_property(&pose_ptr, "bones");
|
||||
}
|
||||
|
||||
if (&pose_ptr.data) {
|
||||
uiItemPointerR(layout, ptr, "bone", &pose_ptr, "bones", NULL, ICON_BONE_DATA);
|
||||
|
||||
if (RNA_property_collection_lookup_string(&pose_ptr, bones_prop, as->posechannel, &pchan_ptr))
|
||||
|
@ -683,6 +683,10 @@ static int outliner_object_operation_exec(bContext *C, wmOperator *op)
|
||||
outliner_do_object_operation(C, scene, soops, &soops->tree, item_rename_cb);
|
||||
str = "Rename Object";
|
||||
}
|
||||
else {
|
||||
BLI_assert(0);
|
||||
return OPERATOR_CANCELLED;
|
||||
}
|
||||
|
||||
ED_undo_push(C, str);
|
||||
|
||||
|
@ -521,7 +521,7 @@ static void octree_fill_rayface(Octree *oc, RayFace *face)
|
||||
copy_v3_v3(co1, face->v1);
|
||||
copy_v3_v3(co2, face->v2);
|
||||
copy_v3_v3(co3, face->v3);
|
||||
if (face->v4)
|
||||
if (RE_rayface_isQuad(face))
|
||||
copy_v3_v3(co4, face->v4);
|
||||
|
||||
for (c = 0; c < 3; c++) {
|
||||
|
Loading…
Reference in New Issue
Block a user