Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2012-11-03 19:35:03 +0400
committerCampbell Barton <ideasman42@gmail.com>2012-11-03 19:35:03 +0400
commit25591e958d8cf8247ec67a2838470f96a8ae606a (patch)
tree6b5ec714de724b207e89672dfaf65afe4fe15180 /source/blender/makesrna
parent060ea498b0565764d154ce968cde173e5676a521 (diff)
style cleanup: tabs & whitespace
Diffstat (limited to 'source/blender/makesrna')
-rw-r--r--source/blender/makesrna/intern/rna_material.c8
-rw-r--r--source/blender/makesrna/intern/rna_nodetree.c18
-rw-r--r--source/blender/makesrna/intern/rna_scene_api.c42
3 files changed, 36 insertions, 32 deletions
diff --git a/source/blender/makesrna/intern/rna_material.c b/source/blender/makesrna/intern/rna_material.c
index 5e8dda7c065..9232ae098ea 100644
--- a/source/blender/makesrna/intern/rna_material.c
+++ b/source/blender/makesrna/intern/rna_material.c
@@ -1837,10 +1837,10 @@ void RNA_def_material(BlenderRNA *brna)
"from other scene lighting");
RNA_def_property_update(prop, 0, "rna_Material_update");
- prop = RNA_def_property(srna, "use_light_group_local", PROP_BOOLEAN, PROP_NONE);
- RNA_def_property_boolean_sdna(prop, NULL, "shade_flag", MA_GROUP_LOCAL);
- RNA_def_property_ui_text(prop, "Light Group Local", "When linked in, material uses local light group with the same name");
- RNA_def_property_update(prop, 0, "rna_Material_update");
+ prop = RNA_def_property(srna, "use_light_group_local", PROP_BOOLEAN, PROP_NONE);
+ RNA_def_property_boolean_sdna(prop, NULL, "shade_flag", MA_GROUP_LOCAL);
+ RNA_def_property_ui_text(prop, "Light Group Local", "When linked in, material uses local light group with the same name");
+ RNA_def_property_update(prop, 0, "rna_Material_update");
prop = RNA_def_property(srna, "use_raytrace", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "mode", MA_TRACEBLE);
diff --git a/source/blender/makesrna/intern/rna_nodetree.c b/source/blender/makesrna/intern/rna_nodetree.c
index 85df288b38b..ece5c82f747 100644
--- a/source/blender/makesrna/intern/rna_nodetree.c
+++ b/source/blender/makesrna/intern/rna_nodetree.c
@@ -1006,14 +1006,18 @@ static bNodeSocket *rna_ShaderNodeScript_find_socket(bNode *node, const char *na
bNodeSocket *sock;
if (is_output) {
- for (sock = node->outputs.first; sock; sock = sock->next)
- if (strcmp(sock->name, name)==0)
+ for (sock = node->outputs.first; sock; sock = sock->next) {
+ if (strcmp(sock->name, name) == 0) {
return sock;
+ }
+ }
}
else {
- for (sock = node->inputs.first; sock; sock = sock->next)
- if (strcmp(sock->name, name)==0)
+ for (sock = node->inputs.first; sock; sock = sock->next) {
+ if (strcmp(sock->name, name) == 0) {
return sock;
+ }
+ }
}
return NULL;
@@ -1052,13 +1056,13 @@ static void rna_ShaderNodeScript_mode_set(PointerRNA *ptr, int value)
if (nss->mode != value) {
nss->mode = value;
nss->filepath[0] = '\0';
- nss->flag &= ~NODE_SCRIPT_AUTO_UPDATE;
+ nss->flag &= ~NODE_SCRIPT_AUTO_UPDATE;
/* replace text datablock by filepath */
if (node->id) {
Text *text = (Text*)node->id;
- if(value == NODE_SCRIPT_EXTERNAL && text->name) {
+ if (value == NODE_SCRIPT_EXTERNAL && text->name) {
BLI_strncpy(nss->filepath, text->name, sizeof(nss->filepath));
BLI_path_rel(nss->filepath, G.main->name);
}
@@ -1068,7 +1072,7 @@ static void rna_ShaderNodeScript_mode_set(PointerRNA *ptr, int value)
}
/* remove any bytecode */
- if(nss->bytecode) {
+ if (nss->bytecode) {
MEM_freeN(nss->bytecode);
nss->bytecode = NULL;
}
diff --git a/source/blender/makesrna/intern/rna_scene_api.c b/source/blender/makesrna/intern/rna_scene_api.c
index 10efc7a94a7..63253153699 100644
--- a/source/blender/makesrna/intern/rna_scene_api.c
+++ b/source/blender/makesrna/intern/rna_scene_api.c
@@ -89,29 +89,29 @@ static void rna_SceneRender_get_frame_path(RenderData *rd, int frame, char *name
#include "../../collada/collada.h"
static void rna_Scene_collada_export(
- Scene *scene,
- const char *filepath,
- int apply_modifiers,
- int export_mesh_type,
-
- int selected,
- int include_children,
- int include_armatures,
- int deform_bones_only,
-
- int active_uv_only,
- int include_uv_textures,
- int include_material_textures,
- int use_texture_copies,
-
- int use_object_instantiation,
- int sort_by_name,
- int second_life)
+ Scene *scene,
+ const char *filepath,
+ int apply_modifiers,
+ int export_mesh_type,
+
+ int selected,
+ int include_children,
+ int include_armatures,
+ int deform_bones_only,
+
+ int active_uv_only,
+ int include_uv_textures,
+ int include_material_textures,
+ int use_texture_copies,
+
+ int use_object_instantiation,
+ int sort_by_name,
+ int second_life)
{
- collada_export(scene, filepath, apply_modifiers, export_mesh_type, selected,
+ collada_export(scene, filepath, apply_modifiers, export_mesh_type, selected,
include_children, include_armatures, deform_bones_only,
- active_uv_only, include_uv_textures, include_material_textures,
- use_texture_copies, use_object_instantiation, sort_by_name, second_life);
+ active_uv_only, include_uv_textures, include_material_textures,
+ use_texture_copies, use_object_instantiation, sort_by_name, second_life);
}
#endif