forked from bartvdbraak/blender
style cleanup
This commit is contained in:
parent
c567cf3fab
commit
b96c622015
@ -38,7 +38,7 @@
|
||||
inline unsigned int CTR_Hash(void *inDWord)
|
||||
{
|
||||
size_t key = (size_t)inDWord;
|
||||
return (unsigned int)(key ^ (key>>4));
|
||||
return (unsigned int)(key ^ (key >> 4));
|
||||
}
|
||||
|
||||
class CTR_HashedPtr
|
||||
|
@ -860,7 +860,8 @@ int GHOST_toggleConsole(int action)
|
||||
}
|
||||
|
||||
|
||||
int GHOST_confirmQuit(GHOST_WindowHandle windowhandle){
|
||||
int GHOST_confirmQuit(GHOST_WindowHandle windowhandle)
|
||||
{
|
||||
GHOST_ISystem *system = GHOST_ISystem::getSystem();
|
||||
return system->confirmQuit((GHOST_IWindow *) windowhandle);
|
||||
}
|
||||
|
@ -1662,17 +1662,19 @@ GHOST_TSuccess GHOST_SystemCocoa::handleKeyEvent(void *eventPtr)
|
||||
case NSKeyDown:
|
||||
case NSKeyUp:
|
||||
charsIgnoringModifiers = [event charactersIgnoringModifiers];
|
||||
if ([charsIgnoringModifiers length]>0)
|
||||
if ([charsIgnoringModifiers length] > 0) {
|
||||
keyCode = convertKey([event keyCode],
|
||||
[charsIgnoringModifiers characterAtIndex:0],
|
||||
[event type] == NSKeyDown?kUCKeyActionDown:kUCKeyActionUp);
|
||||
else
|
||||
}
|
||||
else {
|
||||
keyCode = convertKey([event keyCode],0,
|
||||
[event type] == NSKeyDown?kUCKeyActionDown:kUCKeyActionUp);
|
||||
}
|
||||
|
||||
/* handling both unicode or ascii */
|
||||
characters = [event characters];
|
||||
if ([characters length]>0) {
|
||||
if ([characters length] > 0) {
|
||||
convertedCharacters = [characters dataUsingEncoding:NSUTF8StringEncoding];
|
||||
|
||||
for (int x = 0; x < [convertedCharacters length]; x++) {
|
||||
|
@ -502,7 +502,7 @@ GHOST_WindowCocoa::GHOST_WindowCocoa(
|
||||
|
||||
if (stereoVisual) pixelFormatAttrsWindow[i++] = NSOpenGLPFAStereo;
|
||||
|
||||
if (numOfAASamples>0) {
|
||||
if (numOfAASamples > 0) {
|
||||
// Multisample anti-aliasing
|
||||
pixelFormatAttrsWindow[i++] = NSOpenGLPFAMultisample;
|
||||
|
||||
@ -550,7 +550,7 @@ GHOST_WindowCocoa::GHOST_WindowCocoa(
|
||||
|
||||
}
|
||||
|
||||
if (numOfAASamples>0) { //Set m_numOfAASamples to the actual value
|
||||
if (numOfAASamples > 0) { //Set m_numOfAASamples to the actual value
|
||||
GLint gli;
|
||||
[pixelFormat getValues:&gli forAttribute:NSOpenGLPFASamples forVirtualScreen:0];
|
||||
if (m_numOfAASamples != (GHOST_TUns16)gli) {
|
||||
@ -653,7 +653,7 @@ void GHOST_WindowCocoa::setTitle(const STR_String& title)
|
||||
fileStrRange.location = [windowTitle rangeOfString:@"["].location+1;
|
||||
len = [windowTitle rangeOfString:@"]"].location - fileStrRange.location;
|
||||
|
||||
if (len >0)
|
||||
if (len > 0)
|
||||
{
|
||||
fileStrRange.length = len;
|
||||
associatedFileName = [windowTitle substringWithRange:fileStrRange];
|
||||
@ -1424,9 +1424,9 @@ GHOST_TSuccess GHOST_WindowCocoa::setWindowCursorShape(GHOST_TStandardCursor sha
|
||||
/** Reverse the bits in a GHOST_TUns8
|
||||
static GHOST_TUns8 uns8ReverseBits(GHOST_TUns8 ch)
|
||||
{
|
||||
ch= ((ch>>1)&0x55) | ((ch<<1)&0xAA);
|
||||
ch= ((ch>>2)&0x33) | ((ch<<2)&0xCC);
|
||||
ch= ((ch>>4)&0x0F) | ((ch<<4)&0xF0);
|
||||
ch= ((ch >> 1) & 0x55) | ((ch << 1) & 0xAA);
|
||||
ch= ((ch >> 2) & 0x33) | ((ch << 2) & 0xCC);
|
||||
ch= ((ch >> 4) & 0x0F) | ((ch << 4) & 0xF0);
|
||||
return ch;
|
||||
}
|
||||
*/
|
||||
@ -1435,10 +1435,10 @@ static GHOST_TUns8 uns8ReverseBits(GHOST_TUns8 ch)
|
||||
/** Reverse the bits in a GHOST_TUns16 */
|
||||
static GHOST_TUns16 uns16ReverseBits(GHOST_TUns16 shrt)
|
||||
{
|
||||
shrt= ((shrt>>1)&0x5555) | ((shrt<<1)&0xAAAA);
|
||||
shrt= ((shrt>>2)&0x3333) | ((shrt<<2)&0xCCCC);
|
||||
shrt= ((shrt>>4)&0x0F0F) | ((shrt<<4)&0xF0F0);
|
||||
shrt= ((shrt>>8)&0x00FF) | ((shrt<<8)&0xFF00);
|
||||
shrt = ((shrt >> 1) & 0x5555) | ((shrt << 1) & 0xAAAA);
|
||||
shrt = ((shrt >> 2) & 0x3333) | ((shrt << 2) & 0xCCCC);
|
||||
shrt = ((shrt >> 4) & 0x0F0F) | ((shrt << 4) & 0xF0F0);
|
||||
shrt = ((shrt >> 8) & 0x00FF) | ((shrt << 8) & 0xFF00);
|
||||
return shrt;
|
||||
}
|
||||
|
||||
|
@ -1314,8 +1314,8 @@ validate()
|
||||
*/
|
||||
|
||||
GHOST_WindowX11::
|
||||
~GHOST_WindowX11(
|
||||
){
|
||||
~GHOST_WindowX11()
|
||||
{
|
||||
static Atom Primary_atom, Clipboard_atom;
|
||||
Window p_owner, c_owner;
|
||||
/*Change the owner of the Atoms to None if we are the owner*/
|
||||
|
@ -80,7 +80,7 @@ int main (int argc, char *argv[])
|
||||
for (i = 0; i < NUM_BLOCKS; i++) {
|
||||
int blocksize = 10000;
|
||||
char tagstring[1000];
|
||||
if (verbose >1) printf("|--* Allocating block %d\n", i);
|
||||
if (verbose > 1) printf("|--* Allocating block %d\n", i);
|
||||
sprintf(tagstring,"Memblock no. %d : ", i);
|
||||
p[i]= MEM_callocN(blocksize, strdup(tagstring));
|
||||
}
|
||||
@ -112,7 +112,7 @@ int main (int argc, char *argv[])
|
||||
for (i = 0; i < NUM_BLOCKS; i++) {
|
||||
int blocksize = 10000;
|
||||
char tagstring[1000];
|
||||
if (verbose >1) printf("|--* Allocating block %d\n", i);
|
||||
if (verbose > 1) printf("|--* Allocating block %d\n", i);
|
||||
sprintf(tagstring,"Memblock no. %d : ", i);
|
||||
p[i]= MEM_callocN(blocksize, strdup(tagstring));
|
||||
}
|
||||
|
@ -102,7 +102,7 @@ public:
|
||||
// Properties
|
||||
bool IsUpper() const;
|
||||
bool IsLower() const;
|
||||
inline bool IsEmpty() const { return Len==0; }
|
||||
inline bool IsEmpty() const { return Len == 0; }
|
||||
inline int Length() const { return Len; }
|
||||
|
||||
// Data access
|
||||
@ -122,8 +122,8 @@ public:
|
||||
// Comparison
|
||||
int Compare(rcSTR_String rhs) const;
|
||||
int CompareNoCase(rcSTR_String rhs) const;
|
||||
inline bool IsEqual(rcSTR_String rhs) const { return (Compare(rhs)==0); }
|
||||
inline bool IsEqualNoCase(rcSTR_String rhs) const { return (CompareNoCase(rhs)==0); }
|
||||
inline bool IsEqual(rcSTR_String rhs) const { return (Compare(rhs) == 0); }
|
||||
inline bool IsEqualNoCase(rcSTR_String rhs) const { return (CompareNoCase(rhs) == 0); }
|
||||
|
||||
// Search/replace
|
||||
int Find(char c, int pos = 0) const;
|
||||
@ -178,12 +178,12 @@ public:
|
||||
inline friend bool operator>=(rcSTR_String lhs, rcSTR_String rhs) { return (strcmp(lhs, rhs)>=0); }
|
||||
inline friend bool operator>=(rcSTR_String lhs, const char *rhs) { return (strcmp(lhs, rhs)>=0); }
|
||||
inline friend bool operator>=(const char *lhs, rcSTR_String rhs) { return (strcmp(lhs, rhs)>=0); }
|
||||
inline friend bool operator==(rcSTR_String lhs, rcSTR_String rhs) { return ((lhs.Length() == rhs.Length()) && (memcmp(lhs, rhs, lhs.Length())==0)); }
|
||||
inline friend bool operator==(rcSTR_String lhs, const char *rhs) { return (memcmp(lhs, rhs, lhs.Length()+1)==0); }
|
||||
inline friend bool operator==(const char *lhs, rcSTR_String rhs) { return (memcmp(lhs, rhs, rhs.Length()+1)==0); }
|
||||
inline friend bool operator==(rcSTR_String lhs, rcSTR_String rhs) { return ((lhs.Length() == rhs.Length()) && (memcmp(lhs, rhs, lhs.Length()) == 0)); }
|
||||
inline friend bool operator==(rcSTR_String lhs, const char *rhs) { return (memcmp(lhs, rhs, lhs.Length() + 1) == 0); }
|
||||
inline friend bool operator==(const char *lhs, rcSTR_String rhs) { return (memcmp(lhs, rhs, rhs.Length() + 1) == 0); }
|
||||
inline friend bool operator!=(rcSTR_String lhs, rcSTR_String rhs) { return ((lhs.Length() != rhs.Length()) || (memcmp(lhs, rhs, lhs.Length())!=0)); }
|
||||
inline friend bool operator!=(rcSTR_String lhs, const char *rhs) { return (memcmp(lhs, rhs, lhs.Length()+1)!=0); }
|
||||
inline friend bool operator!=(const char *lhs, rcSTR_String rhs) { return (memcmp(lhs, rhs, rhs.Length()+1)!=0); }
|
||||
inline friend bool operator!=(rcSTR_String lhs, const char *rhs) { return (memcmp(lhs, rhs, lhs.Length() + 1) != 0); }
|
||||
inline friend bool operator!=(const char *lhs, rcSTR_String rhs) { return (memcmp(lhs, rhs, rhs.Length() + 1) != 0); }
|
||||
|
||||
// serializing
|
||||
//int Serialize(pCStream stream);
|
||||
|
@ -377,7 +377,7 @@ static int setkeys(float fac, ListBase *lb, KeyBlock *k[], float t[4], int cycl)
|
||||
k1 = k[0] = k[1] = k[2] = k[3] = firstkey;
|
||||
t[0] = t[1] = t[2] = t[3] = k1->pos;
|
||||
|
||||
/* if (fac<0.0 || fac>1.0) return 1; */
|
||||
/* if (fac < 0.0 || fac > 1.0) return 1; */
|
||||
|
||||
if (k1->next == NULL) return 1;
|
||||
|
||||
|
@ -717,7 +717,7 @@ void sca_move_sensor(bSensor *sens_to_move, Object *ob, int move_up)
|
||||
if (!sens) return;
|
||||
|
||||
/* move up */
|
||||
if ( val==1 && sens->prev) {
|
||||
if (val == 1 && sens->prev) {
|
||||
for (tmp=sens->prev; tmp; tmp=tmp->prev) {
|
||||
if (tmp->flag & SENS_VISIBLE)
|
||||
break;
|
||||
@ -728,7 +728,7 @@ void sca_move_sensor(bSensor *sens_to_move, Object *ob, int move_up)
|
||||
}
|
||||
}
|
||||
/* move down */
|
||||
else if ( val==2 && sens->next) {
|
||||
else if (val == 2 && sens->next) {
|
||||
for (tmp=sens->next; tmp; tmp=tmp->next) {
|
||||
if (tmp->flag & SENS_VISIBLE)
|
||||
break;
|
||||
@ -756,7 +756,7 @@ void sca_move_controller(bController *cont_to_move, Object *ob, int move_up)
|
||||
if (!cont) return;
|
||||
|
||||
/* move up */
|
||||
if ( val==1 && cont->prev) {
|
||||
if (val == 1 && cont->prev) {
|
||||
/* locate the controller that has the same state mask but is earlier in the list */
|
||||
tmp = cont->prev;
|
||||
while (tmp) {
|
||||
@ -771,7 +771,7 @@ void sca_move_controller(bController *cont_to_move, Object *ob, int move_up)
|
||||
}
|
||||
|
||||
/* move down */
|
||||
else if ( val==2 && cont->next) {
|
||||
else if (val == 2 && cont->next) {
|
||||
tmp = cont->next;
|
||||
while (tmp) {
|
||||
if (tmp->state_mask & cont->state_mask)
|
||||
@ -799,7 +799,7 @@ void sca_move_actuator(bActuator *act_to_move, Object *ob, int move_up)
|
||||
if (!act) return;
|
||||
|
||||
/* move up */
|
||||
if ( val==1 && act->prev) {
|
||||
if (val == 1 && act->prev) {
|
||||
/* locate the first visible actuators before this one */
|
||||
for (tmp = act->prev; tmp; tmp=tmp->prev) {
|
||||
if (tmp->flag & ACT_VISIBLE)
|
||||
@ -811,7 +811,7 @@ void sca_move_actuator(bActuator *act_to_move, Object *ob, int move_up)
|
||||
}
|
||||
}
|
||||
/* move down */
|
||||
else if ( val==2 && act->next) {
|
||||
else if (val == 2 && act->next) {
|
||||
/* locate the first visible actuators after this one */
|
||||
for (tmp=act->next; tmp; tmp=tmp->next) {
|
||||
if (tmp->flag & ACT_VISIBLE)
|
||||
|
@ -2449,7 +2449,7 @@ int BKE_tracking_context_step(MovieTrackingContext *context)
|
||||
frame_width = destination_ibuf->x;
|
||||
frame_height = destination_ibuf->y;
|
||||
|
||||
#pragma omp parallel for private(a) shared(destination_ibuf, ok) if (map_size>1)
|
||||
#pragma omp parallel for private(a) shared(destination_ibuf, ok) if (map_size > 1)
|
||||
for (a = 0; a < map_size; a++) {
|
||||
TrackContext *track_context = NULL;
|
||||
MovieTrackingTrack *track;
|
||||
|
@ -180,13 +180,13 @@ static struct bUnitDef buMetricVolDef[] = {
|
||||
static struct bUnitCollection buMetricVolCollecton = {buMetricVolDef, 3, 0, sizeof(buMetricVolDef) / sizeof(bUnitDef)};
|
||||
|
||||
static struct bUnitDef buImperialVolDef[] = {
|
||||
{"cubic mile", "cubic miles", "cu mi", "cu m", "Cubic Miles", UN_SC_MI * UN_SC_MI * UN_SC_MI, 0.0, B_UNIT_DEF_NONE},
|
||||
{"cubic furlong", "cubic furlongs", "cu fur", NULL, "Cubic Furlongs", UN_SC_FUR * UN_SC_FUR * UN_SC_FUR, 0.0, B_UNIT_DEF_SUPPRESS},
|
||||
{"cubic chain", "cubic chains", "cu ch", NULL, "Cubic Chains", UN_SC_CH * UN_SC_CH * UN_SC_CH, 0.0, B_UNIT_DEF_SUPPRESS},
|
||||
{"cubic yard", "cubic yards", "cu yd", NULL, "Cubic Yards", UN_SC_YD * UN_SC_YD * UN_SC_YD, 0.0, B_UNIT_DEF_NONE},
|
||||
{"cubic foot", "cubic feet", "cu ft", NULL, "Cubic Feet", UN_SC_FT * UN_SC_FT * UN_SC_FT, 0.0, B_UNIT_DEF_NONE}, /* base unit */
|
||||
{"cubic inch", "cubic inches", "cu in", NULL , "Cubic Inches", UN_SC_IN * UN_SC_IN * UN_SC_IN, 0.0, B_UNIT_DEF_NONE},
|
||||
{"cubic thou", "cubic thous", "cu mil", NULL, "Cubic Thous", UN_SC_MIL * UN_SC_MIL * UN_SC_MIL, 0.0, B_UNIT_DEF_NONE},
|
||||
{"cubic mile", "cubic miles", "cu mi", "cu m", "Cubic Miles", UN_SC_MI * UN_SC_MI * UN_SC_MI, 0.0, B_UNIT_DEF_NONE},
|
||||
{"cubic furlong", "cubic furlongs", "cu fur", NULL, "Cubic Furlongs", UN_SC_FUR * UN_SC_FUR * UN_SC_FUR, 0.0, B_UNIT_DEF_SUPPRESS},
|
||||
{"cubic chain", "cubic chains", "cu ch", NULL, "Cubic Chains", UN_SC_CH * UN_SC_CH * UN_SC_CH, 0.0, B_UNIT_DEF_SUPPRESS},
|
||||
{"cubic yard", "cubic yards", "cu yd", NULL, "Cubic Yards", UN_SC_YD * UN_SC_YD * UN_SC_YD, 0.0, B_UNIT_DEF_NONE},
|
||||
{"cubic foot", "cubic feet", "cu ft", NULL, "Cubic Feet", UN_SC_FT * UN_SC_FT * UN_SC_FT, 0.0, B_UNIT_DEF_NONE}, /* base unit */
|
||||
{"cubic inch", "cubic inches", "cu in", NULL, "Cubic Inches", UN_SC_IN * UN_SC_IN * UN_SC_IN, 0.0, B_UNIT_DEF_NONE},
|
||||
{"cubic thou", "cubic thous", "cu mil", NULL, "Cubic Thous", UN_SC_MIL * UN_SC_MIL * UN_SC_MIL, 0.0, B_UNIT_DEF_NONE},
|
||||
{NULL, NULL, NULL, NULL, NULL, 0.0, 0.0}
|
||||
};
|
||||
static struct bUnitCollection buImperialVolCollecton = {buImperialVolDef, 4, 0, sizeof(buImperialVolDef) / sizeof(bUnitDef)};
|
||||
|
@ -46,7 +46,7 @@
|
||||
* BLI_array_declare(arr);
|
||||
* int i;
|
||||
*
|
||||
* for (i=0; i<10; i++) {
|
||||
* for (i = 0; i < 10; i++) {
|
||||
* BLI_array_grow_one(arr);
|
||||
* arr[i] = something;
|
||||
* }
|
||||
|
@ -50,7 +50,7 @@ typedef struct BVHTreeOverlap {
|
||||
} BVHTreeOverlap;
|
||||
|
||||
/* flags */
|
||||
#define BVH_ONQUAD (1<<0)
|
||||
#define BVH_ONQUAD (1 << 0)
|
||||
|
||||
typedef struct BVHTreeNearest {
|
||||
int index; /* the index of the nearest found (untouched if none is found within a dist radius from the given coordinates) */
|
||||
|
@ -733,7 +733,7 @@ int isect_ray_tri_v3(const float p1[3], const float d[3],
|
||||
cross_v3_v3v3(p, d, e2);
|
||||
a = dot_v3v3(e1, p);
|
||||
/* note: these values were 0.000001 in 2.4x but for projection snapping on
|
||||
* a human head (1BU==1m), subsurf level 2, this gave many errors - campbell */
|
||||
* a human head (1BU == 1m), subsurf level 2, this gave many errors - campbell */
|
||||
if ((a > -0.00000001f) && (a < 0.00000001f)) return 0;
|
||||
f = 1.0f / a;
|
||||
|
||||
@ -772,7 +772,7 @@ int isect_ray_plane_v3(const float p1[3], const float d[3],
|
||||
cross_v3_v3v3(p, d, e2);
|
||||
a = dot_v3v3(e1, p);
|
||||
/* note: these values were 0.000001 in 2.4x but for projection snapping on
|
||||
* a human head (1BU==1m), subsurf level 2, this gave many errors - campbell */
|
||||
* a human head (1BU == 1m), subsurf level 2, this gave many errors - campbell */
|
||||
if ((a > -0.00000001f) && (a < 0.00000001f)) return 0;
|
||||
f = 1.0f / a;
|
||||
|
||||
|
@ -415,7 +415,7 @@ static short boundinsideEV(ScanFillEdge *eed, ScanFillVert *eve)
|
||||
|
||||
static void testvertexnearedge(ScanFillContext *sf_ctx)
|
||||
{
|
||||
/* only vertices with ->h==1 are being tested for
|
||||
/* only vertices with (->h == 1) are being tested for
|
||||
* being close to an edge, if true insert */
|
||||
|
||||
ScanFillVert *eve;
|
||||
@ -947,7 +947,7 @@ int BLI_scanfill_calc_ex(ScanFillContext *sf_ctx, const short do_quad_tri_speedu
|
||||
return 0;
|
||||
}
|
||||
|
||||
/* does it only for vertices with ->h==1 */
|
||||
/* does it only for vertices with (->h == 1) */
|
||||
testvertexnearedge(sf_ctx);
|
||||
|
||||
ok = 1;
|
||||
|
@ -234,7 +234,7 @@ size_t BLI_wstrlen_utf8(const wchar_t *src)
|
||||
// utf8slen
|
||||
size_t BLI_strlen_utf8(const char *strc)
|
||||
{
|
||||
int len=0;
|
||||
int len = 0;
|
||||
|
||||
while (*strc) {
|
||||
if ((*strc & 0xe0) == 0xc0) {
|
||||
@ -259,7 +259,7 @@ size_t BLI_strlen_utf8(const char *strc)
|
||||
|
||||
size_t BLI_strncpy_wchar_from_utf8(wchar_t *dst_w, const char *src_c, const size_t maxcpy)
|
||||
{
|
||||
int len=0;
|
||||
int len = 0;
|
||||
|
||||
if (dst_w == NULL || src_c == NULL) {
|
||||
return 0;
|
||||
|
@ -364,7 +364,7 @@ static void init_rotsys(BMesh *bm, EdgeData *edata, VertData *vdata)
|
||||
/* BLI_array_staticdeclare(verts, BM_NGON_STACK_SIZE); */ /* UNUSE */
|
||||
int i;
|
||||
|
||||
#define SIGN(n) ((n)<0.0f)
|
||||
#define SIGN(n) ((n) < 0.0f)
|
||||
|
||||
BM_ITER_MESH (v, &iter, bm, BM_VERTS_OF_MESH) {
|
||||
BMIter eiter;
|
||||
|
@ -189,7 +189,7 @@ void ArmatureExporter::add_bone_node(Bone *bone, Object *ob_arm, Scene *sce,
|
||||
|
||||
#if 0
|
||||
if (bone->childbase.first == NULL || BLI_countlist(&(bone->childbase)) >= 2) {
|
||||
add_blender_leaf_bone( bone, ob_arm , node );
|
||||
add_blender_leaf_bone( bone, ob_arm, node);
|
||||
}
|
||||
else {
|
||||
#endif
|
||||
|
@ -467,12 +467,13 @@ bool MeshImporter::primitive_has_faces(COLLADAFW::MeshPrimitive *mp) {
|
||||
}
|
||||
|
||||
// =================================================================
|
||||
// Return the number of faces by summing up
|
||||
// Return the number of faces by summing up
|
||||
// the facecounts of the parts.
|
||||
// hint: This is done because mesh->getFacesCount() does
|
||||
// count loose edges as extra faces, which is not what we want here.
|
||||
// =================================================================
|
||||
void MeshImporter::allocate_face_data(COLLADAFW::Mesh *mesh, Mesh *me, int new_tris) {
|
||||
void MeshImporter::allocate_face_data(COLLADAFW::Mesh *mesh, Mesh *me, int new_tris)
|
||||
{
|
||||
COLLADAFW::MeshPrimitiveArray& prim_arr = mesh->getMeshPrimitives();
|
||||
int total_facecount = 0;
|
||||
|
||||
|
@ -72,8 +72,8 @@ static bool g_openclActive = false;
|
||||
#define MAX_HIGHLIGHT 8
|
||||
extern "C" {
|
||||
int g_highlightIndex;
|
||||
void ** g_highlightedNodes;
|
||||
void ** g_highlightedNodesRead;
|
||||
void **g_highlightedNodes;
|
||||
void **g_highlightedNodesRead;
|
||||
|
||||
#define HIGHLIGHT(wp) \
|
||||
{ \
|
||||
@ -282,7 +282,7 @@ void WorkScheduler::initialize()
|
||||
cl_platform_id platform = platforms[indexPlatform];
|
||||
cl_uint numberOfDevices = 0;
|
||||
clGetDeviceIDs(platform, CL_DEVICE_TYPE_GPU, 0, 0, &numberOfDevices);
|
||||
if (numberOfDevices>0) {
|
||||
if (numberOfDevices > 0) {
|
||||
cl_device_id *cldevices = new cl_device_id[numberOfDevices];
|
||||
clGetDeviceIDs(platform, CL_DEVICE_TYPE_GPU, numberOfDevices, cldevices, 0);
|
||||
|
||||
|
@ -92,7 +92,7 @@ void BokehBlurOperation::executePixel(float output[4], int x, int y, void *data)
|
||||
int pixelSize = this->m_size * max_dim / 100.0f;
|
||||
zero_v4(color_accum);
|
||||
|
||||
if (pixelSize<2) {
|
||||
if (pixelSize < 2) {
|
||||
this->m_inputProgram->read(color_accum, x, y, COM_PS_NEAREST);
|
||||
multiplier_accum[0] = 1.0f;
|
||||
multiplier_accum[1] = 1.0f;
|
||||
|
@ -103,7 +103,7 @@ void ED_base_object_activate(struct bContext *C, struct Base *base);
|
||||
|
||||
void ED_base_object_free_and_unlink(struct Main *bmain, struct Scene *scene, struct Base *base);
|
||||
|
||||
/* single object duplicate, if dupflag==0, fully linked, else it uses the flags given */
|
||||
/* single object duplicate, if (dupflag == 0), fully linked, else it uses the flags given */
|
||||
struct Base *ED_object_add_duplicate(struct Main *bmain, struct Scene *scene, struct Base *base, int dupflag);
|
||||
|
||||
void ED_object_parent(struct Object *ob, struct Object *parent, int type, const char *substr);
|
||||
|
@ -2094,7 +2094,7 @@ static void ui_blockopen_begin(bContext *C, uiBut *but, uiHandleButtonData *data
|
||||
}
|
||||
|
||||
/* this makes adjacent blocks auto open from now on */
|
||||
//if (but->block->auto_open==0) but->block->auto_open= 1;
|
||||
//if (but->block->auto_open ==0 ) but->block->auto_open = 1;
|
||||
}
|
||||
|
||||
static void ui_blockopen_end(bContext *C, uiBut *but, uiHandleButtonData *data)
|
||||
@ -3395,7 +3395,7 @@ static void ui_ndofedit_but_HSVCIRCLE(uiBut *but, uiHandleButtonData *data, wmND
|
||||
/* Convert current color on hue/sat disc to circular coordinates phi, r */
|
||||
phi = fmodf(hsv[0] + 0.25f, 1.0f) * -2.0f * (float)M_PI;
|
||||
r = hsv[1];
|
||||
/* sqr= r>0.f?sqrtf(r):1; */ /* UNUSED */
|
||||
/* sqr = r > 0.0f ? sqrtf(r) : 1; */ /* UNUSED */
|
||||
|
||||
/* Convert to 2d vectors */
|
||||
v[0] = r * cosf(phi);
|
||||
|
@ -706,7 +706,7 @@ static int fluid_init_filepaths(Object *fsDomain, char *targetDir, char *targetF
|
||||
|
||||
// ask user if thats what he/she wants...
|
||||
selection = pupmenu(dispmsg);
|
||||
if (selection<1) return 0; // 0 from menu, or -1 aborted
|
||||
if (selection < 1) return 0; // 0 from menu, or -1 aborted
|
||||
BLI_strncpy(targetDir, newSurfdataPath, sizeof(targetDir));
|
||||
strncpy(domainSettings->surfdataPath, newSurfdataPath, FILE_MAXDIR);
|
||||
BLI_path_abs(targetDir, G.main->name); // fixed #frame-no
|
||||
|
@ -580,7 +580,7 @@ static int image_view_all_exec(bContext *C, wmOperator *UNUSED(op))
|
||||
w = width * aspx;
|
||||
h = height * aspy;
|
||||
|
||||
/* check if the image will fit in the image with zoom==1 */
|
||||
/* check if the image will fit in the image with (zoom == 1) */
|
||||
width = ar->winrct.xmax - ar->winrct.xmin + 1;
|
||||
height = ar->winrct.ymax - ar->winrct.ymin + 1;
|
||||
|
||||
|
@ -377,7 +377,7 @@ static int node_mouse_select(Main *bmain, SpaceNode *snode, ARegion *ar, const i
|
||||
}
|
||||
}
|
||||
}
|
||||
else { /* extend==0 */
|
||||
else { /* extend == 0 */
|
||||
|
||||
/* find the closest visible node */
|
||||
node = node_under_mouse_select(snode->edittree, mx, my);
|
||||
|
@ -4,13 +4,13 @@ uniform sampler2D textureSource;
|
||||
void main()
|
||||
{
|
||||
vec4 color = vec4(0.0);
|
||||
color += texture2D( textureSource, gl_TexCoord[0].st + vec2( -3.0*ScaleU.x, -3.0*ScaleU.y ) ) * 0.015625;
|
||||
color += texture2D( textureSource, gl_TexCoord[0].st + vec2( -2.0*ScaleU.x, -2.0*ScaleU.y ) )*0.09375;
|
||||
color += texture2D( textureSource, gl_TexCoord[0].st + vec2( -1.0*ScaleU.x, -1.0*ScaleU.y ) )*0.234375;
|
||||
color += texture2D( textureSource, gl_TexCoord[0].st + vec2( 0.0 , 0.0) )*0.3125;
|
||||
color += texture2D( textureSource, gl_TexCoord[0].st + vec2( 1.0*ScaleU.x, 1.0*ScaleU.y ) )*0.234375;
|
||||
color += texture2D( textureSource, gl_TexCoord[0].st + vec2( 2.0*ScaleU.x, 2.0*ScaleU.y ) )*0.09375;
|
||||
color += texture2D( textureSource, gl_TexCoord[0].st + vec2( 3.0*ScaleU.x, -3.0*ScaleU.y ) ) * 0.015625;
|
||||
color += texture2D( textureSource, gl_TexCoord[0].st + vec2(-3.0 * ScaleU.x, -3.0 * ScaleU.y ) ) * 0.015625;
|
||||
color += texture2D( textureSource, gl_TexCoord[0].st + vec2(-2.0 * ScaleU.x, -2.0 * ScaleU.y ) ) * 0.09375;
|
||||
color += texture2D( textureSource, gl_TexCoord[0].st + vec2(-1.0 * ScaleU.x, -1.0 * ScaleU.y ) ) * 0.234375;
|
||||
color += texture2D( textureSource, gl_TexCoord[0].st + vec2(0.0, 0.0)) * 0.3125;
|
||||
color += texture2D( textureSource, gl_TexCoord[0].st + vec2(1.0 * ScaleU.x, 1.0 * ScaleU.y ) ) * 0.234375;
|
||||
color += texture2D( textureSource, gl_TexCoord[0].st + vec2(2.0 * ScaleU.x, 2.0 * ScaleU.y ) ) * 0.09375;
|
||||
color += texture2D( textureSource, gl_TexCoord[0].st + vec2(3.0 * ScaleU.x, -3.0 * ScaleU.y ) ) * 0.015625;
|
||||
|
||||
gl_FragColor = color;
|
||||
}
|
||||
|
@ -218,7 +218,7 @@ typedef struct bPoseChannel {
|
||||
short rotmode; /* eRotationModes - rotation representation to use */
|
||||
short pad;
|
||||
|
||||
float chan_mat[4][4]; /* matrix result of loc/quat/size , and where we put deform in, see next line */
|
||||
float chan_mat[4][4]; /* matrix result of loc/quat/size, and where we put deform in, see next line */
|
||||
float pose_mat[4][4]; /* constraints accumulate here. in the end, pose_mat = bone->arm_mat * chan_mat
|
||||
* this matrix is object space */
|
||||
float constinv[4][4]; /* inverse result of constraints.
|
||||
|
@ -332,7 +332,7 @@ typedef struct bTransformConstraint {
|
||||
struct Object *tar; /* target (i.e. 'driver' object/bone) */
|
||||
char subtarget[64]; /* MAX_ID_NAME-2 */
|
||||
|
||||
short from, to; /* can be loc(0) , rot(1), or size(2) */
|
||||
short from, to; /* can be loc(0), rot(1) or size(2) */
|
||||
char map[3]; /* defines which target-axis deform is copied by each owner-axis */
|
||||
char expo; /* extrapolate motion? if 0, confine to ranges */
|
||||
|
||||
|
@ -420,7 +420,7 @@ static PyObject *bpy_bmesh_fmod_getattro(PyObject *UNUSED(self), PyObject *pynam
|
||||
}
|
||||
|
||||
PyErr_Format(PyExc_AttributeError,
|
||||
"BMeshOpsModule: , operator \"%.200s\" doesn't exist",
|
||||
"BMeshOpsModule: operator \"%.200s\" doesn't exist",
|
||||
name);
|
||||
return NULL;
|
||||
}
|
||||
|
@ -66,7 +66,7 @@ struct ImBuf;
|
||||
typedef struct wmJob wmJob;
|
||||
|
||||
/* general API */
|
||||
void WM_setprefsize (int stax, int stay, int sizx, int sizy);
|
||||
void WM_init_state_size_set (int stax, int stay, int sizx, int sizy);
|
||||
void WM_init_state_fullscreen_set(void);
|
||||
void WM_init_state_normal_set(void);
|
||||
|
||||
|
@ -196,7 +196,7 @@ void KX_BlenderRenderTools::applyTransform(RAS_IRasterizer* rasty,double* oglmat
|
||||
//page 360/361 3D Game Engine Design, David Eberly for a discussion
|
||||
// on screen aligned and axis aligned billboards
|
||||
// assumed is that the preprocessor transformed all billboard polygons
|
||||
// so that their normal points into the positive x direction (1.0 , 0.0 , 0.0)
|
||||
// so that their normal points into the positive x direction (1.0, 0.0, 0.0)
|
||||
// when new parenting for objects is done, this rotation
|
||||
// will be moved into the object
|
||||
|
||||
|
@ -299,16 +299,16 @@ public: \
|
||||
* Method table macro (with doc)
|
||||
*/
|
||||
#define KX_PYMETHODTABLE(class_name, method_name) \
|
||||
{#method_name , (PyCFunction) class_name::sPy##method_name, METH_VARARGS, (const char *)class_name::method_name##_doc}
|
||||
{#method_name, (PyCFunction) class_name::sPy##method_name, METH_VARARGS, (const char *)class_name::method_name##_doc}
|
||||
|
||||
#define KX_PYMETHODTABLE_O(class_name, method_name) \
|
||||
{#method_name , (PyCFunction) class_name::sPy##method_name, METH_O, (const char *)class_name::method_name##_doc}
|
||||
{#method_name, (PyCFunction) class_name::sPy##method_name, METH_O, (const char *)class_name::method_name##_doc}
|
||||
|
||||
#define KX_PYMETHODTABLE_NOARGS(class_name, method_name) \
|
||||
{#method_name , (PyCFunction) class_name::sPy##method_name, METH_NOARGS, (const char *)class_name::method_name##_doc}
|
||||
{#method_name, (PyCFunction) class_name::sPy##method_name, METH_NOARGS, (const char *)class_name::method_name##_doc}
|
||||
|
||||
#define KX_PYMETHODTABLE_KEYWORDS(class_name, method_name) \
|
||||
{#method_name , (PyCFunction) class_name::sPy##method_name, METH_VARARGS|METH_KEYWORDS, (const char *)class_name::method_name##_doc}
|
||||
{#method_name, (PyCFunction) class_name::sPy##method_name, METH_VARARGS|METH_KEYWORDS, (const char *)class_name::method_name##_doc}
|
||||
|
||||
/**
|
||||
* Function implementation macro
|
||||
|
@ -29,7 +29,7 @@ class CStringValue : public CPropValue
|
||||
public:
|
||||
/// Construction / destruction
|
||||
CStringValue();
|
||||
CStringValue (const char *txt, const char *name , AllocationTYPE alloctype = CValue::HEAPVALUE);
|
||||
CStringValue(const char *txt, const char *name, AllocationTYPE alloctype = CValue::HEAPVALUE);
|
||||
|
||||
virtual ~CStringValue() {}
|
||||
/// CValue implementation
|
||||
|
@ -620,7 +620,7 @@ bool IsPrintable(int keyIndex)
|
||||
* - numerals: KX_ZEROKEY to KX_NINEKEY
|
||||
* - alphas: KX_AKEY to KX_ZKEY.
|
||||
* - specials: KX_RETKEY, KX_PADASTERKEY, KX_PADCOMMAKEY to KX_PERIODKEY,
|
||||
* KX_TABKEY , KX_SEMICOLONKEY to KX_RIGHTBRACKETKEY,
|
||||
* KX_TABKEY, KX_SEMICOLONKEY to KX_RIGHTBRACKETKEY,
|
||||
* KX_PAD2 to KX_PADPLUSKEY
|
||||
* - delete and backspace: also printable in the sense that they modify
|
||||
* the string
|
||||
|
@ -205,7 +205,7 @@ void GPC_RenderTools::applyTransform(RAS_IRasterizer* rasty,double* oglmatrix,in
|
||||
//page 360/361 3D Game Engine Design, David Eberly for a discussion
|
||||
// on screen aligned and axis aligned billboards
|
||||
// assumed is that the preprocessor transformed all billboard polygons
|
||||
// so that their normal points into the positive x direction (1.0 , 0.0 , 0.0)
|
||||
// so that their normal points into the positive x direction (1.0, 0.0, 0.0)
|
||||
// when new parenting for objects is done, this rotation
|
||||
// will be moved into the object
|
||||
|
||||
|
@ -475,7 +475,7 @@ int main(int argc, char** argv)
|
||||
|
||||
{
|
||||
#if defined(DEBUG)
|
||||
printf("argv[%d] = '%s' , %i\n", i, argv[i],argc);
|
||||
printf("argv[%d] = '%s', %i\n", i, argv[i],argc);
|
||||
#endif
|
||||
if (argv[i][0] == '-')
|
||||
{
|
||||
|
@ -2282,15 +2282,15 @@ PyObject* initGameKeys()
|
||||
KX_MACRO_addTypesToDict(d, PADPLUSKEY, SCA_IInputDevice::KX_PADPLUSKEY);
|
||||
|
||||
|
||||
KX_MACRO_addTypesToDict(d, F1KEY , SCA_IInputDevice::KX_F1KEY);
|
||||
KX_MACRO_addTypesToDict(d, F2KEY , SCA_IInputDevice::KX_F2KEY);
|
||||
KX_MACRO_addTypesToDict(d, F3KEY , SCA_IInputDevice::KX_F3KEY);
|
||||
KX_MACRO_addTypesToDict(d, F4KEY , SCA_IInputDevice::KX_F4KEY);
|
||||
KX_MACRO_addTypesToDict(d, F5KEY , SCA_IInputDevice::KX_F5KEY);
|
||||
KX_MACRO_addTypesToDict(d, F6KEY , SCA_IInputDevice::KX_F6KEY);
|
||||
KX_MACRO_addTypesToDict(d, F7KEY , SCA_IInputDevice::KX_F7KEY);
|
||||
KX_MACRO_addTypesToDict(d, F8KEY , SCA_IInputDevice::KX_F8KEY);
|
||||
KX_MACRO_addTypesToDict(d, F9KEY , SCA_IInputDevice::KX_F9KEY);
|
||||
KX_MACRO_addTypesToDict(d, F1KEY, SCA_IInputDevice::KX_F1KEY);
|
||||
KX_MACRO_addTypesToDict(d, F2KEY, SCA_IInputDevice::KX_F2KEY);
|
||||
KX_MACRO_addTypesToDict(d, F3KEY, SCA_IInputDevice::KX_F3KEY);
|
||||
KX_MACRO_addTypesToDict(d, F4KEY, SCA_IInputDevice::KX_F4KEY);
|
||||
KX_MACRO_addTypesToDict(d, F5KEY, SCA_IInputDevice::KX_F5KEY);
|
||||
KX_MACRO_addTypesToDict(d, F6KEY, SCA_IInputDevice::KX_F6KEY);
|
||||
KX_MACRO_addTypesToDict(d, F7KEY, SCA_IInputDevice::KX_F7KEY);
|
||||
KX_MACRO_addTypesToDict(d, F8KEY, SCA_IInputDevice::KX_F8KEY);
|
||||
KX_MACRO_addTypesToDict(d, F9KEY, SCA_IInputDevice::KX_F9KEY);
|
||||
KX_MACRO_addTypesToDict(d, F10KEY, SCA_IInputDevice::KX_F10KEY);
|
||||
KX_MACRO_addTypesToDict(d, F11KEY, SCA_IInputDevice::KX_F11KEY);
|
||||
KX_MACRO_addTypesToDict(d, F12KEY, SCA_IInputDevice::KX_F12KEY);
|
||||
@ -2302,9 +2302,9 @@ PyObject* initGameKeys()
|
||||
KX_MACRO_addTypesToDict(d, F18KEY, SCA_IInputDevice::KX_F18KEY);
|
||||
KX_MACRO_addTypesToDict(d, F19KEY, SCA_IInputDevice::KX_F19KEY);
|
||||
|
||||
KX_MACRO_addTypesToDict(d, PAUSEKEY, SCA_IInputDevice::KX_PAUSEKEY);
|
||||
KX_MACRO_addTypesToDict(d, PAUSEKEY, SCA_IInputDevice::KX_PAUSEKEY);
|
||||
KX_MACRO_addTypesToDict(d, INSERTKEY, SCA_IInputDevice::KX_INSERTKEY);
|
||||
KX_MACRO_addTypesToDict(d, HOMEKEY , SCA_IInputDevice::KX_HOMEKEY);
|
||||
KX_MACRO_addTypesToDict(d, HOMEKEY, SCA_IInputDevice::KX_HOMEKEY);
|
||||
KX_MACRO_addTypesToDict(d, PAGEUPKEY, SCA_IInputDevice::KX_PAGEUPKEY);
|
||||
KX_MACRO_addTypesToDict(d, PAGEDOWNKEY, SCA_IInputDevice::KX_PAGEDOWNKEY);
|
||||
KX_MACRO_addTypesToDict(d, ENDKEY, SCA_IInputDevice::KX_ENDKEY);
|
||||
|
Loading…
Reference in New Issue
Block a user