header cleanup and typo's
This commit is contained in:
parent
88473fd49a
commit
74017cb020
|
@ -50,9 +50,8 @@
|
|||
extern int datatoc_bfont_ttf_size;
|
||||
extern char datatoc_bfont_ttf[];
|
||||
|
||||
// XXX, bad, but BLI uses these
|
||||
char bprogname[160]= "";
|
||||
char U[1024]= {0};
|
||||
/* cheat */
|
||||
char U[1024]= {0};
|
||||
#endif
|
||||
|
||||
#include "Util.h"
|
||||
|
|
|
@ -49,14 +49,14 @@
|
|||
* the Standard Template Library but without the painful get()
|
||||
* semantics to access the internal c style pointer.
|
||||
*
|
||||
* It is often useful to explicitely decalre ownership of memory
|
||||
* It is often useful to explicitly declare ownership of memory
|
||||
* allocated on the heap within class or function scope. This
|
||||
* class helps you to encapsulate this ownership within a value
|
||||
* type. When an instance of this class goes out of scope it
|
||||
* makes sure that any memory associated with it's internal pointer
|
||||
* is deleted. It can help to inform users of an aggregate class
|
||||
* that it owns instances of it's members and these instances
|
||||
* should not be shared. This is not reliably enforcable in C++
|
||||
* should not be shared. This is not reliably enforceable in C++
|
||||
* but this class attempts to make the 1-1 relationship clear.
|
||||
*
|
||||
* @section Example usage
|
||||
|
|
|
@ -34,7 +34,6 @@
|
|||
*/
|
||||
|
||||
#include "BLI_kdopbvh.h"
|
||||
#include "BLI_linklist.h"
|
||||
|
||||
/*
|
||||
* This header encapsulates necessary code to buld a BVH
|
||||
|
@ -118,7 +117,7 @@ void free_bvhtree_from_mesh(struct BVHTreeFromMesh *data);
|
|||
#define BVHTREE_FROM_VERTICES 1
|
||||
#define BVHTREE_FROM_EDGES 2
|
||||
|
||||
typedef LinkNode* BVHCache;
|
||||
typedef struct LinkNode* BVHCache;
|
||||
|
||||
|
||||
/*
|
||||
|
|
|
@ -50,6 +50,7 @@
|
|||
#include "BLI_memarena.h"
|
||||
#include "BLI_pbvh.h"
|
||||
#include "BLI_utildefines.h"
|
||||
#include "BLI_linklist.h"
|
||||
|
||||
#include "BKE_cdderivedmesh.h"
|
||||
#include "BKE_displist.h"
|
||||
|
|
|
@ -59,7 +59,6 @@
|
|||
#include "BLI_blenlib.h"
|
||||
#include "BLI_bpath.h"
|
||||
#include "BLI_dynstr.h"
|
||||
#include "BLI_path_util.h"
|
||||
#include "BLI_utildefines.h"
|
||||
#include "BLI_callbacks.h"
|
||||
|
||||
|
|
|
@ -40,6 +40,7 @@
|
|||
|
||||
#include "BLI_editVert.h"
|
||||
#include "BLI_utildefines.h"
|
||||
#include "BLI_linklist.h"
|
||||
|
||||
#include "BKE_DerivedMesh.h"
|
||||
|
||||
|
|
|
@ -40,6 +40,7 @@
|
|||
#include "BLI_math.h"
|
||||
#include "BLI_edgehash.h"
|
||||
#include "BLI_utildefines.h"
|
||||
#include "BLI_linklist.h"
|
||||
|
||||
#include "BKE_cdderivedmesh.h"
|
||||
#include "BKE_cloth.h"
|
||||
|
|
|
@ -41,7 +41,6 @@
|
|||
#include "MEM_guardedalloc.h"
|
||||
|
||||
#include "BLI_blenlib.h"
|
||||
#include "BLI_listbase.h"
|
||||
#include "BLI_math.h"
|
||||
#include "BLI_editVert.h"
|
||||
#include "BLI_utildefines.h"
|
||||
|
|
|
@ -47,7 +47,6 @@
|
|||
#include "DNA_ID.h"
|
||||
|
||||
#include "BLI_blenlib.h"
|
||||
#include "BLI_path_util.h"
|
||||
#include "BLI_linklist.h"
|
||||
#include "BLI_math.h"
|
||||
#include "BLI_mempool.h"
|
||||
|
|
|
@ -59,8 +59,6 @@
|
|||
#include "BLI_math.h"
|
||||
#include "BLI_blenlib.h"
|
||||
#include "BLI_jitter.h"
|
||||
#include "BLI_listbase.h"
|
||||
#include "BLI_noise.h"
|
||||
#include "BLI_rand.h"
|
||||
#include "BLI_utildefines.h"
|
||||
|
||||
|
|
|
@ -54,6 +54,7 @@
|
|||
#include "BLI_utildefines.h"
|
||||
#include "BLI_path_util.h"
|
||||
#include "BLI_listbase.h"
|
||||
#include "BLI_linklist.h"
|
||||
#include "BLI_string.h"
|
||||
|
||||
#include "BKE_bmesh.h"
|
||||
|
|
|
@ -54,6 +54,7 @@
|
|||
#include "BLI_kdtree.h"
|
||||
#include "BLI_rand.h"
|
||||
#include "BLI_threads.h"
|
||||
#include "BLI_linklist.h"
|
||||
|
||||
#include "BKE_anim.h"
|
||||
#include "BKE_animsys.h"
|
||||
|
|
|
@ -64,13 +64,12 @@
|
|||
#include "BLI_rand.h"
|
||||
#include "BLI_jitter.h"
|
||||
#include "BLI_math.h"
|
||||
#include "BLI_blenlib.h"
|
||||
#include "BLI_blenlib.h" /* BLI_storage.h For _LARGEFILE64_SOURCE; zlib needs this on some systems */
|
||||
#include "BLI_kdtree.h"
|
||||
#include "BLI_kdopbvh.h"
|
||||
#include "BLI_listbase.h"
|
||||
#include "BLI_threads.h"
|
||||
#include "BLI_storage.h" /* For _LARGEFILE64_SOURCE; zlib needs this on some systems */
|
||||
#include "BLI_utildefines.h"
|
||||
#include "BLI_linklist.h"
|
||||
|
||||
#include "BKE_main.h"
|
||||
#include "BKE_animsys.h"
|
||||
|
|
|
@ -51,6 +51,7 @@
|
|||
#include "BLI_listbase.h"
|
||||
#include "BLI_path_util.h"
|
||||
#include "BLI_string.h"
|
||||
#include "BLI_storage.h"
|
||||
#include "BLI_threads.h"
|
||||
#include "BLI_utildefines.h"
|
||||
|
||||
|
@ -61,9 +62,10 @@
|
|||
#include "BKE_sequencer.h"
|
||||
#include "BKE_fcurve.h"
|
||||
#include "BKE_scene.h"
|
||||
#include "RNA_access.h"
|
||||
#include "BKE_utildefines.h"
|
||||
|
||||
#include "RNA_access.h"
|
||||
|
||||
#include "RE_pipeline.h"
|
||||
|
||||
#include <pthread.h>
|
||||
|
|
|
@ -8661,7 +8661,7 @@ static void do_versions(FileData *fd, Library *lib, Main *main)
|
|||
|
||||
for (wo = main->world.first; wo; wo= wo->id.next) {
|
||||
/* Migrate to Bullet for games, except for the NaN versions */
|
||||
/* People can still explicitely choose for Sumo (after 2.42 is out) */
|
||||
/* People can still explicitly choose for Sumo (after 2.42 is out) */
|
||||
if(main->versionfile > 225)
|
||||
wo->physicsEngine = WOPHY_BULLET;
|
||||
if(WO_AODIST == wo->aomode)
|
||||
|
|
|
@ -53,6 +53,7 @@
|
|||
#include "BLI_listbase.h"
|
||||
#include "BLI_utildefines.h"
|
||||
#include "BLI_math_vector.h"
|
||||
#include "BLI_linklist.h"
|
||||
|
||||
#include "ED_object.h"
|
||||
#include "ED_mesh.h"
|
||||
|
|
|
@ -50,7 +50,6 @@
|
|||
#include "DNA_object_fluidsim.h"
|
||||
|
||||
#include "BLI_blenlib.h"
|
||||
#include "BLI_fileops.h"
|
||||
#include "BLI_threads.h"
|
||||
#include "BLI_math.h"
|
||||
#include "BLI_utildefines.h"
|
||||
|
|
|
@ -47,7 +47,6 @@
|
|||
#include "BLI_blenlib.h"
|
||||
#include "BLI_math.h"
|
||||
#include "BLI_editVert.h"
|
||||
#include "BLI_listbase.h"
|
||||
#include "BLI_utildefines.h"
|
||||
|
||||
#include "BKE_animsys.h"
|
||||
|
|
|
@ -64,7 +64,6 @@
|
|||
|
||||
#include "BLI_blenlib.h"
|
||||
#include "BLI_linklist.h"
|
||||
#include "BLI_path_util.h"
|
||||
#include "BLI_storage_types.h"
|
||||
#include "BLI_dynstr.h"
|
||||
#include "BLI_utildefines.h"
|
||||
|
|
|
@ -68,7 +68,6 @@
|
|||
|
||||
|
||||
#include "BLI_math.h"
|
||||
#include "BLI_blenlib.h"
|
||||
#include "BLI_storage_types.h"
|
||||
|
||||
#include "RE_pipeline.h"
|
||||
|
|
|
@ -40,7 +40,6 @@
|
|||
|
||||
#include "BLI_blenlib.h"
|
||||
#include "BLI_math.h"
|
||||
#include "BLI_path_util.h"
|
||||
#include "BLI_utildefines.h"
|
||||
|
||||
#include "BKE_context.h"
|
||||
|
|
|
@ -67,9 +67,6 @@
|
|||
# include <dirent.h>
|
||||
#endif
|
||||
|
||||
#include "BLI_blenlib.h" /* BLI_remlink BLI_filesize BLI_addtail
|
||||
BLI_countlist BLI_stringdec */
|
||||
|
||||
#include "imbuf.h"
|
||||
|
||||
#include "AVI_avi.h"
|
||||
|
|
|
@ -40,7 +40,6 @@
|
|||
|
||||
#include <stddef.h>
|
||||
|
||||
#include "BLI_blenlib.h"
|
||||
#include "BKE_armature.h"
|
||||
|
||||
void rna_EditBone_align_roll(EditBone *ebo, float no[3])
|
||||
|
|
|
@ -42,8 +42,6 @@
|
|||
|
||||
#include <stddef.h>
|
||||
|
||||
#include "BLI_blenlib.h"
|
||||
|
||||
#include "BKE_animsys.h"
|
||||
#include "BKE_fcurve.h"
|
||||
|
||||
|
|
|
@ -40,8 +40,6 @@
|
|||
|
||||
#ifdef RNA_RUNTIME
|
||||
|
||||
#include "BLI_path_util.h"
|
||||
|
||||
static int rna_GPencilLayer_active_frame_editable(PointerRNA *ptr)
|
||||
{
|
||||
bGPDlayer *gpl= (bGPDlayer *)ptr->data;
|
||||
|
|
|
@ -98,8 +98,6 @@ static EnumPropertyItem empty_vortex_shape_items[] = {
|
|||
#include "BKE_pointcache.h"
|
||||
#include "BKE_depsgraph.h"
|
||||
|
||||
#include "BLI_blenlib.h"
|
||||
|
||||
#include "ED_object.h"
|
||||
|
||||
static void rna_Cache_change(Main *UNUSED(bmain), Scene *UNUSED(scene), PointerRNA *ptr)
|
||||
|
|
|
@ -120,7 +120,6 @@ EnumPropertyItem part_hair_ren_as_items[] = {
|
|||
#ifdef RNA_RUNTIME
|
||||
|
||||
#include "BLI_math.h"
|
||||
#include "BLI_listbase.h"
|
||||
|
||||
#include "BKE_context.h"
|
||||
#include "BKE_cloth.h"
|
||||
|
|
|
@ -175,7 +175,6 @@ EnumPropertyItem image_color_mode_items[] ={
|
|||
|
||||
#include "BLI_threads.h"
|
||||
#include "BLI_editVert.h"
|
||||
#include "BLI_blenlib.h"
|
||||
|
||||
#include "BKE_context.h"
|
||||
#include "BKE_global.h"
|
||||
|
|
|
@ -47,6 +47,7 @@
|
|||
#include "BLI_edgehash.h"
|
||||
#include "BLI_math.h"
|
||||
#include "BLI_utildefines.h"
|
||||
#include "BLI_linklist.h"
|
||||
|
||||
|
||||
#include "BKE_cdderivedmesh.h"
|
||||
|
|
|
@ -1320,7 +1320,7 @@ void IIR_gauss(CompBuf* src, float sigma, int chan, int xy)
|
|||
|
||||
if ((xy < 1) || (xy > 3)) xy = 3;
|
||||
|
||||
// XXX The YVV macro defined below explicitely expects sources of at least 3x3 pixels,
|
||||
// XXX The YVV macro defined below explicitly expects sources of at least 3x3 pixels,
|
||||
// so just skiping blur along faulty direction if src's def is below that limit!
|
||||
if (src->x < 3) xy &= ~(int) 1;
|
||||
if (src->y < 3) xy &= ~(int) 2;
|
||||
|
@ -1346,7 +1346,7 @@ void IIR_gauss(CompBuf* src, float sigma, int chan, int xy)
|
|||
// it seems to work, not entirely sure if it is actually totally correct,
|
||||
// Besides J.M.Geusebroek's anigauss.c (see http://www.science.uva.nl/~mark),
|
||||
// found one other implementation by Cristoph Lampert,
|
||||
// but neither seem to be quite the same, result seems to be ok sofar anyway.
|
||||
// but neither seem to be quite the same, result seems to be ok so far anyway.
|
||||
// Extra scale factor here to not have to do it in filter,
|
||||
// though maybe this had something to with the precision errors
|
||||
sc = cf[0]/((1.0 + cf[1] - cf[2] + cf[3])*(1.0 - cf[1] - cf[2] - cf[3])*(1.0 + cf[2] + (cf[1] - cf[3])*cf[3]));
|
||||
|
|
|
@ -2729,4 +2729,8 @@ void wm_event_add_ghostevent(wmWindowManager *wm, wmWindow *win, int type, int U
|
|||
}
|
||||
|
||||
}
|
||||
|
||||
/* Handy when debugging checking events */
|
||||
/* WM_event_print(&event); */
|
||||
|
||||
}
|
||||
|
|
|
@ -98,7 +98,7 @@ void KX_BulletPhysicsController::SetObject (SG_IObject* object)
|
|||
if (m_bSensor)
|
||||
{
|
||||
// use a different callback function for sensor object,
|
||||
// bullet will not synchronize, we must do it explicitely
|
||||
// bullet will not synchronize, we must do it explicitly
|
||||
SG_Callbacks& callbacks = gameobj->GetSGNode()->GetCallBackFunctions();
|
||||
callbacks.m_updatefunc = KX_GameObject::SynchronizeTransformFunc;
|
||||
}
|
||||
|
|
|
@ -767,7 +767,7 @@ void CcdPhysicsController::SetPhysicsEnvironment(class PHY_IPhysicsEnvironment *
|
|||
if (m_cci.m_physicsEnv != physicsEnv)
|
||||
{
|
||||
// since the environment is changing, we must also move the controler to the
|
||||
// new environement. Note that we don't handle sensor explicitely: this
|
||||
// new environment. Note that we don't handle sensor explicitly: this
|
||||
// function can be called on sensor but only when they are not registered
|
||||
if (m_cci.m_physicsEnv->removeCcdPhysicsController(this))
|
||||
{
|
||||
|
|
|
@ -63,7 +63,7 @@ struct PHY_RayCastResult
|
|||
/**
|
||||
* This class replaces the ignoreController parameter of rayTest function.
|
||||
* It allows more sophisticated filtering on the physics controller before computing the ray intersection to save CPU.
|
||||
* It is only used to its full extend by the Ccd physics environement (Bullet).
|
||||
* It is only used to its full extend by the Ccd physics environment (Bullet).
|
||||
*/
|
||||
class PHY_IRayCastFilterCallback
|
||||
{
|
||||
|
|
|
@ -607,7 +607,7 @@ void VideoFFmpeg::openCam (char * file, short camIdx)
|
|||
// The driver name is constructed automatically from the device type:
|
||||
// v4l : /dev/video<camIdx>
|
||||
// dv1394: /dev/dv1394/<camIdx>
|
||||
// If you have different driver name, you can specify the driver name explicitely
|
||||
// If you have different driver name, you can specify the driver name explicitly
|
||||
// instead of device type. Examples of valid filename:
|
||||
// /dev/v4l/video0:pal
|
||||
// /dev/ieee1394/1:ntsc
|
||||
|
|
Loading…
Reference in New Issue