bartvdbraak/blender
1
0
Fork 4
Code Issues 4 Pull Requests 1 Actions 1 Packages Projects Releases Wiki Activity

Cleanup: style

Browse Source
This commit is contained in:
Campbell Barton 2018-09-20 10:06:59 +10:00
parent 104fb1fb76
commit 0acc1b4c6c
5 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
source/blender/alembic/intern/abc_points.cc
View File

@ -60,10 +60,10 @@ using Alembic::AbcGeom::OPointsSchema;
AbcPointsWriter::AbcPointsWriter(Scene *scene, AbcPointsWriter::AbcPointsWriter(Scene *scene,
Object *ob, Object *ob,
AbcTransformWriter *parent, AbcTransformWriter *parent,
uint32_t time_sampling, uint32_t time_sampling,
ExportSettings &settings, ExportSettings &settings,
ParticleSystem *psys) ParticleSystem *psys)
: AbcObjectWriter(scene, ob, time_sampling, settings, parent) : AbcObjectWriter(scene, ob, time_sampling, settings, parent)
{ {
m_psys = psys; m_psys = psys;

2
source/blender/blenkernel/intern/modifiers_bmesh.c
View File

@ -106,7 +106,7 @@ void DM_to_bmesh_ex(DerivedMesh *dm, BMesh *bm, const bool calc_face_normal)
/*do verts*/ /*do verts*/
bool vert_allocated; bool vert_allocated;
mv = mvert = DM_get_vert_array(dm, &vert_allocated);; mv = mvert = DM_get_vert_array(dm, &vert_allocated);
for (i = 0; i < totvert; i++, mv++) { for (i = 0; i < totvert; i++, mv++) {
v = BM_vert_create(bm, mv->co, NULL, BM_CREATE_SKIP_CD); v = BM_vert_create(bm, mv->co, NULL, BM_CREATE_SKIP_CD);
normal_short_to_float_v3(v->no, mv->no); normal_short_to_float_v3(v->no, mv->no);

2
source/blender/blenkernel/intern/tracking_stabilize.c
View File

@ -992,7 +992,7 @@ static void initialize_all_tracks(StabContext *ctx, float aspect)
* By definition, offset contribution is zero there. * By definition, offset contribution is zero there.
*/ */
int reference_frame = tracking->stabilization.anchor_frame; int reference_frame = tracking->stabilization.anchor_frame;
float average_angle=0, average_scale_step=0; float average_angle = 0, average_scale_step = 0;
float average_translation[2], average_pos[2], pivot[2]; float average_translation[2], average_pos[2], pivot[2];
zero_v2(average_translation); zero_v2(average_translation);
zero_v2(pivot); zero_v2(pivot);

22
source/blender/blenkernel/intern/tracking_util.c
View File

@ -853,17 +853,17 @@ static ImBuf *accessor_get_ibuf(TrackingImageAccessor *accessor,
} }
static libmv_CacheKey accessor_get_image_callback( static libmv_CacheKey accessor_get_image_callback(
struct libmv_FrameAccessorUserData *user_data, struct libmv_FrameAccessorUserData *user_data,
int clip_index, int clip_index,
int frame, int frame,
libmv_InputMode input_mode, libmv_InputMode input_mode,
int downscale, int downscale,
const libmv_Region *region, const libmv_Region *region,
const libmv_FrameTransform *transform, const libmv_FrameTransform *transform,
float **destination, float **destination,
int *width, int *width,
int *height, int *height,
int *channels) int *channels)
{ {
TrackingImageAccessor *accessor = (TrackingImageAccessor *) user_data; TrackingImageAccessor *accessor = (TrackingImageAccessor *) user_data;
ImBuf *ibuf; ImBuf *ibuf;

4
source/blender/compositor/nodes/COM_RenderLayersNode.cpp
View File

@ -78,8 +78,8 @@ void RenderLayersNode::testRenderLink(NodeConverter &converter,
const int num_outputs = this->getNumberOfOutputSockets(); const int num_outputs = this->getNumberOfOutputSockets();
for (int i = 0; i < num_outputs; i++) { for (int i = 0; i < num_outputs; i++) {
NodeOutput *output = this->getOutputSocket(i); NodeOutput *output = this->getOutputSocket(i);
NodeImageLayer *storage = (NodeImageLayer*) output->getbNodeSocket()->storage; NodeImageLayer *storage = (NodeImageLayer *)output->getbNodeSocket()->storage;
RenderPass *rpass = (RenderPass*) BLI_findstring( RenderPass *rpass = (RenderPass *)BLI_findstring(
&rl->passes, &rl->passes,
storage->pass_name, storage->pass_name,
offsetof(RenderPass, name)); offsetof(RenderPass, name));