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
diff options
context:
space:
mode:
Diffstat
-rw-r--r--release/scripts/op/console_python.py2
-rw-r--r--release/scripts/templates/operator_modal_draw.py28
-rw-r--r--source/blender/python/doc/sphinx_doc_gen.py2
-rw-r--r--source/blender/python/generic/bgl.c (renamed from source/blender/python/generic/BGL.c)4
-rw-r--r--source/blender/python/generic/bgl.h (renamed from source/blender/python/generic/BGL.h)0
-rw-r--r--source/blender/python/generic/blf.c (renamed from source/blender/python/generic/BLF.c)4
-rw-r--r--source/blender/python/generic/blf.h (renamed from source/blender/python/generic/BLF.h)0
-rw-r--r--source/blender/python/intern/bpy.c4
-rw-r--r--source/gameengine/Ketsji/KX_PythonInit.cpp4
-rw-r--r--source/gameengine/VideoTexture/ImageBase.cpp2
-rw-r--r--source/gameengine/VideoTexture/ImageBuff.cpp2
11 files changed, 26 insertions, 26 deletions
diff --git a/release/scripts/op/console_python.py b/release/scripts/op/console_python.py
index 587e9f619bc..056435cebcd 100644
--- a/release/scripts/op/console_python.py
+++ b/release/scripts/op/console_python.py
@@ -190,7 +190,7 @@ def banner(context):
add_scrollback("Execute: Enter", 'OUTPUT')
add_scrollback("Autocomplete: Ctrl+Space", 'OUTPUT')
add_scrollback("Ctrl +/- Wheel: Zoom", 'OUTPUT')
- add_scrollback("Builtin Modules: bpy, bpy.data, bpy.ops, bpy.props, bpy.types, bpy.context, Mathutils, Geometry, BGL", 'OUTPUT')
+ add_scrollback("Builtin Modules: bpy, bpy.data, bpy.ops, bpy.props, bpy.types, bpy.context, bgl, blf, Mathutils, Geometry", 'OUTPUT')
add_scrollback("", 'OUTPUT')
add_scrollback("", 'OUTPUT')
sc.prompt = PROMPT
diff --git a/release/scripts/templates/operator_modal_draw.py b/release/scripts/templates/operator_modal_draw.py
index 0cf2dede4ce..1f0d7a8504f 100644
--- a/release/scripts/templates/operator_modal_draw.py
+++ b/release/scripts/templates/operator_modal_draw.py
@@ -1,29 +1,29 @@
-import BGL
-import BLF
+import bgl
+import blf
def draw_callback_px(self, context):
print("mouse points", len(self.mouse_path))
# draw some text
- BLF.position(15, 30, 0)
- BLF.size(20, 72)
- BLF.draw("Hello Word " + str(len(self.mouse_path)))
+ blf.position(15, 30, 0)
+ blf.size(20, 72)
+ blf.draw("Hello Word " + str(len(self.mouse_path)))
# 50% alpha, 2 pixel width line
- BGL.glEnable(BGL.GL_BLEND)
- BGL.glColor4f(0.0, 0.0, 0.0, 0.5)
- BGL.glLineWidth(2)
+ bgl.glEnable(bgl.GL_BLEND)
+ bgl.glColor4f(0.0, 0.0, 0.0, 0.5)
+ bgl.glLineWidth(2)
- BGL.glBegin(BGL.GL_LINE_STRIP)
+ bgl.glBegin(bgl.GL_LINE_STRIP)
for x, y in self.mouse_path:
- BGL.glVertex2i(x, y)
+ bgl.glVertex2i(x, y)
- BGL.glEnd()
+ bgl.glEnd()
# restore opengl defaults
- BGL.glLineWidth(1)
- BGL.glDisable(BGL.GL_BLEND)
- BGL.glColor4f(0.0, 0.0, 0.0, 1.0)
+ bgl.glLineWidth(1)
+ bgl.glDisable(bgl.GL_BLEND)
+ bgl.glColor4f(0.0, 0.0, 0.0, 1.0)
class ModalDrawOperator(bpy.types.Operator):
diff --git a/source/blender/python/doc/sphinx_doc_gen.py b/source/blender/python/doc/sphinx_doc_gen.py
index f2fc58c5653..dc32c1c1399 100644
--- a/source/blender/python/doc/sphinx_doc_gen.py
+++ b/source/blender/python/doc/sphinx_doc_gen.py
@@ -333,7 +333,7 @@ def rna2sphinx(BASEPATH):
del module
import BLF as module
- pymodule2sphinx(BASEPATH, "BLF", module, "Blender Font Drawing (BLF)")
+ pymodule2sphinx(BASEPATH, "blf", module, "Blender Font Drawing (blf)")
del module
if 0:
diff --git a/source/blender/python/generic/BGL.c b/source/blender/python/generic/bgl.c
index 340ebbe3dcd..b17d25ae784 100644
--- a/source/blender/python/generic/BGL.c
+++ b/source/blender/python/generic/bgl.c
@@ -32,7 +32,7 @@
* implementation. The BGL submodule "wraps" OpenGL functions and constants,
* allowing script writers to make OpenGL calls in their Python scripts. */
-#include "BGL.h" /*This must come first */
+#include "bgl.h" /*This must come first */
#include <GL/glew.h>
#include "MEM_guardedalloc.h"
@@ -1095,7 +1095,7 @@ static struct PyMethodDef BGL_methods[] = {
static struct PyModuleDef BGL_module_def = {
PyModuleDef_HEAD_INIT,
- "BGL", /* m_name */
+ "bgl", /* m_name */
0, /* m_doc */
0, /* m_size */
BGL_methods, /* m_methods */
diff --git a/source/blender/python/generic/BGL.h b/source/blender/python/generic/bgl.h
index 89bade930ce..89bade930ce 100644
--- a/source/blender/python/generic/BGL.h
+++ b/source/blender/python/generic/bgl.h
diff --git a/source/blender/python/generic/BLF.c b/source/blender/python/generic/blf.c
index df1497f6573..52fe860f988 100644
--- a/source/blender/python/generic/BLF.c
+++ b/source/blender/python/generic/blf.c
@@ -23,7 +23,7 @@
*/
#include <Python.h>
-#include "BLF.h"
+#include "blf.h"
#include "../../blenfont/BLF_api.h"
@@ -175,7 +175,7 @@ static char BLF_doc[] =
static struct PyModuleDef BLF_module_def = {
PyModuleDef_HEAD_INIT,
- "BLF", /* m_name */
+ "blf", /* m_name */
BLF_doc, /* m_doc */
0, /* m_size */
BLF_methods, /* m_methods */
diff --git a/source/blender/python/generic/BLF.h b/source/blender/python/generic/blf.h
index 0a0e97934e2..0a0e97934e2 100644
--- a/source/blender/python/generic/BLF.h
+++ b/source/blender/python/generic/blf.h
diff --git a/source/blender/python/intern/bpy.c b/source/blender/python/intern/bpy.c
index 12979cd5811..dfbad7aa610 100644
--- a/source/blender/python/intern/bpy.c
+++ b/source/blender/python/intern/bpy.c
@@ -37,8 +37,8 @@
/* external util modules */
#include "../generic/Mathutils.h"
#include "../generic/Geometry.h"
-#include "../generic/BGL.h"
-#include "../generic/BLF.h"
+#include "../generic/bgl.h"
+#include "../generic/blf.h"
#include "../generic/IDProp.h"
static char bpy_home_paths_doc[] =
diff --git a/source/gameengine/Ketsji/KX_PythonInit.cpp b/source/gameengine/Ketsji/KX_PythonInit.cpp
index 0275c3e1f7a..6f0ae284392 100644
--- a/source/gameengine/Ketsji/KX_PythonInit.cpp
+++ b/source/gameengine/Ketsji/KX_PythonInit.cpp
@@ -40,7 +40,7 @@ extern "C" {
#include "bpy_internal_import.h" /* from the blender python api, but we want to import text too! */
#include "Mathutils.h" // Blender.Mathutils module copied here so the blenderlayer can use.
#include "Geometry.h" // Blender.Geometry module copied here so the blenderlayer can use.
- #include "BGL.h"
+ #include "bgl.h"
#include "marshal.h" /* python header for loading/saving dicts */
}
@@ -1622,7 +1622,7 @@ PyObject *KXpy_import(PyObject *self, PyObject *args)
/* quick hack for GamePython modules
TODO: register builtin modules properly by ExtendInittab */
if (!strcmp(name, "GameLogic") || !strcmp(name, "GameKeys") || !strcmp(name, "PhysicsConstraints") ||
- !strcmp(name, "Rasterizer") || !strcmp(name, "Mathutils") || !strcmp(name, "BGL") || !strcmp(name, "Geometry")) {
+ !strcmp(name, "Rasterizer") || !strcmp(name, "Mathutils") || !strcmp(name, "bgl") || !strcmp(name, "Geometry")) {
return PyImport_ImportModuleEx(name, globals, locals, fromlist);
}
diff --git a/source/gameengine/VideoTexture/ImageBase.cpp b/source/gameengine/VideoTexture/ImageBase.cpp
index 908aa5ddd5e..31c634b1511 100644
--- a/source/gameengine/VideoTexture/ImageBase.cpp
+++ b/source/gameengine/VideoTexture/ImageBase.cpp
@@ -22,7 +22,7 @@ http://www.gnu.org/copyleft/lesser.txt.
#include "ImageBase.h"
extern "C" {
-#include "BGL.h"
+#include "bgl.h"
}
#include "GL/glew.h"
diff --git a/source/gameengine/VideoTexture/ImageBuff.cpp b/source/gameengine/VideoTexture/ImageBuff.cpp
index 3e9e7af6c07..0bb0cf59511 100644
--- a/source/gameengine/VideoTexture/ImageBuff.cpp
+++ b/source/gameengine/VideoTexture/ImageBuff.cpp
@@ -34,7 +34,7 @@ http://www.gnu.org/copyleft/lesser.txt.
extern "C" {
#include "IMB_imbuf_types.h"
#include "IMB_imbuf.h"
-#include "BGL.h"
+#include "bgl.h"
};
// default filter
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-16 14:45:56 +0300