forked from bartvdbraak/blender
Cleanup
This commit is contained in:
parent
efc7c355b2
commit
77667ad80f
@ -127,7 +127,7 @@ void ExecutionSystem::set_operations(const Operations &operations, const Groups
|
||||
void ExecutionSystem::execute()
|
||||
{
|
||||
const bNodeTree *editingtree = this->m_context.getbNodeTree();
|
||||
editingtree->stats_draw(editingtree->sdh, (char*)"Compositing | Initializing execution");
|
||||
editingtree->stats_draw(editingtree->sdh, (char *)"Compositing | Initializing execution");
|
||||
|
||||
DebugInfo::execute_started(this);
|
||||
|
||||
@ -183,7 +183,7 @@ void ExecutionSystem::execute()
|
||||
WorkScheduler::finish();
|
||||
WorkScheduler::stop();
|
||||
|
||||
editingtree->stats_draw(editingtree->sdh, (char*)"Compositing | Deinitializing execution");
|
||||
editingtree->stats_draw(editingtree->sdh, (char *)"Compositing | Deinitializing execution");
|
||||
for (index = 0; index < this->m_operations.size(); index++) {
|
||||
NodeOperation *operation = this->m_operations[index];
|
||||
operation->deinitExecution();
|
||||
|
@ -77,7 +77,7 @@ void COM_execute(RenderData *rd, Scene *scene, bNodeTree *editingtree, int rende
|
||||
|
||||
/* set progress bar to 0% and status to init compositing */
|
||||
editingtree->progress(editingtree->prh, 0.0);
|
||||
editingtree->stats_draw(editingtree->sdh, (char*)"Compositing");
|
||||
editingtree->stats_draw(editingtree->sdh, (char *)"Compositing");
|
||||
|
||||
bool twopass = (editingtree->flag & NTREE_TWO_PASS) > 0 && !rendering;
|
||||
/* initialize execution system */
|
||||
|
@ -1738,7 +1738,8 @@ static int insert_key_button_exec(bContext *C, wmOperator *op)
|
||||
}
|
||||
else {
|
||||
BKE_report(op->reports, RPT_WARNING,
|
||||
"Failed to resolve path to property, try manually specifying this using a Keying Set instead");
|
||||
"Failed to resolve path to property, "
|
||||
"try manually specifying this using a Keying Set instead");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -3531,9 +3531,9 @@ static int screen_animation_step(bContext *C, wmOperator *UNUSED(op), const wmEv
|
||||
|
||||
if (sad->flag & ANIMPLAY_FLAG_JUMPED) {
|
||||
BKE_sound_seek_scene(bmain, scene);
|
||||
#ifdef PROFILE_AUDIO_SYNCH
|
||||
#ifdef PROFILE_AUDIO_SYNCH
|
||||
old_frame = CFRA;
|
||||
#endif
|
||||
#endif
|
||||
}
|
||||
|
||||
/* since we follow drawflags, we can't send notifier but tag regions ourselves */
|
||||
|
@ -76,13 +76,13 @@ BoxGrid::Iterator::Iterator (BoxGrid& grid, Vec3r& center, real /*epsilon*/)
|
||||
{
|
||||
// Find target cell
|
||||
_cell = grid.findCell(_target);
|
||||
#if BOX_GRID_LOGGING
|
||||
#if BOX_GRID_LOGGING
|
||||
if (G.debug & G_DEBUG_FREESTYLE) {
|
||||
cout << "Searching for occluders of edge centered at " << _target << " in cell [" <<
|
||||
1_cell->boundary[0] << ", " << _cell->boundary[1] << ", " << _cell->boundary[2] <<
|
||||
", " << _cell->boundary[3] << "] (" << _cell->faces.size() << " occluders)" << endl;
|
||||
}
|
||||
#endif
|
||||
#endif
|
||||
|
||||
// Set iterator
|
||||
_current = _cell->faces.begin();
|
||||
|
@ -303,11 +303,11 @@ inline void BoxGrid::Iterator::reportDepth(Vec3r origin, Vec3r u, real t)
|
||||
// The reported depth is the length of a ray in camera space
|
||||
// We need to convert it into a Z-value in grid space
|
||||
real depth = -(origin + (u * t))[2];
|
||||
#if BOX_GRID_LOGGING
|
||||
#if BOX_GRID_LOGGING
|
||||
if (G.debug & G_DEBUG_FREESTYLE) {
|
||||
std::cout << "\t\tReporting depth of occluder/ee: " << depth;
|
||||
}
|
||||
#endif
|
||||
#endif
|
||||
if (depth > _target[2]) {
|
||||
#if BOX_GRID_LOGGING
|
||||
if (G.debug & G_DEBUG_FREESTYLE) {
|
||||
|
@ -77,13 +77,13 @@ SphericalGrid::Iterator::Iterator(SphericalGrid& grid, Vec3r& center, real /*eps
|
||||
{
|
||||
// Find target cell
|
||||
_cell = grid.findCell(_target);
|
||||
#if SPHERICAL_GRID_LOGGING
|
||||
#if SPHERICAL_GRID_LOGGING
|
||||
if (G.debug & G_DEBUG_FREESTYLE) {
|
||||
cout << "Searching for occluders of edge centered at " << _target << " in cell [" <<
|
||||
_cell->boundary[0] << ", " << _cell->boundary[1] << ", " << _cell->boundary[2] <<
|
||||
", " << _cell->boundary[3] << "] (" << _cell->faces.size() << " occluders)" << endl;
|
||||
}
|
||||
#endif
|
||||
#endif
|
||||
|
||||
// Set iterator
|
||||
_current = _cell->faces.begin();
|
||||
|
@ -1550,7 +1550,7 @@ void KX_GameObject::RegisterCollisionCallbacks()
|
||||
}
|
||||
void KX_GameObject::RunCollisionCallbacks(KX_GameObject *collider, const MT_Vector3 &point, const MT_Vector3 &normal)
|
||||
{
|
||||
#ifdef WITH_PYTHON
|
||||
#ifdef WITH_PYTHON
|
||||
Py_ssize_t len;
|
||||
PyObject* collision_callbacks = m_collisionCallbacks;
|
||||
|
||||
@ -1613,7 +1613,7 @@ void KX_GameObject::RunCollisionCallbacks(KX_GameObject *collider, const MT_Vect
|
||||
if (args_3) Py_DECREF(args_3);
|
||||
if (args_1) Py_DECREF(args_1);
|
||||
}
|
||||
#endif
|
||||
#endif
|
||||
}
|
||||
|
||||
/* Suspend/ resume: for the dynamic behavior, there is a simple
|
||||
|
@ -2057,14 +2057,14 @@ PyObject *initGamePlayerPythonScripting(Main *maggie, int argc, char** argv)
|
||||
Py_SetProgramName(program_path_wchar);
|
||||
|
||||
/* Update, Py3.3 resolves attempting to parse non-existing header */
|
||||
#if 0
|
||||
#if 0
|
||||
/* Python 3.2 now looks for '2.xx/python/include/python3.2d/pyconfig.h' to
|
||||
* parse from the 'sysconfig' module which is used by 'site',
|
||||
* so for now disable site. alternatively we could copy the file. */
|
||||
if (py_path_bundle != NULL) {
|
||||
Py_NoSiteFlag = 1; /* inhibits the automatic importing of 'site' */
|
||||
}
|
||||
#endif
|
||||
#endif
|
||||
|
||||
Py_FrozenFlag = 1;
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user