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
path: root/source
diff options
context:
space:
mode:
Diffstat (limited to 'source')
-rw-r--r--source/blender/blenkernel/BKE_node.h4
-rw-r--r--source/blender/blenkernel/intern/bmfont.c6
-rw-r--r--source/blender/blenlib/BLI_path_util.h2
-rw-r--r--source/blender/editors/interface/interface_widgets.c4
-rw-r--r--source/blender/imbuf/intern/IMB_indexer.h12
-rw-r--r--source/blender/quicktime/quicktime_export.h2
-rw-r--r--source/gameengine/GameLogic/Joystick/SCA_Joystick.cpp5
-rw-r--r--source/gameengine/Ketsji/KX_SoundActuator.cpp7
8 files changed, 22 insertions, 20 deletions
diff --git a/source/blender/blenkernel/BKE_node.h b/source/blender/blenkernel/BKE_node.h
index b700cbb16db..b948f09d3d3 100644
--- a/source/blender/blenkernel/BKE_node.h
+++ b/source/blender/blenkernel/BKE_node.h
@@ -413,8 +413,8 @@ void nodeRegisterSocketType(struct bNodeSocketType *stype);
void nodeUnregisterSocketType(struct bNodeSocketType *stype);
bool nodeSocketIsRegistered(struct bNodeSocket *sock);
struct GHashIterator *nodeSocketTypeGetIterator(void);
-const char * nodeStaticSocketType(int type, int subtype);
-const char * nodeStaticSocketInterfaceType(int type, int subtype);
+const char *nodeStaticSocketType(int type, int subtype);
+const char *nodeStaticSocketInterfaceType(int type, int subtype);
/* helper macros for iterating over node types */
#define NODE_SOCKET_TYPES_BEGIN(stype) \
diff --git a/source/blender/blenkernel/intern/bmfont.c b/source/blender/blenkernel/intern/bmfont.c
index 732c0c35feb..e962e8ca831 100644
--- a/source/blender/blenkernel/intern/bmfont.c
+++ b/source/blender/blenkernel/intern/bmfont.c
@@ -74,7 +74,7 @@ void printfGlyph(bmGlyph *glyph)
void calcAlpha(ImBuf *ibuf)
{
int i;
- char * rect;
+ char *rect;
if (ibuf) {
rect = (char *) ibuf->rect;
@@ -88,7 +88,7 @@ void calcAlpha(ImBuf *ibuf)
void readBitmapFontVersion0(ImBuf *ibuf, unsigned char *rect, int step)
{
int glyphcount, bytes, i, index, linelength, ysize;
- unsigned char * buffer;
+ unsigned char *buffer;
bmFont * bmfont;
linelength = ibuf->x * step;
@@ -174,7 +174,7 @@ void readBitmapFontVersion0(ImBuf *ibuf, unsigned char *rect, int step)
void detectBitmapFont(ImBuf *ibuf)
{
- unsigned char * rect;
+ unsigned char *rect;
unsigned short version;
int i;
diff --git a/source/blender/blenlib/BLI_path_util.h b/source/blender/blenlib/BLI_path_util.h
index d4c5d5fed9f..47064b68a86 100644
--- a/source/blender/blenlib/BLI_path_util.h
+++ b/source/blender/blenlib/BLI_path_util.h
@@ -119,7 +119,7 @@ bool BLI_ensure_extension(char *path, size_t maxlen, const char *ext);
bool BLI_ensure_filename(char *filepath, size_t maxlen, const char *filename);
void BLI_uniquename(struct ListBase *list, void *vlink, const char *defname, char delim, short name_offs, short len);
bool BLI_uniquename_cb(bool (*unique_check)(void *arg, const char *name),
- void *arg, const char * defname, char delim, char *name, short name_len);
+ void *arg, const char *defname, char delim, char *name, short name_len);
void BLI_newname(char *name, int add);
int BLI_stringdec(const char *string, char *head, char *start, unsigned short *numlen);
void BLI_stringenc(char *string, const char *head, const char *tail, unsigned short numlen, int pic);
diff --git a/source/blender/editors/interface/interface_widgets.c b/source/blender/editors/interface/interface_widgets.c
index c85ecd1b5a1..5bcb6686175 100644
--- a/source/blender/editors/interface/interface_widgets.c
+++ b/source/blender/editors/interface/interface_widgets.c
@@ -2324,9 +2324,9 @@ static void widget_numbut(uiWidgetColors *wcol, rcti *rect, int state, int round
widget_numbut_draw(wcol, rect, state, roundboxalign, false);
}
-/*
+/**
* Draw number buttons still with triangles when field is not embossed
-*/
+ */
static void widget_numbut_embossn(uiBut *UNUSED(but), uiWidgetColors *wcol, rcti *rect, int state, int roundboxalign)
{
widget_numbut_draw(wcol, rect, state, roundboxalign, true);
diff --git a/source/blender/imbuf/intern/IMB_indexer.h b/source/blender/imbuf/intern/IMB_indexer.h
index 6173ffa9b78..bac46740f0f 100644
--- a/source/blender/imbuf/intern/IMB_indexer.h
+++ b/source/blender/imbuf/intern/IMB_indexer.h
@@ -72,14 +72,14 @@ struct anim_index {
struct anim_index_builder;
typedef struct anim_index_builder {
- FILE * fp;
+ FILE *fp;
char name[FILE_MAX];
char temp_name[FILE_MAX];
void *private_data;
- void (*delete_priv_data)(struct anim_index_builder * idx);
- void (*proc_frame)(struct anim_index_builder * idx,
+ void (*delete_priv_data)(struct anim_index_builder *idx);
+ void (*proc_frame)(struct anim_index_builder *idx,
unsigned char *buffer,
int data_size,
struct anim_index_entry *entry);
@@ -87,14 +87,14 @@ typedef struct anim_index_builder {
anim_index_builder *IMB_index_builder_create(const char *name);
void IMB_index_builder_add_entry(
- anim_index_builder * fp,
+ anim_index_builder *fp,
int frameno, unsigned long long seek_pos,
unsigned long long seek_pos_dts,
unsigned long long pts);
void IMB_index_builder_proc_frame(
- anim_index_builder * fp,
- unsigned char * buffer,
+ anim_index_builder *fp,
+ unsigned char *buffer,
int data_size,
int frameno, unsigned long long seek_pos,
unsigned long long seek_pos_dts,
diff --git a/source/blender/quicktime/quicktime_export.h b/source/blender/quicktime/quicktime_export.h
index 35e424b9081..a499cd462b7 100644
--- a/source/blender/quicktime/quicktime_export.h
+++ b/source/blender/quicktime/quicktime_export.h
@@ -46,7 +46,7 @@
typedef struct QuicktimeCodecTypeDesc {
int codecType;
int rnatmpvalue;
- char * codecName;
+ char *codecName;
} QuicktimeCodecTypeDesc;
// quicktime movie output functions
diff --git a/source/gameengine/GameLogic/Joystick/SCA_Joystick.cpp b/source/gameengine/GameLogic/Joystick/SCA_Joystick.cpp
index 793ce6a7b83..6e379c91d0c 100644
--- a/source/gameengine/GameLogic/Joystick/SCA_Joystick.cpp
+++ b/source/gameengine/GameLogic/Joystick/SCA_Joystick.cpp
@@ -293,10 +293,11 @@ void SCA_Joystick::DestroyJoystickDevice(void)
#ifdef WITH_SDL
if (m_isinit) {
#if SDL_VERSION_ATLEAST(2, 0, 0)
- if (SDL_JoystickGetAttached(m_private->m_joystick)) {
+ if (SDL_JoystickGetAttached(m_private->m_joystick))
#else
- if (SDL_JoystickOpened(m_joyindex)) {
+ if (SDL_JoystickOpened(m_joyindex))
#endif
+ {
JOYSTICK_ECHO("Closing-joystick " << m_joyindex);
SDL_JoystickClose(m_private->m_joystick);
}
diff --git a/source/gameengine/Ketsji/KX_SoundActuator.cpp b/source/gameengine/Ketsji/KX_SoundActuator.cpp
index 3a4b1d82946..4e5cd0ac5e1 100644
--- a/source/gameengine/Ketsji/KX_SoundActuator.cpp
+++ b/source/gameengine/Ketsji/KX_SoundActuator.cpp
@@ -147,7 +147,7 @@ CValue* KX_SoundActuator::GetReplica()
KX_SoundActuator* replica = new KX_SoundActuator(*this);
replica->ProcessReplica();
return replica;
-};
+}
void KX_SoundActuator::ProcessReplica()
{
@@ -217,11 +217,12 @@ bool KX_SoundActuator::Update(double curtime, bool frame)
// m_posevent==false && m_posevent==false, in this case IsNegativeEvent() returns false
// and assumes this is a positive event.
// check that we actually have a positive event so as not to play sounds when being disabled.
- else if (bPositiveEvent) { // <- added since 2.49
+ else if (bPositiveEvent) /* <- added since 2.49 */
#else
- else { // <- works in most cases except a loop-end sound will never stop unless
+ else // <- works in most cases except a loop-end sound will never stop unless
// the negative pulse is done continuesly
#endif
+ {
if (!m_isplaying)
play();
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-03 13:53:21 +0300