[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [47999] trunk/blender: code cleanup: includes, also correct some py example typos

Campbell Barton ideasman42 at gmail.com
Sat Jun 16 22:20:08 CEST 2012


Revision: 47999
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=47999
Author:   campbellbarton
Date:     2012-06-16 20:20:07 +0000 (Sat, 16 Jun 2012)
Log Message:
-----------
code cleanup: includes, also correct some py example typos

Modified Paths:
--------------
    trunk/blender/doc/python_api/examples/bpy.types.Object.py
    trunk/blender/doc/python_api/examples/bpy.types.Panel.1.py
    trunk/blender/intern/audaspace/Python/AUD_PyAPI.cpp
    trunk/blender/source/blender/blenlib/intern/fnmatch.c
    trunk/blender/source/blender/blenlib/intern/threads.c
    trunk/blender/source/blender/compositor/intern/COM_Converter.cpp
    trunk/blender/source/blender/compositor/intern/COM_ExecutionGroup.cpp
    trunk/blender/source/blender/compositor/intern/COM_ExecutionSystem.cpp
    trunk/blender/source/blender/compositor/intern/COM_ExecutionSystemHelper.cpp
    trunk/blender/source/blender/compositor/intern/COM_Node.cpp
    trunk/blender/source/blender/compositor/intern/COM_NodeBase.cpp
    trunk/blender/source/blender/compositor/intern/COM_NodeOperation.cpp
    trunk/blender/source/blender/compositor/intern/COM_WorkScheduler.cpp
    trunk/blender/source/blender/compositor/nodes/COM_MuteNode.cpp
    trunk/blender/source/gameengine/GameLogic/SCA_RandomActuator.cpp
    trunk/blender/source/gameengine/VideoTexture/Exception.cpp
    trunk/blender/source/gameengine/VideoTexture/FilterBase.cpp
    trunk/blender/source/gameengine/VideoTexture/FilterBase.h
    trunk/blender/source/gameengine/VideoTexture/FilterBlueScreen.cpp
    trunk/blender/source/gameengine/VideoTexture/FilterColor.cpp
    trunk/blender/source/gameengine/VideoTexture/FilterNormal.cpp
    trunk/blender/source/gameengine/VideoTexture/FilterSource.cpp
    trunk/blender/source/gameengine/VideoTexture/ImageBase.cpp
    trunk/blender/source/gameengine/VideoTexture/ImageBase.h
    trunk/blender/source/gameengine/VideoTexture/ImageBuff.cpp
    trunk/blender/source/gameengine/VideoTexture/ImageMix.cpp
    trunk/blender/source/gameengine/VideoTexture/ImageRender.cpp
    trunk/blender/source/gameengine/VideoTexture/ImageRender.h
    trunk/blender/source/gameengine/VideoTexture/ImageViewport.cpp
    trunk/blender/source/gameengine/VideoTexture/PyTypeList.cpp
    trunk/blender/source/gameengine/VideoTexture/PyTypeList.h
    trunk/blender/source/gameengine/VideoTexture/Texture.cpp
    trunk/blender/source/gameengine/VideoTexture/Texture.h
    trunk/blender/source/gameengine/VideoTexture/VideoBase.h
    trunk/blender/source/gameengine/VideoTexture/blendVideoTex.cpp

Modified: trunk/blender/doc/python_api/examples/bpy.types.Object.py
===================================================================
--- trunk/blender/doc/python_api/examples/bpy.types.Object.py	2012-06-16 20:00:43 UTC (rev 47998)
+++ trunk/blender/doc/python_api/examples/bpy.types.Object.py	2012-06-16 20:20:07 UTC (rev 47999)
@@ -2,7 +2,7 @@
 Basic Object Operations Example
 +++++++++++++++++++++++++++++++
 This script demonstrates basic operations on object like creating new
-object, placing it into scene, selecting it and making it active
+object, placing it into scene, selecting it and making it active.
 """
 
 import bpy
@@ -11,15 +11,15 @@
 scene = bpy.context.scene
 
 # Create new lamp datablock
-lamp_data = bpy.data.lamps.new(name="New Lamp", type="POINT")
+lamp_data = bpy.data.lamps.new(name="New Lamp", type='POINT')
 
-# Create new object with out lamp datablock
+# Create new object with our lamp datablock
 lamp_object = bpy.data.objects.new(name="New Lamp", object_data=lamp_data)
 
 # Link lamp object to the scene so it'll appear in this scene
 scene.objects.link(lamp_object)
 
-# Place lamp to specified location
+# Place lamp to a specified location
 lamp_object.location = (5.0, 5.0, 5.0)
 
 # And finally select it make active

Modified: trunk/blender/doc/python_api/examples/bpy.types.Panel.1.py
===================================================================
--- trunk/blender/doc/python_api/examples/bpy.types.Panel.1.py	2012-06-16 20:00:43 UTC (rev 47998)
+++ trunk/blender/doc/python_api/examples/bpy.types.Panel.1.py	2012-06-16 20:20:07 UTC (rev 47999)
@@ -2,7 +2,7 @@
 Simple Object Panel
 +++++++++++++++++++
 This panel has a :class:`Panel.poll` and :class:`Panel.draw_header` function,
-even though the contents is basic this closely resemples blenders panels.
+even though the contents is basic this closely resembles blenders panels.
 """
 import bpy
 

Modified: trunk/blender/intern/audaspace/Python/AUD_PyAPI.cpp
===================================================================
--- trunk/blender/intern/audaspace/Python/AUD_PyAPI.cpp	2012-06-16 20:00:43 UTC (rev 47998)
+++ trunk/blender/intern/audaspace/Python/AUD_PyAPI.cpp	2012-06-16 20:20:07 UTC (rev 47999)
@@ -28,7 +28,7 @@
 
 
 #include "AUD_PyAPI.h"
-#include "structmember.h"
+#include <structmember.h>
 
 #include "AUD_I3DDevice.h"
 #include "AUD_I3DHandle.h"

Modified: trunk/blender/source/blender/blenlib/intern/fnmatch.c
===================================================================
--- trunk/blender/source/blender/blenlib/intern/fnmatch.c	2012-06-16 20:00:43 UTC (rev 47998)
+++ trunk/blender/source/blender/blenlib/intern/fnmatch.c	2012-06-16 20:20:07 UTC (rev 47999)
@@ -25,8 +25,8 @@
 #endif
 
 #include <errno.h>
-#include <BLI_fnmatch.h>
 #include <ctype.h>
+#include "BLI_fnmatch.h"
 
 
 /* Comment out all this code if we are using the GNU C Library, and are not

Modified: trunk/blender/source/blender/blenlib/intern/threads.c
===================================================================
--- trunk/blender/source/blender/blenlib/intern/threads.c	2012-06-16 20:00:43 UTC (rev 47998)
+++ trunk/blender/source/blender/blenlib/intern/threads.c	2012-06-16 20:20:07 UTC (rev 47999)
@@ -44,14 +44,14 @@
 
 /* for checking system threads - BLI_system_thread_count */
 #ifdef WIN32
-#include "windows.h"
-#include <sys/timeb.h>
+#  include <windows.h>
+#  include <sys/timeb.h>
 #elif defined(__APPLE__)
-#include <sys/types.h>
-#include <sys/sysctl.h>
+#  include <sys/types.h>
+#  include <sys/sysctl.h>
 #else
-#include <unistd.h> 
-#include <sys/time.h>
+#  include <unistd.h>
+#  include <sys/time.h>
 #endif
 
 #if defined(__APPLE__) && (PARALLEL == 1) && (__GNUC__ == 4) && (__GNUC_MINOR__ == 2)

Modified: trunk/blender/source/blender/compositor/intern/COM_Converter.cpp
===================================================================
--- trunk/blender/source/blender/compositor/intern/COM_Converter.cpp	2012-06-16 20:00:43 UTC (rev 47998)
+++ trunk/blender/source/blender/compositor/intern/COM_Converter.cpp	2012-06-16 20:20:07 UTC (rev 47999)
@@ -20,100 +20,102 @@
  *		Monique Dewanchand
  */
 
-#include "COM_Converter.h"
+#include <string.h>
+
 #include "BKE_node.h"
+
+#include "COM_AlphaOverNode.h"
+#include "COM_BilateralBlurNode.h"
+#include "COM_BlurNode.h"
+#include "COM_BokehBlurNode.h"
+#include "COM_BokehImageNode.h"
+#include "COM_BoxMaskNode.h"
+#include "COM_BrightnessNode.h"
+#include "COM_ChannelMatteNode.h"
+#include "COM_ChromaMatteNode.h"
+#include "COM_ColorBalanceNode.h"
+#include "COM_ColorCorrectionNode.h"
+#include "COM_ColorCurveNode.h"
+#include "COM_ColorMatteNode.h"
+#include "COM_ColorNode.h"
+#include "COM_ColorRampNode.h"
+#include "COM_ColorSpillNode.h"
+#include "COM_ColorToBWNode.h"
+#include "COM_CombineHSVANode.h"
+#include "COM_CombineRGBANode.h"
+#include "COM_CombineYCCANode.h"
+#include "COM_CombineYUVANode.h"
 #include "COM_CompositorNode.h"
-#include "COM_RenderLayersNode.h"
-#include "COM_ColorToBWNode.h"
-#include "string.h"
-#include "COM_SocketConnection.h"
+#include "COM_ConvertAlphaNode.h"
+#include "COM_ConvertColorToVectorOperation.h"
 #include "COM_ConvertColourToValueProg.h"
 #include "COM_ConvertValueToColourProg.h"
-#include "COM_ConvertColorToVectorOperation.h"
 #include "COM_ConvertValueToVectorOperation.h"
 #include "COM_ConvertVectorToColorOperation.h"
 #include "COM_ConvertVectorToValueOperation.h"
+#include "COM_Converter.h"
+#include "COM_CropNode.h"
+#include "COM_DefocusNode.h"
+#include "COM_DifferenceMatteNode.h"
+#include "COM_DilateErodeNode.h"
+#include "COM_DirectionalBlurNode.h"
+#include "COM_DisplaceNode.h"
+#include "COM_DistanceMatteNode.h"
+#include "COM_DoubleEdgeMaskNode.h"
+#include "COM_EllipseMaskNode.h"
 #include "COM_ExecutionSystem.h"
+#include "COM_ExecutionSystemHelper.h"
+#include "COM_FilterNode.h"
+#include "COM_FlipNode.h"
+#include "COM_GammaNode.h"
+#include "COM_GlareNode.h"
+#include "COM_GroupNode.h"
+#include "COM_HueSaturationValueCorrectNode.h"
+#include "COM_HueSaturationValueNode.h"
+#include "COM_IDMaskNode.h"
+#include "COM_ImageNode.h"
+#include "COM_InvertNode.h"
+#include "COM_KeyingNode.h"
+#include "COM_KeyingScreenNode.h"
+#include "COM_LensDistortionNode.h"
+#include "COM_LuminanceMatteNode.h"
+#include "COM_MapUVNode.h"
+#include "COM_MapValueNode.h"
+#include "COM_MaskNode.h"
+#include "COM_MathNode.h"
 #include "COM_MixNode.h"
+#include "COM_MovieClipNode.h"
+#include "COM_MovieDistortionNode.h"
 #include "COM_MuteNode.h"
-#include "COM_TranslateNode.h"
+#include "COM_NormalNode.h"
+#include "COM_NormalizeNode.h"
+#include "COM_OutputFileNode.h"
+#include "COM_RenderLayersNode.h"
 #include "COM_RotateNode.h"
 #include "COM_ScaleNode.h"
-#include "COM_FlipNode.h"
-#include "COM_IDMaskNode.h"
-#include "COM_FilterNode.h"
-#include "COM_BrightnessNode.h"
+#include "COM_ScaleOperation.h"
+#include "COM_SeparateHSVANode.h"
 #include "COM_SeparateRGBANode.h"
-#include "COM_CombineRGBANode.h"
-#include "COM_SeparateHSVANode.h"
-#include "COM_CombineHSVANode.h"
+#include "COM_SeparateYCCANode.h"
 #include "COM_SeparateYUVANode.h"
-#include "COM_CombineYUVANode.h"
-#include "COM_SeparateYCCANode.h"
-#include "COM_CombineYCCANode.h"
-#include "COM_AlphaOverNode.h"
-#include "COM_ColorBalanceNode.h"
-#include "COM_ViewerNode.h"
+#include "COM_SetAlphaNode.h"
+#include "COM_SetValueOperation.h"
+#include "COM_SocketConnection.h"
 #include "COM_SplitViewerNode.h"
-#include "COM_InvertNode.h"
-#include "COM_GroupNode.h"
-#include "COM_NormalNode.h"
-#include "COM_NormalizeNode.h"
-#include "COM_ImageNode.h"
-#include "COM_BokehImageNode.h"
-#include "COM_ColorCurveNode.h"
-#include "COM_VectorCurveNode.h"
-#include "COM_SetAlphaNode.h"
-#include "COM_ConvertAlphaNode.h"
-#include "COM_MapUVNode.h"
-#include "COM_DisplaceNode.h"
-#include "COM_MathNode.h"
-#include "COM_HueSaturationValueNode.h"
-#include "COM_HueSaturationValueCorrectNode.h"
-#include "COM_ColorCorrectionNode.h"
-#include "COM_BoxMaskNode.h"
-#include "COM_EllipseMaskNode.h"
-#include "COM_GammaNode.h"
-#include "COM_ColorRampNode.h"
-#include "COM_DifferenceMatteNode.h"
-#include "COM_LuminanceMatteNode.h"
-#include "COM_DistanceMatteNode.h"
-#include "COM_ChromaMatteNode.h"
-#include "COM_ColorMatteNode.h"
-#include "COM_ChannelMatteNode.h"
-#include "COM_BlurNode.h"
-#include "COM_BokehBlurNode.h"
-#include "COM_DilateErodeNode.h"
-#include "COM_TranslateOperation.h"
-#include "COM_LensDistortionNode.h"
+#include "COM_Stabilize2dNode.h"
+#include "COM_SwitchNode.h"
 #include "COM_TextureNode.h"
-#include "COM_ColorNode.h"
-#include "COM_ValueNode.h"
 #include "COM_TimeNode.h"
-#include "COM_DirectionalBlurNode.h"
-#include "COM_ZCombineNode.h"
-#include "COM_SetValueOperation.h"
-#include "COM_ScaleOperation.h"
-#include "COM_ExecutionSystemHelper.h"
 #include "COM_TonemapNode.h"
-#include "COM_SwitchNode.h"
-#include "COM_GlareNode.h"
-#include "COM_MovieClipNode.h"
-#include "COM_ColorSpillNode.h"
-#include "COM_OutputFileNode.h"
-#include "COM_MapValueNode.h"
 #include "COM_TransformNode.h"
-#include "COM_Stabilize2dNode.h"
-#include "COM_BilateralBlurNode.h"
+#include "COM_TranslateNode.h"
+#include "COM_TranslateOperation.h"
+#include "COM_ValueNode.h"
 #include "COM_VectorBlurNode.h"
-#include "COM_MovieDistortionNode.h"
+#include "COM_VectorCurveNode.h"
 #include "COM_ViewLevelsNode.h"
-#include "COM_DefocusNode.h"
-#include "COM_DoubleEdgeMaskNode.h"
-#include "COM_CropNode.h"
-#include "COM_MaskNode.h"
-#include "COM_KeyingScreenNode.h"
-#include "COM_KeyingNode.h"
+#include "COM_ViewerNode.h"
+#include "COM_ZCombineNode.h"
 
 Node *Converter::convert(bNode *bNode)
 {

Modified: trunk/blender/source/blender/compositor/intern/COM_ExecutionGroup.cpp
===================================================================
--- trunk/blender/source/blender/compositor/intern/COM_ExecutionGroup.cpp	2012-06-16 20:00:43 UTC (rev 47998)
+++ trunk/blender/source/blender/compositor/intern/COM_ExecutionGroup.cpp	2012-06-16 20:20:07 UTC (rev 47999)
@@ -20,24 +20,25 @@
  *		Monique Dewanchand
  */
 
+#include <algorithm>
+#include <math.h>
+#include <sstream>
+#include <stdlib.h>
+
+#include "BLI_math.h"
+#include "PIL_time.h"
+
 #include "COM_ExecutionGroup.h"
 #include "COM_InputSocket.h"
 #include "COM_SocketConnection.h"
 #include "COM_defines.h"
-#include "math.h"
 #include "COM_ExecutionSystem.h"
-#include <sstream>
 #include "COM_ReadBufferOperation.h"
 #include "COM_WriteBufferOperation.h"

@@ Diff output truncated at 10240 characters. @@



More information about the Bf-blender-cvs mailing list