Commit: ac476375b1755c994cc7d160bba827e4aed73597
Author: Campbell Barton
Date: Tue May 22 07:31:11 2018 +0200
Branches: blender2.8
https://developer.blender.org/rBac476375b1755c994cc7d160bba827e4aed73597
Cleanup: style, whitespace
===================================================================
M source/blender/blenkernel/intern/lattice.c
M source/blender/draw/intern/draw_cache.c
M source/blender/draw/intern/draw_cache_impl_mesh.c
M source/blender/editors/include/ED_keyframing.h
M source/blender/editors/include/ED_view3d.h
M source/blender/editors/space_view3d/view3d_edit.c
M source/blender/editors/space_view3d/view3d_utils.c
===================================================================
diff --git a/source/blender/blenkernel/intern/lattice.c
b/source/blender/blenkernel/intern/lattice.c
index 3257b20291d..d7105d3423f 100644
--- a/source/blender/blenkernel/intern/lattice.c
+++ b/source/blender/blenkernel/intern/lattice.c
@@ -1025,7 +1025,7 @@ void BKE_lattice_modifiers_calc(struct Depsgraph
*depsgraph, Scene *scene, Objec
{
Lattice *lt = ob->data;
/* Get vertex coordinates from the original copy; otherwise we get
already-modified coordinates. */
- Object *orig_ob = DEG_get_original_object(ob);
+ Object *ob_orig = DEG_get_original_object(ob);
VirtualModifierData virtualModifierData;
ModifierData *md = modifiers_getVirtualModifierList(ob,
&virtualModifierData);
float (*vertexCos)[3] = NULL;
@@ -1050,7 +1050,7 @@ void BKE_lattice_modifiers_calc(struct Depsgraph
*depsgraph, Scene *scene, Objec
if (mti->isDisabled && mti->isDisabled(md, 0)) continue;
if (mti->type != eModifierTypeType_OnlyDeform) continue;
- if (!vertexCos) vertexCos = BKE_lattice_vertexcos_get(orig_ob,
&numVerts);
+ if (!vertexCos) vertexCos = BKE_lattice_vertexcos_get(ob_orig,
&numVerts);
modifier_deformVerts_DM_deprecated(md, &mectx, NULL, vertexCos,
numVerts);
}
@@ -1062,7 +1062,7 @@ void BKE_lattice_modifiers_calc(struct Depsgraph
*depsgraph, Scene *scene, Objec
}
else {
/* Displist won't do anything; this is just for posterity's
sake until we remove it. */
- if (!vertexCos) vertexCos = BKE_lattice_vertexcos_get(orig_ob,
&numVerts);
+ if (!vertexCos) vertexCos = BKE_lattice_vertexcos_get(ob_orig,
&numVerts);
DispList *dl = MEM_callocN(sizeof(*dl), "lt_dl");
dl->type = DL_VERTS;
diff --git a/source/blender/draw/intern/draw_cache.c
b/source/blender/draw/intern/draw_cache.c
index 3197ba799be..6065e7f0fc5 100644
--- a/source/blender/draw/intern/draw_cache.c
+++ b/source/blender/draw/intern/draw_cache.c
@@ -1892,22 +1892,22 @@ Gwn_Batch *DRW_cache_bone_envelope_outline_get(void)
for (int a = 0; a < CIRCLE_RESOL; a++) {
v2[0] = radius * sinf((2.0f * M_PI * a) /
((float)CIRCLE_RESOL));
v2[1] = radius * cosf((2.0f * M_PI * a) /
((float)CIRCLE_RESOL));
- GWN_vertbuf_attr_set(vbo, attr_id.pos0, v , v0);
- GWN_vertbuf_attr_set(vbo, attr_id.pos1, v , v1);
+ GWN_vertbuf_attr_set(vbo, attr_id.pos0, v, v0);
+ GWN_vertbuf_attr_set(vbo, attr_id.pos1, v, v1);
GWN_vertbuf_attr_set(vbo, attr_id.pos2, v++, v2);
- GWN_vertbuf_attr_set(vbo, attr_id.pos0, v , v0);
- GWN_vertbuf_attr_set(vbo, attr_id.pos1, v , v1);
+ GWN_vertbuf_attr_set(vbo, attr_id.pos0, v, v0);
+ GWN_vertbuf_attr_set(vbo, attr_id.pos1, v, v1);
GWN_vertbuf_attr_set(vbo, attr_id.pos2, v++, v2);
copy_v2_v2(v0, v1);
copy_v2_v2(v1, v2);
}
v2[0] = 0.0f;
v2[1] = radius;
- GWN_vertbuf_attr_set(vbo, attr_id.pos0, v , v0);
- GWN_vertbuf_attr_set(vbo, attr_id.pos1, v , v1);
+ GWN_vertbuf_attr_set(vbo, attr_id.pos0, v, v0);
+ GWN_vertbuf_attr_set(vbo, attr_id.pos1, v, v1);
GWN_vertbuf_attr_set(vbo, attr_id.pos2, v++, v2);
- GWN_vertbuf_attr_set(vbo, attr_id.pos0, v , v0);
- GWN_vertbuf_attr_set(vbo, attr_id.pos1, v , v1);
+ GWN_vertbuf_attr_set(vbo, attr_id.pos0, v, v0);
+ GWN_vertbuf_attr_set(vbo, attr_id.pos1, v, v1);
GWN_vertbuf_attr_set(vbo, attr_id.pos2, v++, v2);
SHC.drw_bone_envelope_outline =
GWN_batch_create_ex(GWN_PRIM_TRI_STRIP, vbo, NULL, GWN_BATCH_OWNS_VBO);
@@ -2022,9 +2022,9 @@ Gwn_Batch *DRW_cache_bone_point_wire_outline_get(void)
}
v1[0] = 0.0f;
v1[1] = radius;
- GWN_vertbuf_attr_set(vbo, attr_id.pos0, v , v0);
+ GWN_vertbuf_attr_set(vbo, attr_id.pos0, v, v0);
GWN_vertbuf_attr_set(vbo, attr_id.pos1, v++, v1);
- GWN_vertbuf_attr_set(vbo, attr_id.pos0, v , v0);
+ GWN_vertbuf_attr_set(vbo, attr_id.pos0, v, v0);
GWN_vertbuf_attr_set(vbo, attr_id.pos1, v++, v1);
SHC.drw_bone_point_wire =
GWN_batch_create_ex(GWN_PRIM_TRI_STRIP, vbo, NULL, GWN_BATCH_OWNS_VBO);
diff --git a/source/blender/draw/intern/draw_cache_impl_mesh.c
b/source/blender/draw/intern/draw_cache_impl_mesh.c
index 065b98ff873..00d404e1571 100644
--- a/source/blender/draw/intern/draw_cache_impl_mesh.c
+++ b/source/blender/draw/intern/draw_cache_impl_mesh.c
@@ -3247,15 +3247,15 @@ static Gwn_IndexBuf
*mesh_batch_cache_get_edges_adjacency(MeshRenderData *rdata,
break;
}
v0 =
BM_elem_index_get(bm_looptri[e]->v);
- v1 =
BM_elem_index_get(bm_looptri[(e+1)%3]->v);
- v2 =
BM_elem_index_get(bm_looptri[(e+2)%3]->v);
+ v1 = BM_elem_index_get(bm_looptri[(e +
1) % 3]->v);
+ v2 = BM_elem_index_get(bm_looptri[(e +
2) % 3]->v);
}
else {
MLoop *mloop = rdata->mloop;
MLoopTri *mlt = rdata->mlooptri + i;
v0 = mloop[mlt->tri[e]].v;
- v1 = mloop[mlt->tri[(e+1)%3]].v;
- v2 = mloop[mlt->tri[(e+2)%3]].v;
+ v1 = mloop[mlt->tri[(e + 1) % 3]].v;
+ v2 = mloop[mlt->tri[(e + 2) % 3]].v;
}
bool inv_indices = (v1 > v2);
void **pval;
diff --git a/source/blender/editors/include/ED_keyframing.h
b/source/blender/editors/include/ED_keyframing.h
index 54ee0b30d52..85e51874cf3 100644
--- a/source/blender/editors/include/ED_keyframing.h
+++ b/source/blender/editors/include/ED_keyframing.h
@@ -109,7 +109,7 @@ int insert_vert_fcurve(struct FCurve *fcu, float x, float
y, eBezTriple_Keyframe
* Use this to insert a keyframe using the current value being keyframed,
in the
* nominated F-Curve (no creation of animation data performed). Returns
success.
*/
-bool insert_keyframe_direct(struct Depsgraph *depsgraph,struct ReportList
*reports, struct PointerRNA ptr, struct PropertyRNA *prop, struct FCurve *fcu,
float cfra, eBezTriple_KeyframeType keytype, eInsertKeyFlags flag);
+bool insert_keyframe_direct(struct Depsgraph *depsgraph, struct ReportList
*reports, struct PointerRNA ptr, struct PropertyRNA *prop, struct FCurve *fcu,
float cfra, eBezTriple_KeyframeType keytype, eInsertKeyFlags flag);
/* -------- */
diff --git a/source/blender/editors/include/ED_view3d.h
b/source/blender/editors/include/ED_view3d.h
index 9316d8ab265..28e2c5e0d71 100644
--- a/source/blender/editors/include/ED_view3d.h
+++ b/source/blender/editors/include/ED_view3d.h
@@ -110,7 +110,8 @@ void ED_view3d_from_m4(float mat[4][4], float ofs[3], float
quat[4], float *dist
void ED_view3d_from_object(struct Object *ob, float ofs[3], float quat[4],
float *dist, float *lens);
void ED_view3d_to_object(
- const struct Depsgraph *depsgraph, struct Object *ob, const float
ofs[3], const float quat[4], const float dist);
+ const struct Depsgraph *depsgraph, struct Object *ob,
+ const float ofs[3], const float quat[4], const float dist);
void ED_view3d_lastview_store(struct RegionView3D *rv3d);
@@ -380,7 +381,8 @@ int ED_view3d_view_layer_set(int lay, const int *values,
int *active);
struct RV3DMatrixStore *ED_view3d_mats_rv3d_backup(struct RegionView3D *rv3d);
void ED_view3d_mats_rv3d_restore(struct RegionView3D *rv3d,
struct RV3DMatrixStore *rv3dmat);
-void ED_draw_object_facemap(struct Depsgraph *depsgraph, struct Scene *scene,
struct Object *ob, const float col[4], const int facemap);
+void ED_draw_object_facemap(
+ struct Depsgraph *depsgraph, struct Scene *scene, struct Object *ob,
const float col[4], const int facemap);
struct RenderEngineType *ED_view3d_engine_type(struct Scene *scene, int
drawtype);
@@ -437,20 +439,24 @@ uint64_t ED_view3d_datamask(const struct Scene *scene,
const struct View3D *v3d)
uint64_t ED_view3d_screen_datamask(const struct Scene *scene, const struct
bScreen *screen);
bool ED_view3d_offset_lock_check(const struct View3D *v3d, const struct
RegionView3D *rv3d);
-void ED_view3d_persp_switch_from_camera(const struct Depsgraph *depsgraph,
+void ED_view3d_persp_switch_from_camera(
+ const struct Depsgraph *depsgraph,
struct View3D *v3d, struct RegionView3D *rv3d, const char persp);
-bool ED_view3d_persp_ensure(const struct Depsgraph *depsgraph,
+bool ED_view3d_persp_ensure(
+ const struct Depsgraph *depsgraph,
struct View3D *v3d, struct ARegion *ar);
/* camera lock functions */
bool ED_view3d_camera_lock_check(const struct View3D *v3d, const struct
RegionView3D *rv3d);
/* copy the camera to the view before starting a view transformation */
-void ED_view3d_camera_lock_init_ex(const struct Depsgraph *depsgraph,
+void ED_view3d_camera_lock_init_ex(
+ const struct Depsgraph *depsgraph,
struct View3D *v3d, struct RegionView3D *rv3d, const bool calc_dist);
void ED_view3d_camera_lock_init(const struct Depsgraph *depsgraph, struct
View3D *v3d, struct RegionView3D *rv3d);
/* copy the view to the camera, return true if */
-bool ED_view3d_camera_lock_sync(const struct Depsgraph *depsgraph,
+bool ED_view3d_camera_lock_sync(
+ const struct Depsgraph *depsgraph,
struct View3D *v3d, struct RegionView3D *rv3d);
bool ED_view3d_camera_autokey(
diff --git a/source/blender/editors/space_view3d/view3d_edit.c
b/source/blender/editors/space_view3d/view3d_edit.c
index 055595f3b9f..29a61fdf969 100644
--- a/source/blender/editors/space_view3d/view3d_edit.c
+++ b/source/blender/editors/space_view3d/view3d_edit.c
@@ -86,8 +86,6 @@
#include "view3d_intern.h" /* own include */
-#include "DEG_depsgraph_query.h"
-
/* -------------------------------------------------------------------- */
/** \name Generic View Operator Properties
* \{ */
diff --git a/source/blender/editors/space_view3d/view3d_utils.c
b/source/blender/editors/space_view3d/view3d_utils.c
index 92da29d4c62..017043b3545 100644
--- a/source/blender/editors/space_view3d/view3d_utils.c
+++ b/source/blender/editors/space_view3d/view3d_utils.c
@@ -464,7 +464,7 @@ bool ED_view3d_camera_lock_check(const View3D *v3d, const
RegionView3D *rv3d)
* Apply the camera object transformation to the view-port.
* (needed so we can use regular view-port manipulation operators, that sync
back to the camera).
*/
-void ED_view3d_camera_lock_init_ex(const Depsgraph* depsgraph, View3D *v3d,
RegionView3D *rv3d, const bool calc_dist)
+void ED_view3d_camera_lock_init_ex(const Depsgraph *depsgraph, View3D *v3d,
RegionView3D *rv3d, const bool calc_dist)
{
if (ED_view3d_camera_lock_che
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
