griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'blender-v4.3-release'

Browse Source
This commit is contained in:
Harley Acheson
2024-10-17 19:30:08 -07:00
parent f557b0071f cf2d3d0867
commit eec04f32eb
1 changed files with 6 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
source/blender/editors/screen/screen_ops.cc
View File

@@ -4290,26 +4290,12 @@ static void SCREEN_OT_area_join(wmOperatorType *ot)
ot->flag = OPTYPE_BLOCKING;
/* rna */
RNA_def_int_vector(ot->srna,
"source_xy",
2,
nullptr,
INT_MIN,
INT_MAX,
"Source location",
"",
INT_MIN,
INT_MAX);
RNA_def_int_vector(ot->srna,
"target_xy",
2,
nullptr,
INT_MIN,
INT_MAX,
"Target location",
"",
INT_MIN,
INT_MAX);
const int def[2] = {-100, -100};
RNA_def_int_vector(
ot->srna, "source_xy", 2, def, INT_MIN, INT_MAX, "Source location", "", INT_MIN, INT_MAX);
RNA_def_int_vector(
ot->srna, "target_xy", 2, def, INT_MIN, INT_MAX, "Target location", "", INT_MIN, INT_MAX);
}
/** \} */