[Bf-blender-cvs] [4439e5d0ba3] master: Cleanup: add trailing commas to avoid right shift
Campbell Barton
noreply at git.blender.org
Thu Apr 18 17:19:52 CEST 2019
Commit: 4439e5d0ba3ffde3841ec44405a9bcaf800be279
Author: Campbell Barton
Date: Thu Apr 18 17:17:32 2019 +0200
Branches: master
https://developer.blender.org/rB4439e5d0ba3ffde3841ec44405a9bcaf800be279
Cleanup: add trailing commas to avoid right shift
===================================================================
M intern/ghost/intern/GHOST_NDOFManager.cpp
M intern/ghost/intern/GHOST_SystemX11.cpp
M intern/ghost/intern/GHOST_WindowSDL.cpp
M intern/opensubdiv/internal/opensubdiv_device_context_opencl.cc
M source/blender/blenkernel/intern/colortools.c
M source/blender/blenkernel/intern/smoke.c
M source/blender/blenkernel/intern/subdiv_mesh.c
M source/blender/blenkernel/intern/tracking.c
M source/blender/blenkernel/intern/tracking_util.c
M source/blender/blenlib/intern/expr_pylike_eval.c
M source/blender/bmesh/intern/bmesh_log.c
M source/blender/bmesh/operators/bmo_fill_grid.c
M source/blender/bmesh/operators/bmo_hull.c
M source/blender/compositor/intern/COM_OpenCLDevice.cpp
M source/blender/compositor/operations/COM_MaskOperation.cpp
M source/blender/compositor/operations/COM_PlaneCornerPinOperation.cpp
M source/blender/compositor/operations/COM_VariableSizeBokehBlurOperation.cpp
M source/blender/draw/engines/gpencil/gpencil_render.c
M source/blender/draw/intern/draw_cache.c
M source/blender/draw/modes/object_mode.c
M source/blender/editors/gizmo_library/gizmo_types/cage2d_gizmo.c
M source/blender/editors/interface/interface.c
M source/blender/editors/interface/interface_draw.c
M source/blender/editors/physics/particle_object.c
M source/blender/editors/screen/area.c
M source/blender/editors/screen/screen_context.c
M source/blender/editors/space_clip/tracking_ops_orient.c
M source/blender/editors/transform/transform_orientations.c
M source/blender/editors/util/ed_util.c
M source/blender/freestyle/intern/python/StrokeShader/BPy_IncreasingColorShader.cpp
M source/blender/freestyle/intern/python/StrokeShader/BPy_SmoothingShader.cpp
M source/blender/imbuf/intern/indexer.c
M source/blender/makesrna/intern/rna_scene.c
M source/blender/modifiers/intern/MOD_skin.c
M source/blender/nodes/composite/nodes/node_composite_bilateralblur.c
M source/blender/nodes/composite/nodes/node_composite_sepcombYCCA.c
M source/blender/nodes/composite/nodes/node_composite_sepcombYUVA.c
M source/blender/nodes/shader/nodes/node_shader_vectTransform.c
M source/blender/python/intern/bpy.c
M source/blender/python/intern/bpy_rna_id_collection.c
M source/blender/windowmanager/intern/wm_cursors.c
M source/blender/windowmanager/intern/wm_operators.c
M tests/gtests/blenlib/BLI_polyfill_2d_test.cc
===================================================================
diff --git a/intern/ghost/intern/GHOST_NDOFManager.cpp b/intern/ghost/intern/GHOST_NDOFManager.cpp
index b407d120a99..9999bfd7ea6 100644
--- a/intern/ghost/intern/GHOST_NDOFManager.cpp
+++ b/intern/ghost/intern/GHOST_NDOFManager.cpp
@@ -96,21 +96,23 @@ static const NDOF_ButtonT Modern3Dx_HID_map[] = {
NDOF_BUTTON_SHIFT, NDOF_BUTTON_CTRL, NDOF_BUTTON_ROTATE, NDOF_BUTTON_PANZOOM,
NDOF_BUTTON_DOMINANT, NDOF_BUTTON_PLUS, NDOF_BUTTON_MINUS};
-static const NDOF_ButtonT SpaceExplorer_HID_map[] = {NDOF_BUTTON_1,
- NDOF_BUTTON_2,
- NDOF_BUTTON_TOP,
- NDOF_BUTTON_LEFT,
- NDOF_BUTTON_RIGHT,
- NDOF_BUTTON_FRONT,
- NDOF_BUTTON_ESC,
- NDOF_BUTTON_ALT,
- NDOF_BUTTON_SHIFT,
- NDOF_BUTTON_CTRL,
- NDOF_BUTTON_FIT,
- NDOF_BUTTON_MENU,
- NDOF_BUTTON_PLUS,
- NDOF_BUTTON_MINUS,
- NDOF_BUTTON_ROTATE};
+static const NDOF_ButtonT SpaceExplorer_HID_map[] = {
+ NDOF_BUTTON_1,
+ NDOF_BUTTON_2,
+ NDOF_BUTTON_TOP,
+ NDOF_BUTTON_LEFT,
+ NDOF_BUTTON_RIGHT,
+ NDOF_BUTTON_FRONT,
+ NDOF_BUTTON_ESC,
+ NDOF_BUTTON_ALT,
+ NDOF_BUTTON_SHIFT,
+ NDOF_BUTTON_CTRL,
+ NDOF_BUTTON_FIT,
+ NDOF_BUTTON_MENU,
+ NDOF_BUTTON_PLUS,
+ NDOF_BUTTON_MINUS,
+ NDOF_BUTTON_ROTATE,
+};
// this is the older SpacePilot (sans Pro)
// thanks to polosson for info about this device
@@ -123,18 +125,20 @@ static const NDOF_ButtonT SpacePilot_HID_map[] = {
NDOF_BUTTON_NONE // the CONFIG button -- what does it do?
};
-static const NDOF_ButtonT Generic_HID_map[] = {NDOF_BUTTON_1,
- NDOF_BUTTON_2,
- NDOF_BUTTON_3,
- NDOF_BUTTON_4,
- NDOF_BUTTON_5,
- NDOF_BUTTON_6,
- NDOF_BUTTON_7,
- NDOF_BUTTON_8,
- NDOF_BUTTON_9,
- NDOF_BUTTON_A,
- NDOF_BUTTON_B,
- NDOF_BUTTON_C};
+static const NDOF_ButtonT Generic_HID_map[] = {
+ NDOF_BUTTON_1,
+ NDOF_BUTTON_2,
+ NDOF_BUTTON_3,
+ NDOF_BUTTON_4,
+ NDOF_BUTTON_5,
+ NDOF_BUTTON_6,
+ NDOF_BUTTON_7,
+ NDOF_BUTTON_8,
+ NDOF_BUTTON_9,
+ NDOF_BUTTON_A,
+ NDOF_BUTTON_B,
+ NDOF_BUTTON_C,
+};
static const int genericButtonCount = sizeof(Generic_HID_map) / sizeof(NDOF_ButtonT);
diff --git a/intern/ghost/intern/GHOST_SystemX11.cpp b/intern/ghost/intern/GHOST_SystemX11.cpp
index 4d467f3b913..b850619e851 100644
--- a/intern/ghost/intern/GHOST_SystemX11.cpp
+++ b/intern/ghost/intern/GHOST_SystemX11.cpp
@@ -692,14 +692,16 @@ bool GHOST_SystemX11::processEvents(bool waitForEvent)
if (xev_next.type == KeyPress || xev_next.type == KeyRelease) {
/* XK_Hyper_L/R currently unused */
- const static KeySym modifiers[8] = {XK_Shift_L,
- XK_Shift_R,
- XK_Control_L,
- XK_Control_R,
- XK_Alt_L,
- XK_Alt_R,
- XK_Super_L,
- XK_Super_R};
+ const static KeySym modifiers[8] = {
+ XK_Shift_L,
+ XK_Shift_R,
+ XK_Control_L,
+ XK_Control_R,
+ XK_Alt_L,
+ XK_Alt_R,
+ XK_Super_L,
+ XK_Super_R,
+ };
for (int i = 0; i < (sizeof(modifiers) / sizeof(*modifiers)); i++) {
KeyCode kc = XKeysymToKeycode(m_display, modifiers[i]);
diff --git a/intern/ghost/intern/GHOST_WindowSDL.cpp b/intern/ghost/intern/GHOST_WindowSDL.cpp
index d40377acc3a..89efdf1a94e 100644
--- a/intern/ghost/intern/GHOST_WindowSDL.cpp
+++ b/intern/ghost/intern/GHOST_WindowSDL.cpp
@@ -349,24 +349,26 @@ static unsigned char sdl_std_cursor_mask_sb_h_double_arrow[] = {
0x18,
0x0c,
};
-static unsigned char sdl_std_cursor_sb_h_double_arrow[] = {0x00,
- 0x00,
- 0x08,
- 0x08,
- 0x0c,
- 0x18,
- 0xfe,
- 0x3f,
- 0x0f,
- 0x78,
- 0xfe,
- 0x3f,
- 0x0c,
- 0x18,
- 0x08,
- 0x08,
- 0x00,
- 0x00};
+static unsigned char sdl_std_cursor_sb_h_double_arrow[] = {
+ 0x00,
+ 0x00,
+ 0x08,
+ 0x08,
+ 0x0c,
+ 0x18,
+ 0xfe,
+ 0x3f,
+ 0x0f,
+ 0x78,
+ 0xfe,
+ 0x3f,
+ 0x0c,
+ 0x18,
+ 0x08,
+ 0x08,
+ 0x00,
+ 0x00,
+};
#define sdl_std_cursor_WIDTH_sb_h_double_arrow 15
#define sdl_std_cursor_HEIGHT_sb_h_double_arrow 9
#define sdl_std_cursor_HOT_X_sb_h_double_arrow -7
diff --git a/intern/opensubdiv/internal/opensubdiv_device_context_opencl.cc b/intern/opensubdiv/internal/opensubdiv_device_context_opencl.cc
index 12f6ced4bbb..72285930889 100644
--- a/intern/opensubdiv/internal/opensubdiv_device_context_opencl.cc
+++ b/intern/opensubdiv/internal/opensubdiv_device_context_opencl.cc
@@ -155,26 +155,30 @@ bool CLDeviceContext::Initialize()
cl_platform_id cp_platform = findPlatform();
# if defined(_WIN32)
- cl_context_properties props[] = {CL_GL_CONTEXT_KHR,
- (cl_context_properties)wglGetCurrentContext(),
- CL_WGL_HDC_KHR,
- (cl_context_properties)wglGetCurrentDC(),
- CL_CONTEXT_PLATFORM,
- (cl_context_properties)cp_platform,
- 0};
+ cl_context_properties props[] = {
+ CL_GL_CONTEXT_KHR,
+ (cl_context_properties)wglGetCurrentContext(),
+ CL_WGL_HDC_KHR,
+ (cl_context_properties)wglGetCurrentDC(),
+ CL_CONTEXT_PLATFORM,
+ (cl_context_properties)cp_platform,
+ 0,
+ };
# elif defined(__APPLE__)
CGLContextObj kCGLContext = CGLGetCurrentContext();
CGLShareGroupObj kCGLShareGroup = CGLGetShareGroup(kCGLContext);
cl_context_properties props[] = {
CL_CONTEXT_PROPERTY_USE_CGL_SHAREGROUP_APPLE, (cl_context_properties)kCGLShareGroup, 0};
# else
- cl_context_properties props[] = {CL_GL_CONTEXT_KHR,
- (cl_context_properties)glXGetCurrentContext(),
- CL_GLX_DISPLAY_KHR,
- (cl_context_properties)glXGetCurrentDisplay(),
- CL_CONTEXT_PLATFORM,
- (cl_context_properties)cp_platform,
- 0};
+ cl_context_properties props[] = {
+ CL_GL_CONTEXT_KHR,
+ (cl_context_properties)glXGetCurrentContext(),
+ CL_GLX_DISPLAY_KHR,
+ (cl_context_properties)glXGetCurrentDisplay(),
+ CL_CONTEXT_PLATFORM,
+ (cl_context_properties)cp_platform,
+ 0,
+ };
# endif
# if defined(__APPLE__)
diff --git a/source/blender/blenkernel/intern/colortools.c b/source/blender/blenkernel/intern/colortools.c
index 96c098b37e9..6d3aea91bc4 100644
--- a/source/blender/blenkernel/intern/colortools.c
+++ b/source/blender/blenkernel/intern/colortools.c
@@ -1456,8 +1456,7 @@ void scopes_update(Scopes *scopes,
unsigned int nl, na, nr, ng, nb;
double divl, diva, divr, divg, divb;
const unsigned char *display_buffer = NULL;
- unsigned int bin_lum[256] = {0}, bin_r[256] = {0}, bin_g[256] = {0}, bin_b[256] = {0},
- bin_a[256] = {0};
+ uint bin_lum[256] = {0}, bin_r[256] = {0}, bin_g[256] = {0}, bin_b[256] = {0}, bin_a[256] = {0};
int ycc_mode = -1;
void *cache_handle = NULL;
struct ColormanageProcessor *cm_processor = NULL;
diff --git a/source/blender/blenkernel/intern/smoke.c b/source/blender/blenkernel/intern/smoke.c
index 50c72f5a57f..acb0fd350d2 100644
--- a/source/blender/blenkernel/intern/smoke.c
+++ b/source/blender/blenkernel/intern/smoke.c
@@ -1777,7 +1777,10 @@ static void emit_from_mesh_task_cb(void *__restrict userdata,
const int index = smoke_get_index(
x - data->min[0], data->res[0], y - data->min[1], data->res[1], z - data->min[2]);
const float ray_start[3] = {
- lx + 0.5f * data->hr, ly + 0.5f * data->hr, lz + 0.5f * data->hr};
+
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list