diff options
author | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-10-04 20:18:05 +0300 |
---|---|---|
committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-10-04 20:18:05 +0300 |
commit | 63c472b4f9f7eae787bf4ce36160a28a1777bc76 (patch) | |
tree | 0e3144ddeacb83b7ff2a769af178824b1dea5563 /release | |
parent | 9422db7796e17bc23a9544d44f2a2e00a9b7e775 (diff) | |
parent | 296757804cc2e97a3d95b4e44a6cc5d508e1c345 (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'release')
3 files changed, 5 insertions, 3 deletions
diff --git a/release/scripts/modules/bl_i18n_utils/bl_extract_messages.py b/release/scripts/modules/bl_i18n_utils/bl_extract_messages.py index 3b7eff6db9c..bbeb1780355 100644 --- a/release/scripts/modules/bl_i18n_utils/bl_extract_messages.py +++ b/release/scripts/modules/bl_i18n_utils/bl_extract_messages.py @@ -227,6 +227,8 @@ def dump_rna_messages(msgs, reports, settings, verbose=False): # More builtin classes we don't need to parse. blacklist_rna_class |= {cls for cls in bpy.types.Property.__subclasses__()} + # None of this seems needed anymore, and it's broken anyway with current master (blender 2.79.1)... + """ _rna = {getattr(bpy.types, cls) for cls in dir(bpy.types)} # Classes which are attached to collections can be skipped too, these are api access only. @@ -276,6 +278,7 @@ def dump_rna_messages(msgs, reports, settings, verbose=False): #op = get_instance(idname) #if 'INTERNAL' in path_resolve(op, "bl_options"): #blacklist_rna_class.add(idname) + """ return blacklist_rna_class diff --git a/release/scripts/modules/bl_i18n_utils/utils_spell_check.py b/release/scripts/modules/bl_i18n_utils/utils_spell_check.py index b33588c903b..2ce8385f714 100644 --- a/release/scripts/modules/bl_i18n_utils/utils_spell_check.py +++ b/release/scripts/modules/bl_i18n_utils/utils_spell_check.py @@ -107,6 +107,7 @@ class SpellChecker: "fulldome", "fulldomes", "fullscreen", "gridline", + "hardlight", "hemi", "inbetween", "inscatter", "inscattering", @@ -447,6 +448,7 @@ class SpellChecker: "gpencil", "idcol", "keyframe", "keyframes", "keyframing", "keyframed", + "luminocity", "mathvis", "metaball", "metaballs", "mball", "metaelement", "metaelements", diff --git a/release/scripts/startup/bl_ui/space_view3d_toolbar.py b/release/scripts/startup/bl_ui/space_view3d_toolbar.py index b7e2b5b6051..0f9dd117c14 100644 --- a/release/scripts/startup/bl_ui/space_view3d_toolbar.py +++ b/release/scripts/startup/bl_ui/space_view3d_toolbar.py @@ -1773,7 +1773,6 @@ class VIEW3D_PT_tools_weightpaint_options(Panel, View3DPaintPanel): sub.prop(wpaint, "normal_angle", text="") col = layout.column() row = col.row() - row.prop(wpaint, "use_spray") row.prop(wpaint, "use_group_restrict") obj = context.weight_paint_object @@ -1816,8 +1815,6 @@ class VIEW3D_PT_tools_vertexpaint(Panel, View3DPaintPanel): sub.active = (vpaint.use_normal_falloff) sub.prop(vpaint, "normal_angle", text="") - col.prop(vpaint, "use_spray") - self.unified_paint_settings(col, context) |