archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

style cleanup

Browse Source
This commit is contained in:
Campbell Barton
2012-08-22 16:44:32 +00:00
parent 6143acf878
commit 1939baa47d
14 changed files with 55 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/editors/interface/interface.c
View File

@@ -3814,7 +3814,9 @@ void uiButGetStrInfo(bContext *C, uiBut *but, int nbr, ...)
if (WM_key_event_operator_string(C, but->optype->idname, but->opcontext, prop, TRUE,
buf, sizeof(buf)))
{
tmp = BLI_strdup(buf);
}
}
}

48
source/blender/editors/space_logic/space_logic.c
View File

@@ -302,48 +302,48 @@ static void logic_header_area_draw(const bContext *C, ARegion *ar)
/* only called once, from space/spacetypes.c */
void ED_spacetype_logic(void)
{
SpaceType *st= MEM_callocN(sizeof(SpaceType), "spacetype logic");
SpaceType *st = MEM_callocN(sizeof(SpaceType), "spacetype logic");
ARegionType *art;
st->spaceid= SPACE_LOGIC;
st->spaceid = SPACE_LOGIC;
strncpy(st->name, "Logic", BKE_ST_MAXNAME);
st->new= logic_new;
st->free= logic_free;
st->init= logic_init;
st->duplicate= logic_duplicate;
st->operatortypes= logic_operatortypes;
st->keymap= logic_keymap;
st->refresh= logic_refresh;
st->context= logic_context;
st->new = logic_new;
st->free = logic_free;
st->init = logic_init;
st->duplicate = logic_duplicate;
st->operatortypes = logic_operatortypes;
st->keymap = logic_keymap;
st->refresh = logic_refresh;
st->context = logic_context;
/* regions: main window */
art= MEM_callocN(sizeof(ARegionType), "spacetype logic region");
art = MEM_callocN(sizeof(ARegionType), "spacetype logic region");
art->regionid = RGN_TYPE_WINDOW;
art->keymapflag= ED_KEYMAP_UI|ED_KEYMAP_FRAMES|ED_KEYMAP_VIEW2D;
art->init= logic_main_area_init;
art->draw= logic_main_area_draw;
art->listener= logic_listener;
art->keymapflag = ED_KEYMAP_UI | ED_KEYMAP_FRAMES | ED_KEYMAP_VIEW2D;
art->init = logic_main_area_init;
art->draw = logic_main_area_draw;
art->listener = logic_listener;
BLI_addhead(&st->regiontypes, art);
/* regions: listview/buttons */
art= MEM_callocN(sizeof(ARegionType), "spacetype logic region");
art = MEM_callocN(sizeof(ARegionType), "spacetype logic region");
art->regionid = RGN_TYPE_UI;
art->prefsizex= 220; // XXX
art->keymapflag= ED_KEYMAP_UI|ED_KEYMAP_FRAMES;
art->listener= logic_listener;
art->init= logic_buttons_area_init;
art->draw= logic_buttons_area_draw;
art->keymapflag = ED_KEYMAP_UI | ED_KEYMAP_FRAMES;
art->listener = logic_listener;
art->init = logic_buttons_area_init;
art->draw = logic_buttons_area_draw;
BLI_addhead(&st->regiontypes, art);
/* regions: header */
art= MEM_callocN(sizeof(ARegionType), "spacetype logic region");
art->regionid = RGN_TYPE_HEADER;
art->prefsizey= HEADERY;
art->keymapflag= ED_KEYMAP_UI|ED_KEYMAP_VIEW2D|ED_KEYMAP_FRAMES|ED_KEYMAP_HEADER;
art->init= logic_header_area_init;
art->draw= logic_header_area_draw;
art->prefsizey = HEADERY;
art->keymapflag = ED_KEYMAP_UI | ED_KEYMAP_VIEW2D | ED_KEYMAP_FRAMES | ED_KEYMAP_HEADER;
art->init = logic_header_area_init;
art->draw = logic_header_area_draw;
BLI_addhead(&st->regiontypes, art);

8
source/blender/editors/space_node/drawnode.c
View File

@@ -857,13 +857,13 @@ static void node_draw_group(const bContext *C, ARegion *ar, SpaceNode *snode, bN
while (gsock && (!sock || sock->groupsock != gsock)) {
draw_group_socket(C, snode, ntree, gnode, NULL, gsock, index, SOCK_IN);
gsock = gsock->next;
++index;
index++;
}
while (sock && gsock && sock->groupsock == gsock) {
draw_group_socket(C, snode, ntree, gnode, sock, gsock, index, SOCK_IN);
sock = sock->next;
gsock = gsock->next;
++index;
index++;
}
}
gsock = ngroup->outputs.first;
@@ -877,13 +877,13 @@ static void node_draw_group(const bContext *C, ARegion *ar, SpaceNode *snode, bN
while (gsock && (!sock || sock->groupsock != gsock)) {
draw_group_socket(C, snode, ntree, gnode, NULL, gsock, index, SOCK_OUT);
gsock = gsock->next;
++index;
index++;
}
while (sock && gsock && sock->groupsock == gsock) {
draw_group_socket(C, snode, ntree, gnode, sock, gsock, index, SOCK_OUT);
sock = sock->next;
gsock = gsock->next;
++index;
index++;
}
}

4
source/blender/editors/space_node/node_add.c
View File

@@ -25,7 +25,7 @@
* ***** END GPL LICENSE BLOCK *****
*/
/** \file blender/editors/space_node/node_relationships.c
/** \file blender/editors/space_node/node_add.c
* \ingroup spnode
*/
@@ -360,7 +360,7 @@ static int new_node_tree_exec(bContext *C, wmOperator *op)
/* RNA_property_pointer_set increases the user count,
* fixed here as the editor is the initial user.
*/
--ntree->id.us;
ntree->id.us++;
RNA_property_update(C, &ptr, prop);
}
else if (snode) {

4
source/blender/editors/space_node/node_draw.c
View File

@@ -226,12 +226,12 @@ void ED_node_sort(bNodeTree *ntree)
while (a < k && b < k && node_b) {
if (compare_nodes(node_a, node_b) == 0) {
node_a = node_a->next;
++a;
a++;
}
else {
tmp = node_b;
node_b = node_b->next;
++b;
b++;
BLI_remlink(&ntree->nodes, tmp);
BLI_insertlinkbefore(&ntree->nodes, node_a, tmp);
}

4
source/blender/editors/space_node/node_edit.c
View File

@@ -1838,7 +1838,7 @@ static int node_output_file_move_active_socket_exec(bContext *C, wmOperator *op)
return OPERATOR_CANCELLED;
BLI_remlink(&node->inputs, sock);
BLI_insertlinkbefore(&node->inputs, before, sock);
--nimf->active_input;
nimf->active_input--;
}
else {
bNodeSocket *after = sock->next;
@@ -1846,7 +1846,7 @@ static int node_output_file_move_active_socket_exec(bContext *C, wmOperator *op)
return OPERATOR_CANCELLED;
BLI_remlink(&node->inputs, sock);
BLI_insertlinkafter(&node->inputs, after, sock);
++nimf->active_input;
nimf->active_input++;
}
snode_notify(C, snode);

7
source/blender/editors/space_node/node_relationships.c
View File

@@ -224,8 +224,9 @@ static void snode_autoconnect(SpaceNode *snode, int allow_multiple, int replace)
if (!sock_fr)
continue;
if (snode_autoconnect_input(snode, node_fr, sock_fr, node_to, sock_to, replace))
++numlinks;
if (snode_autoconnect_input(snode, node_fr, sock_fr, node_to, sock_to, replace)) {
numlinks++;
}
}
}
@@ -246,7 +247,7 @@ static void snode_autoconnect(SpaceNode *snode, int allow_multiple, int replace)
continue;
if (snode_autoconnect_input(snode, node_fr, sock_fr, node_to, sock_to, replace)) {
++numlinks;
numlinks++;
break;
}
}

2
source/blender/editors/transform/transform.c
View File

@@ -4978,7 +4978,9 @@ static int createSlideVerts(TransInfo *t)
/* This test is only relevant if object is not wire-drawn! See [#32068]. */
if (v3d && t->obedit->dt > OB_WIRE && v3d->drawtype > OB_WIRE &&
!BMBVH_EdgeVisible(btree, e2, ar, v3d, t->obedit))
{
continue;
}
j = GET_INT_FROM_POINTER(BLI_smallhash_lookup(&table, (uintptr_t)v));

4
source/blender/editors/uvedit/uvedit_ops.c
View File

@@ -205,8 +205,8 @@ void ED_uvedit_assign_image(Main *bmain, Scene *scene, Object *obedit, Image *im
ED_image_get_uv_aspect(previma, prev_aspect, prev_aspect + 1);
ED_image_get_uv_aspect(ima, aspect, aspect + 1);
fprev_aspect = prev_aspect[0]/prev_aspect[1];
faspect = aspect[0]/aspect[1];
fprev_aspect = prev_aspect[0] / prev_aspect[1];
faspect = aspect[0] / aspect[1];
#endif
/* ensure we have a uv map */

5
source/blender/imbuf/intern/openexr/openexr_api.cpp
View File

@@ -728,8 +728,9 @@ static int imb_exr_split_token(const char *str, const char *end, const char **to
{
int maxlen = end - str;
int len = 0;
while (len < maxlen && *(end - len - 1) != '.')
++len;
while (len < maxlen && *(end - len - 1) != '.') {
len++;
}
*token = end - len;
return len;

6
source/blender/makesrna/intern/rna_nodetree.c
View File

@@ -3711,7 +3711,7 @@ static void def_cmp_keying(StructRNA *srna)
RNA_def_property_float_sdna(prop, NULL, "clip_white");
RNA_def_property_range(prop, 0.0f, 1.0f);
RNA_def_property_ui_text(prop, "Clip White", "Value of non-scaled matte pixel which considers as fully foreground pixel");
RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update");
RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
prop = RNA_def_property(srna, "blur_pre", PROP_INT, PROP_NONE);
RNA_def_property_int_sdna(prop, NULL, "blur_pre");
@@ -3790,12 +3790,12 @@ static void def_cmp_trackpos(StructRNA *srna)
prop = RNA_def_property(srna, "tracking_object", PROP_STRING, PROP_NONE);
RNA_def_property_string_sdna(prop, NULL, "tracking_object");
RNA_def_property_ui_text(prop, "Tracking Object", "");
RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update");
RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
prop = RNA_def_property(srna, "track_name", PROP_STRING, PROP_NONE);
RNA_def_property_string_sdna(prop, NULL, "track_name");
RNA_def_property_ui_text(prop, "Track", "");
RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update");
RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
}
/* -- Texture Nodes --------------------------------------------------------- */

2
source/blender/makesrna/intern/rna_sequencer.c
View File

@@ -62,7 +62,7 @@ typedef struct EffectInfo {
EnumPropertyItem sequence_modifier_type_items[] = {
{seqModifierType_ColorBalance, "COLOR_BALANCE", ICON_NONE, "Color Balance", ""},
{seqModifierType_Curves, "CURVES", ICON_NONE, "Curves", ""},
{seqModifierType_HueCorrect,"HUE_CORRECT", ICON_NONE, "Hue Correct", ""},
{seqModifierType_HueCorrect, "HUE_CORRECT", ICON_NONE, "Hue Correct", ""},
{0, NULL, 0, NULL, NULL}
};

2
source/blender/python/bmesh/bmesh_py_types.c
View File

@@ -2159,7 +2159,9 @@ static PyObject *bpy_bmelemseq_sort(BPy_BMElemSeq *self, PyObject *args, PyObjec
"|Oi:BMElemSeq.sort",
(char **)kwlist,
&keyfunc, &reverse))
{
return NULL;
}
}
if (keyfunc != NULL && !PyCallable_Check(keyfunc)) {

2
source/blender/python/intern/bpy_operator.c
View File

@@ -160,7 +160,9 @@ static PyObject *pyop_call(PyObject *UNUSED(self), PyObject *args)
if (!PyArg_ParseTuple(args, "sO|O!si:_bpy.ops.call",
&opname, &context_dict, &PyDict_Type, &kw, &context_str, &is_undo))
{
return NULL;
}
ot = WM_operatortype_find(opname, TRUE);