[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [51722] trunk/blender/source: style cleanup
Campbell Barton
ideasman42 at gmail.com
Mon Oct 29 03:11:45 CET 2012
Revision: 51722
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=51722
Author: campbellbarton
Date: 2012-10-29 02:11:40 +0000 (Mon, 29 Oct 2012)
Log Message:
-----------
style cleanup
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/intern/node.c
trunk/blender/source/blender/collada/ArmatureImporter.h
trunk/blender/source/blender/editors/animation/keyframing.c
trunk/blender/source/blender/editors/space_node/drawnode.c
trunk/blender/source/blender/imbuf/intern/colormanagement.c
trunk/blender/source/blender/modifiers/intern/MOD_skin.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_tex_environment.c
trunk/blender/source/blender/quicktime/apple/qtkit_export.m
trunk/blender/source/blender/windowmanager/intern/wm_event_system.c
trunk/blender/source/gameengine/Converter/KX_ConvertSensors.cpp
trunk/blender/source/gameengine/GameLogic/SCA_RandomActuator.cpp
trunk/blender/source/gameengine/Ketsji/KX_BlenderMaterial.cpp
trunk/blender/source/gameengine/Ketsji/KX_Camera.cpp
trunk/blender/source/gameengine/Ketsji/KX_Camera.h
trunk/blender/source/gameengine/Ketsji/KX_IPOTransform.h
trunk/blender/source/gameengine/Ketsji/KX_MouseFocusSensor.h
trunk/blender/source/gameengine/Ketsji/KX_PythonInit.cpp
Modified: trunk/blender/source/blender/blenkernel/intern/node.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/node.c 2012-10-29 01:09:12 UTC (rev 51721)
+++ trunk/blender/source/blender/blenkernel/intern/node.c 2012-10-29 02:11:40 UTC (rev 51722)
@@ -1580,11 +1580,11 @@
/* lists must be aligned */
BLI_assert(BLI_countlist(&node_clipboard.nodes) ==
- BLI_countlist(&node_clipboard.nodes_extra_info));
+ BLI_countlist(&node_clipboard.nodes_extra_info));
for (node = node_clipboard.nodes.first, node_info = node_clipboard.nodes_extra_info.first;
- node;
- node = node->next, node_info = node_info->next)
+ node;
+ node = node->next, node_info = node_info->next)
{
/* validate the node against the stored node info */
Modified: trunk/blender/source/blender/collada/ArmatureImporter.h
===================================================================
--- trunk/blender/source/blender/collada/ArmatureImporter.h 2012-10-29 01:09:12 UTC (rev 51721)
+++ trunk/blender/source/blender/collada/ArmatureImporter.h 2012-10-29 02:11:40 UTC (rev 51722)
@@ -104,7 +104,7 @@
#endif
void create_bone(SkinInfo& skin, COLLADAFW::Node *node, EditBone *parent, int totchild,
- float parent_mat[][4], bArmature *arm);
+ float parent_mat[][4], bArmature *arm);
void create_unskinned_bone(COLLADAFW::Node *node, EditBone *parent, int totchild,
float parent_mat[][4], Object * ob_arm);
Modified: trunk/blender/source/blender/editors/animation/keyframing.c
===================================================================
--- trunk/blender/source/blender/editors/animation/keyframing.c 2012-10-29 01:09:12 UTC (rev 51721)
+++ trunk/blender/source/blender/editors/animation/keyframing.c 2012-10-29 02:11:40 UTC (rev 51722)
@@ -479,10 +479,10 @@
/* Frame in which to add a new-keyframe occurs after all other keys
* -> If there are at least two existing keyframes, then if the values of the
- * last two keyframes and the new-keyframe match, the last existing keyframe
- * gets deleted as it is no longer required.
+ * last two keyframes and the new-keyframe match, the last existing keyframe
+ * gets deleted as it is no longer required.
* -> Otherwise, a keyframe is just added. 1.0 is added so that fake-2nd-to-last
- * keyframe is not equal to last keyframe.
+ * keyframe is not equal to last keyframe.
*/
bezt = (fcu->bezt + (fcu->totvert - 1));
valA = bezt->vec[1][1];
Modified: trunk/blender/source/blender/editors/space_node/drawnode.c
===================================================================
--- trunk/blender/source/blender/editors/space_node/drawnode.c 2012-10-29 01:09:12 UTC (rev 51721)
+++ trunk/blender/source/blender/editors/space_node/drawnode.c 2012-10-29 02:11:40 UTC (rev 51722)
@@ -1388,7 +1388,7 @@
static void node_shader_set_butfunc(bNodeType *ntype)
{
switch (ntype->type) {
- /* case NODE_GROUP: note, typeinfo for group is generated... see "XXX ugly hack" */
+ /* case NODE_GROUP: note, typeinfo for group is generated... see "XXX ugly hack" */
case SH_NODE_MATERIAL:
case SH_NODE_MATERIAL_EXT:
@@ -2639,7 +2639,7 @@
static void node_composit_set_butfunc(bNodeType *ntype)
{
switch (ntype->type) {
- /* case NODE_GROUP: note, typeinfo for group is generated... see "XXX ugly hack" */
+ /* case NODE_GROUP: note, typeinfo for group is generated... see "XXX ugly hack" */
case CMP_NODE_IMAGE:
ntype->uifunc = node_composit_buts_image;
Modified: trunk/blender/source/blender/imbuf/intern/colormanagement.c
===================================================================
--- trunk/blender/source/blender/imbuf/intern/colormanagement.c 2012-10-29 01:09:12 UTC (rev 51721)
+++ trunk/blender/source/blender/imbuf/intern/colormanagement.c 2012-10-29 02:11:40 UTC (rev 51722)
@@ -1225,7 +1225,7 @@
/* first convert byte buffer to float, keep in image space */
for (i = 0, fp = linear_buffer, cp = byte_buffer;
i < channels * width * height;
- i++, fp++, cp++)
+ i++, fp++, cp++)
{
*fp = (float)(*cp) / 255.0f;
}
Modified: trunk/blender/source/blender/modifiers/intern/MOD_skin.c
===================================================================
--- trunk/blender/source/blender/modifiers/intern/MOD_skin.c 2012-10-29 01:09:12 UTC (rev 51721)
+++ trunk/blender/source/blender/modifiers/intern/MOD_skin.c 2012-10-29 02:11:40 UTC (rev 51722)
@@ -697,11 +697,11 @@
}
static EMat *build_edge_mats(const MVertSkin *vs,
- const MVert *mvert,
- int totvert,
+ const MVert *mvert,
+ int totvert,
const MEdge *medge,
- const MeshElemMap *emap,
- int totedge)
+ const MeshElemMap *emap,
+ int totedge)
{
BLI_Stack *stack;
EMat *emat;
Modified: trunk/blender/source/blender/nodes/shader/nodes/node_shader_tex_environment.c
===================================================================
--- trunk/blender/source/blender/nodes/shader/nodes/node_shader_tex_environment.c 2012-10-29 01:09:12 UTC (rev 51721)
+++ trunk/blender/source/blender/nodes/shader/nodes/node_shader_tex_environment.c 2012-10-29 02:11:40 UTC (rev 51722)
@@ -83,7 +83,7 @@
}
}
- return ret;
+ return ret;
}
/* node type definition */
Modified: trunk/blender/source/blender/quicktime/apple/qtkit_export.m
===================================================================
--- trunk/blender/source/blender/quicktime/apple/qtkit_export.m 2012-10-29 01:09:12 UTC (rev 51721)
+++ trunk/blender/source/blender/quicktime/apple/qtkit_export.m 2012-10-29 02:11:40 UTC (rev 51722)
@@ -561,19 +561,21 @@
/* specifying the codec attributes : try to retrieve them from render data first*/
if (rd->qtcodecsettings.codecType) {
- qtexport->frameAttributes = [NSDictionary dictionaryWithObjectsAndKeys:
- stringWithCodecType(rd->qtcodecsettings.codecType),
- QTAddImageCodecType,
- [NSNumber numberWithLong:((rd->qtcodecsettings.codecSpatialQuality)*codecLosslessQuality)/100],
- QTAddImageCodecQuality,
- nil];
+ qtexport->frameAttributes = [
+ NSDictionary dictionaryWithObjectsAndKeys:
+ stringWithCodecType(rd->qtcodecsettings.codecType),
+ QTAddImageCodecType,
+ [NSNumber numberWithLong:((rd->qtcodecsettings.codecSpatialQuality)*codecLosslessQuality)/100],
+ QTAddImageCodecQuality,
+ nil];
}
else {
- qtexport->frameAttributes = [NSDictionary dictionaryWithObjectsAndKeys:@"jpeg",
- QTAddImageCodecType,
- [NSNumber numberWithLong:codecHighQuality],
- QTAddImageCodecQuality,
- nil];
+ qtexport->frameAttributes = [
+ NSDictionary dictionaryWithObjectsAndKeys:@"jpeg",
+ QTAddImageCodecType,
+ [NSNumber numberWithLong:codecHighQuality],
+ QTAddImageCodecQuality,
+ nil];
}
[qtexport->frameAttributes retain];
Modified: trunk/blender/source/blender/windowmanager/intern/wm_event_system.c
===================================================================
--- trunk/blender/source/blender/windowmanager/intern/wm_event_system.c 2012-10-29 01:09:12 UTC (rev 51721)
+++ trunk/blender/source/blender/windowmanager/intern/wm_event_system.c 2012-10-29 02:11:40 UTC (rev 51722)
@@ -1881,14 +1881,14 @@
{
int action = wm_handlers_do_intern(C, event, handlers);
- if (!ELEM(event->type, MOUSEMOVE, INBETWEEN_MOUSEMOVE) && !ISTIMER(event->type)) {
-
+ if (!ELEM(event->type, MOUSEMOVE, INBETWEEN_MOUSEMOVE) && !ISTIMER(event->type)) {
+
/* test for CLICK events */
if (wm_action_not_handled(action)) {
wmWindow *win = CTX_wm_window(C);
/* eventstate stores if previous event was a KM_PRESS, in case that
- wasn't handled, the KM_RELEASE will become a KM_CLICK */
+ * wasn't handled, the KM_RELEASE will become a KM_CLICK */
if (win && event->val == KM_PRESS) {
win->eventstate->check_click = TRUE;
Modified: trunk/blender/source/gameengine/Converter/KX_ConvertSensors.cpp
===================================================================
--- trunk/blender/source/gameengine/Converter/KX_ConvertSensors.cpp 2012-10-29 01:09:12 UTC (rev 51721)
+++ trunk/blender/source/gameengine/Converter/KX_ConvertSensors.cpp 2012-10-29 02:11:40 UTC (rev 51722)
@@ -632,9 +632,9 @@
uniqueval->Release();
/* Conversion succeeded, so we can set the generic props here. */
- gamesensor->SetPulseMode(pos_pulsemode,
- neg_pulsemode,
- frequency);
+ gamesensor->SetPulseMode(pos_pulsemode,
+ neg_pulsemode,
+ frequency);
gamesensor->SetInvert(invert);
gamesensor->SetLevel(level);
gamesensor->SetTap(tap);
Modified: trunk/blender/source/gameengine/GameLogic/SCA_RandomActuator.cpp
===================================================================
--- trunk/blender/source/gameengine/GameLogic/SCA_RandomActuator.cpp 2012-10-29 01:09:12 UTC (rev 51721)
+++ trunk/blender/source/gameengine/GameLogic/SCA_RandomActuator.cpp 2012-10-29 02:11:40 UTC (rev 51722)
@@ -48,13 +48,13 @@
/* ------------------------------------------------------------------------- */
SCA_RandomActuator::SCA_RandomActuator(SCA_IObject *gameobj,
- long seed,
- SCA_RandomActuator::KX_RANDOMACT_MODE mode,
- float para1,
- float para2,
- const STR_String &propName)
- : SCA_IActuator(gameobj, KX_ACT_RANDOM),
- m_propname(propName),
+ long seed,
+ SCA_RandomActuator::KX_RANDOMACT_MODE mode,
+ float para1,
+ float para2,
+ const STR_String &propName)
+ : SCA_IActuator(gameobj, KX_ACT_RANDOM),
+ m_propname(propName),
m_parameter1(para1),
m_parameter2(para2),
m_distribution(mode)
@@ -196,33 +196,30 @@
*/
tmpval = new CFloatValue(m_parameter1);
- } else {
- /*
-
- 070301 - nzc
- Now, with seed != 0, we will most assuredly get some
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list