[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [55544] trunk/blender/source: fix for struct definition building with msvc2008 and some style cleanup.
Campbell Barton
ideasman42 at gmail.com
Sun Mar 24 02:19:55 CET 2013
Revision: 55544
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=55544
Author: campbellbarton
Date: 2013-03-24 01:19:55 +0000 (Sun, 24 Mar 2013)
Log Message:
-----------
fix for struct definition building with msvc2008 and some style cleanup.
Modified Paths:
--------------
trunk/blender/source/blender/blenlib/BLI_callbacks.h
trunk/blender/source/blender/blenloader/intern/readfile.c
trunk/blender/source/blender/collada/ArmatureExporter.cpp
trunk/blender/source/blender/collada/collada_internal.cpp
trunk/blender/source/blender/compositor/nodes/COM_SocketProxyNode.h
trunk/blender/source/blender/compositor/operations/COM_CropOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_OutputFileOperation.cpp
trunk/blender/source/blender/editors/sculpt_paint/paint_image_2d.c
trunk/blender/source/blender/editors/sculpt_paint/paint_image_proj.c
trunk/blender/source/blender/editors/space_node/drawnode.c
trunk/blender/source/blender/makesrna/intern/rna_nodetree.c
trunk/blender/source/blender/nodes/composite/node_composite_util.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_value.c
trunk/blender/source/blender/render/intern/source/pipeline.c
trunk/blender/source/blender/render/intern/source/render_result.c
trunk/blender/source/gameengine/Ketsji/KX_ObjectActuator.cpp
trunk/blender/source/gameengine/Ketsji/KX_Scene.cpp
trunk/blender/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp
Modified: trunk/blender/source/blender/blenlib/BLI_callbacks.h
===================================================================
--- trunk/blender/source/blender/blenlib/BLI_callbacks.h 2013-03-24 00:53:05 UTC (rev 55543)
+++ trunk/blender/source/blender/blenlib/BLI_callbacks.h 2013-03-24 01:19:55 UTC (rev 55544)
@@ -54,7 +54,7 @@
} eCbEvent;
-typedef struct {
+typedef struct bCallbackFuncStore {
struct bCallbackFuncStore *next, *prev;
void (*func)(struct Main *, struct ID *, void *arg);
void *arg;
Modified: trunk/blender/source/blender/blenloader/intern/readfile.c
===================================================================
--- trunk/blender/source/blender/blenloader/intern/readfile.c 2013-03-24 00:53:05 UTC (rev 55543)
+++ trunk/blender/source/blender/blenloader/intern/readfile.c 2013-03-24 01:19:55 UTC (rev 55544)
@@ -1019,7 +1019,7 @@
if (err == Z_STREAM_END) {
return 0;
}
- else if (err != Z_OK) {
+ else if (err != Z_OK) {
printf("fd_read_gzip_from_memory: zlib error\n");
return 0;
}
Modified: trunk/blender/source/blender/collada/ArmatureExporter.cpp
===================================================================
--- trunk/blender/source/blender/collada/ArmatureExporter.cpp 2013-03-24 00:53:05 UTC (rev 55543)
+++ trunk/blender/source/blender/collada/ArmatureExporter.cpp 2013-03-24 01:19:55 UTC (rev 55544)
@@ -171,7 +171,7 @@
if (bone->childbase.first == NULL || BLI_countlist(&(bone->childbase)) >= 2) {
add_blender_leaf_bone( bone, ob_arm, node);
}
- else{
+ else {
#endif
node.start();
Modified: trunk/blender/source/blender/collada/collada_internal.cpp
===================================================================
--- trunk/blender/source/blender/collada/collada_internal.cpp 2013-03-24 00:53:05 UTC (rev 55543)
+++ trunk/blender/source/blender/collada/collada_internal.cpp 2013-03-24 01:19:55 UTC (rev 55544)
@@ -111,7 +111,7 @@
float(&UnitConverter::get_rotation())[4][4]
{
- switch(up_axis) {
+ switch (up_axis) {
case COLLADAFW::FileInfo::X_UP:
return x_up_mat4;
break;
Modified: trunk/blender/source/blender/compositor/nodes/COM_SocketProxyNode.h
===================================================================
--- trunk/blender/source/blender/compositor/nodes/COM_SocketProxyNode.h 2013-03-24 00:53:05 UTC (rev 55543)
+++ trunk/blender/source/blender/compositor/nodes/COM_SocketProxyNode.h 2013-03-24 01:19:55 UTC (rev 55544)
@@ -31,9 +31,9 @@
*/
class SocketProxyNode : public Node {
private:
- bool m_buffer;
+ bool m_buffer;
public:
- SocketProxyNode(bNode *editorNode, bNodeSocket *editorInput, bNodeSocket *editorOutput, bool buffer);
+ SocketProxyNode(bNode *editorNode, bNodeSocket *editorInput, bNodeSocket *editorOutput, bool buffer);
void convertToOperations(ExecutionSystem *graph, CompositorContext *context);
virtual bool isProxyNode() const { return true; }
Modified: trunk/blender/source/blender/compositor/operations/COM_CropOperation.cpp
===================================================================
--- trunk/blender/source/blender/compositor/operations/COM_CropOperation.cpp 2013-03-24 00:53:05 UTC (rev 55543)
+++ trunk/blender/source/blender/compositor/operations/COM_CropOperation.cpp 2013-03-24 01:19:55 UTC (rev 55544)
@@ -119,7 +119,7 @@
void CropImageOperation::executePixel(float output[4], float x, float y, PixelSampler sampler)
{
- if (x >= 0 && x < getWidth() && y >= 0 && y < getHeight()) {
+ if (x >= 0 && x < getWidth() && y >= 0 && y < getHeight()) {
this->m_inputOperation->read(output, (x + this->m_xmin), (y + this->m_ymin), sampler);
}
else {
Modified: trunk/blender/source/blender/compositor/operations/COM_OutputFileOperation.cpp
===================================================================
--- trunk/blender/source/blender/compositor/operations/COM_OutputFileOperation.cpp 2013-03-24 00:53:05 UTC (rev 55543)
+++ trunk/blender/source/blender/compositor/operations/COM_OutputFileOperation.cpp 2013-03-24 01:19:55 UTC (rev 55544)
@@ -166,7 +166,7 @@
}
OutputOpenExrMultiLayerOperation::OutputOpenExrMultiLayerOperation(
- const RenderData *rd, const bNodeTree *tree, const char *path, char exr_codec)
+ const RenderData *rd, const bNodeTree *tree, const char *path, char exr_codec)
{
this->m_rd = rd;
this->m_tree = tree;
Modified: trunk/blender/source/blender/editors/sculpt_paint/paint_image_2d.c
===================================================================
--- trunk/blender/source/blender/editors/sculpt_paint/paint_image_2d.c 2013-03-24 00:53:05 UTC (rev 55543)
+++ trunk/blender/source/blender/editors/sculpt_paint/paint_image_2d.c 2013-03-24 01:19:55 UTC (rev 55544)
@@ -79,9 +79,9 @@
} (void)0
#define IMAPAINT_CHAR_RGB_TO_FLOAT(f, c) { \
- (f)[0] = IMAPAINT_CHAR_TO_FLOAT((c)[0]); \
- (f)[1] = IMAPAINT_CHAR_TO_FLOAT((c)[1]); \
- (f)[2] = IMAPAINT_CHAR_TO_FLOAT((c)[2]); \
+ (f)[0] = IMAPAINT_CHAR_TO_FLOAT((c)[0]); \
+ (f)[1] = IMAPAINT_CHAR_TO_FLOAT((c)[1]); \
+ (f)[2] = IMAPAINT_CHAR_TO_FLOAT((c)[2]); \
} (void)0
#define IMAPAINT_FLOAT_RGB_COPY(a, b) copy_v3_v3(a, b)
Modified: trunk/blender/source/blender/editors/sculpt_paint/paint_image_proj.c
===================================================================
--- trunk/blender/source/blender/editors/sculpt_paint/paint_image_proj.c 2013-03-24 00:53:05 UTC (rev 55543)
+++ trunk/blender/source/blender/editors/sculpt_paint/paint_image_proj.c 2013-03-24 01:19:55 UTC (rev 55544)
@@ -116,10 +116,10 @@
} (void)0
#define IMAPAINT_CHAR_RGBA_TO_FLOAT(f, c) { \
- (f)[0] = IMAPAINT_CHAR_TO_FLOAT((c)[0]); \
- (f)[1] = IMAPAINT_CHAR_TO_FLOAT((c)[1]); \
- (f)[2] = IMAPAINT_CHAR_TO_FLOAT((c)[2]); \
- (f)[3] = IMAPAINT_CHAR_TO_FLOAT((c)[3]); \
+ (f)[0] = IMAPAINT_CHAR_TO_FLOAT((c)[0]); \
+ (f)[1] = IMAPAINT_CHAR_TO_FLOAT((c)[1]); \
+ (f)[2] = IMAPAINT_CHAR_TO_FLOAT((c)[2]); \
+ (f)[3] = IMAPAINT_CHAR_TO_FLOAT((c)[3]); \
} (void)0
#define IMAPAINT_FLOAT_RGB_TO_CHAR(c, f) { \
Modified: trunk/blender/source/blender/editors/space_node/drawnode.c
===================================================================
--- trunk/blender/source/blender/editors/space_node/drawnode.c 2013-03-24 00:53:05 UTC (rev 55543)
+++ trunk/blender/source/blender/editors/space_node/drawnode.c 2013-03-24 01:19:55 UTC (rev 55544)
@@ -2811,14 +2811,14 @@
/* maps standard socket integer type to a color */
static const float std_node_socket_colors[][4] = {
- {0.63, 0.63, 0.63, 1.0}, /* SOCK_FLOAT */
- {0.39, 0.39, 0.78, 1.0}, /* SOCK_VECTOR */
- {0.78, 0.78, 0.16, 1.0}, /* SOCK_RGBA */
- {0.39, 0.78, 0.39, 1.0}, /* SOCK_SHADER */
- {0.70, 0.65, 0.19, 1.0}, /* SOCK_BOOLEAN */
- {0.0, 0.0, 0.0, 1.0}, /*__SOCK_MESH (deprecated) */
- {0.06, 0.52, 0.15, 1.0}, /* SOCK_INT */
- {1.0, 1.0, 1.0, 1.0}, /* SOCK_STRING */
+ {0.63, 0.63, 0.63, 1.0}, /* SOCK_FLOAT */
+ {0.39, 0.39, 0.78, 1.0}, /* SOCK_VECTOR */
+ {0.78, 0.78, 0.16, 1.0}, /* SOCK_RGBA */
+ {0.39, 0.78, 0.39, 1.0}, /* SOCK_SHADER */
+ {0.70, 0.65, 0.19, 1.0}, /* SOCK_BOOLEAN */
+ {0.0, 0.0, 0.0, 1.0}, /*__SOCK_MESH (deprecated) */
+ {0.06, 0.52, 0.15, 1.0}, /* SOCK_INT */
+ {1.0, 1.0, 1.0, 1.0}, /* SOCK_STRING */
};
/* common color callbacks for standard types */
Modified: trunk/blender/source/blender/makesrna/intern/rna_nodetree.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_nodetree.c 2013-03-24 00:53:05 UTC (rev 55543)
+++ trunk/blender/source/blender/makesrna/intern/rna_nodetree.c 2013-03-24 01:19:55 UTC (rev 55544)
@@ -69,15 +69,15 @@
};
EnumPropertyItem node_socket_type_items[] = {
- {SOCK_CUSTOM, "CUSTOM", 0, "Custom", ""},
- {SOCK_FLOAT, "VALUE", 0, "Value", ""},
- {SOCK_INT, "INT", 0, "Int", ""},
- {SOCK_BOOLEAN, "BOOLEAN", 0, "Boolean", ""},
- {SOCK_VECTOR, "VECTOR", 0, "Vector", ""},
- {SOCK_STRING, "STRING", 0, "String", ""},
- {SOCK_RGBA, "RGBA", 0, "RGBA", ""},
- {SOCK_SHADER, "SHADER", 0, "Shader", ""},
- {0, NULL, 0, NULL, NULL}
+ {SOCK_CUSTOM, "CUSTOM", 0, "Custom", ""},
+ {SOCK_FLOAT, "VALUE", 0, "Value", ""},
+ {SOCK_INT, "INT", 0, "Int", ""},
+ {SOCK_BOOLEAN, "BOOLEAN", 0, "Boolean", ""},
+ {SOCK_VECTOR, "VECTOR", 0, "Vector", ""},
+ {SOCK_STRING, "STRING", 0, "String", ""},
+ {SOCK_RGBA, "RGBA", 0, "RGBA", ""},
+ {SOCK_SHADER, "SHADER", 0, "Shader", ""},
+ {0, NULL, 0, NULL, NULL}
};
EnumPropertyItem node_quality_items[] = {
Modified: trunk/blender/source/blender/nodes/composite/node_composite_util.c
===================================================================
--- trunk/blender/source/blender/nodes/composite/node_composite_util.c 2013-03-24 00:53:05 UTC (rev 55543)
+++ trunk/blender/source/blender/nodes/composite/node_composite_util.c 2013-03-24 01:19:55 UTC (rev 55544)
@@ -41,7 +41,7 @@
{
bNodeSocket *sock;
for (sock= node->outputs.first; sock; sock= sock->next) {
- if(sock->cache) {
+ if (sock->cache) {
//free_compbuf(sock->cache);
//sock->cache= NULL;
}
Modified: trunk/blender/source/blender/nodes/shader/nodes/node_shader_value.c
===================================================================
--- trunk/blender/source/blender/nodes/shader/nodes/node_shader_value.c 2013-03-24 00:53:05 UTC (rev 55543)
+++ trunk/blender/source/blender/nodes/shader/nodes/node_shader_value.c 2013-03-24 01:19:55 UTC (rev 55544)
@@ -34,7 +34,7 @@
/* **************** VALUE ******************** */
static bNodeSocketTemplate sh_node_value_out[] = {
- { SOCK_FLOAT, 0, N_("Value"), 0.5f, 0, 0, 0, -FLT_MAX, FLT_MAX, PROP_NONE},
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list