Commit: 2a6e4f71576ebee19f34fd5f7c214fd2e9f060f8
Author: Campbell Barton
Date: Fri May 25 09:45:04 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB2a6e4f71576ebee19f34fd5f7c214fd2e9f060f8
Cleanup: style
===================================================================
M source/blender/blenkernel/intern/studiolight.c
M source/blender/draw/engines/workbench/workbench_deferred.c
M source/blender/draw/engines/workbench/workbench_forward.c
M source/blender/draw/intern/draw_cache.c
M source/blender/makesrna/intern/rna_scene.c
===================================================================
diff --git a/source/blender/blenkernel/intern/studiolight.c
b/source/blender/blenkernel/intern/studiolight.c
index 8086156d3af..d9ff6e84ac2 100644
--- a/source/blender/blenkernel/intern/studiolight.c
+++ b/source/blender/blenkernel/intern/studiolight.c
@@ -109,7 +109,11 @@ static void studiolight_calculate_radiance(ImBuf *ibuf,
float color[4], const fl
nearest_interpolation_color_wrap(ibuf, NULL, color, uv[0] * ibuf->x,
uv[1] * ibuf->y);
}
-static void studiolight_calculate_radiance_buffer(ImBuf *ibuf, float *colbuf,
const float start_x, const float add_x, const float start_y, const float add_y,
const float z, const int index_x, const int index_y, const int index_z)
+static void studiolight_calculate_radiance_buffer(
+ ImBuf *ibuf, float *colbuf,
+ const float start_x, const float add_x,
+ const float start_y, const float add_y, const float z,
+ const int index_x, const int index_y, const int index_z)
{
float direction[3];
float yf = start_y;
@@ -132,37 +136,43 @@ static void studiolight_calculate_radiance_buffer(ImBuf
*ibuf, float *colbuf, co
static void studiolight_calculate_radiance_buffers(StudioLight *sl)
{
if (sl->flag & STUDIOLIGHT_EXTERNAL_FILE) {
- ImBuf* ibuf = NULL;
+ ImBuf *ibuf = NULL;
ibuf = IMB_loadiffname(sl->path, 0, NULL);
if (ibuf) {
IMB_float_from_rect(ibuf);
- float *colbuf =
MEM_mallocN(4*STUDIOLIGHT_RADIANCE_CUBEMAP_SIZE*STUDIOLIGHT_RADIANCE_CUBEMAP_SIZE*sizeof(float),
__func__);
+ float *colbuf =
MEM_mallocN(SQUARE(STUDIOLIGHT_RADIANCE_CUBEMAP_SIZE) * sizeof(float[4]),
__func__);
const float add = 1.0f /
(STUDIOLIGHT_RADIANCE_CUBEMAP_SIZE + 1);
const float start = ((1.0f /
STUDIOLIGHT_RADIANCE_CUBEMAP_SIZE) * 0.5f) - 0.5f;
/* front */
studiolight_calculate_radiance_buffer(ibuf, colbuf,
start, add, start, add, 0.5f, 0, 2, 1);
- sl->radiance_buffers[STUDIOLIGHT_Y_POS] =
IMB_allocFromBuffer(NULL, colbuf, STUDIOLIGHT_RADIANCE_CUBEMAP_SIZE,
STUDIOLIGHT_RADIANCE_CUBEMAP_SIZE);
+ sl->radiance_buffers[STUDIOLIGHT_Y_POS] =
IMB_allocFromBuffer(
+ NULL, colbuf,
STUDIOLIGHT_RADIANCE_CUBEMAP_SIZE, STUDIOLIGHT_RADIANCE_CUBEMAP_SIZE);
/* back */
studiolight_calculate_radiance_buffer(ibuf, colbuf,
-start, -add, start, add, -0.5f, 0, 2, 1);
- sl->radiance_buffers[STUDIOLIGHT_Y_NEG] =
IMB_allocFromBuffer(NULL, colbuf, STUDIOLIGHT_RADIANCE_CUBEMAP_SIZE,
STUDIOLIGHT_RADIANCE_CUBEMAP_SIZE);
+ sl->radiance_buffers[STUDIOLIGHT_Y_NEG] =
IMB_allocFromBuffer(
+ NULL, colbuf,
STUDIOLIGHT_RADIANCE_CUBEMAP_SIZE, STUDIOLIGHT_RADIANCE_CUBEMAP_SIZE);
/* left */
studiolight_calculate_radiance_buffer(ibuf, colbuf,
-start, -add, start, add, 0.5f, 1, 2, 0);
- sl->radiance_buffers[STUDIOLIGHT_X_POS] =
IMB_allocFromBuffer(NULL, colbuf, STUDIOLIGHT_RADIANCE_CUBEMAP_SIZE,
STUDIOLIGHT_RADIANCE_CUBEMAP_SIZE);
+ sl->radiance_buffers[STUDIOLIGHT_X_POS] =
IMB_allocFromBuffer(
+ NULL, colbuf,
STUDIOLIGHT_RADIANCE_CUBEMAP_SIZE, STUDIOLIGHT_RADIANCE_CUBEMAP_SIZE);
/* right */
studiolight_calculate_radiance_buffer(ibuf, colbuf,
start, add, start, add, -0.5f, 1, 2, 0);
- sl->radiance_buffers[STUDIOLIGHT_X_NEG] =
IMB_allocFromBuffer(NULL, colbuf, STUDIOLIGHT_RADIANCE_CUBEMAP_SIZE,
STUDIOLIGHT_RADIANCE_CUBEMAP_SIZE);
+ sl->radiance_buffers[STUDIOLIGHT_X_NEG] =
IMB_allocFromBuffer(
+ NULL, colbuf,
STUDIOLIGHT_RADIANCE_CUBEMAP_SIZE, STUDIOLIGHT_RADIANCE_CUBEMAP_SIZE);
/* top */
studiolight_calculate_radiance_buffer(ibuf, colbuf,
start, add, start, add, -0.5f, 0, 1, 2);
- sl->radiance_buffers[STUDIOLIGHT_Z_NEG] =
IMB_allocFromBuffer(NULL, colbuf, STUDIOLIGHT_RADIANCE_CUBEMAP_SIZE,
STUDIOLIGHT_RADIANCE_CUBEMAP_SIZE);
+ sl->radiance_buffers[STUDIOLIGHT_Z_NEG] =
IMB_allocFromBuffer(
+ NULL, colbuf,
STUDIOLIGHT_RADIANCE_CUBEMAP_SIZE, STUDIOLIGHT_RADIANCE_CUBEMAP_SIZE);
/* bottom */
studiolight_calculate_radiance_buffer(ibuf, colbuf,
start, add, -start, -add, 0.5f, 0, 1, 2);
- sl->radiance_buffers[STUDIOLIGHT_Z_POS] =
IMB_allocFromBuffer(NULL, colbuf, STUDIOLIGHT_RADIANCE_CUBEMAP_SIZE,
STUDIOLIGHT_RADIANCE_CUBEMAP_SIZE);
+ sl->radiance_buffers[STUDIOLIGHT_Z_POS] =
IMB_allocFromBuffer(
+ NULL, colbuf,
STUDIOLIGHT_RADIANCE_CUBEMAP_SIZE, STUDIOLIGHT_RADIANCE_CUBEMAP_SIZE);
#if 0
IMB_saveiff(sl->radiance_buffers[STUDIOLIGHT_X_POS],
"/tmp/studiolight_radiance_left.png", IB_rectfloat);
diff --git a/source/blender/draw/engines/workbench/workbench_deferred.c
b/source/blender/draw/engines/workbench/workbench_deferred.c
index 70de6f71ae8..9a3d186289d 100644
--- a/source/blender/draw/engines/workbench/workbench_deferred.c
+++ b/source/blender/draw/engines/workbench/workbench_deferred.c
@@ -174,26 +174,26 @@ void workbench_deferred_engine_init(WORKBENCH_Data
*vedata)
memset(e_data.prepass_sh_cache, 0x00, sizeof(struct GPUShader
*) * MAX_SHADERS);
memset(e_data.composite_sh_cache, 0x00, sizeof(struct GPUShader
*) * MAX_SHADERS);
e_data.next_object_id = 1;
- #ifdef DEBUG_SHADOW_VOLUME
- const char *shadow_frag =
datatoc_workbench_shadow_debug_frag_glsl;
- #else
- const char *shadow_frag = NULL;
- #endif
- e_data.shadow_pass_sh = DRW_shader_create(
- datatoc_workbench_shadow_vert_glsl,
- datatoc_workbench_shadow_geom_glsl,
- shadow_frag,
- "#define SHADOW_PASS\n");
- e_data.shadow_fail_sh = DRW_shader_create(
- datatoc_workbench_shadow_vert_glsl,
- datatoc_workbench_shadow_geom_glsl,
- shadow_frag,
- "#define SHADOW_FAIL\n");
- e_data.shadow_caps_sh = DRW_shader_create(
- datatoc_workbench_shadow_vert_glsl,
- datatoc_workbench_shadow_caps_geom_glsl,
- shadow_frag,
- NULL);
+#ifdef DEBUG_SHADOW_VOLUME
+ const char *shadow_frag =
datatoc_workbench_shadow_debug_frag_glsl;
+#else
+ const char *shadow_frag = NULL;
+#endif
+ e_data.shadow_pass_sh = DRW_shader_create(
+ datatoc_workbench_shadow_vert_glsl,
+ datatoc_workbench_shadow_geom_glsl,
+ shadow_frag,
+ "#define SHADOW_PASS\n");
+ e_data.shadow_fail_sh = DRW_shader_create(
+ datatoc_workbench_shadow_vert_glsl,
+ datatoc_workbench_shadow_geom_glsl,
+ shadow_frag,
+ "#define SHADOW_FAIL\n");
+ e_data.shadow_caps_sh = DRW_shader_create(
+ datatoc_workbench_shadow_vert_glsl,
+ datatoc_workbench_shadow_caps_geom_glsl,
+ shadow_frag,
+ NULL);
}
if (!stl->g_data) {
@@ -212,7 +212,8 @@ void workbench_deferred_engine_init(WORKBENCH_Data *vedata)
if (NORMAL_ENCODING_ENABLED()) {
e_data.normal_buffer_tx =
DRW_texture_pool_query_2D(size[0], size[1], GPU_RG16,
&draw_engine_workbench_solid);
- } else {
+ }
+ else {
e_data.normal_buffer_tx =
DRW_texture_pool_query_2D(size[0], size[1], GPU_RGBA32F,
&draw_engine_workbench_solid);
}
diff --git a/source/blender/draw/engines/workbench/workbench_forward.c
b/source/blender/draw/engines/workbench/workbench_forward.c
index d73a37bb341..09cdb00926b 100644
--- a/source/blender/draw/engines/workbench/workbench_forward.c
+++ b/source/blender/draw/engines/workbench/workbench_forward.c
@@ -378,7 +378,7 @@ void workbench_forward_cache_init(WORKBENCH_Data
*UNUSED(vedata))
static void workbench_forward_cache_populate_particles(WORKBENCH_Data *vedata,
Object *ob)
{
- #ifdef WORKBENCH_REVEALAGE_ENABLED
+#ifdef WORKBENCH_REVEALAGE_ENABLED
WORKBENCH_StorageList *stl = vedata->stl;
WORKBENCH_PrivateData *wpd = stl->g_data;
#endif
diff --git a/source/blender/draw/intern/draw_cache.c
b/source/blender/draw/intern/draw_cache.c
index 96edb7cd429..a8d3b4294a0 100644
--- a/source/blender/draw/intern/draw_cache.c
+++ b/source/blender/draw/intern/draw_cache.c
@@ -1169,18 +1169,18 @@ Gwn_Batch *DRW_cache_lamp_area_disk_get(void)
}
Gwn_VertBuf *vbo = GWN_vertbuf_create_with_format(&format);
- GWN_vertbuf_data_alloc(vbo, 2*NSEGMENTS);
+ GWN_vertbuf_data_alloc(vbo, 2 * NSEGMENTS);
float v[3] = {0.0f, 0.5f, 0.0f};
GWN_vertbuf_attr_set(vbo, attr_id.pos, 0, v);
for (int a = 1; a < NSEGMENTS; a++) {
- v[0] = 0.5f*sinf(2.f * (float)M_PI * a / NSEGMENTS);
- v[1] = 0.5f*cosf(2.f * (float)M_PI * a / NSEGMENTS);
- GWN_vertbuf_attr_set(vbo, attr_id.pos, 2*a-1, v);
- GWN_vertbuf_attr_set(vbo, attr_id.pos, 2*a, v);
+ v[0] = 0.5f * sinf(2.0f * (float)M_PI * a / NSEGMENTS);
+ v[1] = 0.5f * cosf(2.0f * (float)M_PI * a / NSEGMENTS);
+ GWN_vertbuf_attr_set(vbo, attr_id.pos, 2 * a - 1, v);
+ GWN_vertbuf_attr_set(vbo, attr_id.pos, 2 * a, v);
}
copy_v3_fl3(v, 0.0f, 0.5f, 0.0f);
- GWN_vertbuf_attr_set(vbo, attr_id.pos, 2*NSEGMENTS-1, v);
+ GWN_vertbuf_attr_set(vbo, attr_id.pos, (2 * NSEGMENTS) - 1, v);
SHC.drw_lamp_area_disk = GWN_batch_create_ex(GWN_PRIM_LINES,
vbo, NULL, GWN_BATCH_OWNS_VBO);
}
diff --git a/source/blender/makesrna/intern/rna_scene.c
b/source/blender/makesrna/intern/rna_scene.c
index 8ac3b8c0a5c..c55a6ea4a59 100644
--- a/source/blender/makesrna/intern/rna_scene.c
+++ b/source/blender/makesrna/intern/rna_scene.c
@@ -175,11 +175,10 @@ const EnumPropertyItem rna_enum_snap_element_items[] = {
};
const EnumPropertyItem rna_enum_snap_node_element_items[] = {
- {SCE_SNAP_MODE_GRID , "GRID" , ICON_SNAP_GRID, "Grid", "Snap to
grid"},
- {SCE_SNAP_MODE_NODE_X, "NODE_X" , ICON_SNAP_EDGE, "Node X", "Snap to
left/right node border"},
- {SCE_SNAP_MODE_NODE_Y, "NODE_Y" , ICON_SNAP_EDGE, "Node Y", "Snap to
top/bottom node border"},
- {SCE_SNAP_MODE_NODE_X | SCE_SNAP_MODE_NODE_Y,
- "NODE_XY", ICON_SNAP_EDGE, "Node X / Y", "Snap
to any node border"},
+ {SCE_SNAP_MODE_GRID, "GRID", ICON_SNAP_GRID, "Grid", "Snap to
grid"},
+ {SCE_SNAP_MODE_NODE_X, "NODE_X", ICON_SNAP_EDGE, "Node X", "Snap to
left/right node border"},
+ {SCE_SNAP_MODE_NODE_Y, "NODE_Y", ICON_SNAP_EDGE, "Node Y", "Snap to
top/bottom node border"},
+ {SCE_SNAP_MODE_NODE_X | SCE_SNAP_MODE_NODE_Y, "NODE_XY",
ICON_SNAP_EDGE, "Node X / Y", "Snap to any node border"},
{0, NULL, 0, NULL, NULL}
};
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
