style cleanup
This commit is contained in:
@@ -59,7 +59,7 @@ unsigned int GET_TCC(FILE *fp);
|
|||||||
putc(ch2[1], fp); \
|
putc(ch2[1], fp); \
|
||||||
} (void)0
|
} (void)0
|
||||||
|
|
||||||
void *avi_format_convert (AviMovie *movie, int stream, void *buffer, AviFormat from, AviFormat to, int *size);
|
void *avi_format_convert(AviMovie *movie, int stream, void *buffer, AviFormat from, AviFormat to, int *size);
|
||||||
|
|
||||||
int avi_get_data_id(AviFormat format, int stream);
|
int avi_get_data_id(AviFormat format, int stream);
|
||||||
int avi_get_format_type(AviFormat format);
|
int avi_get_format_type(AviFormat format);
|
||||||
|
|||||||
@@ -32,7 +32,7 @@
|
|||||||
#ifndef __AVI_MJPEG_H__
|
#ifndef __AVI_MJPEG_H__
|
||||||
#define __AVI_MJPEG_H__
|
#define __AVI_MJPEG_H__
|
||||||
|
|
||||||
void *avi_converter_from_mjpeg (AviMovie *movie, int stream, unsigned char *buffer, int *size);
|
void *avi_converter_from_mjpeg(AviMovie *movie, int stream, unsigned char *buffer, int *size);
|
||||||
void *avi_converter_to_mjpeg (AviMovie *movie, int stream, unsigned char *buffer, int *size);
|
void *avi_converter_to_mjpeg(AviMovie *movie, int stream, unsigned char *buffer, int *size);
|
||||||
|
|
||||||
#endif /* __AVI_MJPEG_H__ */
|
#endif /* __AVI_MJPEG_H__ */
|
||||||
|
|||||||
@@ -75,13 +75,13 @@ typedef enum OverlayControlFlags {
|
|||||||
PAINT_OVERLAY_OVERRIDE = (1 << 3)
|
PAINT_OVERLAY_OVERRIDE = (1 << 3)
|
||||||
} OverlayControlFlags;
|
} OverlayControlFlags;
|
||||||
|
|
||||||
void BKE_paint_invalidate_overlay_tex (struct Scene *scene, const struct Tex *tex);
|
void BKE_paint_invalidate_overlay_tex(struct Scene *scene, const struct Tex *tex);
|
||||||
void BKE_paint_invalidate_cursor_overlay (struct Scene *scene, struct CurveMapping *curve);
|
void BKE_paint_invalidate_cursor_overlay(struct Scene *scene, struct CurveMapping *curve);
|
||||||
void BKE_paint_invalidate_overlay_all(void);
|
void BKE_paint_invalidate_overlay_all(void);
|
||||||
OverlayControlFlags BKE_paint_get_overlay_flags (void);
|
OverlayControlFlags BKE_paint_get_overlay_flags(void);
|
||||||
void BKE_paint_reset_overlay_invalid (void);
|
void BKE_paint_reset_overlay_invalid(void);
|
||||||
void BKE_paint_set_overlay_override (bool flag);
|
void BKE_paint_set_overlay_override(bool flag);
|
||||||
bool BKE_paint_get_overlay_override (void);
|
bool BKE_paint_get_overlay_override(void);
|
||||||
|
|
||||||
|
|
||||||
void BKE_paint_init(struct Paint *p, const char col[3]);
|
void BKE_paint_init(struct Paint *p, const char col[3]);
|
||||||
|
|||||||
@@ -193,7 +193,7 @@ static void precalculate_effector(EffectorCache *eff)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
else if (eff->pd->shape == PFIELD_SHAPE_SURFACE) {
|
else if (eff->pd->shape == PFIELD_SHAPE_SURFACE) {
|
||||||
eff->surmd = (SurfaceModifierData *)modifiers_findByType ( eff->ob, eModifierType_Surface );
|
eff->surmd = (SurfaceModifierData *)modifiers_findByType( eff->ob, eModifierType_Surface );
|
||||||
if (eff->ob->type == OB_CURVE)
|
if (eff->ob->type == OB_CURVE)
|
||||||
eff->flag |= PE_USE_NORMAL_DATA;
|
eff->flag |= PE_USE_NORMAL_DATA;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -3316,7 +3316,7 @@ static void mesh_to_softbody(Scene *scene, Object *ob)
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
if (sb->namedVG_Mass[0]) {
|
if (sb->namedVG_Mass[0]) {
|
||||||
int defgrp_index = defgroup_name_index (ob, sb->namedVG_Mass);
|
int defgrp_index = defgroup_name_index(ob, sb->namedVG_Mass);
|
||||||
/* printf("VGN %s %d\n", sb->namedVG_Mass, defgrp_index); */
|
/* printf("VGN %s %d\n", sb->namedVG_Mass, defgrp_index); */
|
||||||
if (defgrp_index != -1) {
|
if (defgrp_index != -1) {
|
||||||
get_scalar_from_vertexgroup(ob, a, defgrp_index, &bp->mass);
|
get_scalar_from_vertexgroup(ob, a, defgrp_index, &bp->mass);
|
||||||
@@ -3329,7 +3329,7 @@ static void mesh_to_softbody(Scene *scene, Object *ob)
|
|||||||
bp->springweight = 1.0f;
|
bp->springweight = 1.0f;
|
||||||
|
|
||||||
if (sb->namedVG_Spring_K[0]) {
|
if (sb->namedVG_Spring_K[0]) {
|
||||||
int defgrp_index = defgroup_name_index (ob, sb->namedVG_Spring_K);
|
int defgrp_index = defgroup_name_index(ob, sb->namedVG_Spring_K);
|
||||||
//printf("VGN %s %d\n", sb->namedVG_Spring_K, defgrp_index);
|
//printf("VGN %s %d\n", sb->namedVG_Spring_K, defgrp_index);
|
||||||
if (defgrp_index != -1) {
|
if (defgrp_index != -1) {
|
||||||
get_scalar_from_vertexgroup(ob, a, defgrp_index , &bp->springweight);
|
get_scalar_from_vertexgroup(ob, a, defgrp_index , &bp->springweight);
|
||||||
|
|||||||
@@ -656,7 +656,7 @@ static int connect_hair(Scene *scene, Object *ob, ParticleSystem *psys)
|
|||||||
DM_ensure_tessface(dm);
|
DM_ensure_tessface(dm);
|
||||||
|
|
||||||
|
|
||||||
numverts = dm->getNumVerts (dm);
|
numverts = dm->getNumVerts(dm);
|
||||||
|
|
||||||
/* convert to global coordinates */
|
/* convert to global coordinates */
|
||||||
for (i=0; i<numverts; i++)
|
for (i=0; i<numverts; i++)
|
||||||
|
|||||||
@@ -698,7 +698,7 @@ void setInputPostFct(MouseInput *mi, void (*post)(struct TransInfo *t, float val
|
|||||||
/*********************** Generics ********************************/
|
/*********************** Generics ********************************/
|
||||||
|
|
||||||
int initTransInfo(struct bContext *C, TransInfo *t, struct wmOperator *op, const struct wmEvent *event);
|
int initTransInfo(struct bContext *C, TransInfo *t, struct wmOperator *op, const struct wmEvent *event);
|
||||||
void postTrans (struct bContext *C, TransInfo *t);
|
void postTrans(struct bContext *C, TransInfo *t);
|
||||||
void resetTransRestrictions(TransInfo *t);
|
void resetTransRestrictions(TransInfo *t);
|
||||||
|
|
||||||
void drawLine(TransInfo *t, const float center[3], const float dir[3], char axis, short options);
|
void drawLine(TransInfo *t, const float center[3], const float dir[3], char axis, short options);
|
||||||
|
|||||||
@@ -2424,10 +2424,10 @@ static void createTransUVs(bContext *C, TransInfo *t)
|
|||||||
if (propconnected) {
|
if (propconnected) {
|
||||||
/* create element map with island information */
|
/* create element map with island information */
|
||||||
if (ts->uv_flag & UV_SYNC_SELECTION) {
|
if (ts->uv_flag & UV_SYNC_SELECTION) {
|
||||||
elementmap = EDBM_uv_element_map_create (em, FALSE, TRUE);
|
elementmap = EDBM_uv_element_map_create(em, false, true);
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
elementmap = EDBM_uv_element_map_create (em, TRUE, TRUE);
|
elementmap = EDBM_uv_element_map_create(em, true, true);
|
||||||
}
|
}
|
||||||
island_enabled = MEM_callocN(sizeof(*island_enabled) * elementmap->totalIslands, "TransIslandData(UV Editing)");
|
island_enabled = MEM_callocN(sizeof(*island_enabled) * elementmap->totalIslands, "TransIslandData(UV Editing)");
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1310,13 +1310,13 @@ static int stitch_process_data(StitchState *state, Scene *scene, int final)
|
|||||||
if (state->mode == STITCH_VERT) {
|
if (state->mode == STITCH_VERT) {
|
||||||
UvElement *element = state->selection_stack[i];
|
UvElement *element = state->selection_stack[i];
|
||||||
|
|
||||||
stitch_propagate_uv_final_position (element, i, preview_position, final_position, state, final, scene);
|
stitch_propagate_uv_final_position(element, i, preview_position, final_position, state, final, scene);
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
UvEdge *edge = state->selection_stack[i];
|
UvEdge *edge = state->selection_stack[i];
|
||||||
|
|
||||||
stitch_propagate_uv_final_position (state->uvs[edge->uv1], edge->uv1, preview_position, final_position, state, final, scene);
|
stitch_propagate_uv_final_position(state->uvs[edge->uv1], edge->uv1, preview_position, final_position, state, final, scene);
|
||||||
stitch_propagate_uv_final_position (state->uvs[edge->uv2], edge->uv2, preview_position, final_position, state, final, scene);
|
stitch_propagate_uv_final_position(state->uvs[edge->uv2], edge->uv2, preview_position, final_position, state, final, scene);
|
||||||
|
|
||||||
edge->flag &= (STITCH_SELECTED | STITCH_BOUNDARY);
|
edge->flag &= (STITCH_SELECTED | STITCH_BOUNDARY);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -155,7 +155,7 @@ static ImBuf *nsImageToiBuf(NSImage *sourceImage, int width, int height)
|
|||||||
NSEnumerator *enumerator;
|
NSEnumerator *enumerator;
|
||||||
NSImageRep *representation;
|
NSImageRep *representation;
|
||||||
|
|
||||||
ibuf = IMB_allocImBuf (width, height, 32, IB_rect);
|
ibuf = IMB_allocImBuf(width, height, 32, IB_rect);
|
||||||
if (!ibuf) {
|
if (!ibuf) {
|
||||||
if (QTIME_DEBUG) {
|
if (QTIME_DEBUG) {
|
||||||
printf("quicktime_import: could not allocate memory for the image.\n");
|
printf("quicktime_import: could not allocate memory for the image.\n");
|
||||||
@@ -307,7 +307,7 @@ int startquicktime(struct anim *anim)
|
|||||||
QTTime qtTimeDuration;
|
QTTime qtTimeDuration;
|
||||||
NSDictionary *attributes;
|
NSDictionary *attributes;
|
||||||
|
|
||||||
anim->qtime = MEM_callocN (sizeof(QuicktimeMovie),"animqt");
|
anim->qtime = MEM_callocN(sizeof(QuicktimeMovie),"animqt");
|
||||||
|
|
||||||
if (anim->qtime == NULL) {
|
if (anim->qtime == NULL) {
|
||||||
if(QTIME_DEBUG) printf("Can't alloc qtime: %s\n", anim->name);
|
if(QTIME_DEBUG) printf("Can't alloc qtime: %s\n", anim->name);
|
||||||
@@ -365,7 +365,7 @@ int startquicktime(struct anim *anim)
|
|||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
anim->qtime->ibuf = IMB_allocImBuf (anim->x, anim->y, 32, IB_rect);
|
anim->qtime->ibuf = IMB_allocImBuf(anim->x, anim->y, 32, IB_rect);
|
||||||
|
|
||||||
qtTimeDuration = [[anim->qtime->media attributeForKey:QTMediaDurationAttribute] QTTimeValue];
|
qtTimeDuration = [[anim->qtime->media attributeForKey:QTMediaDurationAttribute] QTTimeValue];
|
||||||
anim->qtime->durationTime = qtTimeDuration.timeValue;
|
anim->qtime->durationTime = qtTimeDuration.timeValue;
|
||||||
|
|||||||
@@ -155,7 +155,7 @@ typedef struct RenderStats {
|
|||||||
|
|
||||||
/* the name is used as identifier, so elsewhere in blender the result can retrieved */
|
/* the name is used as identifier, so elsewhere in blender the result can retrieved */
|
||||||
/* calling a new render with same name, frees automatic existing render */
|
/* calling a new render with same name, frees automatic existing render */
|
||||||
struct Render *RE_NewRender (const char *name);
|
struct Render *RE_NewRender(const char *name);
|
||||||
struct Render *RE_GetRender(const char *name);
|
struct Render *RE_GetRender(const char *name);
|
||||||
|
|
||||||
/* assign default dummy callbacks */
|
/* assign default dummy callbacks */
|
||||||
|
|||||||
@@ -61,9 +61,9 @@ public:
|
|||||||
virtual CValue* GetReplica();
|
virtual CValue* GetReplica();
|
||||||
virtual void ProcessReplica();
|
virtual void ProcessReplica();
|
||||||
|
|
||||||
void SetBlendTime (float newtime);
|
void SetBlendTime(float newtime);
|
||||||
void SetLocalTime (float curtime);
|
void SetLocalTime(float curtime);
|
||||||
void ResetStartTime (float curtime);
|
void ResetStartTime(float curtime);
|
||||||
|
|
||||||
bAction* GetAction() { return m_action; }
|
bAction* GetAction() { return m_action; }
|
||||||
void SetAction(bAction* act) { m_action= act; }
|
void SetAction(bAction* act) { m_action= act; }
|
||||||
|
|||||||
@@ -542,7 +542,7 @@ CExpression *CParser::Ex(int i)
|
|||||||
errmsg=NULL;
|
errmsg=NULL;
|
||||||
} else {
|
} else {
|
||||||
// does this happen ?
|
// does this happen ?
|
||||||
MT_assert ("does this happen");
|
MT_assert("does this happen");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
e1 = Error(errtext);
|
e1 = Error(errtext);
|
||||||
|
|||||||
@@ -328,13 +328,13 @@ bool RAS_OpenGLRasterizer::BeginFrame(int drawingmode, double time)
|
|||||||
// Blender camera routine destroys the settings
|
// Blender camera routine destroys the settings
|
||||||
if (m_drawingmode < KX_SOLID)
|
if (m_drawingmode < KX_SOLID)
|
||||||
{
|
{
|
||||||
glDisable (GL_CULL_FACE);
|
glDisable(GL_CULL_FACE);
|
||||||
glDisable (GL_DEPTH_TEST);
|
glDisable(GL_DEPTH_TEST);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
glEnable(GL_DEPTH_TEST);
|
glEnable(GL_DEPTH_TEST);
|
||||||
glEnable (GL_CULL_FACE);
|
glEnable(GL_CULL_FACE);
|
||||||
}
|
}
|
||||||
|
|
||||||
glDisable(GL_BLEND);
|
glDisable(GL_BLEND);
|
||||||
|
|||||||
@@ -381,7 +381,7 @@ static PyObject *Texture_refresh(Texture *self, PyObject *args)
|
|||||||
texture = self->m_scaledImg;
|
texture = self->m_scaledImg;
|
||||||
}
|
}
|
||||||
// load texture for rendering
|
// load texture for rendering
|
||||||
loadTexture (self->m_actTex, texture, size, self->m_mipmap);
|
loadTexture(self->m_actTex, texture, size, self->m_mipmap);
|
||||||
|
|
||||||
// refresh texture source, if required
|
// refresh texture source, if required
|
||||||
if (refreshSource) self->m_source->m_image->refresh();
|
if (refreshSource) self->m_source->m_image->refresh();
|
||||||
|
|||||||
Reference in New Issue
Block a user