diff options
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/editors/interface/interface_regions.c | 2 | ||||
| -rw-r--r-- | source/blender/editors/transform/transform.h | 2 | ||||
| -rw-r--r-- | source/tests/bl_load_addons.py | 1 | ||||
| -rw-r--r-- | source/tests/bl_rst_completeness.py | 6 | ||||
| -rw-r--r-- | source/tests/rst_to_doctree_mini.py | 2 |
5 files changed, 7 insertions, 6 deletions
diff --git a/source/blender/editors/interface/interface_regions.c b/source/blender/editors/interface/interface_regions.c index ca5e2a1926c..e846fc3f078 100644 --- a/source/blender/editors/interface/interface_regions.c +++ b/source/blender/editors/interface/interface_regions.c @@ -651,7 +651,7 @@ ARegion *ui_tooltip_create(bContext *C, ARegion *butregion, uiBut *but) ofsx = 0; //(but->block->panel) ? but->block->panel->ofsx : 0; ofsy = 0; //(but->block->panel) ? but->block->panel->ofsy : 0; - rect_fl.xmin = (but->rect.xmin + but->rect.xmax) * 0.5f + ofsx - TIP_BORDER_X; + rect_fl.xmin = BLI_rctf_cent_x(&but->rect) + ofsx - TIP_BORDER_X; rect_fl.xmax = rect_fl.xmin + fontw + TIP_BORDER_X; rect_fl.ymax = but->rect.ymin + ofsy - TIP_BORDER_Y; rect_fl.ymin = rect_fl.ymax - fonth - TIP_BORDER_Y; diff --git a/source/blender/editors/transform/transform.h b/source/blender/editors/transform/transform.h index 28264a44bcf..083d7b94738 100644 --- a/source/blender/editors/transform/transform.h +++ b/source/blender/editors/transform/transform.h @@ -108,7 +108,7 @@ typedef struct TransCon { void (*applyVec)(struct TransInfo *t, struct TransData *td, const float in[3], float out[3], float pvec[3]); /* Apply function pointer for linear vectorial transformation */ /* The last three parameters are pointers to the in/out/printable vectors */ - void (*applySize)(struct TransInfo *t, struct TransData *td, float [3][3]); + void (*applySize)(struct TransInfo *t, struct TransData *td, float smat[3][3]); /* Apply function pointer for size transformation */ void (*applyRot)(struct TransInfo *t, struct TransData *td, float vec[3], float *angle); /* Apply function pointer for rotation transformation */ diff --git a/source/tests/bl_load_addons.py b/source/tests/bl_load_addons.py index fab2e2ead11..1ed76a1bc02 100644 --- a/source/tests/bl_load_addons.py +++ b/source/tests/bl_load_addons.py @@ -26,6 +26,7 @@ import addon_utils import sys import imp + def disable_addons(): # first disable all addons = bpy.context.user_preferences.addons diff --git a/source/tests/bl_rst_completeness.py b/source/tests/bl_rst_completeness.py index e9e2779bda8..6e67f8d908d 100644 --- a/source/tests/bl_rst_completeness.py +++ b/source/tests/bl_rst_completeness.py @@ -56,6 +56,7 @@ modules = ( ("gpu.rst", "gpu", False), ) + def is_directive_pydata(filepath, directive): if directive.type in {"function", "method", "class", "attribute", "data"}: return True @@ -113,7 +114,6 @@ def module_validate(filepath, mod, mod_name, doctree, partial_ok): print(directive_to_str(filepath, directive_child), end=" ") print("rst contains non existing class member %r" % attr_id) - # MODULE member missing from RST ??? doctree_dict = directive_members_dict(filepath, doctree) for attr in dir(mod): @@ -136,7 +136,7 @@ def module_validate(filepath, mod, mod_name, doctree, partial_ok): def main(): - + if bge is None: print("Skipping BGE modules!") @@ -151,7 +151,7 @@ def main(): doctree = rst_to_doctree_mini.parse_rst_py(filepath) __import__(modname) mod = sys.modules[modname] - + module_validate(filepath, mod, modname, doctree, partial_ok) diff --git a/source/tests/rst_to_doctree_mini.py b/source/tests/rst_to_doctree_mini.py index 181037299cf..cb7b0291296 100644 --- a/source/tests/rst_to_doctree_mini.py +++ b/source/tests/rst_to_doctree_mini.py @@ -45,7 +45,7 @@ def parse_rst_py(filepath): # --> # ("foo", "bar") re_prefix = re.compile(r"^\.\.\s([a-zA-Z09\-]+)::\s*(.*)\s*$") - + tree = collections.defaultdict(list) indent_map = {} indent_prev = 0 |