Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/release/scripts/modules
diff options
context:
space:
mode:
Diffstat (limited to 'release/scripts/modules')
-rw-r--r--release/scripts/modules/bl_i18n_utils/utils_spell_check.py4
-rw-r--r--release/scripts/modules/bpy/path.py5
-rw-r--r--release/scripts/modules/bpy/utils.py8
-rw-r--r--release/scripts/modules/bpy_extras/mesh_utils.py1
-rw-r--r--release/scripts/modules/bpy_extras/object_utils.py1
-rw-r--r--release/scripts/modules/bpy_types.py9
-rw-r--r--release/scripts/modules/rna_prop_ui.py3
-rw-r--r--release/scripts/modules/sys_info.py26
8 files changed, 50 insertions, 7 deletions
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 99475603bf2..a887ebde449 100644
--- a/release/scripts/modules/bl_i18n_utils/utils_spell_check.py
+++ b/release/scripts/modules/bl_i18n_utils/utils_spell_check.py
@@ -363,6 +363,7 @@ class SpellChecker():
"icosphere",
"inpaint",
"lightmap",
+ "linearlight",
"lossless", "lossy",
"matcap",
"midtones",
@@ -372,6 +373,7 @@ class SpellChecker():
"nurb", "nurbs",
"perlin",
"phong",
+ "pinlight",
"qi",
"radiosity",
"raycasting",
@@ -379,6 +381,7 @@ class SpellChecker():
"renderfarm",
"scanfill",
"shader", "shaders",
+ "softlight",
"specular", "specularity",
"spillmap",
"sobel",
@@ -386,6 +389,7 @@ class SpellChecker():
"tonemap",
"toon",
"timecode",
+ "vividlight",
"voronoi",
"voxel", "voxels",
"vsync",
diff --git a/release/scripts/modules/bpy/path.py b/release/scripts/modules/bpy/path.py
index ccc9df93b0d..874efc2e131 100644
--- a/release/scripts/modules/bpy/path.py
+++ b/release/scripts/modules/bpy/path.py
@@ -219,7 +219,10 @@ def resolve_ncase(path):
# we are expecting 'dirpath' to be a directory, but it could be a file
if _os.path.isdir(dirpath):
- files = _os.listdir(dirpath)
+ try:
+ files = _os.listdir(dirpath)
+ except PermissionError: # We might not have the permission to list dirpath...
+ return path, False
else:
return path, False
diff --git a/release/scripts/modules/bpy/utils.py b/release/scripts/modules/bpy/utils.py
index 5621af29bc3..b3a7a13e331 100644
--- a/release/scripts/modules/bpy/utils.py
+++ b/release/scripts/modules/bpy/utils.py
@@ -429,7 +429,7 @@ def time_from_frame(frame, fps=None, fps_base=None):
:arg frame: number.
:type frame: the frame number
:return: the time in seconds.
- :rtype: timedate.timedelta
+ :rtype: datetime.timedelta
"""
if fps is None:
@@ -440,18 +440,18 @@ def time_from_frame(frame, fps=None, fps_base=None):
from datetime import timedelta
- return timedelta((frame * fps_base) / fps)
+ return timedelta(0, (frame * fps_base) / fps)
def time_to_frame(time, fps=None, fps_base=None):
"""
Returns a float frame number from a time given in seconds or
- as a timedate.timedelta object.
+ as a datetime.timedelta object.
If *fps* and *fps_base* are not given the current scene is used.
:arg time: time in seconds.
- :type time: number or a timedate.timedelta object
+ :type time: number or a datetime.timedelta object
:return: the frame.
:rtype: float
"""
diff --git a/release/scripts/modules/bpy_extras/mesh_utils.py b/release/scripts/modules/bpy_extras/mesh_utils.py
index 1e3e4c873a8..4293930e823 100644
--- a/release/scripts/modules/bpy_extras/mesh_utils.py
+++ b/release/scripts/modules/bpy_extras/mesh_utils.py
@@ -421,7 +421,6 @@ def ngon_tessellate(from_data, indices, fix_loops=True):
loop_segments.append(context_loop)
else:
if context_loop and context_loop[-1][1] == v[1]:
- #raise "as"
pass
else:
context_loop.append(v)
diff --git a/release/scripts/modules/bpy_extras/object_utils.py b/release/scripts/modules/bpy_extras/object_utils.py
index 766da46107b..01390760c76 100644
--- a/release/scripts/modules/bpy_extras/object_utils.py
+++ b/release/scripts/modules/bpy_extras/object_utils.py
@@ -245,6 +245,7 @@ def object_image_guess(obj, bm=None):
me = obj.data
if bm is None:
if obj.mode == 'EDIT':
+ import bmesh
bm = bmesh.from_edit_mesh(me)
if bm is not None:
diff --git a/release/scripts/modules/bpy_types.py b/release/scripts/modules/bpy_types.py
index d2683471915..bc2e9368b71 100644
--- a/release/scripts/modules/bpy_types.py
+++ b/release/scripts/modules/bpy_types.py
@@ -140,6 +140,15 @@ class WindowManager(bpy_types.ID):
finally:
self.pupmenu_end__internal(popup)
+ def popup_menu_pie(self, event, draw_func, title="", icon='NONE'):
+ import bpy
+ pie = self.piemenu_begin__internal(title, icon, event)
+
+ try:
+ draw_func(pie, bpy.context)
+ finally:
+ self.piemenu_end__internal(pie)
+
class _GenericBone:
"""
diff --git a/release/scripts/modules/rna_prop_ui.py b/release/scripts/modules/rna_prop_ui.py
index e9c96d59eae..e278b0d20fe 100644
--- a/release/scripts/modules/rna_prop_ui.py
+++ b/release/scripts/modules/rna_prop_ui.py
@@ -57,6 +57,7 @@ def rna_idprop_ui_prop_clear(item, prop):
except:
pass
+
def rna_idprop_context_value(context, context_member, property_type):
space = context.space_data
@@ -73,11 +74,13 @@ def rna_idprop_context_value(context, context_member, property_type):
return rna_item, context_member
+
def rna_idprop_has_properties(rna_item):
keys = rna_item.keys()
nbr_props = len(keys)
return (nbr_props > 1) or (nbr_props and '_RNA_UI' not in keys)
+
def draw(layout, context, context_member, property_type, use_edit=True):
def assign_props(prop, val, key):
diff --git a/release/scripts/modules/sys_info.py b/release/scripts/modules/sys_info.py
index f87cf611dd4..7fd97c4d347 100644
--- a/release/scripts/modules/sys_info.py
+++ b/release/scripts/modules/sys_info.py
@@ -153,7 +153,8 @@ def write_sysinfo(op):
else:
output.write("\nOpenGL\n")
output.write(lilies)
- output.write("renderer:\t%r\n" % (bgl.glGetString(bgl.GL_RENDERER)))
+ version = bgl.glGetString(bgl.GL_RENDERER);
+ output.write("renderer:\t%r\n" % version)
output.write("vendor:\t\t%r\n" % (bgl.glGetString(bgl.GL_VENDOR)))
output.write("version:\t%r\n" % (bgl.glGetString(bgl.GL_VERSION)))
output.write("extensions:\n")
@@ -163,6 +164,29 @@ def write_sysinfo(op):
for l in glext:
output.write("\t\t%r\n" % (l))
+ output.write("\nImplementation Dependent OpenGL Limits:\n")
+ output.write(lilies)
+ limit = bgl.Buffer(bgl.GL_INT, 1)
+ bgl.glGetIntegerv(bgl.GL_MAX_TEXTURE_UNITS, limit)
+ output.write("Maximum Fixed Function Texture Units:\t%d\n" % limit[0])
+
+ output.write("\nGLSL:\n")
+ if version[0] > '1':
+ bgl.glGetIntegerv(bgl.GL_MAX_VARYING_FLOATS, limit)
+ output.write("Maximum Varying Floats:\t%d\n" % limit[0])
+ bgl.glGetIntegerv(bgl.GL_MAX_VERTEX_ATTRIBS, limit)
+ output.write("Maximum Vertex Attributes:\t%d\n" % limit[0])
+ bgl.glGetIntegerv(bgl.GL_MAX_VERTEX_UNIFORM_COMPONENTS, limit)
+ output.write("Maximum Vertex Uniform Components:\t%d\n" % limit[0])
+ bgl.glGetIntegerv(bgl.GL_MAX_FRAGMENT_UNIFORM_COMPONENTS, limit)
+ output.write("Maximum Fragment Uniform Components:\t%d\n" % limit[0])
+ bgl.glGetIntegerv(bgl.GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS, limit)
+ output.write("Maximum Vertex Image Units:\t%d\n" % limit[0])
+ bgl.glGetIntegerv(bgl.GL_MAX_TEXTURE_IMAGE_UNITS, limit)
+ output.write("Maximum Fragment Image Units:\t%d\n" % limit[0])
+ bgl.glGetIntegerv(bgl.GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS, limit)
+ output.write("Maximum Pipeline Image Units:\t%d\n" % limit[0])
+
output.current_line_index = 0
op.report({'INFO'}, "System information generated in 'system-info.txt'")
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-15 21:03:28 +0300