[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [53524] branches/ge_harmony/source: Minor whitespace cleanup.
Daniel Stokes
kupomail at gmail.com
Thu Jan 3 10:09:40 CET 2013
Revision: 53524
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=53524
Author: kupoman
Date: 2013-01-03 09:09:34 +0000 (Thu, 03 Jan 2013)
Log Message:
-----------
Minor whitespace cleanup.
Modified Paths:
--------------
branches/ge_harmony/source/blender/makesrna/intern/rna_shader.c
branches/ge_harmony/source/gameengine/GamePlayer/ghost/GPG_Application.cpp
Modified: branches/ge_harmony/source/blender/makesrna/intern/rna_shader.c
===================================================================
--- branches/ge_harmony/source/blender/makesrna/intern/rna_shader.c 2013-01-03 08:09:57 UTC (rev 53523)
+++ branches/ge_harmony/source/blender/makesrna/intern/rna_shader.c 2013-01-03 09:09:34 UTC (rev 53524)
@@ -120,7 +120,7 @@
int rna_Shader_active_index_get(int index)
{
- return MAX2(index-1, 0);
+ return MAX2(index - 1, 0);
}
void rna_Shader_active_index_set(int value, int *index)
@@ -173,7 +173,7 @@
int i;
memset(values, 0.f, sizeof(float)*uni->size);
- for(i=0; i<uni->size; i++)
+ for(i = 0; i < uni->size; i++)
values[i] = ((float*)uni->data)[i];
}
@@ -182,7 +182,7 @@
Uniform *uni = (Uniform*)ptr->data;
int i;
- for (i=0; i<uni->size; i++)
+ for (i = 0; i < uni->size; i++)
((float*)uni->data)[i] = values[i];
}
@@ -191,9 +191,9 @@
Uniform *uni = (Uniform*)ptr->data;
int i;
- memset(values, 0, sizeof(int)*uni->size);
+ memset(values, 0, sizeof(int) * uni->size);
- for(i=0; i<uni->size; i++)
+ for(i = 0; i < uni->size; i++)
values[i] = ((int*)uni->data)[i];
}
@@ -202,7 +202,7 @@
Uniform *uni = (Uniform*)ptr->data;
int i;
- for (i=0; i<uni->size; i++)
+ for (i = 0; i < uni->size; i++)
((int*)uni->data)[i] = values[i];
}
@@ -251,7 +251,7 @@
int x3[] = {3, 3};
int x4[] = {4, 4};
- srna= RNA_def_struct(brna, name, "Uniform");
+ srna = RNA_def_struct(brna, name, "Uniform");
RNA_def_struct_ui_text(srna, name, doc);
RNA_def_struct_sdna(srna, "Uniform");
@@ -316,19 +316,18 @@
{SHADER_UNF_MAT4, "MAT4", 0, "mat4", "mat4"},
{0, NULL, 0, NULL, NULL}};
- srna= RNA_def_struct(brna, "Uniform", NULL);
+ srna = RNA_def_struct(brna, "Uniform", NULL);
RNA_def_struct_sdna(srna, "Uniform");
- //RNA_def_struct_nested(brna, srna, "Shader");
RNA_def_struct_ui_text(srna, "Uniform", "Uniform data for custom shaders");
RNA_def_struct_refine_func(srna, "rna_Uniform_refine");
- prop= RNA_def_property(srna, "name", PROP_STRING, PROP_NONE);
+ prop = RNA_def_property(srna, "name", PROP_STRING, PROP_NONE);
RNA_def_struct_name_property(srna, prop);
RNA_def_property_clear_flag(prop, PROP_EDITABLE);
RNA_def_property_string_sdna(prop, NULL, "name");
RNA_def_property_ui_text(prop, "Name", "The name of the uniform");
- prop= RNA_def_property(srna, "type", PROP_ENUM, PROP_NONE);
+ prop = RNA_def_property(srna, "type", PROP_ENUM, PROP_NONE);
RNA_def_property_enum_sdna(prop, NULL, "type");
RNA_def_property_enum_items(prop, prop_type_items);
RNA_def_property_clear_flag(prop, PROP_EDITABLE);
@@ -471,19 +470,19 @@
RNA_def_property_ui_text(prop, "Source", "The path to the shader to use");
RNA_def_property_update(prop, 0, "rna_Shader_source_update");
- prop= RNA_def_property(srna, "geometry_input", PROP_ENUM, PROP_NONE);
+ prop = RNA_def_property(srna, "geometry_input", PROP_ENUM, PROP_NONE);
RNA_def_property_enum_sdna(prop, NULL, "geom_in");
RNA_def_property_enum_items(prop, prop_geomin_items);
RNA_def_property_ui_text(prop, "Input", "The input type for the geometry shader");
RNA_def_property_update(prop, 0, "rna_Shader_update");
- prop= RNA_def_property(srna, "geometry_output", PROP_ENUM, PROP_NONE);
+ prop = RNA_def_property(srna, "geometry_output", PROP_ENUM, PROP_NONE);
RNA_def_property_enum_sdna(prop, NULL, "geom_out");
RNA_def_property_enum_items(prop, prop_geomout_items);
RNA_def_property_ui_text(prop, "Output", "The output type for the geometry shader");
RNA_def_property_update(prop, 0, "rna_Shader_update");
- prop= RNA_def_property(srna, "uniforms", PROP_COLLECTION, PROP_NONE);
+ prop = RNA_def_property(srna, "uniforms", PROP_COLLECTION, PROP_NONE);
RNA_def_property_collection_sdna(prop, NULL, "uniforms", NULL);
RNA_def_property_struct_type(prop, "Uniform");
RNA_def_property_ui_text(prop, "Custom Uniforms", "Uniform values to send to custom shaders");
Modified: branches/ge_harmony/source/gameengine/GamePlayer/ghost/GPG_Application.cpp
===================================================================
--- branches/ge_harmony/source/gameengine/GamePlayer/ghost/GPG_Application.cpp 2013-01-03 08:09:57 UTC (rev 53523)
+++ branches/ge_harmony/source/gameengine/GamePlayer/ghost/GPG_Application.cpp 2013-01-03 09:09:34 UTC (rev 53524)
@@ -740,7 +740,7 @@
}
- // setup render targets
+ // setup render targets
GameRenderData gr = m_startScene->gm.r;
m_rasterizer->SetPrepassCount(gr.prepasstargets);
m_rasterizer->SetRenderCount(gr.rendertargets);
More information about the Bf-blender-cvs
mailing list