fix some types and incorrect info
This commit is contained in:
parent
7f1a76887f
commit
4c2de5e0c7
|
@ -1479,7 +1479,7 @@ void GHOST_SystemX11::getClipboard_xcout(XEvent evt,
|
||||||
|
|
||||||
XFree(buffer);
|
XFree(buffer);
|
||||||
|
|
||||||
/* if we have come this far, the propery contains
|
/* if we have come this far, the property contains
|
||||||
* text, we know the size. */
|
* text, we know the size. */
|
||||||
XGetWindowProperty(m_display, win, m_xclip_out, 0, (long) pty_size,
|
XGetWindowProperty(m_display, win, m_xclip_out, 0, (long) pty_size,
|
||||||
False, AnyPropertyType, &pty_type, &pty_format,
|
False, AnyPropertyType, &pty_type, &pty_format,
|
||||||
|
|
|
@ -335,7 +335,7 @@ protected:
|
||||||
/** Modified state : are there unsaved changes */
|
/** Modified state : are there unsaved changes */
|
||||||
bool m_isUnsavedChanges;
|
bool m_isUnsavedChanges;
|
||||||
|
|
||||||
/** Stores wether this is a full screen window. */
|
/** Stores whether this is a full screen window. */
|
||||||
bool m_fullScreen;
|
bool m_fullScreen;
|
||||||
|
|
||||||
/** Stereo visual created. Only necessary for 'real' stereo support,
|
/** Stereo visual created. Only necessary for 'real' stereo support,
|
||||||
|
|
|
@ -106,7 +106,7 @@ int _EatSpace( std::istream& is,int* countp=NULL) {
|
||||||
|
|
||||||
|
|
||||||
// Eats whites, returns, tabs and the delim character
|
// Eats whites, returns, tabs and the delim character
|
||||||
// Checks wether delim char. is encountered.
|
// Checks whether delim char. is encountered.
|
||||||
void Eat( std::istream& is, int delim )
|
void Eat( std::istream& is, int delim )
|
||||||
{
|
{
|
||||||
int ch;
|
int ch;
|
||||||
|
@ -119,7 +119,7 @@ void Eat( std::istream& is, int delim )
|
||||||
}
|
}
|
||||||
|
|
||||||
// Eats whites, returns, tabs and the delim character
|
// Eats whites, returns, tabs and the delim character
|
||||||
// Checks wether delim char. is encountered.
|
// Checks whether delim char. is encountered.
|
||||||
// EatEnd does not eat all space-like char's at the end.
|
// EatEnd does not eat all space-like char's at the end.
|
||||||
void EatEnd( std::istream& is, int delim )
|
void EatEnd( std::istream& is, int delim )
|
||||||
{
|
{
|
||||||
|
|
|
@ -130,7 +130,7 @@ protected :
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Protected constructors
|
* Protected constructors
|
||||||
* This class is not for direct instanciation. Sub classes
|
* This class is not for direct instantiation. Sub classes
|
||||||
* should only be allocated on the heap.
|
* should only be allocated on the heap.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
|
|
@ -1066,7 +1066,7 @@ void BKE_brush_jitter_pos(const Scene *scene, Brush *brush, const float pos[2],
|
||||||
int use_jitter = brush->jitter != 0;
|
int use_jitter = brush->jitter != 0;
|
||||||
|
|
||||||
/* jitter-ed brush gives weird and unpredictable result for this
|
/* jitter-ed brush gives weird and unpredictable result for this
|
||||||
* kinds of stroke, so manyally disable jitter usage (sergey) */
|
* kinds of stroke, so manually disable jitter usage (sergey) */
|
||||||
use_jitter &= (brush->flag & (BRUSH_RESTORE_MESH | BRUSH_ANCHORED)) == 0;
|
use_jitter &= (brush->flag & (BRUSH_RESTORE_MESH | BRUSH_ANCHORED)) == 0;
|
||||||
|
|
||||||
if (use_jitter) {
|
if (use_jitter) {
|
||||||
|
|
|
@ -3309,7 +3309,7 @@ static void mesh_to_softbody(Scene *scene, Object *ob)
|
||||||
if (ob->softflag & OB_SB_GOAL) {bp->goal = sb->defgoal;}
|
if (ob->softflag & OB_SB_GOAL) {bp->goal = sb->defgoal;}
|
||||||
}
|
}
|
||||||
|
|
||||||
/* to proove the concept
|
/* to proof the concept
|
||||||
* this enables per vertex *mass painting*
|
* this enables per vertex *mass painting*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
@ -3798,7 +3798,7 @@ static void softbody_update_positions(Object *ob, SoftBody *sb, float (*vertexCo
|
||||||
/* vertexCos came from local world, go global */
|
/* vertexCos came from local world, go global */
|
||||||
mul_m4_v3(ob->obmat, bp->origE);
|
mul_m4_v3(ob->obmat, bp->origE);
|
||||||
/* just to be save give bp->origT a defined value
|
/* just to be save give bp->origT a defined value
|
||||||
* will be calulated in interpolate_exciter()*/
|
* will be calculated in interpolate_exciter() */
|
||||||
copy_v3_v3(bp->origT, bp->origE);
|
copy_v3_v3(bp->origT, bp->origE);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -853,7 +853,7 @@ static void track_mask_gpencil_layer_rasterize(int frame_width, int frame_height
|
||||||
fp[1] = (stroke_points[i].y - marker->search_min[1]) * frame_height / mask_height;
|
fp[1] = (stroke_points[i].y - marker->search_min[1]) * frame_height / mask_height;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* TODO: add an option to control wether AA is enabled or not */
|
/* TODO: add an option to control whether AA is enabled or not */
|
||||||
PLX_raskterize((float (*)[2])mask_points, stroke->totpoints, mask, mask_width, mask_height, FALSE);
|
PLX_raskterize((float (*)[2])mask_points, stroke->totpoints, mask, mask_width, mask_height, FALSE);
|
||||||
|
|
||||||
MEM_freeN(mask_points);
|
MEM_freeN(mask_points);
|
||||||
|
|
|
@ -556,7 +556,7 @@ typedef struct FT_Outline_
|
||||||
* Type1 format.
|
* Type1 format.
|
||||||
*
|
*
|
||||||
* Each arc is described through a series of start, end and control points. Each point of the outline
|
* Each arc is described through a series of start, end and control points. Each point of the outline
|
||||||
* has a specific tag which indicates wether it is used to describe a line segment or an arc.
|
* has a specific tag which indicates whether it is used to describe a line segment or an arc.
|
||||||
*
|
*
|
||||||
*
|
*
|
||||||
* The following rules are applied to decompose the contour's points into segments and arcs :
|
* The following rules are applied to decompose the contour's points into segments and arcs :
|
||||||
|
|
|
@ -914,12 +914,13 @@ static int image_open_invoke(bContext *C, wmOperator *op, wmEvent *UNUSED(event)
|
||||||
|
|
||||||
if (prop) {
|
if (prop) {
|
||||||
PointerRNA oldptr;
|
PointerRNA oldptr;
|
||||||
|
Image *oldima;
|
||||||
|
|
||||||
oldptr = RNA_property_pointer_get(&ptr, prop);
|
oldptr = RNA_property_pointer_get(&ptr, prop);
|
||||||
ima = (Image *)oldptr.id.data;
|
oldima = (Image *)oldptr.id.data;
|
||||||
/* unlikely but better avoid strange crash */
|
/* unlikely to fail but better avoid strange crash */
|
||||||
if (ima && GS(ima->id.name) != ID_IM) {
|
if (oldima && GS(oldima->id.name) != ID_IM) {
|
||||||
ima = NULL;
|
ima = oldima;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -438,7 +438,7 @@ static short apply_targetless_ik(Object *ob)
|
||||||
/* rotation */
|
/* rotation */
|
||||||
/* [#22409] is partially caused by this, as slight numeric error introduced during
|
/* [#22409] is partially caused by this, as slight numeric error introduced during
|
||||||
* the solving process leads to locked-axis values changing. However, we cannot modify
|
* the solving process leads to locked-axis values changing. However, we cannot modify
|
||||||
* the values here, or else there are huge discreptancies between IK-solver (interactive)
|
* the values here, or else there are huge discrepancies between IK-solver (interactive)
|
||||||
* and applied poses.
|
* and applied poses.
|
||||||
*/
|
*/
|
||||||
if (parchan->rotmode > 0)
|
if (parchan->rotmode > 0)
|
||||||
|
|
|
@ -86,7 +86,7 @@ typedef struct IDProperty {
|
||||||
#define IDP_STRING_SUB_UTF8 0 /* default */
|
#define IDP_STRING_SUB_UTF8 0 /* default */
|
||||||
#define IDP_STRING_SUB_BYTE 1 /* arbitrary byte array, _not_ null terminated */
|
#define IDP_STRING_SUB_BYTE 1 /* arbitrary byte array, _not_ null terminated */
|
||||||
/*->flag*/
|
/*->flag*/
|
||||||
#define IDP_FLAG_GHOST (1<<7) /* this means the propery is set but RNA will return
|
#define IDP_FLAG_GHOST (1<<7) /* this means the property is set but RNA will return
|
||||||
* false when checking 'RNA_property_is_set',
|
* false when checking 'RNA_property_is_set',
|
||||||
* currently this is a runtime flag */
|
* currently this is a runtime flag */
|
||||||
|
|
||||||
|
|
|
@ -526,7 +526,7 @@ static int rna_Property_readonly_get(PointerRNA *ptr)
|
||||||
{
|
{
|
||||||
PropertyRNA *prop = (PropertyRNA *)ptr->data;
|
PropertyRNA *prop = (PropertyRNA *)ptr->data;
|
||||||
|
|
||||||
/* don't use this becaure it will call functions that check the internal
|
/* don't use this because it will call functions that check the internal
|
||||||
* data for introspection we only need to know if it can be edited so the
|
* data for introspection we only need to know if it can be edited so the
|
||||||
* flag is better for this */
|
* flag is better for this */
|
||||||
/* return RNA_property_editable(ptr, prop); */
|
/* return RNA_property_editable(ptr, prop); */
|
||||||
|
|
|
@ -145,7 +145,7 @@ EnumPropertyItem snap_node_element_items[] = {
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
/* workaround for duplice enums,
|
/* workaround for duplicate enums,
|
||||||
* have each enum line as a defne then conditionally set it or not
|
* have each enum line as a defne then conditionally set it or not
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
@ -771,7 +771,7 @@ static EnumPropertyItem *rna_ImageFormatSettings_color_mode_itemf(bContext *C, P
|
||||||
#ifdef WITH_FFMPEG
|
#ifdef WITH_FFMPEG
|
||||||
/* a WAY more crappy case than B&W flag: depending on codec, file format MIGHT support
|
/* a WAY more crappy case than B&W flag: depending on codec, file format MIGHT support
|
||||||
* alpha channel. for example MPEG format with h264 codec can't do alpha channel, but
|
* alpha channel. for example MPEG format with h264 codec can't do alpha channel, but
|
||||||
* the same MPEG format with QTRLE codec can easily handle alpga channel.
|
* the same MPEG format with QTRLE codec can easily handle alpha channel.
|
||||||
* not sure how to deal with such cases in a nicer way (sergey) */
|
* not sure how to deal with such cases in a nicer way (sergey) */
|
||||||
if (is_render) {
|
if (is_render) {
|
||||||
Scene *scene = ptr->id.data;
|
Scene *scene = ptr->id.data;
|
||||||
|
@ -1105,7 +1105,7 @@ static void rna_RenderSettings_color_management_update(Main *bmain, Scene *UNUSE
|
||||||
|
|
||||||
if (ntree && scene->use_nodes) {
|
if (ntree && scene->use_nodes) {
|
||||||
/* images are freed here, stop render and preview threads, until
|
/* images are freed here, stop render and preview threads, until
|
||||||
* Image is threadsafe. when we are changing this propery from a
|
* Image is threadsafe. when we are changing this property from a
|
||||||
* python script in the render thread, don't stop own thread */
|
* python script in the render thread, don't stop own thread */
|
||||||
if (BLI_thread_is_main())
|
if (BLI_thread_is_main())
|
||||||
WM_jobs_stop_all(bmain->wm.first);
|
WM_jobs_stop_all(bmain->wm.first);
|
||||||
|
|
|
@ -128,7 +128,7 @@ static DerivedMesh *applyModifier(ModifierData *md, Object *ob,
|
||||||
return derivedData;
|
return derivedData;
|
||||||
|
|
||||||
|
|
||||||
/* 2.64 used this... */
|
/* 2.63 used this... */
|
||||||
/* dm = bmd->object->derivedFinal; */
|
/* dm = bmd->object->derivedFinal; */
|
||||||
|
|
||||||
/* but we want to make sure we can get the object
|
/* but we want to make sure we can get the object
|
||||||
|
|
|
@ -27,7 +27,7 @@
|
||||||
|
|
||||||
/** \file gameengine/Ketsji/KX_SCA_DynamicActuator.cpp
|
/** \file gameengine/Ketsji/KX_SCA_DynamicActuator.cpp
|
||||||
* \ingroup ketsji
|
* \ingroup ketsji
|
||||||
* Adjust dynamics settins for this object
|
* Adjust dynamics settings for this object
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/* Previously existed as:
|
/* Previously existed as:
|
||||||
|
|
|
@ -289,7 +289,7 @@ private :
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Private constructor - this class is not meant
|
* Private constructor - this class is not meant
|
||||||
* for instanciation.
|
* for instantiation.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
RAS_FramingManager(
|
RAS_FramingManager(
|
||||||
|
|
Loading…
Reference in New Issue