Commit: 2465bd90d5a12fbb074f25898ca3f4a6c6def953
Author: Campbell Barton
Date: Sun Jun 19 06:25:54 2016 +1000
Branches: master
https://developer.blender.org/rB2465bd90d5a12fbb074f25898ca3f4a6c6def953
Cleanup: style, whitespace, doxy filepaths
===================================================================
M source/blender/blenkernel/intern/anim.c
M source/blender/blenkernel/intern/dynamicpaint.c
M source/blender/blenkernel/intern/library_idmap.c
M source/blender/blenkernel/intern/node.c
M source/blender/blenkernel/intern/particle_system.c
M source/blender/blenkernel/intern/pointcache.c
M source/blender/blenlib/intern/array_utils.c
M source/blender/blenlib/intern/storage.c
M source/blender/blenlib/intern/task.c
M source/blender/collada/MeshImporter.cpp
M source/blender/depsgraph/intern/builder/deg_builder.cc
M source/blender/depsgraph/intern/builder/deg_builder.h
M source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
M source/blender/depsgraph/intern/builder/deg_builder_pchanmap.cc
M source/blender/depsgraph/intern/builder/deg_builder_relations.cc
M source/blender/depsgraph/intern/builder/deg_builder_relations.h
M source/blender/depsgraph/intern/builder/deg_builder_transitive.cc
M source/blender/depsgraph/intern/depsgraph_type_defines.cc
M source/blender/depsgraph/intern/eval/deg_eval.cc
M source/blender/depsgraph/intern/eval/deg_eval.h
M source/blender/depsgraph/intern/eval/deg_eval_flush.cc
M source/blender/depsgraph/intern/eval/deg_eval_flush.h
M source/blender/depsgraph/intern/nodes/deg_node.cc
M source/blender/depsgraph/intern/nodes/deg_node.h
M source/blender/depsgraph/intern/nodes/deg_node_component.cc
M source/blender/depsgraph/intern/nodes/deg_node_component.h
M source/blender/depsgraph/intern/nodes/deg_node_operation.cc
M source/blender/depsgraph/intern/nodes/deg_node_operation.h
M source/blender/editors/interface/interface_panel.c
M source/blender/editors/io/io_collada.c
M source/blender/editors/mesh/editmesh_knife.c
M source/blender/editors/mesh/editmesh_rip.c
M source/blender/editors/physics/particle_edit.c
M source/blender/editors/space_image/image_ops.c
M source/blender/editors/space_view3d/drawobject.c
M source/blender/editors/space_view3d/view3d_edit.c
M source/blender/editors/transform/transform_snap.c
M source/blender/freestyle/intern/python/BPy_FrsNoise.cpp
M source/blender/gpu/intern/gpu_draw.c
M source/blender/makesdna/DNA_camera_types.h
M source/blender/makesdna/intern/dna_genfile.c
M source/blender/makesrna/intern/rna_scene_api.c
M source/blender/nodes/shader/node_shader_tree.c
M source/blender/nodes/shader/nodes/node_shader_normal_map.c
M source/gameengine/Converter/BL_BlenderDataConversion.cpp
M source/gameengine/Converter/KX_ConvertActuators.cpp
M source/gameengine/Expressions/EXP_PyObjectPlus.h
M source/gameengine/GameLogic/SCA_PropertySensor.cpp
M source/gameengine/Ketsji/KX_GameObject.cpp
M source/gameengine/Ketsji/KX_Light.cpp
M source/gameengine/Ketsji/KX_Scene.cpp
M source/gameengine/Ketsji/KX_SoundActuator.cpp
M source/gameengine/Ketsji/KX_TrackToActuator.cpp
M source/gameengine/Ketsji/KX_VehicleWrapper.cpp
M source/gameengine/Physics/Bullet/CcdPhysicsController.h
M source/gameengine/Physics/common/PHY_ICharacter.h
M source/gameengine/Physics/common/PHY_IController.h
M source/gameengine/Physics/common/PHY_IMotionState.h
M source/gameengine/Physics/common/PHY_IPhysicsController.h
M source/gameengine/Physics/common/PHY_IPhysicsEnvironment.h
M source/gameengine/Physics/common/PHY_IVehicle.h
M source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_StorageVA.h
M source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_StorageVBO.h
===================================================================
diff --git a/source/blender/blenkernel/intern/anim.c
b/source/blender/blenkernel/intern/anim.c
index dff6968..7d3d12a 100644
--- a/source/blender/blenkernel/intern/anim.c
+++ b/source/blender/blenkernel/intern/anim.c
@@ -340,11 +340,11 @@ static void motionpaths_calc_update_scene(Scene *scene)
}
}
#else // original, 'always correct' version
- /* do all updates
- * - if this is too slow, resort to using a more efficient way
- * that doesn't force complete update, but for now, this is the
- * most accurate way!
- */
+ /* do all updates
+ * - if this is too slow, resort to using a more efficient way
+ * that doesn't force complete update, but for now, this is the
+ * most accurate way!
+ */
BKE_scene_update_for_newframe(G.main->eval_ctx, G.main, scene,
scene->lay); /* XXX this is the best way we can get anything moving */
#endif
}
diff --git a/source/blender/blenkernel/intern/dynamicpaint.c
b/source/blender/blenkernel/intern/dynamicpaint.c
index 2d531e3..cc495b3 100644
--- a/source/blender/blenkernel/intern/dynamicpaint.c
+++ b/source/blender/blenkernel/intern/dynamicpaint.c
@@ -1826,14 +1826,14 @@ static DerivedMesh *dynamicPaint_Modifier_apply(
DynamicPaintModifierApplyData
data = {.surface = surface, .fcolor = fcolor};
BLI_task_parallel_range(0,
sData->total_points, &data,
dynamic_paint_apply_surface_vpaint_blend_cb,
-
sData->total_points > 1000);
+
sData->total_points > 1000);
/* paint layer */
MLoopCol *mloopcol =
CustomData_get_layer_named(&result->loopData, CD_MLOOPCOL,
surface->output_name);
/* if output layer is lost from
a constructive modifier, re-add it */
if (!mloopcol &&
dynamicPaint_outputLayerExists(surface, ob, 0)) {
mloopcol =
CustomData_add_layer_named(
-
&result->loopData, CD_MLOOPCOL, CD_CALLOC, NULL, totloop, surface->output_name);
+
&result->loopData, CD_MLOOPCOL, CD_CALLOC, NULL, totloop, surface->output_name);
}
/* wet layer */
@@ -1841,7 +1841,7 @@ static DerivedMesh *dynamicPaint_Modifier_apply(
/* if output layer is lost from
a constructive modifier, re-add it */
if (!mloopcol_wet &&
dynamicPaint_outputLayerExists(surface, ob, 1)) {
mloopcol_wet =
CustomData_add_layer_named(
-
&result->loopData, CD_MLOOPCOL, CD_CALLOC, NULL, totloop,
surface->output_name2);
+
&result->loopData, CD_MLOOPCOL, CD_CALLOC, NULL, totloop,
surface->output_name2);
}
/* Save preview results to
weight layer to be able to share same drawing methods */
@@ -1850,7 +1850,7 @@ static DerivedMesh *dynamicPaint_Modifier_apply(
mloopcol_preview =
CustomData_get_layer(&result->loopData, CD_PREVIEW_MLOOPCOL);
if (!mloopcol_preview) {
mloopcol_preview = CustomData_add_layer(
-
&result->loopData, CD_PREVIEW_MLOOPCOL, CD_CALLOC, NULL,
totloop);
+
&result->loopData, CD_PREVIEW_MLOOPCOL, CD_CALLOC, NULL, totloop);
}
}
@@ -2367,15 +2367,15 @@ static int dynamic_paint_find_neighbour_pixel(
edge1_index = 0;
edge2_index = 1;
dist_squared = dist_squared_to_line_segment_v2(
- pixel,
-
mloopuv[mlooptri[cPoint->tri_index].tri[0]].uv,
-
mloopuv[mlooptri[cPoint->tri_index].tri[1]].uv);
+ pixel,
+ mloopuv[mlooptri[cPoint->tri_index].tri[0]].uv,
+ mloopuv[mlooptri[cPoint->tri_index].tri[1]].uv);
/* Dist to second edge */
t_dist_squared = dist_squared_to_line_segment_v2(
- pixel,
-
mloopuv[mlooptri[cPoint->tri_index].tri[1]].uv,
-
mloopuv[mlooptri[cPoint->tri_index].tri[2]].uv);
+ pixel,
+ mloopuv[mlooptri[cPoint->tri_index].tri[1]].uv,
+ mloopuv[mlooptri[cPoint->tri_index].tri[2]].uv);
if (t_dist_squared < dist_squared) {
e1_index = cPoint->v2;
e2_index = cPoint->v3;
@@ -2386,9 +2386,9 @@ static int dynamic_paint_find_neighbour_pixel(
/* Dist to third edge */
t_dist_squared = dist_squared_to_line_segment_v2(
- pixel,
-
mloopuv[mlooptri[cPoint->tri_index].tri[2]].uv,
-
mloopuv[mlooptri[cPoint->tri_index].tri[0]].uv);
+ pixel,
+ mloopuv[mlooptri[cPoint->tri_index].tri[2]].uv,
+ mloopuv[mlooptri[cPoint->tri_index].tri[0]].uv);
if (t_dist_squared < dist_squared) {
e1_index = cPoint->v3;
e2_index = cPoint->v1;
@@ -2439,9 +2439,9 @@ static int dynamic_paint_find_neighbour_pixel(
//printf("connected UV : %f,%f & %f,%f - %f,%f & %f,%f\n",
s_uv1[0], s_uv1[1], s_uv2[0], s_uv2[1], t_uv1[0], t_uv1[1], t_uv2[0], t_uv2[1]);
if (((s_uv1[0] == t_uv1[0] && s_uv1[1] == t_uv1[1]) &&
- (s_uv2[0] == t_uv2[0] && s_uv2[1] == t_uv2[1])) ||
- ((s_uv2[0] == t_uv1[0] && s_uv2[1] == t_uv1[1]) &&
- (s_uv1[0] == t_uv2[0] && s_uv1[1] == t_uv2[1])))
+ (s_uv2[0] == t_uv2[0] && s_uv2[1] == t_uv2[1])) ||
+ ((s_uv2[0] == t_uv1[0] && s_uv2[1] == t_uv1[1]) &&
+ (s_uv1[0] == t_uv2[0] && s_uv1[1] == t_uv2[1])))
{
return ((px + neighX[n_index]) + w * (py +
neighY[n_index]));
}
@@ -2451,15 +2451,15 @@ static int dynamic_paint_find_neighbour_pixel(
* on this other face UV
*/
lambda = closest_to_line_v2(
- closest_point, pixel,
-
mloopuv[mlooptri[cPoint->tri_index].tri[edge1_index]].uv,
-
mloopuv[mlooptri[cPoint->tri_index].tri[edge2_index]].uv);
+ closest_point, pixel,
+
mloopuv[mlooptri[cPoint->tri_index].tri[edge1_index]].uv,
+
mloopuv[mlooptri[cPoint->tri_index].tri[edge2_index]].uv);
CLAMP(lambda, 0.0f, 1.0f);
sub_v2_v2v2(
- dir_vec,
-
mloopuv[mlooptri[target_tri].tri[target_uv2]].uv,
-
mloopuv[mlooptri[target_tri].tri[target_uv1]].uv);
+ dir_vec,
+ mloopuv[mlooptri[target_tri].tri[target_uv2]].uv,
+ mloopuv[mlooptri[target_tri].tri[target_uv1]].uv);
mul_v2_fl(dir_vec, lambda);
@@ -2678,8 +2678,8 @@ int dynamicPaint_createUVSurface(Scene *scene,
DynamicPaintSurface *surface, flo
ImgSeqFormatData *f_data = MEM_callocN(sizeof(*f_data),
"ImgSeqFormatData");
if (f_data) {
f_data->uv_p = MEM_callocN(active_points *
sizeof(*f_data->uv_p), "PaintUVPoint");
- f_data->barycentricWeights = MEM_callocN(active_points
* aa_samples * sizeof(*f_data->barycentricWeights),
-
"PaintUVPoint");
+ f_data->barycentricWeights =
+ MEM_callocN(active_points * aa_samples *
sizeof(*f_data->barycentricWeights), "PaintUVPoint");
if (!f_data->uv_p || !f_data->barycentricWeights)
error = 1;
@@ -2881,7 +2881,7 @@ void dynamicPaint_outputSurfaceImage(DynamicPaintSurface
*surface, char *filenam
}
DynamicPaintOutputSurfaceImageData data = {.surface = surface, .ibuf =
ibuf};
- switch(surface->type) {
+ switch (surface->type) {
case MOD_DPAINT_SURFACE_T_PAINT:
switch (output_layer) {
case 0:
@@ -3883,12 +3883,12 @@ static int dynamicPaint_paintMesh(DynamicPaintSurface
*surface,
/* loop through cell points and process
brush */
DynamicPaintPaintData data = {
- .surface = surface,
+ .surface = surface,
.brush = brush, .brushOb = brushOb,
.bMats = bMats,
.scene = scene, .timescale =
timescale, .c_index = c_index,
- .dm = dm, .mvert = mvert,
.mloop = mloop, .mlooptri = mlooptri,
- .brush_radius = brush_radius,
.avg_brushNor = avg_brushNor, .brushVelocity = brushVelocity,
- .treeData = &treeData
+ .dm = dm, .mvert = mvert, .mloop =
mloop, .mlooptri = mlooptri,
+ .brush_radius = brush_radius,
.avg_brushNor = avg_brushNor, .brushVelocity = brushVelocity,
+ .treeData = &treeData
};
BLI_task_parallel_range_ex(0,
grid->s_num[c_index], &data, NULL, 0,
dynamic_paint_paint_mesh_cell_point_cb_ex,
@@ -4170,10 +4170,10 @@ static int
dynamicPaint_paintParticles(DynamicPaintSurface *surface,
/* loop through cell points */
DynamicPaintPaintData data = {
- .surface = surface,
+ .surface = surface,
.brush = brush, .psys = psys,
.solidradius = solidradius, .timescale = timescale,
.c_index = c_index,
- .treeData = tree,
+ .treeData = tree,
};
BLI_task_parallel_range_ex(0, grid->s_num[c_index],
&data, NULL, 0,
dynamic_paint_paint_particle_cell_point_cb_ex,
@@ -4313,16 +4313,16 @@ static int dynamicPaint_paintSinglePoint(
* Loop through every surface point
*/
DynamicPaintPaintData data = {
- .surface = surface,
- .brush = brush, .brushOb = brushOb, .bMats = bMats,
- .scene = scene, .timescale = timescale,
- .mvert = mvert,
- .brush_radius = brush_radius, .brushVelocity = &brushVel,
+ .surface = surface,
+ .brush = brush, .brushOb = brushOb, .bMats = bMats,
+ .scene = scene, .timescale = timescale,
+ .mvert = mvert,
+ .brush_radius = brush_radius, .brushVelocity = &brushVel,
.pointCoord = pointCoord,
};
BLI_task_parallel_range_ex(0, sData->total_points, &data, NULL, 0,
-
dynamic_paint_paint_single_point_cb_ex,
- sData->total_points
> 1000, true);
+ dynamic_paint_paint_single_point_cb_ex,
+ sData->total_points > 1000, true);
return 1;
}
@@ -4755,83 +4755,83 @@ static void dynamic_paint_effect_drip_cb(void
*userdata, const int index)
{
const DynamicPaintEffectData *data = userdata;
- const DynamicPaintSurface *surface = data->surface;
- const PaintSurfaceData *sData = surface->data;
- BakeAdjPoint *bNeighs = sData->bData->bNeighs;
- PaintPoint *pPoint = &((PaintPoint *)sData->type_data)[index];
- const PaintPoint *prevPoint = data->prevPoint;
- const PaintPoint *pPoint_prev = &prevPoint[index];
- const float *force = data->force;
- const float eff_scale = data->eff_scale;
+ const DynamicPaintSurface *surface = data->surface;
+ const PaintSurfaceData *sData = surface->data;
+ BakeAdjPoint *bNeighs = sData->bData->bNeighs;
+ PaintPoint *pPoint = &((PaintPoint *)sData->type_data)[index];
+ const PaintPoint *prevPoint = data->prevPoint;
+ const PaintPoint *pPoint_prev = &prevPoint[index];
+ co
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
