Commit: a25c11fd8d602236f36c34c342453149bdc1d909
Author: Campbell Barton
Date: Fri Jun 8 08:07:48 2018 +0200
Branches: master
https://developer.blender.org/rBa25c11fd8d602236f36c34c342453149bdc1d909
Cleanup: trailing space
Remove from blender/nodes, collada, blenfont & render.
===================================================================
M source/blender/blenfont/intern/blf.c
M source/blender/blenfont/intern/blf_dir.c
M source/blender/blenfont/intern/blf_font.c
M source/blender/blenfont/intern/blf_glyph.c
M source/blender/blenfont/intern/blf_internal_types.h
M source/blender/collada/AnimationExporter.cpp
M source/blender/collada/AnimationExporter.h
M source/blender/collada/AnimationImporter.cpp
M source/blender/collada/AnimationImporter.h
M source/blender/collada/ArmatureExporter.cpp
M source/blender/collada/ArmatureImporter.cpp
M source/blender/collada/ArmatureImporter.h
M source/blender/collada/CameraExporter.cpp
M source/blender/collada/ControllerExporter.cpp
M source/blender/collada/DocumentExporter.cpp
M source/blender/collada/DocumentImporter.cpp
M source/blender/collada/DocumentImporter.h
M source/blender/collada/EffectExporter.cpp
M source/blender/collada/EffectExporter.h
M source/blender/collada/ErrorHandler.cpp
M source/blender/collada/ExtraHandler.cpp
M source/blender/collada/ExtraHandler.h
M source/blender/collada/ExtraTags.cpp
M source/blender/collada/ExtraTags.h
M source/blender/collada/GeometryExporter.cpp
M source/blender/collada/GeometryExporter.h
M source/blender/collada/ImageExporter.cpp
M source/blender/collada/ImageExporter.h
M source/blender/collada/LightExporter.cpp
M source/blender/collada/MaterialExporter.h
M source/blender/collada/MeshImporter.cpp
M source/blender/collada/MeshImporter.h
M source/blender/collada/SceneExporter.cpp
M source/blender/collada/SceneExporter.h
M source/blender/collada/SkinInfo.cpp
M source/blender/collada/SkinInfo.h
M source/blender/collada/TransformReader.cpp
M source/blender/collada/TransformReader.h
M source/blender/collada/TransformWriter.cpp
M source/blender/collada/collada_internal.h
M source/blender/collada/collada_utils.cpp
M source/blender/collada/collada_utils.h
M source/blender/datatoc/datatoc_icon.c
M source/blender/ikplugin/CMakeLists.txt
M source/blender/ikplugin/intern/ikplugin_api.c
M source/blender/ikplugin/intern/itasc_plugin.cpp
M source/blender/nodes/composite/node_composite_tree.c
M source/blender/nodes/composite/node_composite_util.c
M source/blender/nodes/composite/nodes/node_composite_bokehblur.c
M source/blender/nodes/composite/nodes/node_composite_bokehimage.c
M source/blender/nodes/composite/nodes/node_composite_boxmask.c
M source/blender/nodes/composite/nodes/node_composite_brightness.c
M source/blender/nodes/composite/nodes/node_composite_colorSpill.c
M source/blender/nodes/composite/nodes/node_composite_colorbalance.c
M source/blender/nodes/composite/nodes/node_composite_common.c
M source/blender/nodes/composite/nodes/node_composite_dilate.c
M source/blender/nodes/composite/nodes/node_composite_ellipsemask.c
M source/blender/nodes/composite/nodes/node_composite_gamma.c
M source/blender/nodes/composite/nodes/node_composite_huecorrect.c
M source/blender/nodes/composite/nodes/node_composite_image.c
M source/blender/nodes/composite/nodes/node_composite_inpaint.c
M source/blender/nodes/composite/nodes/node_composite_math.c
M source/blender/nodes/composite/nodes/node_composite_moviedistortion.c
M source/blender/nodes/composite/nodes/node_composite_normalize.c
M source/blender/nodes/composite/nodes/node_composite_outputFile.c
M source/blender/nodes/composite/nodes/node_composite_splitViewer.c
M source/blender/nodes/composite/nodes/node_composite_stabilize2d.c
M source/blender/nodes/composite/nodes/node_composite_valToRgb.c
M source/blender/nodes/composite/nodes/node_composite_viewer.c
M source/blender/nodes/intern/node_common.c
M source/blender/nodes/intern/node_exec.c
M source/blender/nodes/intern/node_exec.h
M source/blender/nodes/intern/node_socket.c
M source/blender/nodes/intern/node_util.c
M source/blender/nodes/shader/node_shader_tree.c
M source/blender/nodes/shader/node_shader_util.c
M source/blender/nodes/shader/nodes/node_shader_brightness.c
M source/blender/nodes/shader/nodes/node_shader_bump.c
M source/blender/nodes/shader/nodes/node_shader_camera.c
M source/blender/nodes/shader/nodes/node_shader_common.c
M source/blender/nodes/shader/nodes/node_shader_curves.c
M source/blender/nodes/shader/nodes/node_shader_fresnel.c
M source/blender/nodes/shader/nodes/node_shader_gamma.c
M source/blender/nodes/shader/nodes/node_shader_geom.c
M source/blender/nodes/shader/nodes/node_shader_hueSatVal.c
M source/blender/nodes/shader/nodes/node_shader_invert.c
M source/blender/nodes/shader/nodes/node_shader_mapping.c
M source/blender/nodes/shader/nodes/node_shader_material.c
M source/blender/nodes/shader/nodes/node_shader_math.c
M source/blender/nodes/shader/nodes/node_shader_mixRgb.c
M source/blender/nodes/shader/nodes/node_shader_normal.c
M source/blender/nodes/shader/nodes/node_shader_output.c
M source/blender/nodes/shader/nodes/node_shader_output_world.c
M source/blender/nodes/shader/nodes/node_shader_sepcombHSV.c
M source/blender/nodes/shader/nodes/node_shader_sepcombRGB.c
M source/blender/nodes/shader/nodes/node_shader_squeeze.c
M source/blender/nodes/shader/nodes/node_shader_tex_brick.c
M source/blender/nodes/shader/nodes/node_shader_tex_coord.c
M source/blender/nodes/shader/nodes/node_shader_tex_environment.c
M source/blender/nodes/shader/nodes/node_shader_texture.c
M source/blender/nodes/shader/nodes/node_shader_valToRgb.c
M source/blender/nodes/shader/nodes/node_shader_vectMath.c
M source/blender/nodes/shader/nodes/node_shader_vectTransform.c
M source/blender/nodes/texture/node_texture_tree.c
M source/blender/nodes/texture/node_texture_util.c
M source/blender/nodes/texture/nodes/node_texture_at.c
M source/blender/nodes/texture/nodes/node_texture_bricks.c
M source/blender/nodes/texture/nodes/node_texture_checker.c
M source/blender/nodes/texture/nodes/node_texture_common.c
M source/blender/nodes/texture/nodes/node_texture_compose.c
M source/blender/nodes/texture/nodes/node_texture_coord.c
M source/blender/nodes/texture/nodes/node_texture_curves.c
M source/blender/nodes/texture/nodes/node_texture_decompose.c
M source/blender/nodes/texture/nodes/node_texture_distance.c
M source/blender/nodes/texture/nodes/node_texture_hueSatVal.c
M source/blender/nodes/texture/nodes/node_texture_image.c
M source/blender/nodes/texture/nodes/node_texture_invert.c
M source/blender/nodes/texture/nodes/node_texture_mixRgb.c
M source/blender/nodes/texture/nodes/node_texture_output.c
M source/blender/nodes/texture/nodes/node_texture_proc.c
M source/blender/nodes/texture/nodes/node_texture_rotate.c
M source/blender/nodes/texture/nodes/node_texture_scale.c
M source/blender/nodes/texture/nodes/node_texture_texture.c
M source/blender/nodes/texture/nodes/node_texture_translate.c
M source/blender/nodes/texture/nodes/node_texture_valToNor.c
M source/blender/nodes/texture/nodes/node_texture_valToRgb.c
M source/blender/nodes/texture/nodes/node_texture_viewer.c
M source/blender/physics/intern/BPH_mass_spring.cpp
M source/blender/physics/intern/ConstrainedConjugateGradient.h
M source/blender/physics/intern/eigen_utils.h
M source/blender/physics/intern/hair_volume.cpp
M source/blender/physics/intern/implicit.h
M source/blender/physics/intern/implicit_blender.c
M source/blender/physics/intern/implicit_eigen.cpp
M source/blender/render/CMakeLists.txt
M source/blender/render/extern/include/RE_pipeline.h
M source/blender/render/extern/include/RE_shader_ext.h
M source/blender/render/intern/include/envmap.h
M source/blender/render/intern/include/initrender.h
M source/blender/render/intern/include/pixelblending.h
M source/blender/render/intern/include/pixelshading.h
M source/blender/render/intern/include/pointdensity.h
M source/blender/render/intern/include/raycounter.h
M source/blender/render/intern/include/rayintersection.h
M source/blender/render/intern/include/render_types.h
M source/blender/render/intern/include/rendercore.h
M source/blender/render/intern/include/shading.h
M source/blender/render/intern/include/strand.h
M source/blender/render/intern/include/sunsky.h
M source/blender/render/intern/include/texture_ocean.h
M source/blender/render/intern/include/voxeldata.h
M source/blender/render/intern/include/zbuf.h
M source/blender/render/intern/raytrace/bvh.h
M source/blender/render/intern/raytrace/rayobject.cpp
M source/blender/render/intern/raytrace/rayobject_hint.h
M source/blender/render/intern/raytrace/rayobject_instance.cpp
M source/blender/render/intern/raytrace/rayobject_octree.cpp
M source/blender/render/intern/raytrace/rayobject_qbvh.cpp
M source/blender/render/intern/raytrace/rayobject_raycounter.cpp
M source/blender/render/intern/raytrace/rayobject_rtbuild.cpp
M source/blender/render/intern/raytrace/rayobject_rtbuild.h
M source/blender/render/intern/raytrace/rayobject_svbvh.cpp
M source/blender/render/intern/raytrace/rayobject_vbvh.cpp
M source/blender/render/intern/raytrace/reorganize.h
M source/blender/render/intern/raytrace/svbvh.h
M source/blender/render/intern/raytrace/vbvh.h
M source/blender/render/intern/source/bake.c
M source/blender/render/intern/source/convertblender.c
M source/blender/render/intern/source/envmap.c
M source/blender/render/intern/source/external_engine.c
M source/blender/render/intern/source/imagetexture.c
M source/blender/render/intern/source/initrender.c
M source/blender/render/intern/source/multires_bake.c
M source/blender/render/intern/source/occlusion.c
M source/blender/render/intern/source/pipeline.c
M source/blender/render/intern/source/pixelblending.c
M source/blender/render/intern/source/pixelshading.c
M source/blender/render/intern/source/pointdensity.c
M source/blender/render/intern/source/rayshade.c
M source/blender/render/intern/source/render_result.c
M source/blender/render/intern/source/render_texture.c
M source/blender/render/intern/source/rendercore.c
M source/blender/render/intern/source/renderdatabase.c
M source/blender/render/intern/source/shadbuf.c
M source/blender/render/intern/source/shadeinput.c
M source/blender/render/intern/source/shadeoutput.c
M source/blender/render/intern/source/sss.c
M source/blender/render/intern/source/strand.c
M source/blender/render/intern/source/sunsky.c
M source/blender/render/intern/source/volume_precache.c
M source/blender/render/intern/source/volumetric.c
M source/blender/render/intern/source/voxeldata.c
M source/blender/render/intern/source/zbuf.c
===================================================================
diff --git a/source/blender/blenfont/intern/blf.c
b/source/blender/blenfont/intern/blf.c
index 38c1498d76b..2a8fc14f4ae 100644
--- a/source/blender/blenfont/intern/blf.c
+++ b/source/blender/blenfont/intern/blf.c
@@ -164,7 +164,7 @@ static int blf_search_available(void)
for (i = 0; i < BLF_MAX_FONT; i++)
if (!global_font[i])
return i;
-
+
return -1;
}
diff --git a/source/blender/blenfont/intern/blf_dir.c
b/source/blender/blenfont/intern/blf_dir.c
index d3349a10834..ff5c1151a82 100644
--- a/source/blender/blenfont/intern/blf_dir.c
+++ b/source/blender/blenfont/intern/blf_dir.c
@@ -61,7 +61,7 @@ static ListBase global_font_dir = { NULL, NULL };
static DirBLF *blf_dir_find(const char *path)
{
DirBLF *p;
-
+
p = global_font_dir.first;
while (p) {
if (BLI_path_cmp(p->path, path) == 0)
@@ -74,11 +74,11 @@ static DirBLF *blf_dir_find(const char *path)
void BLF_dir_add(const char *path)
{
DirBLF *dir;
-
+
dir = blf_dir_find(path);
if (dir) /* already in the list ? just return. */
return;
-
+
dir = (DirBLF *)MEM_callocN(sizeof(DirBLF), "BLF_dir_add");
dir->path = BLI_strdup(path);
BLI_addhead(&global_font_dir, dir);
@@ -87,7 +87,7 @@ void BLF_dir_add(const char *path)
void BLF_dir_rem(const char *path)
{
DirBLF *dir;
-
+
dir = blf_dir_find(path);
if (dir) {
BLI_remlink(&global_font_dir, dir);
@@ -102,11 +102,11 @@ char **BLF_dir_get(int *ndir)
char **dirs;
char *path;
int i, count;
-
+
count = BLI_listbase_count(&global_font_dir);
if (!count)
return NULL;
-
+
dirs = (char **)MEM_callocN(sizeof(char *) * count, "BLF_dir_get");
p = global_font_dir.first;
i = 0;
@@ -123,7 +123,7 @@ void BLF_dir_free(char **dirs, int count)
{
char *path;
int i;
-
+
for (i = 0; i < count; i++) {
path = dirs[i];
MEM_freeN(path);
@@ -159,7 +159,7 @@ int blf_dir_split(const char *str, char *file, int *size)
{
int i, len;
char *s;
-
+
/* Window, Linux or Mac, this is always / */
s = strrchr(str, '/');
if (s) {
diff --git a/source/blender/blenfont/intern/blf_font.c
b/source/blender/blenfont/intern/blf_font.c
index c82515ff41c..fe9769dd2d1 100644
--- a/source/blender/blenfont/intern/blf_font.c
+++ b/source/blender/blenfont/intern/blf_font.c
@@ -343,7 +343,7 @@ static void blf_font_draw_buffer_ex(
width_clip -= chx + width_clip - buf_info->w;
if (height_clip + pen_y > buf_info->h)
height_clip -= pen_y + height_clip -
buf_info->h;
-
+
/* drawing below the image? */
if (pen_y < 0) {
yb_start += (g->pitch < 0) ? -pen_y : pen_y;
diff --git a/source/blender/blenfont/intern/blf_glyph.c
b/source/blender/blenfont/intern/blf_glyph.c
index b5fe29ae2d9..9af347908e1 100644
--- a/source/blender/blenfont/intern/blf_glyph.c
+++ b/source/blender/blenfont/intern/blf_glyph.c
@@ -245,11 +245,11 @@ GlyphBLF *blf_glyph_add(FontBLF *font, unsigned int
index, unsigned int c)
if (font->flags & BLF_HINTING)
flags &= ~FT_LOAD_NO_HINTING;
-
+
if (is_sharp)
err = FT_Load_Glyph(font->face, (FT_UInt)index,
FT_LOAD_TARGET_MONO);
else
- err = FT_Load_Glyph(font->face, (FT_UInt)index, flags);
+ err = FT_Load_Glyph(font->face, (FT_UInt)index, flags);
if (err) {
BLI_spin_unlock(font->ft_lib_mutex);
@@ -336,13 +336,13 @@ static void blf_texture_draw(float uv[2][2], float dx,
float y1, float dx1, floa
glBegin(GL_QUADS);
glTexCoord2f(uv[0][0], uv[0][1]);
glVertex2f(dx, y1);
-
+
glTexCoord2f(uv[0][0], uv[1][1]);
glVertex2f(dx, y2);
-
+
glTexCoord2f(uv[1][0], uv[1][1]);
glVertex2f(dx1, y2);
-
+
glTexCoord2f(uv[1][0], uv[0][1]);
glVertex2f(dx1, y1);
glEnd();
@@ -355,7 +355,7 @@ static void blf_texture5_draw(const float shadow_col[4],
float uv[2][2], float x
2 / 60.0f, 5 / 60.0f, 8 / 60.0f, 5 / 60.0f, 2 /
60.0f,
1 / 60.0f, 3 / 60.0f, 5 / 60.0f, 3 / 60.0f, 1 /
60.0f,
1 / 60.0f, 1 / 60.0f, 2 / 60.0f, 1 / 60.0f, 1 /
60.0f};
-
+
const float *fp = soft;
float color[4];
float dx, dy;
@@ -363,7 +363,7 @@ static void blf_texture5_draw(const float shadow_col[4],
float uv[2][2], float x
color[0] = shadow_col[0];
color[1] = shadow_col[1];
color[2] = shadow_col[2];
-
+
for (dx = -2; dx < 3; dx++) {
for (dy = -2; dy < 3; dy++, fp++) {
color[3] = *(fp) * shadow_col[3];
@@ -371,7 +371,7 @@ static void blf_texture5_draw(const float shadow_col[4],
float uv[2][2], float x
blf_texture_draw(uv, x1 + dx, y1 + dy, x2 + dx, y2 +
dy);
}
}
-
+
glColor4fv(color);
}
@@ -396,7 +396,7 @@ static void blf_texture3_draw(const float shadow_col[4],
float uv[2][2], float x
blf_texture_draw(uv, x1 + dx, y1 + dy, x2 + dx, y2 +
dy);
}
}
-
+
glColor4fv(color);
}
diff --git a/source/blender/blenfont/intern/blf_internal_types.h
b/source/blender/blenfont/intern/blf_internal_types.h
index 17bafa81458..5723f08d44b 100644
--- a/source/blender/blenfont/intern/blf_internal_types.h
+++ b/source/blender/blenfont/intern/blf_internal_types.h
@@ -174,7 +174,7 @@ typedef struct FontBLF {
/* angle in radians. */
float angle;
-
+
/* blur: 3 or 5 large kernel */
int blur;
diff --git a/source/blender/collada/AnimationExporter.cpp
b/source/blender/collada/AnimationExporter.cpp
index c891414f088..bf371332fd0 100644
--- a/source/blender/collada/AnimationExporter.cpp
+++ b/source/blender/collada/AnimationExporter.cpp
@@ -270,7 +270,7 @@ void
AnimationExporter::export_sampled_transrotloc_animation(Object *ob, std::ve
create_sampled_animation(3, ctimes, baked_curves[SCALE], ob_name,
"scale", "", false);
create_sampled_animation(3, ctimes, baked_curves[LOC], ob_name,
"location", "", false);
- /* Not sure how to export rotation as a 3channel animation,
+ /* Not sure how to export rotation as a 3channel animation,
* so separate into 3 single animations for now:
*/
@@ -314,7 +314,7 @@ void AnimationExporter::operator()(Object *ob)
//This needs to be handled by extra profiles, so postponed for now
//export_morph_animation(ob);
-
+
//Export Lamp parameter animations
if ( (ob->type == OB_LAMP) && ((Lamp *)ob->data)->adt && ((Lamp
*)ob->data)->adt->action) {
FCurve *fcu = (FCurve *)(((Lamp
*)ob->data)->adt->action->curves.first);
@@ -338,7 +338,7 @@ void AnimationExporter::operator()(Object *ob)
if ((STREQ(transformName, "lens")) ||
(STREQ(transformName, "ortho_scale")) ||
- (STREQ(transformName, "clip_end")) ||
+ (STREQ(transformName, "clip_end")) ||
(STREQ(transformName, "clip_start")))
{
create_keyframed_animation(ob, fcu,
transformName, true);
@@ -380,7 +380,7 @@ void
AnimationExporter::export_object_constraint_animation(Object *ob)
}
void AnimationExporter::export_morph_animation(Object *ob)
-{
+{
FCurve *fcu;
char *transformName;
Key *key = BKE_key_from_object(ob);
@@ -388,12 +388,12 @@ void AnimationExporter::export_morph_animation(Object *ob)
if (key->adt && key->adt->action) {
fcu = (FCurve *)key->adt->action->curves.first;
-
+
while (fcu) {
transformName = extract_transform_name(fcu->rna_path);
create_keyframed_animation(ob, fcu, transformName,
true);
-
+
fcu = fcu->next;
}
}
@@ -407,17 +407,17 @@ void
AnimationExporter::make_anim_frames_from_targets(Object *ob, std::vector<fl
bConstraint *con;
for (con = (bConstraint *)conlist->first; con; con = con->next) {
ListBase targets = {NULL, NULL};
-
+
const bConstraintTypeInfo *cti =
BKE_constraint_typeinfo_get(con);
-
+
if (!validateConstraints(con)) continue;
if (cti && cti->get_constraint_targets) {
bConstraintTarget *ct;
Object *obtar;
- /* get targets
+ /* get targets
* - constraints should use ct->matrix, not directly
accessing values
- * - ct->matrix members have not yet been
calculated here!
+ * - ct->matrix members have not yet been
calculated here!
*/
cti->get_constraint_targets(con, &targets);
@@ -438,7 +438,7 @@ void
AnimationExporter::make_anim_frames_from_targets(Object *ob, std::vector<fl
float *AnimationExporter::get_eul_source_for_quat(Object *ob)
{
FCurve *fcu = (FCurve *)ob->adt->action->curves.first;
- const int keys = fcu->totvert;
+ const int keys = fcu->totvert;
float *quat = (float *)MEM_callocN(sizeof(float) * fcu->totvert * 4,
"quat output source values");
float *eul = (float *)MEM_callocN(sizeof(float) * fcu->totvert * 3,
"quat output source values");
float temp_quat[4];
@@ -520,11 +520,11 @@ void AnimationExporter::create_keyframed_animation(Object
*ob, FCurve *fcu, char
/*
* Note: Handle transformation animations separately (to apply matrix
inverse to fcurves)
- * We will use the object to evaluate the animation on all keyframes
and calculate the
+ * We will use the object to evaluate the animation on all keyframes
and calculate the
* resulting object matrix. We need this to incorporate the
* effects of the parent inverse matrix (when it contains a rotation
component)
*
- * TODO: try to combine exported fcurves into 3 channel animations like
done
+ * TODO: try to combine exported fcurves into 3 channel animations like
done
* in export_sampled_animation(). For now each channel is exported as
separate <Animation>.
*/
@@ -648,7 +648,7 @@ void AnimationExporter::create_keyframed_animation(Object
*ob, FCurve *fcu, char
"/common/" /*profile common is only supported
*/ + get_transform_sid(fcu->rna_path, -1, axis_name, true);
//if shape key animation, this is the main problem, how to
define the channel targets.
/*target = get_morph_id(ob) +
- "/value" +*/
+ "/value" +*/
}
addChannel(COLLADABU::URI(empty, sampler_id), target);
@@ -673,7 +673,7 @@ void AnimationExporter::write_bone_animation_matrix(Object
*ob_arm, Bone *bone)
}
bool AnimationExporter::is_bone_deform_group(Bone *bone)
-{
+{
bool is_def;
//Check if current bone is deform
if ((bone->flag & BONE_NO_DEFORM) == 0) return true;
@@ -707,7 +707,7 @@ void
AnimationExporter::sample_and_write_bone_animation_matrix(Object *ob_arm, B
fcu = fcu->next;
}
- if (!(fcu)) return;*/
+ if (!(fcu)) return;*/
bPoseChannel *pchan = BKE_pose_channel_find_name(ob_arm->pose,
bone->name
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
