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:
authorCampbell Barton <ideasman42@gmail.com>2018-09-21 00:31:29 +0300
committerCampbell Barton <ideasman42@gmail.com>2018-09-21 01:11:50 +0300
commit08c7733c1393d200513983d9b895ef8e92110591 (patch)
tree72dc2b3621fd2ab41f5879d02d0bdae78533c7f9 /source/blender
parentfb88088203ec478f4c06bd4b755d47492246759d (diff)
Cleanup: style
Diffstat (limited to 'source/blender')
-rw-r--r--source/blender/blenloader/intern/versioning_280.c6
-rw-r--r--source/blender/editors/gpencil/gpencil_ops.c2
-rw-r--r--source/blender/python/gpu/gpu_py_shader.c4
3 files changed, 6 insertions, 6 deletions
diff --git a/source/blender/blenloader/intern/versioning_280.c b/source/blender/blenloader/intern/versioning_280.c
index 9174b7bf588..011e2641089 100644
--- a/source/blender/blenloader/intern/versioning_280.c
+++ b/source/blender/blenloader/intern/versioning_280.c
@@ -822,11 +822,11 @@ void do_versions_after_linking_280(Main *bmain)
for (int a = 0; a < nu->pntsu; a++, bezt++) {
if ((old_count -= 3) < 0) {
- memcpy(newptr, bezt->vec, sizeof(float[3*3]));
+ memcpy(newptr, bezt->vec, sizeof(float[3][3]));
newptr[3][0] = bezt->alfa;
}
else {
- memcpy(newptr, oldptr, sizeof(float[3*4]));
+ memcpy(newptr, oldptr, sizeof(float[3][4]));
}
newptr[3][1] = bezt->radius;
@@ -838,7 +838,7 @@ void do_versions_after_linking_280(Main *bmain)
else if (nu->bp) {
BPoint *bp = nu->bp;
- for (int a = 0; a < nu->pntsu*nu->pntsv; a++, bp++) {
+ for (int a = 0; a < nu->pntsu * nu->pntsv; a++, bp++) {
if (--old_count < 0) {
copy_v3_v3(newptr[0], bp->vec);
newptr[1][0] = bp->alfa;
diff --git a/source/blender/editors/gpencil/gpencil_ops.c b/source/blender/editors/gpencil/gpencil_ops.c
index 6a65f579053..9749038cee6 100644
--- a/source/blender/editors/gpencil/gpencil_ops.c
+++ b/source/blender/editors/gpencil/gpencil_ops.c
@@ -460,7 +460,7 @@ static void ed_keymap_gpencil_editing(wmKeyConfig *keyconf)
WM_keymap_add_item(keymap, "GPENCIL_OT_editmode_toggle", TABKEY, KM_PRESS, 0, 0);
/* select mode */
- kmi = WM_keymap_add_item(keymap, "GPENCIL_OT_selectmode_toggle", ONEKEY, KM_PRESS,0 , 0);
+ kmi = WM_keymap_add_item(keymap, "GPENCIL_OT_selectmode_toggle", ONEKEY, KM_PRESS, 0, 0);
RNA_int_set(kmi->ptr, "mode", 0);
kmi = WM_keymap_add_item(keymap, "GPENCIL_OT_selectmode_toggle", TWOKEY, KM_PRESS, 0, 0);
diff --git a/source/blender/python/gpu/gpu_py_shader.c b/source/blender/python/gpu/gpu_py_shader.c
index 3a9122297cd..a10fe22a7f2 100644
--- a/source/blender/python/gpu/gpu_py_shader.c
+++ b/source/blender/python/gpu/gpu_py_shader.c
@@ -340,8 +340,8 @@ static PyObject *bpygpu_shader_uniform_float(
float value;
if (!PyArg_ParseTuple(
- args, "if:GPUShader.uniform_float",
- &location, &value))
+ args, "if:GPUShader.uniform_float",
+ &location, &value))
{
return NULL;
}