Commit: 3c9e2e82fae35ae45c06c4ebc3c7db1775acc2d1
Author: Campbell Barton
Date: Tue Jun 5 21:32:49 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB3c9e2e82fae35ae45c06c4ebc3c7db1775acc2d1
Cleanup: style
===================================================================
M source/blender/blenkernel/intern/object.c
M source/blender/blenkernel/intern/studiolight.c
M source/blender/draw/engines/workbench/workbench_data.c
M source/blender/draw/intern/draw_cache_impl_mesh.c
M source/tools
===================================================================
diff --git a/source/blender/blenkernel/intern/object.c
b/source/blender/blenkernel/intern/object.c
index 522ed65174c..3951f15a50d 100644
--- a/source/blender/blenkernel/intern/object.c
+++ b/source/blender/blenkernel/intern/object.c
@@ -2875,8 +2875,7 @@ Mesh *BKE_object_get_pre_modified_mesh(Object *object)
if (object->runtime.mesh_orig != NULL) {
BLI_assert(object->id.tag & LIB_TAG_COPIED_ON_WRITE);
BLI_assert(object->id.orig_id != NULL);
- BLI_assert(object->runtime.mesh_orig->id.orig_id ==
- ((Object*)object->id.orig_id)->data);
+ BLI_assert(object->runtime.mesh_orig->id.orig_id == ((Object
*)object->id.orig_id)->data);
Mesh *result = object->runtime.mesh_orig;
BLI_assert((result->id.tag & LIB_TAG_COPIED_ON_WRITE) != 0);
BLI_assert((result->id.tag &
LIB_TAG_COPIED_ON_WRITE_EVAL_RESULT) == 0);
@@ -2900,7 +2899,7 @@ Mesh *BKE_object_get_original_mesh(Object *object)
}
else {
BLI_assert((object->id.tag & LIB_TAG_COPIED_ON_WRITE) != 0);
- result = ((Object*)object->id.orig_id)->data;
+ result = ((Object *)object->id.orig_id)->data;
}
BLI_assert(result != NULL);
BLI_assert((result->id.tag & (LIB_TAG_COPIED_ON_WRITE |
LIB_TAG_COPIED_ON_WRITE_EVAL_RESULT)) == 0);
diff --git a/source/blender/blenkernel/intern/studiolight.c
b/source/blender/blenkernel/intern/studiolight.c
index 0d44509ae65..8ebc8f7e082 100644
--- a/source/blender/blenkernel/intern/studiolight.c
+++ b/source/blender/blenkernel/intern/studiolight.c
@@ -586,15 +586,13 @@ static uint *studiolight_matcap_preview(StudioLight *sl,
int icon_size)
uint *rect = MEM_mallocN(icon_size * icon_size * sizeof(uint),
__func__);
int offset = 0;
- ImBuf* ibuf = sl->equirectangular_radiance_buffer;
- for (int y= 0; y < icon_size; y ++)
- {
- for (int x = 0; x < icon_size; x ++)
- {
+ ImBuf *ibuf = sl->equirectangular_radiance_buffer;
+ for (int y = 0; y < icon_size; y++) {
+ for (int x = 0; x < icon_size; x++) {
uint pixelresult = 0x0;
float fx = x * ibuf->x / icon_size;
float fy = y * ibuf->y / icon_size;
- nearest_interpolation_color(ibuf, (unsigned
char*)&pixelresult, NULL, fx, fy);
+ nearest_interpolation_color(ibuf, (uchar
*)&pixelresult, NULL, fx, fy);
rect[offset++] = pixelresult;
}
}
diff --git a/source/blender/draw/engines/workbench/workbench_data.c
b/source/blender/draw/engines/workbench/workbench_data.c
index 4eca3acf238..7468d748986 100644
--- a/source/blender/draw/engines/workbench/workbench_data.c
+++ b/source/blender/draw/engines/workbench/workbench_data.c
@@ -16,9 +16,12 @@ void workbench_private_data_init(WORKBENCH_PrivateData *wpd)
wpd->shading = v3d->shading;
wpd->drawtype = v3d->drawtype;
if (wpd->shading.light == V3D_LIGHTING_MATCAP) {
- wpd->studio_light =
BKE_studiolight_find(wpd->shading.matcap, STUDIOLIGHT_ORIENTATION_VIEWNORMAL);
- } else {
- wpd->studio_light =
BKE_studiolight_find(wpd->shading.studio_light, STUDIOLIGHT_ORIENTATION_CAMERA
| STUDIOLIGHT_ORIENTATION_WORLD);
+ wpd->studio_light = BKE_studiolight_find(
+ wpd->shading.matcap,
STUDIOLIGHT_ORIENTATION_VIEWNORMAL);
+ }
+ else {
+ wpd->studio_light = BKE_studiolight_find(
+ wpd->shading.studio_light,
STUDIOLIGHT_ORIENTATION_CAMERA | STUDIOLIGHT_ORIENTATION_WORLD);
}
}
else {
diff --git a/source/blender/draw/intern/draw_cache_impl_mesh.c
b/source/blender/draw/intern/draw_cache_impl_mesh.c
index fa78e143e98..53b3cadafe2 100644
--- a/source/blender/draw/intern/draw_cache_impl_mesh.c
+++ b/source/blender/draw/intern/draw_cache_impl_mesh.c
@@ -3438,8 +3438,8 @@ static Gwn_VertBuf
*mesh_batch_cache_create_edges_overlay_adj_texture_buf(MeshRe
GWN_vertbuf_attr_set(vbo, index_id, vidx++, &value);
if (do_adjacency) {
- int v1 = mloop[mlt->tri[(e+1) % 3]].v;
- int v2 = mloop[mlt->tri[(e+2) % 3]].v;
+ int v1 = mloop[mlt->tri[(e + 1) % 3]].v;
+ int v2 = mloop[mlt->tri[(e + 2) % 3]].v;
EdgeAdjacentVerts *eav =
BLI_edgehash_lookup(eh, v0, v1);
int adj_v;
if (eav->vert_index[0] != v2) {
diff --git a/source/tools b/source/tools
index 48736838d42..fca325137b6 160000
--- a/source/tools
+++ b/source/tools
@@ -1 +1 @@
-Subproject commit 48736838d421447d5e4d67ccd59bf1d22dcc85d9
+Subproject commit fca325137b6ee2dfd0930ca87684ccf30703554f
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
