forked from bartvdbraak/blender
style cleanup: spaces -> tabs
This commit is contained in:
parent
9d4be17de4
commit
69993c5d40
@ -150,7 +150,7 @@ GHOST_TSuccess GHOST_DisplayManagerCarbon::setCurrentDisplaySetting(GHOST_TUns8
|
||||
#endif // GHOST_DEBUG
|
||||
|
||||
CGDisplayErr err = ::CGDisplaySwitchToMode(m_displayIDs[display], displayModeValues);
|
||||
|
||||
|
||||
return err == CGDisplayNoErr ? GHOST_kSuccess : GHOST_kFailure;
|
||||
}
|
||||
|
||||
@ -158,19 +158,18 @@ GHOST_TSuccess GHOST_DisplayManagerCarbon::setCurrentDisplaySetting(GHOST_TUns8
|
||||
long GHOST_DisplayManagerCarbon::getValue(CFDictionaryRef values, CFStringRef key) const
|
||||
{
|
||||
CFNumberRef numberValue = (CFNumberRef) CFDictionaryGetValue(values, key);
|
||||
|
||||
|
||||
if (!numberValue)
|
||||
{
|
||||
return -1;
|
||||
}
|
||||
|
||||
|
||||
long intValue;
|
||||
|
||||
|
||||
if (!CFNumberGetValue(numberValue, kCFNumberLongType, &intValue))
|
||||
{
|
||||
return -1;
|
||||
}
|
||||
|
||||
|
||||
return intValue;
|
||||
}
|
||||
|
||||
|
@ -230,7 +230,7 @@ int ccg_gridsize(int level)
|
||||
{
|
||||
BLI_assert(level > 0);
|
||||
BLI_assert(level <= 31);
|
||||
|
||||
|
||||
return (1 << (level - 1)) + 1;
|
||||
}
|
||||
|
||||
|
@ -27,7 +27,6 @@
|
||||
* \ingroup bke
|
||||
*/
|
||||
|
||||
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <stddef.h>
|
||||
|
@ -135,7 +135,7 @@ static void modifier_apply_threaded(ImBuf *ibuf, ImBuf *mask, modifier_apply_thr
|
||||
init_data.apply_callback = apply_callback;
|
||||
|
||||
IMB_processor_apply_threaded(ibuf->y, sizeof(ModifierThread), &init_data,
|
||||
modifier_init_handle, modifier_do_thread);
|
||||
modifier_init_handle, modifier_do_thread);
|
||||
}
|
||||
|
||||
/* **** Color Balance Modifier **** */
|
||||
|
@ -1746,7 +1746,7 @@ void BKE_sequencer_color_balance_apply(StripColorBalance *cb, ImBuf *ibuf, float
|
||||
init_data.mask = mask_input;
|
||||
|
||||
IMB_processor_apply_threaded(ibuf->y, sizeof(ColorBalanceThread), &init_data,
|
||||
color_balance_init_handle, color_balance_do_thread);
|
||||
color_balance_init_handle, color_balance_do_thread);
|
||||
|
||||
/* color balance either happens on float buffer or byte buffer, but never on both,
|
||||
* free byte buffer if there's float buffer since float buffer would be used for
|
||||
|
@ -7344,13 +7344,13 @@ static void do_version_node_cleanup_dynamic_sockets_264(void *UNUSED(data), ID *
|
||||
|
||||
static void do_version_node_fix_translate_wrapping(void *UNUSED(data), ID *UNUSED(id), bNodeTree *ntree)
|
||||
{
|
||||
bNode *node;
|
||||
bNode *node;
|
||||
|
||||
for (node = ntree->nodes.first; node; node = node->next) {
|
||||
if (node->type == CMP_NODE_TRANSLATE && node->storage == NULL) {
|
||||
node->storage = MEM_callocN(sizeof(NodeTranslateData), "node translate data");
|
||||
}
|
||||
}
|
||||
for (node = ntree->nodes.first; node; node = node->next) {
|
||||
if (node->type == CMP_NODE_TRANSLATE && node->storage == NULL) {
|
||||
node->storage = MEM_callocN(sizeof(NodeTranslateData), "node translate data");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
static void do_version_node_fix_internal_links_264(void *UNUSED(data), ID *UNUSED(id), bNodeTree *ntree)
|
||||
@ -8727,14 +8727,14 @@ static void do_versions(FileData *fd, Library *lib, Main *main)
|
||||
}
|
||||
}
|
||||
|
||||
// add storage for compositor translate nodes when not existing
|
||||
if (!MAIN_VERSION_ATLEAST(main, 265, 9)) {
|
||||
bNodeTreeType *ntreetype;
|
||||
// add storage for compositor translate nodes when not existing
|
||||
if (!MAIN_VERSION_ATLEAST(main, 265, 9)) {
|
||||
bNodeTreeType *ntreetype;
|
||||
|
||||
ntreetype = ntreeGetType(NTREE_COMPOSIT);
|
||||
if (ntreetype && ntreetype->foreach_nodetree)
|
||||
ntreetype->foreach_nodetree(main, NULL, do_version_node_fix_translate_wrapping);
|
||||
}
|
||||
ntreetype = ntreeGetType(NTREE_COMPOSIT);
|
||||
if (ntreetype && ntreetype->foreach_nodetree)
|
||||
ntreetype->foreach_nodetree(main, NULL, do_version_node_fix_translate_wrapping);
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
@ -84,9 +84,9 @@ void AnimationExporter::operator()(Object *ob)
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
export_object_constraint_animation(ob);
|
||||
|
||||
|
||||
export_object_constraint_animation(ob);
|
||||
|
||||
//This needs to be handled by extra profiles, so postponed for now
|
||||
//export_morph_animation(ob);
|
||||
|
||||
@ -149,11 +149,11 @@ void AnimationExporter::operator()(Object *ob)
|
||||
void AnimationExporter::export_object_constraint_animation(Object *ob)
|
||||
{
|
||||
std::vector<float> fra;
|
||||
//Takes frames of target animations
|
||||
//Takes frames of target animations
|
||||
make_anim_frames_from_targets(ob, fra);
|
||||
|
||||
|
||||
if (fra.size())
|
||||
dae_baked_object_animation(fra, ob);
|
||||
dae_baked_object_animation(fra, ob);
|
||||
}
|
||||
|
||||
void AnimationExporter::export_morph_animation(Object *ob)
|
||||
@ -274,8 +274,8 @@ void AnimationExporter::dae_animation(Object *ob, FCurve *fcu, char *transformNa
|
||||
|
||||
//axis names for colors
|
||||
else if (!strcmp(transformName, "color") ||
|
||||
!strcmp(transformName, "specular_color") ||
|
||||
!strcmp(transformName, "diffuse_color") ||
|
||||
!strcmp(transformName, "specular_color") ||
|
||||
!strcmp(transformName, "diffuse_color") ||
|
||||
!strcmp(transformName, "alpha"))
|
||||
{
|
||||
const char *axis_names[] = {"R", "G", "B"};
|
||||
@ -285,9 +285,9 @@ void AnimationExporter::dae_animation(Object *ob, FCurve *fcu, char *transformNa
|
||||
|
||||
//axis names for transforms
|
||||
else if (!strcmp(transformName, "location") ||
|
||||
!strcmp(transformName, "scale") ||
|
||||
!strcmp(transformName, "scale") ||
|
||||
!strcmp(transformName, "rotation_euler") ||
|
||||
!strcmp(transformName, "rotation_quaternion"))
|
||||
!strcmp(transformName, "rotation_quaternion"))
|
||||
{
|
||||
const char *axis_names[] = {"X", "Y", "Z"};
|
||||
if (fcu->array_index < 3)
|
||||
@ -526,7 +526,7 @@ void AnimationExporter::dae_baked_object_animation(std::vector<float> &fra, Obje
|
||||
return;
|
||||
|
||||
BLI_snprintf(anim_id, sizeof(anim_id), "%s_%s", (char*)translate_id(ob_name).c_str(),
|
||||
"object_matrix");
|
||||
"object_matrix");
|
||||
|
||||
openAnimation(anim_id, COLLADABU::Utils::EMPTY_STRING);
|
||||
|
||||
@ -897,7 +897,7 @@ std::string AnimationExporter::create_4x4_source(std::vector<float> &frames, Obj
|
||||
add_source_parameters(param, semantic, false, NULL, true);
|
||||
|
||||
source.prepareToAppendValues();
|
||||
|
||||
|
||||
bPoseChannel *parchan = NULL;
|
||||
bPoseChannel *pchan = NULL;
|
||||
|
||||
@ -916,7 +916,7 @@ std::string AnimationExporter::create_4x4_source(std::vector<float> &frames, Obj
|
||||
int j = 0;
|
||||
for (it = frames.begin(); it != frames.end(); it++) {
|
||||
float mat[4][4], ipar[4][4];
|
||||
|
||||
|
||||
float ctime = BKE_scene_frame_get_from_ctime(scene, *it);
|
||||
CFRA = BKE_scene_frame_get_from_ctime(scene, *it);
|
||||
//BKE_scene_update_for_newframe(G.main,scene,scene->lay);
|
||||
|
@ -104,7 +104,7 @@ bool ArmatureExporter::add_instance_controller(Object *ob)
|
||||
for (bone = (Bone *)arm->bonebase.first; bone; bone = bone->next) {
|
||||
write_bone_URLs(ins, ob_arm, bone);
|
||||
}
|
||||
|
||||
|
||||
InstanceWriter::add_material_bindings(ins.getBindMaterial(), ob, this->export_settings->active_uv_only);
|
||||
|
||||
ins.add();
|
||||
|
@ -319,7 +319,7 @@ void ArmatureImporter::create_armature_bones( )
|
||||
|
||||
if (!ob_arm)
|
||||
continue;
|
||||
|
||||
|
||||
ED_armature_to_edit(ob_arm);
|
||||
|
||||
/*
|
||||
@ -327,8 +327,8 @@ void ArmatureImporter::create_armature_bones( )
|
||||
* check if bones have already been created for a given joint
|
||||
*/
|
||||
|
||||
create_bone(NULL, *ri , NULL, (*ri)->getChildNodes().getCount(), NULL, (bArmature *)ob_arm->data);
|
||||
|
||||
create_bone(NULL, *ri , NULL, (*ri)->getChildNodes().getCount(), NULL, (bArmature *)ob_arm->data);
|
||||
|
||||
//leaf bone tails are derived from the matrix, so no need of this.
|
||||
fix_leaf_bones();
|
||||
|
||||
@ -336,15 +336,13 @@ void ArmatureImporter::create_armature_bones( )
|
||||
unskinned_armature_map[(*ri)->getUniqueId()] = ob_arm;
|
||||
|
||||
ED_armature_from_edit(ob_arm);
|
||||
|
||||
|
||||
//This serves no purpose, as pose is automatically reset later, in BKE_where_is_bone()
|
||||
//set_pose(ob_arm, *ri, NULL, NULL);
|
||||
|
||||
ED_armature_edit_free(ob_arm);
|
||||
DAG_id_tag_update(&ob_arm->id, OB_RECALC_OB | OB_RECALC_DATA);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
void ArmatureImporter::create_armature_bones(SkinInfo& skin)
|
||||
@ -650,12 +648,12 @@ bool ArmatureImporter::write_controller(const COLLADAFW::Controller *controller)
|
||||
void ArmatureImporter::make_shape_keys(){
|
||||
std::vector<COLLADAFW::MorphController *>::iterator mc;
|
||||
float weight;
|
||||
|
||||
|
||||
for (mc = morph_controllers.begin(); mc != morph_controllers.end(); mc++) {
|
||||
//Controller data
|
||||
COLLADAFW::UniqueIdArray& morphTargetIds = (*mc)->getMorphTargets();
|
||||
COLLADAFW::FloatOrDoubleArray& morphWeights = (*mc)->getMorphWeights();
|
||||
|
||||
|
||||
//Prereq: all the geometries must be imported and mesh objects must be made
|
||||
Object *source_ob = this->mesh_importer->get_object_by_geom_uid((*mc)->getSource());
|
||||
|
||||
|
@ -96,7 +96,7 @@ bool ControllerExporter::add_instance_controller(Object *ob)
|
||||
for (bone = (Bone *)arm->bonebase.first; bone; bone = bone->next) {
|
||||
write_bone_URLs(ins, ob_arm, bone);
|
||||
}
|
||||
|
||||
|
||||
InstanceWriter::add_material_bindings(ins.getBindMaterial(), ob, this->export_settings->active_uv_only);
|
||||
|
||||
ins.add();
|
||||
@ -302,7 +302,7 @@ void ControllerExporter::export_morph_controller(Object *ob, Key *key)
|
||||
|
||||
openMorph(controller_id, controller_name,
|
||||
COLLADABU::URI(COLLADABU::Utils::EMPTY_STRING, get_geometry_id(ob, use_instantiation)));
|
||||
|
||||
|
||||
std::string targets_id = add_morph_targets(key, ob);
|
||||
std::string morph_weights_id = add_morph_weights(key, ob);
|
||||
|
||||
@ -320,7 +320,7 @@ void ControllerExporter::export_morph_controller(Object *ob, Key *key)
|
||||
{
|
||||
BKE_libblock_free_us(&(G.main->mesh), me);
|
||||
}
|
||||
|
||||
|
||||
//support for animations
|
||||
//can also try the base element and param alternative
|
||||
add_weight_extras(key);
|
||||
@ -337,7 +337,7 @@ std::string ControllerExporter::add_morph_targets(Key *key, Object *ob)
|
||||
source.setArrayId(source_id + ARRAY_ID_SUFFIX);
|
||||
source.setAccessorCount(key->totkey - 1);
|
||||
source.setAccessorStride(1);
|
||||
|
||||
|
||||
COLLADASW::SourceBase::ParameterNameList ¶m = source.getParameterNameList();
|
||||
param.push_back("IDREF");
|
||||
|
||||
@ -366,7 +366,7 @@ std::string ControllerExporter::add_morph_weights(Key *key, Object *ob)
|
||||
source.setArrayId(source_id + ARRAY_ID_SUFFIX);
|
||||
source.setAccessorCount(key->totkey - 1);
|
||||
source.setAccessorStride(1);
|
||||
|
||||
|
||||
COLLADASW::SourceBase::ParameterNameList ¶m = source.getParameterNameList();
|
||||
param.push_back("MORPH_WEIGHT");
|
||||
|
||||
|
@ -426,7 +426,7 @@ void DocumentImporter::write_node(COLLADAFW::Node *node, COLLADAFW::Node *parent
|
||||
bool read_transform = true;
|
||||
|
||||
std::vector<Object *> *objects_done = new std::vector<Object *>();
|
||||
|
||||
|
||||
if (is_joint) {
|
||||
armature_importer.add_joint(node, parent_node == NULL || parent_node->getType() != COLLADAFW::Node::JOINT, par, sce);
|
||||
}
|
||||
@ -1203,7 +1203,7 @@ bool DocumentImporter::is_armature(COLLADAFW::Node *node){
|
||||
if(child_nodes[i]->getType() == COLLADAFW::Node::JOINT) return true;
|
||||
else continue;
|
||||
}
|
||||
|
||||
|
||||
//no child is JOINT
|
||||
return false;
|
||||
|
||||
|
@ -157,7 +157,7 @@ void GeometryExporter::operator()(Object *ob)
|
||||
if (this->export_settings->apply_modifiers) {
|
||||
BKE_libblock_free_us(&(G.main->mesh), me);
|
||||
}
|
||||
|
||||
|
||||
if (this->export_settings->include_shapekeys) {
|
||||
Key * key = BKE_key_from_object(ob);
|
||||
if(key) {
|
||||
|
@ -216,7 +216,7 @@ void SceneExporter::writeNodes(Object *ob, Scene *sce)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
con = con->next;
|
||||
}
|
||||
}
|
||||
|
@ -111,7 +111,7 @@ void TransformWriter::add_node_transform_ob(COLLADASW::Node& node, Object *ob)
|
||||
node.addMatrix("parentinverse", dmat);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
double d_obmat[4][4];
|
||||
converter.mat4_to_dae_double(d_obmat, ob->obmat);
|
||||
node.addMatrix("transform",d_obmat);
|
||||
|
@ -33,7 +33,7 @@
|
||||
SocketProxyNode::SocketProxyNode(bNode *editorNode, bNodeSocket *editorInput, bNodeSocket *editorOutput, bool buffer) : Node(editorNode, false)
|
||||
{
|
||||
DataType dt;
|
||||
this->m_buffer = buffer;
|
||||
this->m_buffer = buffer;
|
||||
|
||||
dt = COM_DT_VALUE;
|
||||
if (editorInput->type == SOCK_RGBA) dt = COM_DT_COLOR;
|
||||
|
@ -27,7 +27,6 @@
|
||||
* \ingroup edgpencil
|
||||
*/
|
||||
|
||||
|
||||
#include <stdio.h>
|
||||
#include <string.h>
|
||||
#include <stdlib.h>
|
||||
|
@ -373,7 +373,7 @@ void uiRoundRect(float minx, float miny, float maxx, float maxy, float rad)
|
||||
glEnable(GL_BLEND);
|
||||
|
||||
uiDrawBox(GL_LINE_LOOP, minx, miny, maxx, maxy, rad);
|
||||
|
||||
|
||||
glDisable(GL_BLEND);
|
||||
glDisable(GL_LINE_SMOOTH);
|
||||
}
|
||||
|
@ -875,7 +875,7 @@ static void ui_do_animate(const bContext *C, Panel *panel)
|
||||
void uiBeginPanels(const bContext *UNUSED(C), ARegion *ar)
|
||||
{
|
||||
Panel *pa;
|
||||
|
||||
|
||||
/* set all panels as inactive, so that at the end we know
|
||||
* which ones were used */
|
||||
for (pa = ar->panels.first; pa; pa = pa->next) {
|
||||
|
@ -4151,7 +4151,7 @@ int PE_minmax(Scene *scene, float min[3], float max[3])
|
||||
BKE_object_minmax(ob, min, max, TRUE);
|
||||
ok= 1;
|
||||
}
|
||||
|
||||
|
||||
return ok;
|
||||
}
|
||||
|
||||
|
@ -654,7 +654,6 @@ static int sculpt_brush_test_cyl(SculptBrushTest *test, float co[3], float locat
|
||||
/* ===== Sculpting =====
|
||||
*
|
||||
*/
|
||||
|
||||
|
||||
static float overlapped_curve(Brush *br, float x)
|
||||
{
|
||||
|
@ -1983,7 +1983,7 @@ static void node_composit_buts_distance_matte(uiLayout *layout, bContext *UNUSED
|
||||
uiLayout *col, *row;
|
||||
|
||||
col = uiLayoutColumn(layout, TRUE);
|
||||
|
||||
|
||||
uiItemL(layout, IFACE_("Color Space:"), ICON_NONE);
|
||||
row = uiLayoutRow(layout, FALSE);
|
||||
uiItemR(row, ptr, "channel", UI_ITEM_R_EXPAND, NULL, ICON_NONE);
|
||||
|
@ -1057,7 +1057,7 @@ static PFace *p_face_add(PHandle *handle)
|
||||
e1->pair = NULL;
|
||||
e2->pair = NULL;
|
||||
e3->pair = NULL;
|
||||
|
||||
|
||||
e1->flag = 0;
|
||||
e2->flag = 0;
|
||||
e3->flag = 0;
|
||||
|
@ -154,7 +154,7 @@ static void escape_uri_string(const char *string, char *escaped_string, int len,
|
||||
*q++ = *p;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
*q = '\0';
|
||||
}
|
||||
|
||||
|
@ -36,7 +36,7 @@
|
||||
#include "../node_composite_util.h"
|
||||
|
||||
/* **************** Bokeh image Tools ******************** */
|
||||
|
||||
|
||||
static bNodeSocketTemplate cmp_node_bokehimage_out[] = {
|
||||
{ SOCK_RGBA, 0, N_("Image"), 0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f},
|
||||
{ -1, 0, "" }
|
||||
|
@ -34,7 +34,7 @@
|
||||
#include "node_composite_util.h"
|
||||
|
||||
/* **************** Gamma Tools ******************** */
|
||||
|
||||
|
||||
static bNodeSocketTemplate cmp_node_gamma_in[] = {
|
||||
{ SOCK_RGBA, 1, N_("Image"), 1.0f, 1.0f, 1.0f, 1.0f},
|
||||
{ SOCK_FLOAT, 1, N_("Gamma"), 1.0f, 0.0f, 0.0f, 0.0f, 0.001f, 10.0f, PROP_UNSIGNED},
|
||||
|
@ -29,7 +29,7 @@
|
||||
#include "node_shader_util.h"
|
||||
|
||||
/* **************** Gamma Tools ******************** */
|
||||
|
||||
|
||||
static bNodeSocketTemplate sh_node_gamma_in[] = {
|
||||
{ SOCK_RGBA, 1, N_("Color"), 1.0f, 1.0f, 1.0f, 1.0f},
|
||||
{ SOCK_FLOAT, 1, N_("Gamma"), 1.0f, 0.0f, 0.0f, 0.0f, 0.001f, 10.0f, PROP_UNSIGNED},
|
||||
|
@ -120,7 +120,7 @@ void addalphaAddfacFloat(float dest[4], const float source[4], char addfac)
|
||||
else
|
||||
#endif
|
||||
dest[0] = c;
|
||||
|
||||
|
||||
c = (m * dest[1]) + source[1];
|
||||
#ifdef RE_FLOAT_COLOR_CLIPPING
|
||||
if (c >= RE_FULL_COLOR_FLOAT) dest[1] = RE_FULL_COLOR_FLOAT;
|
||||
|
@ -286,7 +286,7 @@ int shadeHaloFloat(HaloRen *har, float col[4], int zz,
|
||||
/* fill in col */
|
||||
float t, zn, radist, ringf=0.0f, linef=0.0f, alpha, si, co;
|
||||
int a;
|
||||
|
||||
|
||||
if (R.wrld.mode & WO_MIST) {
|
||||
if (har->type & HA_ONLYSKY) {
|
||||
/* stars but no mist */
|
||||
|
@ -676,14 +676,14 @@ static void strand_render(Render *re, StrandSegment *sseg, float winmat[4][4], S
|
||||
else {
|
||||
float hoco1[4], hoco2[4];
|
||||
int a, obi, index;
|
||||
|
||||
|
||||
obi= sseg->obi - re->objectinstance;
|
||||
index= sseg->strand->index;
|
||||
|
||||
projectvert(p1->co, winmat, hoco1);
|
||||
projectvert(p2->co, winmat, hoco2);
|
||||
|
||||
|
||||
|
||||
for (a=0; a<totzspan; a++) {
|
||||
#if 0
|
||||
/* render both strand and single pixel wire to counter aliasing */
|
||||
|
@ -29,7 +29,6 @@
|
||||
* \ingroup player
|
||||
*/
|
||||
|
||||
|
||||
#include <iostream>
|
||||
#include <string.h>
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user