kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

style cleanup

Browse Source
This commit is contained in:
Campbell Barton 2012-07-29 00:20:28 +00:00
parent 7ecc0ba999
commit e32c60284a
21 changed files with 487 additions and 504 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
source/blender/avi/intern/avi.c
View File

@ -857,9 +857,9 @@ AviError AVI_open_compress(char *name, AviMovie *movie, int streams, ...)
#if 0
if (movie->streams[i].format == AVI_FORMAT_MJPEG) {
AviMJPEGUnknown *tmp;
tmp = (AviMJPEGUnknown *) ((char*) movie->streams[i].sf +sizeof(AviBitmapInfoHeader));
tmp = (AviMJPEGUnknown *)((char *) movie->streams[i].sf + sizeof(AviBitmapInfoHeader));
tmp->a = 44;
tmp->b = 24;
tmp->c = 0;

2
source/blender/blenkernel/intern/multires.c
View File

@ -1311,7 +1311,7 @@ void multires_set_space(DerivedMesh *dm, Object *ob, int from, int to)
memcpy(subGridData[i], gridData[i], key.elem_size * gridSize * gridSize);
}
/*numGrids = ccgdm->dm->getNumGrids((DerivedMesh*)ccgdm);*/ /*UNUSED*/
/* numGrids = ccgdm->dm->getNumGrids((DerivedMesh *)ccgdm); */ /*UNUSED*/
gridSize = ccgdm->getGridSize((DerivedMesh *)ccgdm);
gridData = ccgdm->getGridData((DerivedMesh *)ccgdm);
gridOffset = ccgdm->getGridOffset((DerivedMesh *)ccgdm);

655
source/blender/blenkernel/intern/node.c
View File

File diff suppressed because it is too large Load Diff

2
source/blender/blenkernel/intern/ocean.c
View File

@ -834,7 +834,7 @@ void BKE_init_ocean(struct Ocean *o, int M, int N, float Lx, float Lz, float V,
o->_fft_in_nz = (fftw_complex *) MEM_mallocN(o->_M * (1 + o->_N / 2) * sizeof(fftw_complex), "ocean_fft_in_nz");
o->_N_x = (double *) MEM_mallocN(o->_M * o->_N * sizeof(double), "ocean_N_x");
/*o->_N_y = (float*) fftwf_malloc(o->_M * o->_N * sizeof(float)); (MEM01)*/
/* o->_N_y = (float *) fftwf_malloc(o->_M * o->_N * sizeof(float)); (MEM01) */
o->_N_z = (double *) MEM_mallocN(o->_M * o->_N * sizeof(double), "ocean_N_z");
o->_N_x_plan = fftw_plan_dft_c2r_2d(o->_M, o->_N, o->_fft_in_nx, o->_N_x, FFTW_ESTIMATE);

80
source/blender/blenkernel/intern/writeframeserver.c
View File

@ -128,7 +128,7 @@ int BKE_frameserver_start(struct Scene *scene, RenderData *UNUSED(rd), int rectx
return 0;
}
setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, (char*) &arg, sizeof(arg));
setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, (char *) &arg, sizeof(arg));
addr.sin_family = AF_INET;
addr.sin_port = htons(U.frameserverport);
@ -177,7 +177,7 @@ static char good_bye[] =
"<body><pre>\n"
"Render stopped. Goodbye</pre></body></html>";
static int safe_write(char * s, int tosend)
static int safe_write(char *s, int tosend)
{
int total = tosend;
do {
@ -192,15 +192,15 @@ static int safe_write(char * s, int tosend)
return total;
}
static int safe_puts(char * s)
static int safe_puts(char *s)
{
return safe_write(s, strlen(s));
}
static int handle_request(RenderData *rd, char * req)
static int handle_request(RenderData *rd, char *req)
{
char * p;
char * path;
char *p;
char *path;
int pathlen;
if (memcmp(req, "GET ", 4) != 0) {
@ -230,22 +230,22 @@ static int handle_request(RenderData *rd, char * req)
char buf[4096];
sprintf(buf,
"HTTP/1.1 200 OK\r\n"
"Content-Type: text/html\r\n"
"\r\n"
"start %d\n"
"end %d\n"
"width %d\n"
"height %d\n"
"rate %d\n"
"ratescale %d\n",
rd->sfra,
rd->efra,
render_width,
render_height,
rd->frs_sec,
1
);
"HTTP/1.1 200 OK\r\n"
"Content-Type: text/html\r\n"
"\r\n"
"start %d\n"
"end %d\n"
"width %d\n"
"height %d\n"
"rate %d\n"
"ratescale %d\n",
rd->sfra,
rd->efra,
render_width,
render_height,
rd->frs_sec,
1
);
safe_puts(buf);
return -1;
@ -262,7 +262,7 @@ int BKE_frameserver_loop(RenderData *rd, ReportList *UNUSED(reports))
{
fd_set readfds;
struct timeval tv;
struct sockaddr_in addr;
struct sockaddr_in addr;
int len, rval;
#ifdef FREE_WINDOWS
int socklen;
@ -305,7 +305,7 @@ int BKE_frameserver_loop(RenderData *rd, ReportList *UNUSED(reports))
tv.tv_sec = 10;
tv.tv_usec = 0;
rval = select(connsock + 1, &readfds, NULL, NULL, &tv);
rval = select(connsock + 1, &readfds, NULL, NULL, &tv);
if (rval > 0) {
break;
}
@ -332,30 +332,30 @@ int BKE_frameserver_loop(RenderData *rd, ReportList *UNUSED(reports))
static void serve_ppm(int *pixels, int rectx, int recty)
{
unsigned char* rendered_frame;
unsigned char* row = (unsigned char*) malloc(render_width * 3);
unsigned char *rendered_frame;
unsigned char *row = (unsigned char *) malloc(render_width * 3);
int y;
char header[1024];
sprintf(header,
"HTTP/1.1 200 OK\r\n"
"Content-Type: image/ppm\r\n"
"Connection: close\r\n"
"\r\n"
"P6\n"
"# Creator: blender frameserver v0.0.1\n"
"%d %d\n"
"255\n",
rectx, recty);
"HTTP/1.1 200 OK\r\n"
"Content-Type: image/ppm\r\n"
"Connection: close\r\n"
"\r\n"
"P6\n"
"# Creator: blender frameserver v0.0.1\n"
"%d %d\n"
"255\n",
rectx, recty);
safe_puts(header);
rendered_frame = (unsigned char *)pixels;
for (y = recty - 1; y >= 0; y--) {
unsigned char* target = row;
unsigned char* src = rendered_frame + rectx * 4 * y;
unsigned char* end = src + rectx * 4;
unsigned char *target = row;
unsigned char *src = rendered_frame + rectx * 4 * y;
unsigned char *end = src + rectx * 4;
while (src != end) {
target[2] = src[2];
target[1] = src[1];
@ -364,7 +364,7 @@ static void serve_ppm(int *pixels, int rectx, int recty)
target += 3;
src += 4;
}
safe_write((char*)row, 3 * rectx);
safe_write((char *)row, 3 * rectx);
}
free(row);
closesocket(connsock);
@ -372,7 +372,7 @@ static void serve_ppm(int *pixels, int rectx, int recty)
}
int BKE_frameserver_append(RenderData *UNUSED(rd), int UNUSED(start_frame), int frame, int *pixels,
int rectx, int recty, ReportList *UNUSED(reports))
int rectx, int recty, ReportList *UNUSED(reports))
{
fprintf(stderr, "Serving frame: %d\n", frame);
if (write_ppm) {

2
source/blender/blenlib/intern/BLI_args.c
View File

@ -88,7 +88,7 @@ static unsigned int case_strhash(const void *ptr)
static unsigned int keyhash(const void *ptr)
{
const bAKey *k = ptr;
return case_strhash(k->arg); // ^ BLI_ghashutil_inthash((void*)k->pass);
return case_strhash(k->arg); /* ^ BLI_ghashutil_inthash((void *)k->pass); */
}
static int keycmp(const void *a, const void *b)

4
source/blender/blenlib/intern/DLRB_tree.c
View File

@ -330,7 +330,7 @@ static void rotate_left(DLRBT_Tree *tree, DLRBT_Node *root)
root_slot = &root->parent->right;
}
else
root_slot = ((DLRBT_Node **)&tree->root); //&((DLRBT_Node*)tree->root);
root_slot = ((DLRBT_Node **)&tree->root); /* &((DLRBT_Node *)tree->root); */
/* - pivot's left child becomes root's right child
* - root now becomes pivot's left child
@ -364,7 +364,7 @@ static void rotate_right(DLRBT_Tree *tree, DLRBT_Node *root)
root_slot = &root->parent->right;
}
else
root_slot = ((DLRBT_Node **)&tree->root); //&((DLRBT_Node*)tree->root);
root_slot = ((DLRBT_Node **)&tree->root); /* &((DLRBT_Node*)tree->root); */
/* - pivot's right child becomes root's left child
* - root now becomes pivot's right child

2
source/blender/editors/armature/editarmature_retarget.c
View File

@ -2379,7 +2379,7 @@ static void findCorrespondingArc(RigGraph *rigg, RigArc *start_arc, RigNode *sta
// printf("CANDIDATES\n");
// for (i = 0; i < enode->degree; i++)
// {
// next_earc = (ReebArc*)enode->arcs[i];
// next_earc = (ReebArc *)enode->arcs[i];
// printf("flag %i -- level %i -- flag %i -- group %i\n", next_earc->flag, next_earc->symmetry_level, next_earc->symmetry_flag, next_earc->symmetry_group);
// }

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

@ -2674,10 +2674,11 @@ static uiBut *ui_def_but(uiBlock *block, int type, int retval, const char *str,
* of our UI functions take prop rather then propname.
*/
#define UI_DEF_BUT_RNA_DISABLE(but) \
but->flag |= UI_BUT_DISABLED; \
but->lock = 1; \
but->lockstr = ""
#define UI_DEF_BUT_RNA_DISABLE(but) { \
but->flag |= UI_BUT_DISABLED; \
but->lock = TRUE; \
but->lockstr = ""; \
} (void)0
static uiBut *ui_def_but_rna(uiBlock *block, int type, int retval, const char *str,
@ -3713,7 +3714,7 @@ void uiButGetStrInfo(bContext *C, uiBut *but, int nbr, ...)
va_start(args, nbr);
while (nbr--) {
uiStringInfo *si = (uiStringInfo*) va_arg(args, void*);
uiStringInfo *si = (uiStringInfo *) va_arg(args, void *);
int type = si->type;
char *tmp = NULL;
@ -3727,13 +3728,13 @@ void uiButGetStrInfo(bContext *C, uiBut *but, int nbr, ...)
tmp = BLI_strdup(but->str);
}
else
type = BUT_GET_RNA_LABEL; /* Fail-safe solution... */
type = BUT_GET_RNA_LABEL; /* Fail-safe solution... */
}
else if (type == BUT_GET_TIP) {
if (but->tip && but->tip[0])
tmp = BLI_strdup(but->tip);
else
type = BUT_GET_RNA_TIP; /* Fail-safe solution... */
type = BUT_GET_RNA_TIP; /* Fail-safe solution... */
}
if (type == BUT_GET_RNAPROP_IDENTIFIER) {

12
source/blender/editors/mesh/editmesh_knife.c
View File

@ -291,14 +291,14 @@ static void knife_add_edge_faces_to_vert(KnifeTool_OpData *kcd, KnifeVert *kfv,
/* Find a face in common in the two faces lists.
If more than one, return the first; if none, return NULL */
static BMFace* knife_find_common_face(ListBase *faces1, ListBase *faces2)
static BMFace *knife_find_common_face(ListBase *faces1, ListBase *faces2)
{
Ref *ref1, *ref2;
for (ref1 = faces1->first; ref1; ref1 = ref1->next) {
for (ref2 = faces2->first; ref2; ref2 = ref2->next) {
if (ref1->ref == ref2->ref)
return (BMFace*)(ref1->ref);
return (BMFace *)(ref1->ref);
}
}
return NULL;
@ -454,7 +454,8 @@ static KnifeVert *knife_split_edge(KnifeTool_OpData *kcd, KnifeEdge *kfe, float
newkfe->v2->draw = 1;
if (kfe->e) {
knife_add_edge_faces_to_vert(kcd, newkfe->v2, kfe->e);
} else {
}
else {
/* kfe cuts across an existing face.
If v1 and v2 are in multiple faces together (e.g., if they
are in doubled polys) then this arbitrarily chooses one of them */
@ -1097,7 +1098,7 @@ static BMEdgeHit *knife_edge_tri_isect(KnifeTool_OpData *kcd, BMBVHTree *bmtree,
/* for comparing distances, error of intersection depends on triangle scale.
* need to scale down before squaring for accurate comparison */
const float depsilon = 50 * FLT_EPSILON * len_v3_tri_side_max(v1, v2, v3);
const float depsilon = 50 *FLT_EPSILON *len_v3_tri_side_max(v1, v2, v3);
const float depsilon_squared = depsilon * depsilon;
copy_v3_v3(cos + 0, v1);
@ -2944,7 +2945,8 @@ wmKeyMap *knifetool_modal_keymap(wmKeyConfig *keyconf)
{KNF_MODAL_CUT_THROUGH_TOGGLE, "CUT_THROUGH_TOGGLE", 0, "Toggle Cut Through", ""},
{KNF_MODAL_NEW_CUT, "NEW_CUT", 0, "End Current Cut", ""},
{KNF_MODAL_ADD_CUT, "ADD_CUT", 0, "Add Cut", ""},
{0, NULL, 0, NULL, NULL}};
{0, NULL, 0, NULL, NULL}
};
wmKeyMap *keymap = WM_modalkeymap_get(keyconf, "Knife Tool Modal Map");

16
source/blender/editors/object/object_modifier.c
View File

@ -212,10 +212,10 @@ int ED_object_iter_other(Main *bmain, Object *orig_ob, int include_orig,
int totfound = include_orig ? 0 : 1;
for (ob = bmain->object.first; ob && totfound < users;
ob = ob->id.next)
ob = ob->id.next)
{
if (((ob != orig_ob) || include_orig) &&
(ob->data == orig_ob->data))
(ob->data == orig_ob->data))
{
if (callback(ob, callback_data))
return TRUE;
@ -233,7 +233,7 @@ int ED_object_iter_other(Main *bmain, Object *orig_ob, int include_orig,
static int object_has_modifier_cb(Object *ob, void *data)
{
ModifierType type = *((ModifierType*)data);
ModifierType type = *((ModifierType *)data);
return object_has_modifier(ob, NULL, type);
}
@ -244,7 +244,7 @@ static int object_has_modifier_cb(Object *ob, void *data)
int ED_object_multires_update_totlevels_cb(Object *ob, void *totlevel_v)
{
ModifierData *md;
int totlevel = *((int*)totlevel_v);
int totlevel = *((int *)totlevel_v);
for (md = ob->modifiers.first; md; md = md->next) {
if (md->type == eModifierType_Multires) {
@ -1148,8 +1148,8 @@ static int multires_higher_levels_delete_exec(bContext *C, wmOperator *op)
multiresModifier_del_levels(mmd, ob, 1);
ED_object_iter_other(CTX_data_main(C), ob, TRUE,
ED_object_multires_update_totlevels_cb,
&mmd->totlvl);
ED_object_multires_update_totlevels_cb,
&mmd->totlvl);
WM_event_add_notifier(C, NC_OBJECT | ND_MODIFIER, ob);
@ -1192,8 +1192,8 @@ static int multires_subdivide_exec(bContext *C, wmOperator *op)
multiresModifier_subdivide(mmd, ob, 0, mmd->simple);
ED_object_iter_other(CTX_data_main(C), ob, TRUE,
ED_object_multires_update_totlevels_cb,
&mmd->totlvl);
ED_object_multires_update_totlevels_cb,
&mmd->totlvl);
DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
WM_event_add_notifier(C, NC_OBJECT | ND_MODIFIER, ob);

4
source/blender/editors/sculpt_paint/sculpt.c
View File

@ -3254,9 +3254,9 @@ static void sculpt_omp_start(Sculpt *sd, SculptSession *ss)
if (ss->multires) {
int i, gridsize, array_mem_size;
BLI_pbvh_node_get_grids(ss->pbvh, NULL, NULL, NULL, NULL,
&gridsize, NULL, NULL);
&gridsize, NULL, NULL);
array_mem_size = cache->num_threads * sizeof(void*);
array_mem_size = cache->num_threads * sizeof(void *);
cache->tmpgrid_co = MEM_mallocN(array_mem_size, "tmpgrid_co array");
cache->tmprow_co = MEM_mallocN(array_mem_size, "tmprow_co array");

3
source/blender/editors/space_action/space_action.c
View File

@ -129,8 +129,7 @@ static SpaceLink *action_new(const bContext *C)
/* not spacelink itself */
static void action_free(SpaceLink *UNUSED(sl))
{
// SpaceAction *saction= (SpaceAction*) sl;
// SpaceAction *saction= (SpaceAction *) sl;
}

2
source/blender/editors/space_clip/clip_toolbar.c
View File

@ -224,7 +224,7 @@ static void clip_panel_operator_redo(const bContext *C, Panel *pa)
if (op == NULL)
return;
if (WM_operator_poll((bContext*)C, op->type) == 0)
if (WM_operator_poll((bContext *)C, op->type) == 0)
return;
block = uiLayoutGetBlock(pa->layout);

119
source/blender/editors/space_logic/logic_ops.c
View File

@ -64,25 +64,25 @@
/* ************* Generic Operator Helpers ************* */
static int edit_sensor_poll(bContext *C)
{
PointerRNA ptr= CTX_data_pointer_get_type(C, "sensor", &RNA_Sensor);
PointerRNA ptr = CTX_data_pointer_get_type(C, "sensor", &RNA_Sensor);
if (ptr.data && ((ID*)ptr.id.data)->lib) return 0;
if (ptr.data && ((ID *)ptr.id.data)->lib) return 0;
return 1;
}
static int edit_controller_poll(bContext *C)
{
PointerRNA ptr= CTX_data_pointer_get_type(C, "controller", &RNA_Controller);
PointerRNA ptr = CTX_data_pointer_get_type(C, "controller", &RNA_Controller);
if (ptr.data && ((ID*)ptr.id.data)->lib) return 0;
if (ptr.data && ((ID *)ptr.id.data)->lib) return 0;
return 1;
}
static int edit_actuator_poll(bContext *C)
{
PointerRNA ptr= CTX_data_pointer_get_type(C, "actuator", &RNA_Actuator);
PointerRNA ptr = CTX_data_pointer_get_type(C, "actuator", &RNA_Actuator);
if (ptr.data && ((ID*)ptr.id.data)->lib) return 0;
if (ptr.data && ((ID *)ptr.id.data)->lib) return 0;
return 1;
}
@ -94,7 +94,7 @@ static void edit_sensor_properties(wmOperatorType *ot)
static int edit_sensor_invoke_properties(bContext *C, wmOperator *op)
{
PointerRNA ptr= CTX_data_pointer_get_type(C, "sensor", &RNA_Sensor);
PointerRNA ptr = CTX_data_pointer_get_type(C, "sensor", &RNA_Sensor);
if (RNA_struct_property_is_set(op->ptr, "sensor") && RNA_struct_property_is_set(op->ptr, "object") )
return 1;
@ -104,7 +104,7 @@ static int edit_sensor_invoke_properties(bContext *C, wmOperator *op)
Object *ob = ptr.id.data;
RNA_string_set(op->ptr, "sensor", sens->name);
RNA_string_set(op->ptr, "object", ob->id.name+2);
RNA_string_set(op->ptr, "object", ob->id.name + 2);
return 1;
}
@ -123,7 +123,7 @@ static Object *edit_object_property_get(bContext *C, wmOperator *op)
if (BLI_strnlen(ob_name, MAX_NAME) > 0)
ob = BLI_findstring(&(CTX_data_main(C)->object), ob_name, offsetof(ID, name) + 2);
else
ob= ED_object_active_context(C);
ob = ED_object_active_context(C);
return ob;
}
@ -135,7 +135,7 @@ static bSensor *edit_sensor_property_get(bContext *C, wmOperator *op, Object **o
RNA_string_get(op->ptr, "sensor", sensor_name);
*ob= edit_object_property_get(C, op);
*ob = edit_object_property_get(C, op);
if (!*ob) return NULL;
sens = BLI_findstring(&((*ob)->sensors), sensor_name, offsetof(bSensor, name));
@ -150,7 +150,7 @@ static void edit_controller_properties(wmOperatorType *ot)
static int edit_controller_invoke_properties(bContext *C, wmOperator *op)
{
PointerRNA ptr= CTX_data_pointer_get_type(C, "controller", &RNA_Controller);
PointerRNA ptr = CTX_data_pointer_get_type(C, "controller", &RNA_Controller);
if (RNA_struct_property_is_set(op->ptr, "controller") && RNA_struct_property_is_set(op->ptr, "object") )
return 1;
@ -160,7 +160,7 @@ static int edit_controller_invoke_properties(bContext *C, wmOperator *op)
Object *ob = ptr.id.data;
RNA_string_set(op->ptr, "controller", cont->name);
RNA_string_set(op->ptr, "object", ob->id.name+2);
RNA_string_set(op->ptr, "object", ob->id.name + 2);
return 1;
}
@ -174,7 +174,7 @@ static bController *edit_controller_property_get(bContext *C, wmOperator *op, Ob
RNA_string_get(op->ptr, "controller", controller_name);
*ob= edit_object_property_get(C, op);
*ob = edit_object_property_get(C, op);
if (!*ob) return NULL;
cont = BLI_findstring(&((*ob)->controllers), controller_name, offsetof(bController, name));
@ -189,7 +189,7 @@ static void edit_actuator_properties(wmOperatorType *ot)
static int edit_actuator_invoke_properties(bContext *C, wmOperator *op)
{
PointerRNA ptr= CTX_data_pointer_get_type(C, "actuator", &RNA_Actuator);
PointerRNA ptr = CTX_data_pointer_get_type(C, "actuator", &RNA_Actuator);
if (RNA_struct_property_is_set(op->ptr, "actuator") && RNA_struct_property_is_set(op->ptr, "object") )
return 1;
@ -199,7 +199,7 @@ static int edit_actuator_invoke_properties(bContext *C, wmOperator *op)
Object *ob = ptr.id.data;
RNA_string_set(op->ptr, "actuator", act->name);
RNA_string_set(op->ptr, "object", ob->id.name+2);
RNA_string_set(op->ptr, "object", ob->id.name + 2);
return 1;
}
@ -213,7 +213,7 @@ static bActuator *edit_actuator_property_get(bContext *C, wmOperator *op, Object
RNA_string_get(op->ptr, "actuator", actuator_name);
*ob= edit_object_property_get(C, op);
*ob = edit_object_property_get(C, op);
if (!*ob) return NULL;
act = BLI_findstring(&((*ob)->actuators), actuator_name, offsetof(bActuator, name));
@ -234,7 +234,7 @@ static int logicbricks_move_property_get(wmOperator *op)
static int sensor_remove_exec(bContext *C, wmOperator *op)
{
Object *ob=NULL;
Object *ob = NULL;
bSensor *sens = edit_sensor_property_get(C, op, &ob);
if (!sens)
@ -248,7 +248,7 @@ static int sensor_remove_exec(bContext *C, wmOperator *op)
return OPERATOR_FINISHED;
}
static int sensor_remove_invoke(bContext *C, wmOperator *op, wmEvent *UNUSED(event))
static int sensor_remove_invoke(bContext *C, wmOperator *op, wmEvent *UNUSED(event))
{
if (edit_sensor_invoke_properties(C, op))
return sensor_remove_exec(C, op);
@ -267,7 +267,7 @@ static void LOGIC_OT_sensor_remove(wmOperatorType *ot)
ot->poll = edit_sensor_poll;
/* flags */
ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO;
ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
edit_sensor_properties(ot);
}
@ -279,13 +279,13 @@ static int sensor_add_exec(bContext *C, wmOperator *op)
PropertyRNA *prop;
const char *sens_name;
char name[MAX_NAME];
int type= RNA_enum_get(op->ptr, "type");
int type = RNA_enum_get(op->ptr, "type");
ob= edit_object_property_get(C, op);
ob = edit_object_property_get(C, op);
if (!ob)
return OPERATOR_CANCELLED;
sens= new_sensor(type);
sens = new_sensor(type);
BLI_addtail(&(ob->sensors), sens);
/* set the sensor name based on rna type enum */
@ -323,10 +323,10 @@ static void LOGIC_OT_sensor_add(wmOperatorType *ot)
ot->poll = ED_operator_object_active_editable;
/* flags */
ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO;
ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
/* properties */
ot->prop = prop= RNA_def_enum(ot->srna, "type", DummyRNA_NULL_items, SENS_ALWAYS, "Type", "Type of sensor to add");
ot->prop = prop = RNA_def_enum(ot->srna, "type", DummyRNA_NULL_items, SENS_ALWAYS, "Type", "Type of sensor to add");
RNA_def_enum_funcs(prop, rna_Sensor_type_itemf);
RNA_def_string(ot->srna, "name", "", MAX_NAME, "Name", "Name of the Sensor to add");
RNA_def_string(ot->srna, "object", "", MAX_NAME, "Object", "Name of the Object to add the Sensor to");
@ -351,7 +351,7 @@ static int controller_remove_exec(bContext *C, wmOperator *op)
return OPERATOR_FINISHED;
}
static int controller_remove_invoke(bContext *C, wmOperator *op, wmEvent *UNUSED(event))
static int controller_remove_invoke(bContext *C, wmOperator *op, wmEvent *UNUSED(event))
{
if (edit_controller_invoke_properties(C, op))
return controller_remove_exec(C, op);
@ -370,7 +370,7 @@ static void LOGIC_OT_controller_remove(wmOperatorType *ot)
ot->poll = edit_controller_poll;
/* flags */
ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO;
ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
edit_controller_properties(ot);
}
@ -383,13 +383,13 @@ static int controller_add_exec(bContext *C, wmOperator *op)
const char *cont_name;
int bit;
char name[MAX_NAME];
int type= RNA_enum_get(op->ptr, "type");
int type = RNA_enum_get(op->ptr, "type");
ob= edit_object_property_get(C, op);
ob = edit_object_property_get(C, op);
if (!ob)
return OPERATOR_CANCELLED;
cont= new_controller(type);
cont = new_controller(type);
BLI_addtail(&(ob->controllers), cont);
/* set the controller name based on rna type enum */
@ -408,11 +408,11 @@ static int controller_add_exec(bContext *C, wmOperator *op)
/* set the controller state mask from the current object state.
* A controller is always in a single state, so select the lowest bit set
* from the object state */
for (bit=0; bit<OB_MAX_STATES; bit++) {
if (ob->state & (1<<bit))
for (bit = 0; bit < OB_MAX_STATES; bit++) {
if (ob->state & (1 << bit))
break;
}
cont->state_mask = (1<<bit);
cont->state_mask = (1 << bit);
if (cont->state_mask == 0) {
/* shouldn't happen, object state is never 0 */
cont->state_mask = 1;
@ -438,7 +438,7 @@ static void LOGIC_OT_controller_add(wmOperatorType *ot)
ot->poll = ED_operator_object_active_editable;
/* flags */
ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO;
ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
/* properties */
ot->prop = RNA_def_enum(ot->srna, "type", controller_type_items, CONT_LOGIC_AND, "Type", "Type of controller to add");
@ -450,7 +450,7 @@ static void LOGIC_OT_controller_add(wmOperatorType *ot)
static int actuator_remove_exec(bContext *C, wmOperator *op)
{
Object *ob=NULL;
Object *ob = NULL;
bActuator *act = edit_actuator_property_get(C, op, &ob);
if (!act)
@ -484,7 +484,7 @@ static void LOGIC_OT_actuator_remove(wmOperatorType *ot)
ot->poll = edit_actuator_poll;
/* flags */
ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO;
ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
edit_actuator_properties(ot);
}
@ -495,14 +495,14 @@ static int actuator_add_exec(bContext *C, wmOperator *op)
PointerRNA act_ptr;
PropertyRNA *prop;
const char *act_name;
char name[MAX_NAME];
int type= RNA_enum_get(op->ptr, "type");
char name[MAX_NAME];
int type = RNA_enum_get(op->ptr, "type");
ob= edit_object_property_get(C, op);
ob = edit_object_property_get(C, op);
if (!ob)
return OPERATOR_CANCELLED;
act= new_actuator(type);
act = new_actuator(type);
BLI_addtail(&(ob->actuators), act);
/* set the actuator name based on rna type enum */
@ -540,27 +540,28 @@ static void LOGIC_OT_actuator_add(wmOperatorType *ot)
ot->poll = ED_operator_object_active_editable;
/* flags */
ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO;
ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
/* properties */
ot->prop = prop= RNA_def_enum(ot->srna, "type", DummyRNA_NULL_items, CONT_LOGIC_AND, "Type", "Type of actuator to add");
ot->prop = prop = RNA_def_enum(ot->srna, "type", DummyRNA_NULL_items, CONT_LOGIC_AND, "Type", "Type of actuator to add");
RNA_def_enum_funcs(prop, rna_Actuator_type_itemf);
RNA_def_string(ot->srna, "name", "", MAX_NAME, "Name", "Name of the Actuator to add");
RNA_def_string(ot->srna, "object", "", MAX_NAME, "Object", "Name of the Object to add the Actuator to");
}
/* ************* Move Logic Bricks Operator ************* */
static EnumPropertyItem logicbricks_move_direction[] ={
{1, "UP", 0, "Move Up", ""},
{2, "DOWN", 0, "Move Down", ""},
{0, NULL, 0, NULL, NULL}};
static EnumPropertyItem logicbricks_move_direction[] = {
{1, "UP", 0, "Move Up", ""},
{2, "DOWN", 0, "Move Down", ""},
{0, NULL, 0, NULL, NULL}
};
static int sensor_move_exec(bContext *C, wmOperator *op)
{
Object *ob=NULL;
bSensor *sens= edit_sensor_property_get(C, op, &ob);
int move_up= logicbricks_move_property_get(op);
Object *ob = NULL;
bSensor *sens = edit_sensor_property_get(C, op, &ob);
int move_up = logicbricks_move_property_get(op);
if (!sens)
return OPERATOR_CANCELLED;
@ -594,7 +595,7 @@ static void LOGIC_OT_sensor_move(wmOperatorType *ot)
ot->poll = edit_sensor_poll;
/* flags */
ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO;
ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
/* properties */
edit_sensor_properties(ot);
@ -603,9 +604,9 @@ static void LOGIC_OT_sensor_move(wmOperatorType *ot)
static int controller_move_exec(bContext *C, wmOperator *op)
{
Object *ob=NULL;
bController *cont= edit_controller_property_get(C, op, &ob);
int move_up= logicbricks_move_property_get(op);
Object *ob = NULL;
bController *cont = edit_controller_property_get(C, op, &ob);
int move_up = logicbricks_move_property_get(op);
if (!cont)
return OPERATOR_CANCELLED;
@ -639,7 +640,7 @@ static void LOGIC_OT_controller_move(wmOperatorType *ot)
ot->poll = edit_controller_poll;
/* flags */
ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO;
ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
/* properties */
edit_controller_properties(ot);
@ -648,9 +649,9 @@ static void LOGIC_OT_controller_move(wmOperatorType *ot)
static int actuator_move_exec(bContext *C, wmOperator *op)
{
Object *ob=NULL;
Object *ob = NULL;
bActuator *act = edit_actuator_property_get(C, op, &ob);
int move_up= logicbricks_move_property_get(op);
int move_up = logicbricks_move_property_get(op);
if (!act)
return OPERATOR_CANCELLED;
@ -684,7 +685,7 @@ static void LOGIC_OT_actuator_move(wmOperatorType *ot)
ot->poll = edit_actuator_poll;
/* flags */
ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO;
ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
/* properties */
edit_actuator_properties(ot);
@ -694,7 +695,7 @@ static void LOGIC_OT_actuator_move(wmOperatorType *ot)
/* ************* TexFace Converter Operator ************* */
static int texface_convert_exec(bContext *C, wmOperator *UNUSED(op))
{
Main *bmain= CTX_data_main(C);
Main *bmain = CTX_data_main(C);
do_version_tface(bmain, 0);
return OPERATOR_FINISHED;
@ -705,7 +706,7 @@ static int texface_convert_invoke(bContext *C, wmOperator *op, wmEvent *UNUSED(e
return texface_convert_exec(C, op);
}
static void LOGIC_OT_texface_convert(wmOperatorType *ot)
static void LOGIC_OT_texface_convert(wmOperatorType *ot)
{
/* identifiers */
ot->name = "TexFace to Material Converter";
@ -718,7 +719,7 @@ static int texface_convert_invoke(bContext *C, wmOperator *op, wmEvent *UNUSED(e
// ot->poll = texface_convert_poll;
/* flags */
ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO;
ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
}

2
source/blender/makesdna/intern/makesdna.c
View File

@ -291,7 +291,7 @@ static int add_name(const char *str)
if (str[0] == '(' && str[1] == '*') {
/* we handle function pointer and special array cases here, e.g.
* void (*function)(...) and float (*array)[..]. the array case
* name is still converted to (array*)() though because it is that
* name is still converted to (array *)() though because it is that
* way in old dna too, and works correct with elementsize() */
int isfuncptr = (strchr(str + 1, '(')) != NULL;

26
source/blender/makesrna/intern/rna_access.c
View File

@ -2590,7 +2590,7 @@ void RNA_property_pointer_set(PointerRNA *ptr, PropertyRNA *prop, PointerRNA ptr
PointerRNA RNA_property_pointer_get_default(PointerRNA *UNUSED(ptr), PropertyRNA *UNUSED(prop))
{
/*PointerPropertyRNA *pprop = (PointerPropertyRNA*)prop; */
/*PointerPropertyRNA *pprop = (PointerPropertyRNA *)prop; */
/* BLI_assert(RNA_property_type(prop) == PROP_POINTER); */
@ -2729,7 +2729,7 @@ int RNA_property_collection_length(PointerRNA *ptr, PropertyRNA *prop)
void RNA_property_collection_add(PointerRNA *ptr, PropertyRNA *prop, PointerRNA *r_ptr)
{
IDProperty *idprop;
/* CollectionPropertyRNA *cprop = (CollectionPropertyRNA*)prop; */
/* CollectionPropertyRNA *cprop = (CollectionPropertyRNA *)prop; */
BLI_assert(RNA_property_type(prop) == PROP_COLLECTION);
@ -2788,7 +2788,7 @@ void RNA_property_collection_add(PointerRNA *ptr, PropertyRNA *prop, PointerRNA
int RNA_property_collection_remove(PointerRNA *ptr, PropertyRNA *prop, int key)
{
IDProperty *idprop;
/* CollectionPropertyRNA *cprop = (CollectionPropertyRNA*)prop; */
/* CollectionPropertyRNA *cprop = (CollectionPropertyRNA *)prop; */
BLI_assert(RNA_property_type(prop) == PROP_COLLECTION);
@ -3035,11 +3035,11 @@ int RNA_property_collection_raw_array(PointerRNA *ptr, PropertyRNA *prop, Proper
#define RAW_GET(dtype, var, raw, a) \
{ \
switch (raw.type) { \
case PROP_RAW_CHAR: var = (dtype)((char*)raw.array)[a]; break; \
case PROP_RAW_SHORT: var = (dtype)((short*)raw.array)[a]; break; \
case PROP_RAW_INT: var = (dtype)((int*)raw.array)[a]; break; \
case PROP_RAW_FLOAT: var = (dtype)((float*)raw.array)[a]; break; \
case PROP_RAW_DOUBLE: var = (dtype)((double*)raw.array)[a]; break; \
case PROP_RAW_CHAR: var = (dtype)((char *)raw.array)[a]; break; \
case PROP_RAW_SHORT: var = (dtype)((short *)raw.array)[a]; break; \
case PROP_RAW_INT: var = (dtype)((int *)raw.array)[a]; break; \
case PROP_RAW_FLOAT: var = (dtype)((float *)raw.array)[a]; break; \
case PROP_RAW_DOUBLE: var = (dtype)((double *)raw.array)[a]; break; \
default: var = (dtype)0; \
} \
} (void)0
@ -3047,11 +3047,11 @@ int RNA_property_collection_raw_array(PointerRNA *ptr, PropertyRNA *prop, Proper
#define RAW_SET(dtype, raw, a, var) \
{ \
switch (raw.type) { \
case PROP_RAW_CHAR: ((char*)raw.array)[a] = (char)var; break; \
case PROP_RAW_SHORT: ((short*)raw.array)[a] = (short)var; break; \
case PROP_RAW_INT: ((int*)raw.array)[a] = (int)var; break; \
case PROP_RAW_FLOAT: ((float*)raw.array)[a] = (float)var; break; \
case PROP_RAW_DOUBLE: ((double*)raw.array)[a] = (double)var; break; \
case PROP_RAW_CHAR: ((char *)raw.array)[a] = (char)var; break; \
case PROP_RAW_SHORT: ((short *)raw.array)[a] = (short)var; break; \
case PROP_RAW_INT: ((int *)raw.array)[a] = (int)var; break; \
case PROP_RAW_FLOAT: ((float *)raw.array)[a] = (float)var; break; \
case PROP_RAW_DOUBLE: ((double *)raw.array)[a] = (double)var; break; \
default: break; \
} \
} (void)0

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

@ -24,7 +24,6 @@
* \ingroup RNA
*/
#include <stdlib.h>
#include <string.h>
@ -206,30 +205,6 @@ EnumPropertyItem prop_wave_items[] = {
#include "DNA_scene_types.h"
#include "WM_api.h"
static void rna_Node_custom3_set_as_int(PointerRNA *ptr, int value)
{
bNode *node = (bNode *)ptr->data;
node->custom3 = value;
}
static int rna_Node_custom3_get_as_int(PointerRNA *ptr)
{
bNode *node = (bNode *)ptr->data;
return (int)node->custom3;
}
static void rna_Node_custom4_set_as_int(PointerRNA *ptr, int value)
{
bNode *node = (bNode *)ptr->data;
node->custom4 = value;
}
static int rna_Node_custom4_get_as_int(PointerRNA *ptr)
{
bNode *node = (bNode *)ptr->data;
return (int)node->custom4;
}
static StructRNA *rna_Node_refine(struct PointerRNA *ptr)
{
bNode *node = (bNode *)ptr->data;

2
source/blender/render/intern/source/render_texture.c
View File

@ -3636,7 +3636,7 @@ void RE_sample_material_color(Material *mat, float color[3], float *alpha, const
float *uv1, *uv2, *uv3;
float l;
CustomData *data = &orcoDm->faceData;
MTFace *tface = (MTFace*) data->layers[layer_index+i].data;
MTFace *tface = (MTFace *) data->layers[layer_index+i].data;
float uv[3];
/* point layer name from actual layer data */
shi.uv[i].name = data->layers[i].name;

4
source/blender/render/intern/source/shadbuf.c
View File

@ -322,8 +322,8 @@ static void compress_deepshadowbuf(Render *re, ShadBuf *shb, APixstr *apixbuf, A
shsample= MEM_callocN(sizeof(ShadSampleBuf), "shad sample buf");
BLI_addtail(&shb->buffers, shsample);
shsample->totbuf= MEM_callocN(sizeof(int)*size*size, "deeptotbuf");
shsample->deepbuf= MEM_callocN(sizeof(DeepSample*)*size*size, "deepbuf");
shsample->totbuf = MEM_callocN(sizeof(int) * size * size, "deeptotbuf");
shsample->deepbuf = MEM_callocN(sizeof(DeepSample *) * size * size, "deepbuf");
ap= apixbuf;
aps= apixbufstrand;

8
source/blender/render/intern/source/sss.c
View File

@ -747,8 +747,8 @@ ScatterTree *scatter_tree_new(ScatterSettings *ss[3], float scale, float error,
tree->ss[1]= ss[1];
tree->ss[2]= ss[2];
points= MEM_callocN(sizeof(ScatterPoint)*totpoint, "ScatterPoints");
refpoints= MEM_callocN(sizeof(ScatterPoint*)*totpoint, "ScatterRefPoints");
points = MEM_callocN(sizeof(ScatterPoint) * totpoint, "ScatterPoints");
refpoints = MEM_callocN(sizeof(ScatterPoint *) * totpoint, "ScatterRefPoints");
tree->points= points;
tree->refpoints= refpoints;
@ -777,8 +777,8 @@ void scatter_tree_build(ScatterTree *tree)
float mid[3], size[3];
int totpoint= tree->totpoint;
newpoints= MEM_callocN(sizeof(ScatterPoint)*totpoint, "ScatterPoints");
tmppoints= MEM_callocN(sizeof(ScatterPoint*)*totpoint, "ScatterTmpPoints");
newpoints = MEM_callocN(sizeof(ScatterPoint) * totpoint, "ScatterPoints");
tmppoints = MEM_callocN(sizeof(ScatterPoint *) * totpoint, "ScatterTmpPoints");
tree->tmppoints= tmppoints;
tree->arena= BLI_memarena_new(0x8000 * sizeof(ScatterNode), "sss tree arena");