[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [54286] trunk/blender: style cleanup: spaces -> tabs
Campbell Barton
ideasman42 at gmail.com
Mon Feb 4 01:18:11 CET 2013
Revision: 54286
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=54286
Author: campbellbarton
Date: 2013-02-04 00:18:09 +0000 (Mon, 04 Feb 2013)
Log Message:
-----------
style cleanup: spaces -> tabs
Modified Paths:
--------------
trunk/blender/intern/ghost/intern/GHOST_DisplayManagerCarbon.cpp
trunk/blender/source/blender/blenkernel/intern/CCGSubSurf.c
trunk/blender/source/blender/blenkernel/intern/idprop.c
trunk/blender/source/blender/blenkernel/intern/seqmodifier.c
trunk/blender/source/blender/blenkernel/intern/sequencer.c
trunk/blender/source/blender/blenloader/intern/readfile.c
trunk/blender/source/blender/collada/AnimationExporter.cpp
trunk/blender/source/blender/collada/ArmatureExporter.cpp
trunk/blender/source/blender/collada/ArmatureImporter.cpp
trunk/blender/source/blender/collada/ControllerExporter.cpp
trunk/blender/source/blender/collada/DocumentImporter.cpp
trunk/blender/source/blender/collada/GeometryExporter.cpp
trunk/blender/source/blender/collada/SceneExporter.cpp
trunk/blender/source/blender/collada/TransformWriter.cpp
trunk/blender/source/blender/compositor/nodes/COM_SocketProxyNode.cpp
trunk/blender/source/blender/editors/gpencil/drawgpencil.c
trunk/blender/source/blender/editors/interface/interface_draw.c
trunk/blender/source/blender/editors/interface/interface_panel.c
trunk/blender/source/blender/editors/physics/particle_edit.c
trunk/blender/source/blender/editors/sculpt_paint/sculpt.c
trunk/blender/source/blender/editors/space_node/drawnode.c
trunk/blender/source/blender/editors/uvedit/uvedit_parametrizer.c
trunk/blender/source/blender/imbuf/intern/thumbs.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_bokehimage.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_gamma.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_gamma.c
trunk/blender/source/blender/render/intern/source/pixelblending.c
trunk/blender/source/blender/render/intern/source/pixelshading.c
trunk/blender/source/blender/render/intern/source/strand.c
trunk/blender/source/gameengine/GamePlayer/common/GPC_RawImage.cpp
Modified: trunk/blender/intern/ghost/intern/GHOST_DisplayManagerCarbon.cpp
===================================================================
--- trunk/blender/intern/ghost/intern/GHOST_DisplayManagerCarbon.cpp 2013-02-04 00:05:15 UTC (rev 54285)
+++ trunk/blender/intern/ghost/intern/GHOST_DisplayManagerCarbon.cpp 2013-02-04 00:18:09 UTC (rev 54286)
@@ -150,7 +150,7 @@
#endif // GHOST_DEBUG
CGDisplayErr err = ::CGDisplaySwitchToMode(m_displayIDs[display], displayModeValues);
-
+
return err == CGDisplayNoErr ? GHOST_kSuccess : GHOST_kFailure;
}
@@ -158,19 +158,18 @@
long GHOST_DisplayManagerCarbon::getValue(CFDictionaryRef values, CFStringRef key) const
{
CFNumberRef numberValue = (CFNumberRef) CFDictionaryGetValue(values, key);
-
+
if (!numberValue)
{
return -1;
}
-
+
long intValue;
-
+
if (!CFNumberGetValue(numberValue, kCFNumberLongType, &intValue))
{
return -1;
}
-
+
return intValue;
}
-
Modified: trunk/blender/source/blender/blenkernel/intern/CCGSubSurf.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/CCGSubSurf.c 2013-02-04 00:05:15 UTC (rev 54285)
+++ trunk/blender/source/blender/blenkernel/intern/CCGSubSurf.c 2013-02-04 00:18:09 UTC (rev 54286)
@@ -230,7 +230,7 @@
{
BLI_assert(level > 0);
BLI_assert(level <= 31);
-
+
return (1 << (level - 1)) + 1;
}
Modified: trunk/blender/source/blender/blenkernel/intern/idprop.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/idprop.c 2013-02-04 00:05:15 UTC (rev 54285)
+++ trunk/blender/source/blender/blenkernel/intern/idprop.c 2013-02-04 00:18:09 UTC (rev 54286)
@@ -27,7 +27,6 @@
* \ingroup bke
*/
-
#include <stdio.h>
#include <stdlib.h>
#include <stddef.h>
Modified: trunk/blender/source/blender/blenkernel/intern/seqmodifier.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/seqmodifier.c 2013-02-04 00:05:15 UTC (rev 54285)
+++ trunk/blender/source/blender/blenkernel/intern/seqmodifier.c 2013-02-04 00:18:09 UTC (rev 54286)
@@ -135,7 +135,7 @@
init_data.apply_callback = apply_callback;
IMB_processor_apply_threaded(ibuf->y, sizeof(ModifierThread), &init_data,
- modifier_init_handle, modifier_do_thread);
+ modifier_init_handle, modifier_do_thread);
}
/* **** Color Balance Modifier **** */
Modified: trunk/blender/source/blender/blenkernel/intern/sequencer.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/sequencer.c 2013-02-04 00:05:15 UTC (rev 54285)
+++ trunk/blender/source/blender/blenkernel/intern/sequencer.c 2013-02-04 00:18:09 UTC (rev 54286)
@@ -1746,7 +1746,7 @@
init_data.mask = mask_input;
IMB_processor_apply_threaded(ibuf->y, sizeof(ColorBalanceThread), &init_data,
- color_balance_init_handle, color_balance_do_thread);
+ color_balance_init_handle, color_balance_do_thread);
/* color balance either happens on float buffer or byte buffer, but never on both,
* free byte buffer if there's float buffer since float buffer would be used for
Modified: trunk/blender/source/blender/blenloader/intern/readfile.c
===================================================================
--- trunk/blender/source/blender/blenloader/intern/readfile.c 2013-02-04 00:05:15 UTC (rev 54285)
+++ trunk/blender/source/blender/blenloader/intern/readfile.c 2013-02-04 00:18:09 UTC (rev 54286)
@@ -7344,13 +7344,13 @@
static void do_version_node_fix_translate_wrapping(void *UNUSED(data), ID *UNUSED(id), bNodeTree *ntree)
{
- bNode *node;
+ bNode *node;
- for (node = ntree->nodes.first; node; node = node->next) {
- if (node->type == CMP_NODE_TRANSLATE && node->storage == NULL) {
- node->storage = MEM_callocN(sizeof(NodeTranslateData), "node translate data");
- }
- }
+ for (node = ntree->nodes.first; node; node = node->next) {
+ if (node->type == CMP_NODE_TRANSLATE && node->storage == NULL) {
+ node->storage = MEM_callocN(sizeof(NodeTranslateData), "node translate data");
+ }
+ }
}
static void do_version_node_fix_internal_links_264(void *UNUSED(data), ID *UNUSED(id), bNodeTree *ntree)
@@ -8727,14 +8727,14 @@
}
}
- // add storage for compositor translate nodes when not existing
- if (!MAIN_VERSION_ATLEAST(main, 265, 9)) {
- bNodeTreeType *ntreetype;
+ // add storage for compositor translate nodes when not existing
+ if (!MAIN_VERSION_ATLEAST(main, 265, 9)) {
+ bNodeTreeType *ntreetype;
- ntreetype = ntreeGetType(NTREE_COMPOSIT);
- if (ntreetype && ntreetype->foreach_nodetree)
- ntreetype->foreach_nodetree(main, NULL, do_version_node_fix_translate_wrapping);
- }
+ ntreetype = ntreeGetType(NTREE_COMPOSIT);
+ if (ntreetype && ntreetype->foreach_nodetree)
+ ntreetype->foreach_nodetree(main, NULL, do_version_node_fix_translate_wrapping);
+ }
Modified: trunk/blender/source/blender/collada/AnimationExporter.cpp
===================================================================
--- trunk/blender/source/blender/collada/AnimationExporter.cpp 2013-02-04 00:05:15 UTC (rev 54285)
+++ trunk/blender/source/blender/collada/AnimationExporter.cpp 2013-02-04 00:18:09 UTC (rev 54286)
@@ -84,9 +84,9 @@
}
}
-
- export_object_constraint_animation(ob);
-
+
+ export_object_constraint_animation(ob);
+
//This needs to be handled by extra profiles, so postponed for now
//export_morph_animation(ob);
@@ -149,11 +149,11 @@
void AnimationExporter::export_object_constraint_animation(Object *ob)
{
std::vector<float> fra;
- //Takes frames of target animations
+ //Takes frames of target animations
make_anim_frames_from_targets(ob, fra);
-
+
if (fra.size())
- dae_baked_object_animation(fra, ob);
+ dae_baked_object_animation(fra, ob);
}
void AnimationExporter::export_morph_animation(Object *ob)
@@ -274,8 +274,8 @@
//axis names for colors
else if (!strcmp(transformName, "color") ||
- !strcmp(transformName, "specular_color") ||
- !strcmp(transformName, "diffuse_color") ||
+ !strcmp(transformName, "specular_color") ||
+ !strcmp(transformName, "diffuse_color") ||
!strcmp(transformName, "alpha"))
{
const char *axis_names[] = {"R", "G", "B"};
@@ -285,9 +285,9 @@
//axis names for transforms
else if (!strcmp(transformName, "location") ||
- !strcmp(transformName, "scale") ||
+ !strcmp(transformName, "scale") ||
!strcmp(transformName, "rotation_euler") ||
- !strcmp(transformName, "rotation_quaternion"))
+ !strcmp(transformName, "rotation_quaternion"))
{
const char *axis_names[] = {"X", "Y", "Z"};
if (fcu->array_index < 3)
@@ -526,7 +526,7 @@
return;
BLI_snprintf(anim_id, sizeof(anim_id), "%s_%s", (char*)translate_id(ob_name).c_str(),
- "object_matrix");
+ "object_matrix");
openAnimation(anim_id, COLLADABU::Utils::EMPTY_STRING);
@@ -897,7 +897,7 @@
add_source_parameters(param, semantic, false, NULL, true);
source.prepareToAppendValues();
-
+
bPoseChannel *parchan = NULL;
bPoseChannel *pchan = NULL;
@@ -916,7 +916,7 @@
int j = 0;
for (it = frames.begin(); it != frames.end(); it++) {
float mat[4][4], ipar[4][4];
-
+
float ctime = BKE_scene_frame_get_from_ctime(scene, *it);
CFRA = BKE_scene_frame_get_from_ctime(scene, *it);
//BKE_scene_update_for_newframe(G.main,scene,scene->lay);
Modified: trunk/blender/source/blender/collada/ArmatureExporter.cpp
===================================================================
--- trunk/blender/source/blender/collada/ArmatureExporter.cpp 2013-02-04 00:05:15 UTC (rev 54285)
+++ trunk/blender/source/blender/collada/ArmatureExporter.cpp 2013-02-04 00:18:09 UTC (rev 54286)
@@ -104,7 +104,7 @@
for (bone = (Bone *)arm->bonebase.first; bone; bone = bone->next) {
write_bone_URLs(ins, ob_arm, bone);
}
-
+
InstanceWriter::add_material_bindings(ins.getBindMaterial(), ob, this->export_settings->active_uv_only);
ins.add();
Modified: trunk/blender/source/blender/collada/ArmatureImporter.cpp
===================================================================
--- trunk/blender/source/blender/collada/ArmatureImporter.cpp 2013-02-04 00:05:15 UTC (rev 54285)
+++ trunk/blender/source/blender/collada/ArmatureImporter.cpp 2013-02-04 00:18:09 UTC (rev 54286)
@@ -319,7 +319,7 @@
if (!ob_arm)
continue;
-
+
ED_armature_to_edit(ob_arm);
/*
@@ -327,8 +327,8 @@
* check if bones have already been created for a given joint
*/
- create_bone(NULL, *ri , NULL, (*ri)->getChildNodes().getCount(), NULL, (bArmature *)ob_arm->data);
-
+ create_bone(NULL, *ri , NULL, (*ri)->getChildNodes().getCount(), NULL, (bArmature *)ob_arm->data);
+
//leaf bone tails are derived from the matrix, so no need of this.
fix_leaf_bones();
@@ -336,15 +336,13 @@
unskinned_armature_map[(*ri)->getUniqueId()] = ob_arm;
ED_armature_from_edit(ob_arm);
-
+
//This serves no purpose, as pose is automatically reset later, in BKE_where_is_bone()
//set_pose(ob_arm, *ri, NULL, NULL);
ED_armature_edit_free(ob_arm);
DAG_id_tag_update(&ob_arm->id, OB_RECALC_OB | OB_RECALC_DATA);
}
-
-
}
void ArmatureImporter::create_armature_bones(SkinInfo& skin)
@@ -650,12 +648,12 @@
void ArmatureImporter::make_shape_keys(){
std::vector<COLLADAFW::MorphController *>::iterator mc;
float weight;
-
+
for (mc = morph_controllers.begin(); mc != morph_controllers.end(); mc++) {
//Controller data
COLLADAFW::UniqueIdArray& morphTargetIds = (*mc)->getMorphTargets();
COLLADAFW::FloatOrDoubleArray& morphWeights = (*mc)->getMorphWeights();
-
+
//Prereq: all the geometries must be imported and mesh objects must be made
Object *source_ob = this->mesh_importer->get_object_by_geom_uid((*mc)->getSource());
Modified: trunk/blender/source/blender/collada/ControllerExporter.cpp
===================================================================
--- trunk/blender/source/blender/collada/ControllerExporter.cpp 2013-02-04 00:05:15 UTC (rev 54285)
+++ trunk/blender/source/blender/collada/ControllerExporter.cpp 2013-02-04 00:18:09 UTC (rev 54286)
@@ -96,7 +96,7 @@
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list