diff options
author | Campbell Barton <ideasman42@gmail.com> | 2018-06-09 15:42:01 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2018-06-09 15:43:01 +0300 |
commit | 2ca8230f67db3d6c4693d0a2e0997dfd5de43091 (patch) | |
tree | d8d7e5c7a15a68f7b27fde0dc7939cbfcf71cf4a /source/blender/makesrna/intern/rna_screen.c | |
parent | 09ce794dc8c6cf5e406532651576e6b86dfd9232 (diff) | |
parent | fb565ddb681f39cbe47e91d11e5b728bb4314a7b (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/makesrna/intern/rna_screen.c')
-rw-r--r-- | source/blender/makesrna/intern/rna_screen.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/makesrna/intern/rna_screen.c b/source/blender/makesrna/intern/rna_screen.c index 731333bd18a..e30b75b27bd 100644 --- a/source/blender/makesrna/intern/rna_screen.c +++ b/source/blender/makesrna/intern/rna_screen.c @@ -394,10 +394,10 @@ static void rna_def_view2d_api(StructRNA *srna) { FunctionRNA *func; PropertyRNA *parm; - + static const float view_default[2] = {0.0f, 0.0f}; static const int region_default[2] = {0.0f, 0.0f}; - + func = RNA_def_function(srna, "region_to_view", "rna_View2D_region_to_view"); RNA_def_function_ui_description(func, "Transform region coordinates to 2D view"); parm = RNA_def_int(func, "x", 0, INT_MIN, INT_MAX, "x", "Region x coordinate", -10000, 10000); @@ -428,9 +428,9 @@ static void rna_def_view2d(BlenderRNA *brna) srna = RNA_def_struct(brna, "View2D", NULL); RNA_def_struct_ui_text(srna, "View2D", "Scroll and zoom for a 2D region"); RNA_def_struct_sdna(srna, "View2D"); - + /* TODO more View2D properties could be exposed here (read-only) */ - + rna_def_view2d_api(srna); } |