diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2010-11-02 16:12:30 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2010-11-02 16:12:30 +0300 |
| commit | 369a5cc29e80d0ac30f9db444f2c0f9c1da32e01 (patch) | |
| tree | e6510d985b37ef027e5614da8b5479a2d95c7a92 | |
| parent | 5d7ed88f17c7a253c81ee48c147149d73dd88e6a (diff) | |
fix for compiling with the c90 standard, support for non-static variable initializers is a c99 feature.
21 files changed, 999 insertions, 866 deletions
diff --git a/source/blender/blenkernel/intern/anim.c b/source/blender/blenkernel/intern/anim.c index a4e791aa6b3..500161fee2e 100644 --- a/source/blender/blenkernel/intern/anim.c +++ b/source/blender/blenkernel/intern/anim.c @@ -1145,7 +1145,6 @@ static void new_particle_duplilist(ListBase *lb, ID *UNUSED(id), Scene *scene, O Object *ob=0, **oblist=0, obcopy, *obcopylist=0; DupliObject *dob; ParticleDupliWeight *dw; - ParticleSimulationData sim = {scene, par, psys, psys_get_modifier(par, psys)}; ParticleSettings *part; ParticleData *pa; ChildParticle *cpa=0; @@ -1180,6 +1179,11 @@ static void new_particle_duplilist(ListBase *lb, ID *UNUSED(id), Scene *scene, O lay= scene->lay; if((psys->renderdata || part->draw_as==PART_DRAW_REND) && ELEM(part->ren_as, PART_DRAW_OB, PART_DRAW_GR)) { + ParticleSimulationData sim= {0}; + sim.scene= scene; + sim.ob= par; + sim.psys= psys; + sim.psmd= psys_get_modifier(par, psys); /* first check for loops (particle system object used as dupli object) */ if(part->ren_as == PART_DRAW_OB) { diff --git a/source/blender/blenkernel/intern/boids.c b/source/blender/blenkernel/intern/boids.c index 943cf20720e..5c2c0721972 100644 --- a/source/blender/blenkernel/intern/boids.c +++ b/source/blender/blenkernel/intern/boids.c @@ -1257,7 +1257,11 @@ void boid_body(BoidBrainData *bbd, ParticleData *pa) switch(bpa->data.mode) { case eBoidMode_InAir: { - float grav[3] = {0.0f, 0.0f, bbd->sim->scene->physics_settings.gravity[2] < 0.0f ? -1.0f : 0.0f}; + float grav[3]; + + grav[0]= 0.0f; + grav[1]= 0.0f; + grav[2]= bbd->sim->scene->physics_settings.gravity[2] < 0.0f ? -1.0f : 0.0f; /* don't take forward acceleration into account (better banking) */ if(dot_v3v3(bpa->data.acc, pa->state.vel) > 0.0f) { @@ -1296,7 +1300,12 @@ void boid_body(BoidBrainData *bbd, ParticleData *pa) } case eBoidMode_Falling: { - float grav[3] = {0.0f, 0.0f, bbd->sim->scene->physics_settings.gravity[2] < 0.0f ? -1.0f : 0.0f}; + float grav[3]; + + grav[0]= 0.0f; + grav[1]= 0.0f; + grav[2]= bbd->sim->scene->physics_settings.gravity[2] < 0.0f ? -1.0f : 0.0f; + /* gather apparent gravity */ VECADDFAC(bpa->gravity, bpa->gravity, grav, dtime); diff --git a/source/blender/blenlib/intern/math_geom.c b/source/blender/blenlib/intern/math_geom.c index c2e765388c8..88ca739a39e 100644 --- a/source/blender/blenlib/intern/math_geom.c +++ b/source/blender/blenlib/intern/math_geom.c @@ -1651,11 +1651,21 @@ void window_translate_m4(float winmat[][4], float perspmat[][4], float x, float { if(winmat[2][3] == -1.0f) { /* in the case of a win-matrix, this means perspective always */ - float v1[3]= {perspmat[0][0], perspmat[1][0], perspmat[2][0]}; - float v2[3]= {perspmat[0][1], perspmat[1][1], perspmat[2][1]}; - float len1= (1.0f / len_v3(v1)); - float len2= (1.0f / len_v3(v2)); - + float v1[3]; + float v2[3]; + float len1, len2; + + v1[0]= perspmat[0][0]; + v1[1]= perspmat[1][0]; + v1[2]= perspmat[2][0]; + + v2[0]= perspmat[0][1]; + v2[1]= perspmat[1][1]; + v2[2]= perspmat[2][1]; + + len1= (1.0f / len_v3(v1)); + len2= (1.0f / len_v3(v2)); + winmat[2][0] += len1 * winmat[0][0] * x; winmat[2][1] += len2 * winmat[1][1] * y; } diff --git a/source/blender/blenlib/intern/math_matrix.c b/source/blender/blenlib/intern/math_matrix.c index aadd08f0c90..58fb3b9b76b 100644 --- a/source/blender/blenlib/intern/math_matrix.c +++ b/source/blender/blenlib/intern/math_matrix.c @@ -609,7 +609,11 @@ void orthogonalize_m3(float mat[][3], int axis) normalize_v3(mat[1]); cross_v3_v3v3(mat[2], mat[0], mat[1]); } else { - float vec[3] = {mat[0][1], mat[0][2], mat[0][0]}; + float vec[3]; + + vec[0]= mat[0][1]; + vec[1]= mat[0][2]; + vec[2]= mat[0][0]; cross_v3_v3v3(mat[2], mat[0], vec); normalize_v3(mat[2]); @@ -625,7 +629,11 @@ void orthogonalize_m3(float mat[][3], int axis) normalize_v3(mat[0]); cross_v3_v3v3(mat[2], mat[0], mat[1]); } else { - float vec[3] = {mat[1][1], mat[1][2], mat[1][0]}; + float vec[3]; + + vec[0]= mat[1][1]; + vec[1]= mat[1][2]; + vec[2]= mat[1][0]; cross_v3_v3v3(mat[0], mat[1], vec); normalize_v3(mat[0]); @@ -641,7 +649,11 @@ void orthogonalize_m3(float mat[][3], int axis) normalize_v3(mat[0]); cross_v3_v3v3(mat[1], mat[2], mat[0]); } else { - float vec[3] = {mat[2][1], mat[2][2], mat[2][0]}; + float vec[3]; + + vec[0]= mat[2][1]; + vec[1]= mat[2][2]; + vec[2]= mat[2][0]; cross_v3_v3v3(mat[0], vec, mat[2]); normalize_v3(mat[0]); @@ -670,7 +682,11 @@ void orthogonalize_m4(float mat[][4], int axis) normalize_v3(mat[1]); cross_v3_v3v3(mat[2], mat[0], mat[1]); } else { - float vec[3] = {mat[0][1], mat[0][2], mat[0][0]}; + float vec[3]; + + vec[0]= mat[0][1]; + vec[1]= mat[0][2]; + vec[2]= mat[0][0]; cross_v3_v3v3(mat[2], mat[0], vec); normalize_v3(mat[2]); @@ -687,7 +703,11 @@ void orthogonalize_m4(float mat[][4], int axis) normalize_v3(mat[0]); cross_v3_v3v3(mat[2], mat[0], mat[1]); } else { - float vec[3] = {mat[1][1], mat[1][2], mat[1][0]}; + float vec[3]; + + vec[0]= mat[1][1]; + vec[1]= mat[1][2]; + vec[2]= mat[1][0]; cross_v3_v3v3(mat[0], mat[1], vec); normalize_v3(mat[0]); @@ -703,7 +723,11 @@ void orthogonalize_m4(float mat[][4], int axis) normalize_v3(mat[0]); cross_v3_v3v3(mat[1], mat[2], mat[0]); } else { - float vec[3] = {mat[2][1], mat[2][2], mat[2][0]}; + float vec[3]; + + vec[0]= mat[2][1]; + vec[1]= mat[2][2]; + vec[2]= mat[2][0]; cross_v3_v3v3(mat[0], vec, mat[2]); normalize_v3(mat[0]); diff --git a/source/blender/blenlib/intern/math_rotation.c b/source/blender/blenlib/intern/math_rotation.c index af537af8ccf..2d0e347b2e6 100644 --- a/source/blender/blenlib/intern/math_rotation.c +++ b/source/blender/blenlib/intern/math_rotation.c @@ -121,7 +121,13 @@ void mul_qt_fl(float *q, const float f) void sub_qt_qtqt(float q[4], const float q1[4], const float q2[4]) { - const float nq2[4]= {-q2[0], q2[1], q2[2], q2[3]}; + float nq2[4]; + + nq2[0]= -q2[0]; + nq2[1]= q2[1]; + nq2[2]= q2[2]; + nq2[3]= q2[3]; + mul_qt_qtqt(q, q1, nq2); } diff --git a/source/blender/editors/include/UI_icons.h b/source/blender/editors/include/UI_icons.h index eef517ddda7..5aff480647e 100644 --- a/source/blender/editors/include/UI_icons.h +++ b/source/blender/editors/include/UI_icons.h @@ -30,886 +30,885 @@ once from UI_resources.h for the internal icon enum and once for interface_api.c for the definition of the RNA enum for the icons */ -DEF_ICON(ICON_BLENDER) -DEF_ICON(ICON_QUESTION) -DEF_ICON(ICON_ERROR) -DEF_ICON(ICON_CANCEL) -DEF_ICON(ICON_TRIA_RIGHT) -DEF_ICON(ICON_TRIA_DOWN) -DEF_ICON(ICON_TRIA_LEFT) -DEF_ICON(ICON_TRIA_UP) -DEF_ICON(ICON_ARROW_LEFTRIGHT) -DEF_ICON(ICON_PLUS) -DEF_ICON(ICON_DISCLOSURE_TRI_DOWN) -DEF_ICON(ICON_DISCLOSURE_TRI_RIGHT) -DEF_ICON(ICON_RADIOBUT_OFF) -DEF_ICON(ICON_RADIOBUT_ON) -DEF_ICON(ICON_MENU_PANEL) -DEF_ICON(ICON_BLANK002) -DEF_ICON(ICON_BLANK003) -DEF_ICON(ICON_DOT) -DEF_ICON(ICON_BLANK004) -DEF_ICON(ICON_X) -DEF_ICON(ICON_BLANK005) -DEF_ICON(ICON_GO_LEFT) -DEF_ICON(ICON_PLUG) -DEF_ICON(ICON_UI) -DEF_ICON(ICON_NODE) -DEF_ICON(ICON_NODE_SEL) +/* ICON_ prefix added */ +DEF_ICON(BLENDER) +DEF_ICON(QUESTION) +DEF_ICON(ERROR) +DEF_ICON(CANCEL) +DEF_ICON(TRIA_RIGHT) +DEF_ICON(TRIA_DOWN) +DEF_ICON(TRIA_LEFT) +DEF_ICON(TRIA_UP) +DEF_ICON(ARROW_LEFTRIGHT) +DEF_ICON(PLUS) +DEF_ICON(DISCLOSURE_TRI_DOWN) +DEF_ICON(DISCLOSURE_TRI_RIGHT) +DEF_ICON(RADIOBUT_OFF) +DEF_ICON(RADIOBUT_ON) +DEF_ICON(MENU_PANEL) +DEF_ICON(BLANK002) +DEF_ICON(BLANK003) +DEF_ICON(DOT) +DEF_ICON(BLANK004) +DEF_ICON(X) +DEF_ICON(BLANK005) +DEF_ICON(GO_LEFT) +DEF_ICON(PLUG) +DEF_ICON(UI) +DEF_ICON(NODE) +DEF_ICON(NODE_SEL) /* ui */ -DEF_ICON(ICON_FULLSCREEN) -DEF_ICON(ICON_SPLITSCREEN) -DEF_ICON(ICON_RIGHTARROW_THIN) -DEF_ICON(ICON_BORDERMOVE) -DEF_ICON(ICON_VIEWZOOM) -DEF_ICON(ICON_ZOOMIN) -DEF_ICON(ICON_ZOOMOUT) -DEF_ICON(ICON_PANEL_CLOSE) -DEF_ICON(ICON_COPY_ID) //ICON_BLANK009 -DEF_ICON(ICON_EYEDROPPER) -DEF_ICON(ICON_LINK_AREA) //ICON_BLANK010 -DEF_ICON(ICON_AUTO) -DEF_ICON(ICON_CHECKBOX_DEHLT) -DEF_ICON(ICON_CHECKBOX_HLT) -DEF_ICON(ICON_UNLOCKED) -DEF_ICON(ICON_LOCKED) -DEF_ICON(ICON_UNPINNED) -DEF_ICON(ICON_PINNED) -DEF_ICON(ICON_SCREEN_BACK) -DEF_ICON(ICON_RIGHTARROW) -DEF_ICON(ICON_DOWNARROW_HLT) -DEF_ICON(ICON_DOTSUP) -DEF_ICON(ICON_DOTSDOWN) -DEF_ICON(ICON_LINK) -DEF_ICON(ICON_INLINK) -DEF_ICON(ICON_PLUGIN) +DEF_ICON(FULLSCREEN) +DEF_ICON(SPLITSCREEN) +DEF_ICON(RIGHTARROW_THIN) +DEF_ICON(BORDERMOVE) +DEF_ICON(VIEWZOOM) +DEF_ICON(ZOOMIN) +DEF_ICON(ZOOMOUT) +DEF_ICON(PANEL_CLOSE) +DEF_ICON(COPY_ID) //ICON_BLANK009 +DEF_ICON(EYEDROPPER) +DEF_ICON(LINK_AREA) //ICON_BLANK010 +DEF_ICON(AUTO) +DEF_ICON(CHECKBOX_DEHLT) +DEF_ICON(CHECKBOX_HLT) +DEF_ICON(UNLOCKED) +DEF_ICON(LOCKED) +DEF_ICON(UNPINNED) +DEF_ICON(PINNED) +DEF_ICON(SCREEN_BACK) +DEF_ICON(RIGHTARROW) +DEF_ICON(DOWNARROW_HLT) +DEF_ICON(DOTSUP) +DEF_ICON(DOTSDOWN) +DEF_ICON(LINK) +DEF_ICON(INLINK) +DEF_ICON(PLUGIN) /* various ui */ -DEF_ICON(ICON_HELP) -DEF_ICON(ICON_GHOST_ENABLED) -DEF_ICON(ICON_COLOR) -DEF_ICON(ICON_LINKED) -DEF_ICON(ICON_UNLINKED) -DEF_ICON(ICON_HAND) -DEF_ICON(ICON_ZOOM_ALL) -DEF_ICON(ICON_ZOOM_SELECTED) -DEF_ICON(ICON_ZOOM_PREVIOUS) -DEF_ICON(ICON_ZOOM_IN) -DEF_ICON(ICON_ZOOM_OUT) -DEF_ICON(ICON_RENDER_REGION) -DEF_ICON(ICON_BORDER_RECT) -DEF_ICON(ICON_BORDER_LASSO) -DEF_ICON(ICON_FREEZE) -DEF_ICON(ICON_STYLUS_PRESSURE) -DEF_ICON(ICON_GHOST_DISABLED) -DEF_ICON(ICON_NEW) -DEF_ICON(ICON_FILE_TICK) -DEF_ICON(ICON_QUIT) -DEF_ICON(ICON_URL) -DEF_ICON(ICON_RECOVER_LAST) -DEF_ICON(ICON_BLANK038) -DEF_ICON(ICON_FULLSCREEN_ENTER) -DEF_ICON(ICON_FULLSCREEN_EXIT) -DEF_ICON(ICON_BLANK1) // Not actually blank - this is used all over the place +DEF_ICON(HELP) +DEF_ICON(GHOST_ENABLED) +DEF_ICON(COLOR) +DEF_ICON(LINKED) +DEF_ICON(UNLINKED) +DEF_ICON(HAND) +DEF_ICON(ZOOM_ALL) +DEF_ICON(ZOOM_SELECTED) +DEF_ICON(ZOOM_PREVIOUS) +DEF_ICON(ZOOM_IN) +DEF_ICON(ZOOM_OUT) +DEF_ICON(RENDER_REGION) +DEF_ICON(BORDER_RECT) +DEF_ICON(BORDER_LASSO) +DEF_ICON(FREEZE) +DEF_ICON(STYLUS_PRESSURE) +DEF_ICON(GHOST_DISABLED) +DEF_ICON(NEW) +DEF_ICON(FILE_TICK) +DEF_ICON(QUIT) +DEF_ICON(URL) +DEF_ICON(RECOVER_LAST) +DEF_ICON(BLANK038) +DEF_ICON(FULLSCREEN_ENTER) +DEF_ICON(FULLSCREEN_EXIT) +DEF_ICON(BLANK1) // Not actually blank - this is used all over the place /* BUTTONS */ -DEF_ICON(ICON_LAMP) -DEF_ICON(ICON_MATERIAL) -DEF_ICON(ICON_TEXTURE) -DEF_ICON(ICON_ANIM) -DEF_ICON(ICON_WORLD) -DEF_ICON(ICON_SCENE) -DEF_ICON(ICON_EDIT) -DEF_ICON(ICON_GAME) -DEF_ICON(ICON_RADIO) -DEF_ICON(ICON_SCRIPT) -DEF_ICON(ICON_PARTICLES) -DEF_ICON(ICON_PHYSICS) -DEF_ICON(ICON_SPEAKER) -DEF_ICON(ICON_TEXTURE_SHADED) //ICON_BLANK041 -DEF_ICON(ICON_BLANK042) -DEF_ICON(ICON_BLANK043) -DEF_ICON(ICON_BLANK044) -DEF_ICON(ICON_BLANK045) -DEF_ICON(ICON_BLANK046) -DEF_ICON(ICON_BLANK047) -DEF_ICON(ICON_BLANK048) -DEF_ICON(ICON_BLANK049) -DEF_ICON(ICON_BLANK050) -DEF_ICON(ICON_BLANK051) -DEF_ICON(ICON_BLANK052) -DEF_ICON(ICON_BLANK052b) +DEF_ICON(LAMP) +DEF_ICON(MATERIAL) +DEF_ICON(TEXTURE) +DEF_ICON(ANIM) +DEF_ICON(WORLD) +DEF_ICON(SCENE) +DEF_ICON(EDIT) +DEF_ICON(GAME) +DEF_ICON(RADIO) +DEF_ICON(SCRIPT) +DEF_ICON(PARTICLES) +DEF_ICON(PHYSICS) +DEF_ICON(SPEAKER) +DEF_ICON(TEXTURE_SHADED) //ICON_BLANK041 +DEF_ICON(BLANK042) +DEF_ICON(BLANK043) +DEF_ICON(BLANK044) +DEF_ICON(BLANK045) +DEF_ICON(BLANK046) +DEF_ICON(BLANK047) +DEF_ICON(BLANK048) +DEF_ICON(BLANK049) +DEF_ICON(BLANK050) +DEF_ICON(BLANK051) +DEF_ICON(BLANK052) +DEF_ICON(BLANK052b) /* EDITORS */ -DEF_ICON(ICON_VIEW3D) -DEF_ICON(ICON_IPO) -DEF_ICON(ICON_OOPS) -DEF_ICON(ICON_BUTS) -DEF_ICON(ICON_FILESEL) -DEF_ICON(ICON_IMAGE_COL) -DEF_ICON(ICON_INFO) -DEF_ICON(ICON_SEQUENCE) -DEF_ICON(ICON_TEXT) -DEF_ICON(ICON_IMASEL) -DEF_ICON(ICON_SOUND) -DEF_ICON(ICON_ACTION) -DEF_ICON(ICON_NLA) -DEF_ICON(ICON_SCRIPTWIN) -DEF_ICON(ICON_TIME) -DEF_ICON(ICON_NODETREE) -DEF_ICON(ICON_LOGIC) -DEF_ICON(ICON_CONSOLE) -DEF_ICON(ICON_PREFERENCES) -DEF_ICON(ICON_ASSET_MANAGER) -DEF_ICON(ICON_BLANK057) -DEF_ICON(ICON_BLANK058) -DEF_ICON(ICON_BLANK059) -DEF_ICON(ICON_BLANK060) -DEF_ICON(ICON_BLANK061) -DEF_ICON(ICON_BLANK061b) +DEF_ICON(VIEW3D) +DEF_ICON(IPO) +DEF_ICON(OOPS) +DEF_ICON(BUTS) +DEF_ICON(FILESEL) +DEF_ICON(IMAGE_COL) +DEF_ICON(INFO) +DEF_ICON(SEQUENCE) +DEF_ICON(TEXT) +DEF_ICON(IMASEL) +DEF_ICON(SOUND) +DEF_ICON(ACTION) +DEF_ICON(NLA) +DEF_ICON(SCRIPTWIN) +DEF_ICON(TIME) +DEF_ICON(NODETREE) +DEF_ICON(LOGIC) +DEF_ICON(CONSOLE) +DEF_ICON(PREFERENCES) +DEF_ICON(ASSET_MANAGER) +DEF_ICON(BLANK057) +DEF_ICON(BLANK058) +DEF_ICON(BLANK059) +DEF_ICON(BLANK060) +DEF_ICON(BLANK061) +DEF_ICON(BLANK061b) /* MODES */ -DEF_ICON(ICON_OBJECT_DATAMODE) // XXX fix this up -DEF_ICON(ICON_EDITMODE_HLT) -DEF_ICON(ICON_FACESEL_HLT) -DEF_ICON(ICON_VPAINT_HLT) -DEF_ICON(ICON_TPAINT_HLT) -DEF_ICON(ICON_WPAINT_HLT) -DEF_ICON(ICON_SCULPTMODE_HLT) -DEF_ICON(ICON_POSE_HLT) -DEF_ICON(ICON_PARTICLEMODE) -DEF_ICON(ICON_LIGHTPAINT) -DEF_ICON(ICON_BLANK063) -DEF_ICON(ICON_BLANK064) -DEF_ICON(ICON_BLANK065) -DEF_ICON(ICON_BLANK066) -DEF_ICON(ICON_BLANK067) -DEF_ICON(ICON_BLANK068) -DEF_ICON(ICON_BLANK069) -DEF_ICON(ICON_BLANK070) -DEF_ICON(ICON_BLANK071) -DEF_ICON(ICON_BLANK072) -DEF_ICON(ICON_BLANK073) -DEF_ICON(ICON_BLANK074) -DEF_ICON(ICON_BLANK075) -DEF_ICON(ICON_BLANK076) -DEF_ICON(ICON_BLANK077) -DEF_ICON(ICON_BLANK077b) +DEF_ICON(OBJECT_DATAMODE) // XXX fix this up +DEF_ICON(EDITMODE_HLT) +DEF_ICON(FACESEL_HLT) +DEF_ICON(VPAINT_HLT) +DEF_ICON(TPAINT_HLT) +DEF_ICON(WPAINT_HLT) +DEF_ICON(SCULPTMODE_HLT) +DEF_ICON(POSE_HLT) +DEF_ICON(PARTICLEMODE) +DEF_ICON(LIGHTPAINT) +DEF_ICON(BLANK063) +DEF_ICON(BLANK064) +DEF_ICON(BLANK065) +DEF_ICON(BLANK066) +DEF_ICON(BLANK067) +DEF_ICON(BLANK068) +DEF_ICON(BLANK069) +DEF_ICON(BLANK070) +DEF_ICON(BLANK071) +DEF_ICON(BLANK072) +DEF_ICON(BLANK073) +DEF_ICON(BLANK074) +DEF_ICON(BLANK075) +DEF_ICON(BLANK076) +DEF_ICON(BLANK077) +DEF_ICON(BLANK077b) /* DATA */ -DEF_ICON(ICON_SCENE_DATA) -DEF_ICON(ICON_RENDERLAYERS) -DEF_ICON(ICON_WORLD_DATA) -DEF_ICON(ICON_OBJECT_DATA) -DEF_ICON(ICON_MESH_DATA) -DEF_ICON(ICON_CURVE_DATA) -DEF_ICON(ICON_META_DATA) -DEF_ICON(ICON_LATTICE_DATA) -DEF_ICON(ICON_LAMP_DATA) -DEF_ICON(ICON_MATERIAL_DATA) -DEF_ICON(ICON_TEXTURE_DATA) -DEF_ICON(ICON_ANIM_DATA) -DEF_ICON(ICON_CAMERA_DATA) -DEF_ICON(ICON_PARTICLE_DATA) -DEF_ICON(ICON_LIBRARY_DATA_DIRECT) -DEF_ICON(ICON_GROUP) -DEF_ICON(ICON_ARMATURE_DATA) -DEF_ICON(ICON_POSE_DATA) -DEF_ICON(ICON_BONE_DATA) -DEF_ICON(ICON_CONSTRAINT) -DEF_ICON(ICON_SHAPEKEY_DATA) -DEF_ICON(ICON_CONSTRAINT_BONE) -DEF_ICON(ICON_BLANK079) -DEF_ICON(ICON_PACKAGE) -DEF_ICON(ICON_UGLYPACKAGE) -DEF_ICON(ICON_BLANK079b) +DEF_ICON(SCENE_DATA) +DEF_ICON(RENDERLAYERS) +DEF_ICON(WORLD_DATA) +DEF_ICON(OBJECT_DATA) +DEF_ICON(MESH_DATA) +DEF_ICON(CURVE_DATA) +DEF_ICON(META_DATA) +DEF_ICON(LATTICE_DATA) +DEF_ICON(LAMP_DATA) +DEF_ICON(MATERIAL_DATA) +DEF_ICON(TEXTURE_DATA) +DEF_ICON(ANIM_DATA) +DEF_ICON(CAMERA_DATA) +DEF_ICON(PARTICLE_DATA) +DEF_ICON(LIBRARY_DATA_DIRECT) +DEF_ICON(GROUP) +DEF_ICON(ARMATURE_DATA) +DEF_ICON(POSE_DATA) +DEF_ICON(BONE_DATA) +DEF_ICON(CONSTRAINT) +DEF_ICON(SHAPEKEY_DATA) +DEF_ICON(CONSTRAINT_BONE) +DEF_ICON(BLANK079) +DEF_ICON(PACKAGE) +DEF_ICON(UGLYPACKAGE) +DEF_ICON(BLANK079b) /* DATA */ -DEF_ICON(ICON_BRUSH_DATA) -DEF_ICON(ICON_IMAGE_DATA) -DEF_ICON(ICON_FILE) -DEF_ICON(ICON_FCURVE) -DEF_ICON(ICON_FONT_DATA) -DEF_ICON(ICON_RENDER_RESULT) -DEF_ICON(ICON_SURFACE_DATA) -DEF_ICON(ICON_EMPTY_DATA) -DEF_ICON(ICON_SETTINGS) -DEF_ICON(ICON_RENDER_ANIMATION) -DEF_ICON(ICON_RENDER_STILL) -DEF_ICON(ICON_BLANK080F) -DEF_ICON(ICON_BOIDS) -DEF_ICON(ICON_STRANDS) -DEF_ICON(ICON_LIBRARY_DATA_INDIRECT) -DEF_ICON(ICON_GREASEPENCIL) -DEF_ICON(ICON_BLANK083) -DEF_ICON(ICON_BLANK084) -DEF_ICON(ICON_GROUP_BONE) -DEF_ICON(ICON_GROUP_VERTEX) -DEF_ICON(ICON_GROUP_VCOL) -DEF_ICON(ICON_GROUP_UVS) -DEF_ICON(ICON_BLANK089) -DEF_ICON(ICON_BLANK090) -DEF_ICON(ICON_RNA) -DEF_ICON(ICON_RNA_ADD) +DEF_ICON(BRUSH_DATA) +DEF_ICON(IMAGE_DATA) +DEF_ICON(FILE) +DEF_ICON(FCURVE) +DEF_ICON(FONT_DATA) +DEF_ICON(RENDER_RESULT) +DEF_ICON(SURFACE_DATA) +DEF_ICON(EMPTY_DATA) +DEF_ICON(SETTINGS) +DEF_ICON(RENDER_ANIMATION) +DEF_ICON(RENDER_STILL) +DEF_ICON(BLANK080F) +DEF_ICON(BOIDS) +DEF_ICON(STRANDS) +DEF_ICON(LIBRARY_DATA_INDIRECT) +DEF_ICON(GREASEPENCIL) +DEF_ICON(BLANK083) +DEF_ICON(BLANK084) +DEF_ICON(GROUP_BONE) +DEF_ICON(GROUP_VERTEX) +DEF_ICON(GROUP_VCOL) +DEF_ICON(GROUP_UVS) +DEF_ICON(BLANK089) +DEF_ICON(BLANK090) +DEF_ICON(RNA) +DEF_ICON(RNA_ADD) /* available */ -DEF_ICON(ICON_BLANK092) -DEF_ICON(ICON_BLANK093) -DEF_ICON(ICON_BLANK094) -DEF_ICON(ICON_BLANK095) -DEF_ICON(ICON_BLANK096) -DEF_ICON(ICON_BLANK097) -DEF_ICON(ICON_BLANK098) -DEF_ICON(ICON_BLANK099) -DEF_ICON(ICON_BLANK100) -DEF_ICON(ICON_BLANK101) -DEF_ICON(ICON_BLANK102) -DEF_ICON(ICON_BLANK103) -DEF_ICON(ICON_BLANK104) -DEF_ICON(ICON_BLANK105) -DEF_ICON(ICON_BLANK106) -DEF_ICON(ICON_BLANK107) -DEF_ICON(ICON_BLANK108) -DEF_ICON(ICON_BLANK109) -DEF_ICON(ICON_BLANK110) -DEF_ICON(ICON_BLANK111) -DEF_ICON(ICON_BLANK112) -DEF_ICON(ICON_BLANK113) -DEF_ICON(ICON_BLANK114) -DEF_ICON(ICON_BLANK115) -DEF_ICON(ICON_BLANK116) -DEF_ICON(ICON_BLANK116b) +DEF_ICON(BLANK092) +DEF_ICON(BLANK093) +DEF_ICON(BLANK094) +DEF_ICON(BLANK095) +DEF_ICON(BLANK096) +DEF_ICON(BLANK097) +DEF_ICON(BLANK098) +DEF_ICON(BLANK099) +DEF_ICON(BLANK100) +DEF_ICON(BLANK101) +DEF_ICON(BLANK102) +DEF_ICON(BLANK103) +DEF_ICON(BLANK104) +DEF_ICON(BLANK105) +DEF_ICON(BLANK106) +DEF_ICON(BLANK107) +DEF_ICON(BLANK108) +DEF_ICON(BLANK109) +DEF_ICON(BLANK110) +DEF_ICON(BLANK111) +DEF_ICON(BLANK112) +DEF_ICON(BLANK113) +DEF_ICON(BLANK114) +DEF_ICON(BLANK115) +DEF_ICON(BLANK116) +DEF_ICON(BLANK116b) /* OUTLINER */ -DEF_ICON(ICON_OUTLINER_OB_EMPTY) -DEF_ICON(ICON_OUTLINER_OB_MESH) -DEF_ICON(ICON_OUTLINER_OB_CURVE) -DEF_ICON(ICON_OUTLINER_OB_LATTICE) -DEF_ICON(ICON_OUTLINER_OB_META) -DEF_ICON(ICON_OUTLINER_OB_LAMP) -DEF_ICON(ICON_OUTLINER_OB_CAMERA) -DEF_ICON(ICON_OUTLINER_OB_ARMATURE) -DEF_ICON(ICON_OUTLINER_OB_FONT) -DEF_ICON(ICON_OUTLINER_OB_SURFACE) -DEF_ICON(ICON_BLANK119) -DEF_ICON(ICON_BLANK120) -DEF_ICON(ICON_BLANK121) -DEF_ICON(ICON_BLANK122) -DEF_ICON(ICON_BLANK123) -DEF_ICON(ICON_BLANK124) -DEF_ICON(ICON_BLANK125) -DEF_ICON(ICON_BLANK126) -DEF_ICON(ICON_BLANK127) -DEF_ICON(ICON_RESTRICT_VIEW_OFF) -DEF_ICON(ICON_RESTRICT_VIEW_ON) -DEF_ICON(ICON_RESTRICT_SELECT_OFF) -DEF_ICON(ICON_RESTRICT_SELECT_ON) -DEF_ICON(ICON_RESTRICT_RENDER_OFF) -DEF_ICON(ICON_RESTRICT_RENDER_ON) -DEF_ICON(ICON_BLANK127b) +DEF_ICON(OUTLINER_OB_EMPTY) +DEF_ICON(OUTLINER_OB_MESH) +DEF_ICON(OUTLINER_OB_CURVE) +DEF_ICON(OUTLINER_OB_LATTICE) +DEF_ICON(OUTLINER_OB_META) +DEF_ICON(OUTLINER_OB_LAMP) +DEF_ICON(OUTLINER_OB_CAMERA) +DEF_ICON(OUTLINER_OB_ARMATURE) +DEF_ICON(OUTLINER_OB_FONT) +DEF_ICON(OUTLINER_OB_SURFACE) +DEF_ICON(BLANK119) +DEF_ICON(BLANK120) +DEF_ICON(BLANK121) +DEF_ICON(BLANK122) +DEF_ICON(BLANK123) +DEF_ICON(BLANK124) +DEF_ICON(BLANK125) +DEF_ICON(BLANK126) +DEF_ICON(BLANK127) +DEF_ICON(RESTRICT_VIEW_OFF) +DEF_ICON(RESTRICT_VIEW_ON) +DEF_ICON(RESTRICT_SELECT_OFF) +DEF_ICON(RESTRICT_SELECT_ON) +DEF_ICON(RESTRICT_RENDER_OFF) +DEF_ICON(RESTRICT_RENDER_ON) +DEF_ICON(BLANK127b) /* OUTLINER */ -DEF_ICON(ICON_OUTLINER_DATA_EMPTY) -DEF_ICON(ICON_OUTLINER_DATA_MESH) -DEF_ICON(ICON_OUTLINER_DATA_CURVE) -DEF_ICON(ICON_OUTLINER_DATA_LATTICE) -DEF_ICON(ICON_OUTLINER_DATA_META) -DEF_ICON(ICON_OUTLINER_DATA_LAMP) -DEF_ICON(ICON_OUTLINER_DATA_CAMERA) -DEF_ICON(ICON_OUTLINER_DATA_ARMATURE) -DEF_ICON(ICON_OUTLINER_DATA_FONT) -DEF_ICON(ICON_OUTLINER_DATA_SURFACE) -DEF_ICON(ICON_OUTLINER_DATA_POSE) -DEF_ICON(ICON_BLANK129) -DEF_ICON(ICON_BLANK130) -DEF_ICON(ICON_BLANK131) -DEF_ICON(ICON_BLANK132) -DEF_ICON(ICON_BLANK133) -DEF_ICON(ICON_BLANK134) -DEF_ICON(ICON_BLANK135) -DEF_ICON(ICON_BLANK136) -DEF_ICON(ICON_BLANK137) -DEF_ICON(ICON_BLANK138) -DEF_ICON(ICON_BLANK139) -DEF_ICON(ICON_BLANK140) -DEF_ICON(ICON_BLANK141) -DEF_ICON(ICON_BLANK142) -DEF_ICON(ICON_BLANK142b) +DEF_ICON(OUTLINER_DATA_EMPTY) +DEF_ICON(OUTLINER_DATA_MESH) +DEF_ICON(OUTLINER_DATA_CURVE) +DEF_ICON(OUTLINER_DATA_LATTICE) +DEF_ICON(OUTLINER_DATA_META) +DEF_ICON(OUTLINER_DATA_LAMP) +DEF_ICON(OUTLINER_DATA_CAMERA) +DEF_ICON(OUTLINER_DATA_ARMATURE) +DEF_ICON(OUTLINER_DATA_FONT) +DEF_ICON(OUTLINER_DATA_SURFACE) +DEF_ICON(OUTLINER_DATA_POSE) +DEF_ICON(BLANK129) +DEF_ICON(BLANK130) +DEF_ICON(BLANK131) +DEF_ICON(BLANK132) +DEF_ICON(BLANK133) +DEF_ICON(BLANK134) +DEF_ICON(BLANK135) +DEF_ICON(BLANK136) +DEF_ICON(BLANK137) +DEF_ICON(BLANK138) +DEF_ICON(BLANK139) +DEF_ICON(BLANK140) +DEF_ICON(BLANK141) +DEF_ICON(BLANK142) +DEF_ICON(BLANK142b) /* PRIMITIVES */ -DEF_ICON(ICON_MESH_PLANE) -DEF_ICON(ICON_MESH_CUBE) -DEF_ICON(ICON_MESH_CIRCLE) -DEF_ICON(ICON_MESH_UVSPHERE) -DEF_ICON(ICON_MESH_ICOSPHERE) -DEF_ICON(ICON_MESH_GRID) -DEF_ICON(ICON_MESH_MONKEY) -DEF_ICON(ICON_MESH_CYLINDER) -DEF_ICON(ICON_MESH_TORUS) -DEF_ICON(ICON_MESH_CONE) -DEF_ICON(ICON_BLANK610) -DEF_ICON(ICON_BLANK611) -DEF_ICON(ICON_LAMP_POINT) -DEF_ICON(ICON_LAMP_SUN) -DEF_ICON(ICON_LAMP_SPOT) -DEF_ICON(ICON_LAMP_HEMI) -DEF_ICON(ICON_LAMP_AREA) -DEF_ICON(ICON_BLANK617) -DEF_ICON(ICON_BLANK618) -DEF_ICON(ICON_BLANK619) -DEF_ICON(ICON_META_PLANE) -DEF_ICON(ICON_META_CUBE) -DEF_ICON(ICON_META_BALL) -DEF_ICON(ICON_META_ELLIPSOID) -DEF_ICON(ICON_META_CAPSULE) -DEF_ICON(ICON_BLANK625) +DEF_ICON(MESH_PLANE) +DEF_ICON(MESH_CUBE) +DEF_ICON(MESH_CIRCLE) +DEF_ICON(MESH_UVSPHERE) +DEF_ICON(MESH_ICOSPHERE) +DEF_ICON(MESH_GRID) +DEF_ICON(MESH_MONKEY) +DEF_ICON(MESH_CYLINDER) +DEF_ICON(MESH_TORUS) +DEF_ICON(MESH_CONE) +DEF_ICON(BLANK610) +DEF_ICON(BLANK611) +DEF_ICON(LAMP_POINT) +DEF_ICON(LAMP_SUN) +DEF_ICON(LAMP_SPOT) +DEF_ICON(LAMP_HEMI) +DEF_ICON(LAMP_AREA) +DEF_ICON(BLANK617) +DEF_ICON(BLANK618) +DEF_ICON(BLANK619) +DEF_ICON(META_PLANE) +DEF_ICON(META_CUBE) +DEF_ICON(META_BALL) +DEF_ICON(META_ELLIPSOID) +DEF_ICON(META_CAPSULE) +DEF_ICON(BLANK625) /* PRIMITIVES */ -DEF_ICON(ICON_SURFACE_NCURVE) -DEF_ICON(ICON_SURFACE_NCIRCLE) -DEF_ICON(ICON_SURFACE_NSURFACE) -DEF_ICON(ICON_SURFACE_NCYLINDER) -DEF_ICON(ICON_SURFACE_NSPHERE) -DEF_ICON(ICON_SURFACE_NTORUS) -DEF_ICON(ICON_BLANK636) -DEF_ICON(ICON_BLANK637) -DEF_ICON(ICON_BLANK638) -DEF_ICON(ICON_CURVE_BEZCURVE) -DEF_ICON(ICON_CURVE_BEZCIRCLE) -DEF_ICON(ICON_CURVE_NCURVE) -DEF_ICON(ICON_CURVE_NCIRCLE) -DEF_ICON(ICON_CURVE_PATH) -DEF_ICON(ICON_BLANK644) -DEF_ICON(ICON_BLANK645) -DEF_ICON(ICON_BLANK646) -DEF_ICON(ICON_BLANK647) -DEF_ICON(ICON_BLANK648) -DEF_ICON(ICON_BLANK649) -DEF_ICON(ICON_BLANK650) -DEF_ICON(ICON_BLANK651) -DEF_ICON(ICON_BLANK652) -DEF_ICON(ICON_BLANK653) -DEF_ICON(ICON_BLANK654) -DEF_ICON(ICON_BLANK655) +DEF_ICON(SURFACE_NCURVE) +DEF_ICON(SURFACE_NCIRCLE) +DEF_ICON(SURFACE_NSURFACE) +DEF_ICON(SURFACE_NCYLINDER) +DEF_ICON(SURFACE_NSPHERE) +DEF_ICON(SURFACE_NTORUS) +DEF_ICON(BLANK636) +DEF_ICON(BLANK637) +DEF_ICON(BLANK638) +DEF_ICON(CURVE_BEZCURVE) +DEF_ICON(CURVE_BEZCIRCLE) +DEF_ICON(CURVE_NCURVE) +DEF_ICON(CURVE_NCIRCLE) +DEF_ICON(CURVE_PATH) +DEF_ICON(BLANK644) +DEF_ICON(BLANK645) +DEF_ICON(BLANK646) +DEF_ICON(BLANK647) +DEF_ICON(BLANK648) +DEF_ICON(BLANK649) +DEF_ICON(BLANK650) +DEF_ICON(BLANK651) +DEF_ICON(BLANK652) +DEF_ICON(BLANK653) +DEF_ICON(BLANK654) +DEF_ICON(BLANK655) /* EMPTY */ -DEF_ICON(ICON_FORCE_FORCE) -DEF_ICON(ICON_FORCE_WIND) -DEF_ICON(ICON_FORCE_VORTEX) -DEF_ICON(ICON_FORCE_MAGNETIC) -DEF_ICON(ICON_FORCE_HARMONIC) -DEF_ICON(ICON_FORCE_CHARGE) -DEF_ICON(ICON_FORCE_LENNARDJONES) -DEF_ICON(ICON_FORCE_TEXTURE) -DEF_ICON(ICON_FORCE_CURVE) -DEF_ICON(ICON_FORCE_BOID) -DEF_ICON(ICON_FORCE_TURBULENCE) -DEF_ICON(ICON_FORCE_DRAG) -DEF_ICON(ICON_BLANK672) -DEF_ICON(ICON_BLANK673) -DEF_ICON(ICON_BLANK674) -DEF_ICON(ICON_BLANK675) -DEF_ICON(ICON_BLANK676) -DEF_ICON(ICON_BLANK677) -DEF_ICON(ICON_BLANK678) -DEF_ICON(ICON_BLANK679) -DEF_ICON(ICON_BLANK680) -DEF_ICON(ICON_BLANK681) -DEF_ICON(ICON_BLANK682) -DEF_ICON(ICON_BLANK683) -DEF_ICON(ICON_BLANK684) -DEF_ICON(ICON_BLANK685) +DEF_ICON(FORCE_FORCE) +DEF_ICON(FORCE_WIND) +DEF_ICON(FORCE_VORTEX) +DEF_ICON(FORCE_MAGNETIC) +DEF_ICON(FORCE_HARMONIC) +DEF_ICON(FORCE_CHARGE) +DEF_ICON(FORCE_LENNARDJONES) +DEF_ICON(FORCE_TEXTURE) +DEF_ICON(FORCE_CURVE) +DEF_ICON(FORCE_BOID) +DEF_ICON(FORCE_TURBULENCE) +DEF_ICON(FORCE_DRAG) +DEF_ICON(BLANK672) +DEF_ICON(BLANK673) +DEF_ICON(BLANK674) +DEF_ICON(BLANK675) +DEF_ICON(BLANK676) +DEF_ICON(BLANK677) +DEF_ICON(BLANK678) +DEF_ICON(BLANK679) +DEF_ICON(BLANK680) +DEF_ICON(BLANK681) +DEF_ICON(BLANK682) +DEF_ICON(BLANK683) +DEF_ICON(BLANK684) +DEF_ICON(BLANK685) /* EMPTY */ -DEF_ICON(ICON_BLANK690) -DEF_ICON(ICON_BLANK691) -DEF_ICON(ICON_BLANK692) -DEF_ICON(ICON_BLANK693) -DEF_ICON(ICON_BLANK694) -DEF_ICON(ICON_BLANK695) -DEF_ICON(ICON_BLANK696) -DEF_ICON(ICON_BLANK697) -DEF_ICON(ICON_BLANK698) -DEF_ICON(ICON_BLANK699) -DEF_ICON(ICON_BLANK700) -DEF_ICON(ICON_BLANK701) -DEF_ICON(ICON_BLANK702) -DEF_ICON(ICON_BLANK703) -DEF_ICON(ICON_BLANK704) -DEF_ICON(ICON_BLANK705) -DEF_ICON(ICON_BLANK706) -DEF_ICON(ICON_BLANK707) -DEF_ICON(ICON_BLANK708) -DEF_ICON(ICON_BLANK709) -DEF_ICON(ICON_BLANK710) -DEF_ICON(ICON_BLANK711) -DEF_ICON(ICON_BLANK712) -DEF_ICON(ICON_BLANK713) -DEF_ICON(ICON_BLANK714) -DEF_ICON(ICON_BLANK715) +DEF_ICON(BLANK690) +DEF_ICON(BLANK691) +DEF_ICON(BLANK692) +DEF_ICON(BLANK693) +DEF_ICON(BLANK694) +DEF_ICON(BLANK695) +DEF_ICON(BLANK696) +DEF_ICON(BLANK697) +DEF_ICON(BLANK698) +DEF_ICON(BLANK699) +DEF_ICON(BLANK700) +DEF_ICON(BLANK701) +DEF_ICON(BLANK702) +DEF_ICON(BLANK703) +DEF_ICON(BLANK704) +DEF_ICON(BLANK705) +DEF_ICON(BLANK706) +DEF_ICON(BLANK707) +DEF_ICON(BLANK708) +DEF_ICON(BLANK709) +DEF_ICON(BLANK710) +DEF_ICON(BLANK711) +DEF_ICON(BLANK712) +DEF_ICON(BLANK713) +DEF_ICON(BLANK714) +DEF_ICON(BLANK715) /* EMPTY */ -DEF_ICON(ICON_BLANK720) -DEF_ICON(ICON_BLANK721) -DEF_ICON(ICON_BLANK722) -DEF_ICON(ICON_BLANK733) -DEF_ICON(ICON_BLANK734) -DEF_ICON(ICON_BLANK735) -DEF_ICON(ICON_BLANK736) -DEF_ICON(ICON_BLANK737) -DEF_ICON(ICON_BLANK738) -DEF_ICON(ICON_BLANK739) -DEF_ICON(ICON_BLANK740) -DEF_ICON(ICON_BLANK741) -DEF_ICON(ICON_BLANK742) -DEF_ICON(ICON_BLANK743) -DEF_ICON(ICON_BLANK744) -DEF_ICON(ICON_BLANK745) -DEF_ICON(ICON_BLANK746) -DEF_ICON(ICON_BLANK747) -DEF_ICON(ICON_BLANK748) -DEF_ICON(ICON_BLANK749) -DEF_ICON(ICON_BLANK750) -DEF_ICON(ICON_BLANK751) -DEF_ICON(ICON_BLANK752) -DEF_ICON(ICON_BLANK753) -DEF_ICON(ICON_BLANK754) -DEF_ICON(ICON_BLANK755) +DEF_ICON(BLANK720) +DEF_ICON(BLANK721) +DEF_ICON(BLANK722) +DEF_ICON(BLANK733) +DEF_ICON(BLANK734) +DEF_ICON(BLANK735) +DEF_ICON(BLANK736) +DEF_ICON(BLANK737) +DEF_ICON(BLANK738) +DEF_ICON(BLANK739) +DEF_ICON(BLANK740) +DEF_ICON(BLANK741) +DEF_ICON(BLANK742) +DEF_ICON(BLANK743) +DEF_ICON(BLANK744) +DEF_ICON(BLANK745) +DEF_ICON(BLANK746) +DEF_ICON(BLANK747) +DEF_ICON(BLANK748) +DEF_ICON(BLANK749) +DEF_ICON(BLANK750) +DEF_ICON(BLANK751) +DEF_ICON(BLANK752) +DEF_ICON(BLANK753) +DEF_ICON(BLANK754) +DEF_ICON(BLANK755) /* EMPTY */ -DEF_ICON(ICON_BLANK760) -DEF_ICON(ICON_BLANK761) -DEF_ICON(ICON_BLANK762) -DEF_ICON(ICON_BLANK763) -DEF_ICON(ICON_BLANK764) -DEF_ICON(ICON_BLANK765) -DEF_ICON(ICON_BLANK766) -DEF_ICON(ICON_BLANK767) -DEF_ICON(ICON_BLANK768) -DEF_ICON(ICON_BLANK769) -DEF_ICON(ICON_BLANK770) -DEF_ICON(ICON_BLANK771) -DEF_ICON(ICON_BLANK772) -DEF_ICON(ICON_BLANK773) -DEF_ICON(ICON_BLANK774) -DEF_ICON(ICON_BLANK775) -DEF_ICON(ICON_BLANK776) -DEF_ICON(ICON_BLANK777) -DEF_ICON(ICON_BLANK778) -DEF_ICON(ICON_BLANK779) -DEF_ICON(ICON_BLANK780) -DEF_ICON(ICON_BLANK781) -DEF_ICON(ICON_BLANK782) -DEF_ICON(ICON_BLANK783) -DEF_ICON(ICON_BLANK784) -DEF_ICON(ICON_BLANK785) +DEF_ICON(BLANK760) +DEF_ICON(BLANK761) +DEF_ICON(BLANK762) +DEF_ICON(BLANK763) +DEF_ICON(BLANK764) +DEF_ICON(BLANK765) +DEF_ICON(BLANK766) +DEF_ICON(BLANK767) +DEF_ICON(BLANK768) +DEF_ICON(BLANK769) +DEF_ICON(BLANK770) +DEF_ICON(BLANK771) +DEF_ICON(BLANK772) +DEF_ICON(BLANK773) +DEF_ICON(BLANK774) +DEF_ICON(BLANK775) +DEF_ICON(BLANK776) +DEF_ICON(BLANK777) +DEF_ICON(BLANK778) +DEF_ICON(BLANK779) +DEF_ICON(BLANK780) +DEF_ICON(BLANK781) +DEF_ICON(BLANK782) +DEF_ICON(BLANK783) +DEF_ICON(BLANK784) +DEF_ICON(BLANK785) /* MODIFIERS */ -DEF_ICON(ICON_MODIFIER) -DEF_ICON(ICON_MOD_WAVE) -DEF_ICON(ICON_MOD_BUILD) -DEF_ICON(ICON_MOD_DECIM) -DEF_ICON(ICON_MOD_MIRROR) -DEF_ICON(ICON_MOD_SOFT) -DEF_ICON(ICON_MOD_SUBSURF) -DEF_ICON(ICON_HOOK) -DEF_ICON(ICON_MOD_PHYSICS) -DEF_ICON(ICON_MOD_PARTICLES) -DEF_ICON(ICON_MOD_BOOLEAN) -DEF_ICON(ICON_MOD_EDGESPLIT) -DEF_ICON(ICON_MOD_ARRAY) -DEF_ICON(ICON_MOD_UVPROJECT) -DEF_ICON(ICON_MOD_DISPLACE) -DEF_ICON(ICON_MOD_CURVE) -DEF_ICON(ICON_MOD_LATTICE) -DEF_ICON(ICON_CONSTRAINT_DATA) -DEF_ICON(ICON_MOD_ARMATURE) -DEF_ICON(ICON_MOD_SHRINKWRAP) -DEF_ICON(ICON_MOD_CAST) -DEF_ICON(ICON_MOD_MESHDEFORM) -DEF_ICON(ICON_MOD_BEVEL) -DEF_ICON(ICON_MOD_SMOOTH) -DEF_ICON(ICON_MOD_SIMPLEDEFORM) -DEF_ICON(ICON_MOD_MASK) +DEF_ICON(MODIFIER) +DEF_ICON(MOD_WAVE) +DEF_ICON(MOD_BUILD) +DEF_ICON(MOD_DECIM) +DEF_ICON(MOD_MIRROR) +DEF_ICON(MOD_SOFT) +DEF_ICON(MOD_SUBSURF) +DEF_ICON(HOOK) +DEF_ICON(MOD_PHYSICS) +DEF_ICON(MOD_PARTICLES) +DEF_ICON(MOD_BOOLEAN) +DEF_ICON(MOD_EDGESPLIT) +DEF_ICON(MOD_ARRAY) +DEF_ICON(MOD_UVPROJECT) +DEF_ICON(MOD_DISPLACE) +DEF_ICON(MOD_CURVE) +DEF_ICON(MOD_LATTICE) +DEF_ICON(CONSTRAINT_DATA) +DEF_ICON(MOD_ARMATURE) +DEF_ICON(MOD_SHRINKWRAP) +DEF_ICON(MOD_CAST) +DEF_ICON(MOD_MESHDEFORM) +DEF_ICON(MOD_BEVEL) +DEF_ICON(MOD_SMOOTH) +DEF_ICON(MOD_SIMPLEDEFORM) +DEF_ICON(MOD_MASK) /* MODIFIERS */ -DEF_ICON(ICON_MOD_CLOTH) -DEF_ICON(ICON_MOD_EXPLODE) -DEF_ICON(ICON_MOD_FLUIDSIM) -DEF_ICON(ICON_MOD_MULTIRES) -DEF_ICON(ICON_MOD_SMOKE) -DEF_ICON(ICON_MOD_SOLIDIFY) -DEF_ICON(ICON_MOD_SCREW) -DEF_ICON(ICON_BLANK160) -DEF_ICON(ICON_BLANK161) -DEF_ICON(ICON_BLANK162) -DEF_ICON(ICON_BLANK163) -DEF_ICON(ICON_BLANK164) -DEF_ICON(ICON_BLANK165) -DEF_ICON(ICON_BLANK166) -DEF_ICON(ICON_BLANK167) -DEF_ICON(ICON_BLANK168) -DEF_ICON(ICON_BLANK169) -DEF_ICON(ICON_BLANK170) -DEF_ICON(ICON_BLANK171) -DEF_ICON(ICON_BLANK172) -DEF_ICON(ICON_BLANK173) -DEF_ICON(ICON_BLANK174) -DEF_ICON(ICON_BLANK175) -DEF_ICON(ICON_BLANK176) -DEF_ICON(ICON_BLANK177) -DEF_ICON(ICON_BLANK177b) +DEF_ICON(MOD_CLOTH) +DEF_ICON(MOD_EXPLODE) +DEF_ICON(MOD_FLUIDSIM) +DEF_ICON(MOD_MULTIRES) +DEF_ICON(MOD_SMOKE) +DEF_ICON(MOD_SOLIDIFY) +DEF_ICON(MOD_SCREW) +DEF_ICON(BLANK160) +DEF_ICON(BLANK161) +DEF_ICON(BLANK162) +DEF_ICON(BLANK163) +DEF_ICON(BLANK164) +DEF_ICON(BLANK165) +DEF_ICON(BLANK166) +DEF_ICON(BLANK167) +DEF_ICON(BLANK168) +DEF_ICON(BLANK169) +DEF_ICON(BLANK170) +DEF_ICON(BLANK171) +DEF_ICON(BLANK172) +DEF_ICON(BLANK173) +DEF_ICON(BLANK174) +DEF_ICON(BLANK175) +DEF_ICON(BLANK176) +DEF_ICON(BLANK177) +DEF_ICON(BLANK177b) /* ANIMATION */ -DEF_ICON(ICON_REC) -DEF_ICON(ICON_PLAY) -DEF_ICON(ICON_FF) -DEF_ICON(ICON_REW) -DEF_ICON(ICON_PAUSE) -DEF_ICON(ICON_PREV_KEYFRAME) -DEF_ICON(ICON_NEXT_KEYFRAME) -DEF_ICON(ICON_PLAY_AUDIO) -DEF_ICON(ICON_PLAY_REVERSE) -DEF_ICON(ICON_PREVIEW_RANGE) -DEF_ICON(ICON_BLANK180) -DEF_ICON(ICON_PMARKER_ACT) -DEF_ICON(ICON_PMARKER_SEL) -DEF_ICON(ICON_PMARKER) -DEF_ICON(ICON_MARKER_HLT) -DEF_ICON(ICON_MARKER) -DEF_ICON(ICON_SPACE2) // XXX -DEF_ICON(ICON_SPACE3) // XXX -DEF_ICON(ICON_BLANK181) -DEF_ICON(ICON_KEY_DEHLT) -DEF_ICON(ICON_KEY_HLT) -DEF_ICON(ICON_MUTE_IPO_OFF) -DEF_ICON(ICON_MUTE_IPO_ON) -DEF_ICON(ICON_BLANK182) -DEF_ICON(ICON_BLANK183) -DEF_ICON(ICON_BLANK183b) +DEF_ICON(REC) +DEF_ICON(PLAY) +DEF_ICON(FF) +DEF_ICON(REW) +DEF_ICON(PAUSE) +DEF_ICON(PREV_KEYFRAME) +DEF_ICON(NEXT_KEYFRAME) +DEF_ICON(PLAY_AUDIO) +DEF_ICON(PLAY_REVERSE) +DEF_ICON(PREVIEW_RANGE) +DEF_ICON(BLANK180) +DEF_ICON(PMARKER_ACT) +DEF_ICON(PMARKER_SEL) +DEF_ICON(PMARKER) +DEF_ICON(MARKER_HLT) +DEF_ICON(MARKER) +DEF_ICON(SPACE2) // XXX +DEF_ICON(SPACE3) // XXX +DEF_ICON(BLANK181) +DEF_ICON(KEY_DEHLT) +DEF_ICON(KEY_HLT) +DEF_ICON(MUTE_IPO_OFF) +DEF_ICON(MUTE_IPO_ON) +DEF_ICON(BLANK182) +DEF_ICON(BLANK183) +DEF_ICON(BLANK183b) /* available */ -DEF_ICON(ICON_BLANK184) -DEF_ICON(ICON_BLANK185) -DEF_ICON(ICON_BLANK186) -DEF_ICON(ICON_BLANK187) -DEF_ICON(ICON_BLANK188) -DEF_ICON(ICON_BLANK189) -DEF_ICON(ICON_BLANK190) -DEF_ICON(ICON_BLANK191) -DEF_ICON(ICON_BLANK192) -DEF_ICON(ICON_BLANK193) -DEF_ICON(ICON_BLANK194) -DEF_ICON(ICON_BLANK195) -DEF_ICON(ICON_BLANK196) -DEF_ICON(ICON_BLANK197) -DEF_ICON(ICON_BLANK198) -DEF_ICON(ICON_BLANK199) -DEF_ICON(ICON_BLANK200) -DEF_ICON(ICON_BLANK201) -DEF_ICON(ICON_BLANK202) -DEF_ICON(ICON_BLANK203) -DEF_ICON(ICON_BLANK204) -DEF_ICON(ICON_BLANK205) -DEF_ICON(ICON_BLANK206) -DEF_ICON(ICON_BLANK207) -DEF_ICON(ICON_BLANK208) -DEF_ICON(ICON_BLANK208b) +DEF_ICON(BLANK184) +DEF_ICON(BLANK185) +DEF_ICON(BLANK186) +DEF_ICON(BLANK187) +DEF_ICON(BLANK188) +DEF_ICON(BLANK189) +DEF_ICON(BLANK190) +DEF_ICON(BLANK191) +DEF_ICON(BLANK192) +DEF_ICON(BLANK193) +DEF_ICON(BLANK194) +DEF_ICON(BLANK195) +DEF_ICON(BLANK196) +DEF_ICON(BLANK197) +DEF_ICON(BLANK198) +DEF_ICON(BLANK199) +DEF_ICON(BLANK200) +DEF_ICON(BLANK201) +DEF_ICON(BLANK202) +DEF_ICON(BLANK203) +DEF_ICON(BLANK204) +DEF_ICON(BLANK205) +DEF_ICON(BLANK206) +DEF_ICON(BLANK207) +DEF_ICON(BLANK208) +DEF_ICON(BLANK208b) /* EDITING */ -DEF_ICON(ICON_VERTEXSEL) -DEF_ICON(ICON_EDGESEL) -DEF_ICON(ICON_FACESEL) -DEF_ICON(ICON_BLANK209) -DEF_ICON(ICON_BLANK210) -DEF_ICON(ICON_ROTATE) -DEF_ICON(ICON_CURSOR) -DEF_ICON(ICON_ROTATECOLLECTION) -DEF_ICON(ICON_ROTATECENTER) -DEF_ICON(ICON_ROTACTIVE) -DEF_ICON(ICON_ALIGN) -DEF_ICON(ICON_BLANK211) -DEF_ICON(ICON_SMOOTHCURVE) -DEF_ICON(ICON_SPHERECURVE) -DEF_ICON(ICON_ROOTCURVE) -DEF_ICON(ICON_SHARPCURVE) -DEF_ICON(ICON_LINCURVE) -DEF_ICON(ICON_NOCURVE) -DEF_ICON(ICON_RNDCURVE) -DEF_ICON(ICON_PROP_OFF) -DEF_ICON(ICON_PROP_ON) -DEF_ICON(ICON_PROP_CON) -DEF_ICON(ICON_BLANK212) -DEF_ICON(ICON_PARTICLE_POINT) -DEF_ICON(ICON_PARTICLE_TIP) -DEF_ICON(ICON_PARTICLE_PATH) +DEF_ICON(VERTEXSEL) +DEF_ICON(EDGESEL) +DEF_ICON(FACESEL) +DEF_ICON(BLANK209) +DEF_ICON(BLANK210) +DEF_ICON(ROTATE) +DEF_ICON(CURSOR) +DEF_ICON(ROTATECOLLECTION) +DEF_ICON(ROTATECENTER) +DEF_ICON(ROTACTIVE) +DEF_ICON(ALIGN) +DEF_ICON(BLANK211) +DEF_ICON(SMOOTHCURVE) +DEF_ICON(SPHERECURVE) +DEF_ICON(ROOTCURVE) +DEF_ICON(SHARPCURVE) +DEF_ICON(LINCURVE) +DEF_ICON(NOCURVE) +DEF_ICON(RNDCURVE) +DEF_ICON(PROP_OFF) +DEF_ICON(PROP_ON) +DEF_ICON(PROP_CON) +DEF_ICON(BLANK212) +DEF_ICON(PARTICLE_POINT) +DEF_ICON(PARTICLE_TIP) +DEF_ICON(PARTICLE_PATH) /* EDITING */ -DEF_ICON(ICON_MAN_TRANS) -DEF_ICON(ICON_MAN_ROT) -DEF_ICON(ICON_MAN_SCALE) -DEF_ICON(ICON_MANIPUL) -DEF_ICON(ICON_SNAP_OFF) -DEF_ICON(ICON_SNAP_ON) -DEF_ICON(ICON_SNAP_NORMAL) -DEF_ICON(ICON_SNAP_INCREMENT) -DEF_ICON(ICON_SNAP_VERTEX) -DEF_ICON(ICON_SNAP_EDGE) -DEF_ICON(ICON_SNAP_FACE) -DEF_ICON(ICON_SNAP_VOLUME) -DEF_ICON(ICON_BLANK220) -DEF_ICON(ICON_STICKY_UVS_LOC) -DEF_ICON(ICON_STICKY_UVS_DISABLE) -DEF_ICON(ICON_STICKY_UVS_VERT) -DEF_ICON(ICON_CLIPUV_DEHLT) -DEF_ICON(ICON_CLIPUV_HLT) -DEF_ICON(ICON_SNAP_PEEL_OBJECT) -DEF_ICON(ICON_GRID) -DEF_ICON(ICON_BLANK221) -DEF_ICON(ICON_BLANK222) -DEF_ICON(ICON_BLANK224) -DEF_ICON(ICON_BLANK225) -DEF_ICON(ICON_BLANK226) -DEF_ICON(ICON_BLANK226b) +DEF_ICON(MAN_TRANS) +DEF_ICON(MAN_ROT) +DEF_ICON(MAN_SCALE) +DEF_ICON(MANIPUL) +DEF_ICON(SNAP_OFF) +DEF_ICON(SNAP_ON) +DEF_ICON(SNAP_NORMAL) +DEF_ICON(SNAP_INCREMENT) +DEF_ICON(SNAP_VERTEX) +DEF_ICON(SNAP_EDGE) +DEF_ICON(SNAP_FACE) +DEF_ICON(SNAP_VOLUME) +DEF_ICON(BLANK220) +DEF_ICON(STICKY_UVS_LOC) +DEF_ICON(STICKY_UVS_DISABLE) +DEF_ICON(STICKY_UVS_VERT) +DEF_ICON(CLIPUV_DEHLT) +DEF_ICON(CLIPUV_HLT) +DEF_ICON(SNAP_PEEL_OBJECT) +DEF_ICON(GRID) +DEF_ICON(BLANK221) +DEF_ICON(BLANK222) +DEF_ICON(BLANK224) +DEF_ICON(BLANK225) +DEF_ICON(BLANK226) +DEF_ICON(BLANK226b) /* EDITING */ -DEF_ICON(ICON_PASTEDOWN) -DEF_ICON(ICON_COPYDOWN) -DEF_ICON(ICON_PASTEFLIPUP) -DEF_ICON(ICON_PASTEFLIPDOWN) -DEF_ICON(ICON_BLANK227) -DEF_ICON(ICON_BLANK228) -DEF_ICON(ICON_BLANK229) -DEF_ICON(ICON_BLANK230) -DEF_ICON(ICON_SNAP_SURFACE) -DEF_ICON(ICON_BLANK232) -DEF_ICON(ICON_BLANK233) -DEF_ICON(ICON_RETOPO) -DEF_ICON(ICON_UV_VERTEXSEL) -DEF_ICON(ICON_UV_EDGESEL) -DEF_ICON(ICON_UV_FACESEL) -DEF_ICON(ICON_UV_ISLANDSEL) -DEF_ICON(ICON_UV_SYNC_SELECT) -DEF_ICON(ICON_BLANK240) -DEF_ICON(ICON_BLANK241) -DEF_ICON(ICON_BLANK242) -DEF_ICON(ICON_BLANK243) -DEF_ICON(ICON_BLANK244) -DEF_ICON(ICON_BLANK245) -DEF_ICON(ICON_BLANK246) -DEF_ICON(ICON_BLANK247) -DEF_ICON(ICON_BLANK247b) +DEF_ICON(PASTEDOWN) +DEF_ICON(COPYDOWN) +DEF_ICON(PASTEFLIPUP) +DEF_ICON(PASTEFLIPDOWN) +DEF_ICON(BLANK227) +DEF_ICON(BLANK228) +DEF_ICON(BLANK229) +DEF_ICON(BLANK230) +DEF_ICON(SNAP_SURFACE) +DEF_ICON(BLANK232) +DEF_ICON(BLANK233) +DEF_ICON(RETOPO) +DEF_ICON(UV_VERTEXSEL) +DEF_ICON(UV_EDGESEL) +DEF_ICON(UV_FACESEL) +DEF_ICON(UV_ISLANDSEL) +DEF_ICON(UV_SYNC_SELECT) +DEF_ICON(BLANK240) +DEF_ICON(BLANK241) +DEF_ICON(BLANK242) +DEF_ICON(BLANK243) +DEF_ICON(BLANK244) +DEF_ICON(BLANK245) +DEF_ICON(BLANK246) +DEF_ICON(BLANK247) +DEF_ICON(BLANK247b) /* 3D VIEW */ -DEF_ICON(ICON_BBOX) -DEF_ICON(ICON_WIRE) -DEF_ICON(ICON_SOLID) -DEF_ICON(ICON_SMOOTH) -DEF_ICON(ICON_POTATO) -DEF_ICON(ICON_BLANK248) -DEF_ICON(ICON_ORTHO) -DEF_ICON(ICON_BLANK249) -DEF_ICON(ICON_BLANK250) -DEF_ICON(ICON_LOCKVIEW_OFF) -DEF_ICON(ICON_LOCKVIEW_ON) -DEF_ICON(ICON_BLANK251) -DEF_ICON(ICON_AXIS_SIDE) -DEF_ICON(ICON_AXIS_FRONT) -DEF_ICON(ICON_AXIS_TOP) -DEF_ICON(ICON_NDOF_DOM) -DEF_ICON(ICON_NDOF_TURN) -DEF_ICON(ICON_NDOF_FLY) -DEF_ICON(ICON_NDOF_TRANS) -DEF_ICON(ICON_LAYER_USED) -DEF_ICON(ICON_LAYER_ACTIVE) -DEF_ICON(ICON_BLANK254) -DEF_ICON(ICON_BLANK255) -DEF_ICON(ICON_BLANK256) -DEF_ICON(ICON_BLANK257) -DEF_ICON(ICON_BLANK257b) +DEF_ICON(BBOX) +DEF_ICON(WIRE) +DEF_ICON(SOLID) +DEF_ICON(SMOOTH) +DEF_ICON(POTATO) +DEF_ICON(BLANK248) +DEF_ICON(ORTHO) +DEF_ICON(BLANK249) +DEF_ICON(BLANK250) +DEF_ICON(LOCKVIEW_OFF) +DEF_ICON(LOCKVIEW_ON) +DEF_ICON(BLANK251) +DEF_ICON(AXIS_SIDE) +DEF_ICON(AXIS_FRONT) +DEF_ICON(AXIS_TOP) +DEF_ICON(NDOF_DOM) +DEF_ICON(NDOF_TURN) +DEF_ICON(NDOF_FLY) +DEF_ICON(NDOF_TRANS) +DEF_ICON(LAYER_USED) +DEF_ICON(LAYER_ACTIVE) +DEF_ICON(BLANK254) +DEF_ICON(BLANK255) +DEF_ICON(BLANK256) +DEF_ICON(BLANK257) +DEF_ICON(BLANK257b) /* available */ -DEF_ICON(ICON_BLANK258) -DEF_ICON(ICON_BLANK259) -DEF_ICON(ICON_BLANK260) -DEF_ICON(ICON_BLANK261) -DEF_ICON(ICON_BLANK262) -DEF_ICON(ICON_BLANK263) -DEF_ICON(ICON_BLANK264) -DEF_ICON(ICON_BLANK265) -DEF_ICON(ICON_BLANK266) -DEF_ICON(ICON_BLANK267) -DEF_ICON(ICON_BLANK268) -DEF_ICON(ICON_BLANK269) -DEF_ICON(ICON_BLANK270) -DEF_ICON(ICON_BLANK271) -DEF_ICON(ICON_BLANK272) -DEF_ICON(ICON_BLANK273) -DEF_ICON(ICON_BLANK274) -DEF_ICON(ICON_BLANK275) -DEF_ICON(ICON_BLANK276) -DEF_ICON(ICON_BLANK277) -DEF_ICON(ICON_BLANK278) -DEF_ICON(ICON_BLANK279) -DEF_ICON(ICON_BLANK280) -DEF_ICON(ICON_BLANK281) -DEF_ICON(ICON_BLANK282) -DEF_ICON(ICON_BLANK282b) +DEF_ICON(BLANK258) +DEF_ICON(BLANK259) +DEF_ICON(BLANK260) +DEF_ICON(BLANK261) +DEF_ICON(BLANK262) +DEF_ICON(BLANK263) +DEF_ICON(BLANK264) +DEF_ICON(BLANK265) +DEF_ICON(BLANK266) +DEF_ICON(BLANK267) +DEF_ICON(BLANK268) +DEF_ICON(BLANK269) +DEF_ICON(BLANK270) +DEF_ICON(BLANK271) +DEF_ICON(BLANK272) +DEF_ICON(BLANK273) +DEF_ICON(BLANK274) +DEF_ICON(BLANK275) +DEF_ICON(BLANK276) +DEF_ICON(BLANK277) +DEF_ICON(BLANK278) +DEF_ICON(BLANK279) +DEF_ICON(BLANK280) +DEF_ICON(BLANK281) +DEF_ICON(BLANK282) +DEF_ICON(BLANK282b) /* FILE SELECT */ -DEF_ICON(ICON_SORTALPHA) -DEF_ICON(ICON_SORTBYEXT) -DEF_ICON(ICON_SORTTIME) -DEF_ICON(ICON_SORTSIZE) -DEF_ICON(ICON_LONGDISPLAY) -DEF_ICON(ICON_SHORTDISPLAY) -DEF_ICON(ICON_GHOST) -DEF_ICON(ICON_IMGDISPLAY) -DEF_ICON(ICON_BLANK284) -DEF_ICON(ICON_BLANK285) -DEF_ICON(ICON_BOOKMARKS) -DEF_ICON(ICON_FONTPREVIEW) -DEF_ICON(ICON_FILTER) -DEF_ICON(ICON_NEWFOLDER) -DEF_ICON(ICON_BLANK285F) -DEF_ICON(ICON_FILE_PARENT) -DEF_ICON(ICON_FILE_REFRESH) -DEF_ICON(ICON_FILE_FOLDER) -DEF_ICON(ICON_FILE_BLANK) -DEF_ICON(ICON_FILE_BLEND) -DEF_ICON(ICON_FILE_IMAGE) -DEF_ICON(ICON_FILE_MOVIE) -DEF_ICON(ICON_FILE_SCRIPT) -DEF_ICON(ICON_FILE_SOUND) -DEF_ICON(ICON_FILE_FONT) -DEF_ICON(ICON_BLANK291b) +DEF_ICON(SORTALPHA) +DEF_ICON(SORTBYEXT) +DEF_ICON(SORTTIME) +DEF_ICON(SORTSIZE) +DEF_ICON(LONGDISPLAY) +DEF_ICON(SHORTDISPLAY) +DEF_ICON(GHOST) +DEF_ICON(IMGDISPLAY) +DEF_ICON(BLANK284) +DEF_ICON(BLANK285) +DEF_ICON(BOOKMARKS) +DEF_ICON(FONTPREVIEW) +DEF_ICON(FILTER) +DEF_ICON(NEWFOLDER) +DEF_ICON(BLANK285F) +DEF_ICON(FILE_PARENT) +DEF_ICON(FILE_REFRESH) +DEF_ICON(FILE_FOLDER) +DEF_ICON(FILE_BLANK) +DEF_ICON(FILE_BLEND) +DEF_ICON(FILE_IMAGE) +DEF_ICON(FILE_MOVIE) +DEF_ICON(FILE_SCRIPT) +DEF_ICON(FILE_SOUND) +DEF_ICON(FILE_FONT) +DEF_ICON(BLANK291b) /* available */ -DEF_ICON(ICON_BLANK292) -DEF_ICON(ICON_BLANK293) -DEF_ICON(ICON_BLANK294) -DEF_ICON(ICON_BLANK295) -DEF_ICON(ICON_BLANK296) -DEF_ICON(ICON_BLANK297) -DEF_ICON(ICON_BLANK298) -DEF_ICON(ICON_BLANK299) -DEF_ICON(ICON_BLANK300) -DEF_ICON(ICON_BLANK301) -DEF_ICON(ICON_BLANK302) -DEF_ICON(ICON_BLANK303) -DEF_ICON(ICON_BLANK304) -DEF_ICON(ICON_BLANK305) -DEF_ICON(ICON_BLANK306) -DEF_ICON(ICON_BACK) -DEF_ICON(ICON_FORWARD) -DEF_ICON(ICON_BLANK309) -DEF_ICON(ICON_BLANK310) -DEF_ICON(ICON_BLANK311) -DEF_ICON(ICON_BLANK312) -DEF_ICON(ICON_BLANK313) -DEF_ICON(ICON_BLANK314) -DEF_ICON(ICON_BLANK315) -DEF_ICON(ICON_BLANK316) -DEF_ICON(ICON_DISK_DRIVE) +DEF_ICON(BLANK292) +DEF_ICON(BLANK293) +DEF_ICON(BLANK294) +DEF_ICON(BLANK295) +DEF_ICON(BLANK296) +DEF_ICON(BLANK297) +DEF_ICON(BLANK298) +DEF_ICON(BLANK299) +DEF_ICON(BLANK300) +DEF_ICON(BLANK301) +DEF_ICON(BLANK302) +DEF_ICON(BLANK303) +DEF_ICON(BLANK304) +DEF_ICON(BLANK305) +DEF_ICON(BLANK306) +DEF_ICON(BACK) +DEF_ICON(FORWARD) +DEF_ICON(BLANK309) +DEF_ICON(BLANK310) +DEF_ICON(BLANK311) +DEF_ICON(BLANK312) +DEF_ICON(BLANK313) +DEF_ICON(BLANK314) +DEF_ICON(BLANK315) +DEF_ICON(BLANK316) +DEF_ICON(DISK_DRIVE) /* SHADING / TEXT */ -DEF_ICON(ICON_MATPLANE) -DEF_ICON(ICON_MATSPHERE) -DEF_ICON(ICON_MATCUBE) -DEF_ICON(ICON_MONKEY) -DEF_ICON(ICON_HAIR) -DEF_ICON(ICON_ALIASED) -DEF_ICON(ICON_ANTIALIASED) -DEF_ICON(ICON_MAT_SPHERE_SKY) -DEF_ICON(ICON_BLANK319) -DEF_ICON(ICON_BLANK320) -DEF_ICON(ICON_BLANK321) -DEF_ICON(ICON_BLANK322) -DEF_ICON(ICON_WORDWRAP_OFF) -DEF_ICON(ICON_WORDWRAP_ON) -DEF_ICON(ICON_SYNTAX_OFF) -DEF_ICON(ICON_SYNTAX_ON) -DEF_ICON(ICON_LINENUMBERS_OFF) -DEF_ICON(ICON_LINENUMBERS_ON) -DEF_ICON(ICON_SCRIPTPLUGINS) // XXX CREATE NEW -DEF_ICON(ICON_BLANK323) -DEF_ICON(ICON_BLANK324) -DEF_ICON(ICON_BLANK325) -DEF_ICON(ICON_BLANK326) -DEF_ICON(ICON_BLANK327) -DEF_ICON(ICON_BLANK328) -DEF_ICON(ICON_BLANK328b) +DEF_ICON(MATPLANE) +DEF_ICON(MATSPHERE) +DEF_ICON(MATCUBE) +DEF_ICON(MONKEY) +DEF_ICON(HAIR) +DEF_ICON(ALIASED) +DEF_ICON(ANTIALIASED) +DEF_ICON(MAT_SPHERE_SKY) +DEF_ICON(BLANK319) +DEF_ICON(BLANK320) +DEF_ICON(BLANK321) +DEF_ICON(BLANK322) +DEF_ICON(WORDWRAP_OFF) +DEF_ICON(WORDWRAP_ON) +DEF_ICON(SYNTAX_OFF) +DEF_ICON(SYNTAX_ON) +DEF_ICON(LINENUMBERS_OFF) +DEF_ICON(LINENUMBERS_ON) +DEF_ICON(SCRIPTPLUGINS) // XXX CREATE NEW +DEF_ICON(BLANK323) +DEF_ICON(BLANK324) +DEF_ICON(BLANK325) +DEF_ICON(BLANK326) +DEF_ICON(BLANK327) +DEF_ICON(BLANK328) +DEF_ICON(BLANK328b) /* SEQUENCE / IMAGE EDITOR */ -DEF_ICON(ICON_SEQ_SEQUENCER) -DEF_ICON(ICON_SEQ_PREVIEW) -DEF_ICON(ICON_SEQ_LUMA_WAVEFORM) -DEF_ICON(ICON_SEQ_CHROMA_SCOPE) -DEF_ICON(ICON_SEQ_HISTOGRAM) -DEF_ICON(ICON_SEQ_SPLITVIEW) -DEF_ICON(ICON_BLANK331) -DEF_ICON(ICON_BLANK332) -DEF_ICON(ICON_BLANK333) -DEF_ICON(ICON_IMAGE_RGB) // XXX CHANGE TO STRAIGHT ALPHA, Z ETC -DEF_ICON(ICON_IMAGE_RGB_ALPHA) -DEF_ICON(ICON_IMAGE_ALPHA) -DEF_ICON(ICON_IMAGE_ZDEPTH) -DEF_ICON(ICON_IMAGEFILE) -DEF_ICON(ICON_BLANK336) -DEF_ICON(ICON_BLANK337) -DEF_ICON(ICON_BLANK338) -DEF_ICON(ICON_BLANK339) -DEF_ICON(ICON_BLANK340) -DEF_ICON(ICON_BLANK341) -DEF_ICON(ICON_BLANK342) -DEF_ICON(ICON_BLANK343) -DEF_ICON(ICON_BLANK344) -DEF_ICON(ICON_BLANK345) -DEF_ICON(ICON_BLANK346) -DEF_ICON(ICON_BLANK346b) +DEF_ICON(SEQ_SEQUENCER) +DEF_ICON(SEQ_PREVIEW) +DEF_ICON(SEQ_LUMA_WAVEFORM) +DEF_ICON(SEQ_CHROMA_SCOPE) +DEF_ICON(SEQ_HISTOGRAM) +DEF_ICON(SEQ_SPLITVIEW) +DEF_ICON(BLANK331) +DEF_ICON(BLANK332) +DEF_ICON(BLANK333) +DEF_ICON(IMAGE_RGB) // XXX CHANGE TO STRAIGHT ALPHA, Z ETC +DEF_ICON(IMAGE_RGB_ALPHA) +DEF_ICON(IMAGE_ALPHA) +DEF_ICON(IMAGE_ZDEPTH) +DEF_ICON(IMAGEFILE) +DEF_ICON(BLANK336) +DEF_ICON(BLANK337) +DEF_ICON(BLANK338) +DEF_ICON(BLANK339) +DEF_ICON(BLANK340) +DEF_ICON(BLANK341) +DEF_ICON(BLANK342) +DEF_ICON(BLANK343) +DEF_ICON(BLANK344) +DEF_ICON(BLANK345) +DEF_ICON(BLANK346) +DEF_ICON(BLANK346b) /* brush icons */ -DEF_ICON(ICON_BRUSH_ADD) -DEF_ICON(ICON_BRUSH_BLOB) -DEF_ICON(ICON_BRUSH_BLUR) -DEF_ICON(ICON_BRUSH_CLAY) -DEF_ICON(ICON_BRUSH_CLONE) -DEF_ICON(ICON_BRUSH_CREASE) -DEF_ICON(ICON_BRUSH_DARKEN) -DEF_ICON(ICON_BRUSH_FILL) -DEF_ICON(ICON_BRUSH_FLATTEN) -DEF_ICON(ICON_BRUSH_GRAB) -DEF_ICON(ICON_BRUSH_INFLATE) -DEF_ICON(ICON_BRUSH_LAYER) -DEF_ICON(ICON_BRUSH_LIGHTEN) -DEF_ICON(ICON_BRUSH_MIX) -DEF_ICON(ICON_BRUSH_MULTIPLY) -DEF_ICON(ICON_BRUSH_NUDGE) -DEF_ICON(ICON_BRUSH_PINCH) -DEF_ICON(ICON_BRUSH_SCRAPE) -DEF_ICON(ICON_BRUSH_SCULPT_DRAW) -DEF_ICON(ICON_BRUSH_SMEAR) -DEF_ICON(ICON_BRUSH_SMOOTH) -DEF_ICON(ICON_BRUSH_SNAKE_HOOK) -DEF_ICON(ICON_BRUSH_SOFTEN) -DEF_ICON(ICON_BRUSH_SUBTRACT) -DEF_ICON(ICON_BRUSH_TEXDRAW) -DEF_ICON(ICON_BRUSH_THUMB) -DEF_ICON(ICON_BRUSH_ROTATE) -DEF_ICON(ICON_BRUSH_VERTEXDRAW) - - /* vector icons */ - -DEF_ICON(VICO_VIEW3D_VEC) -DEF_ICON(VICO_EDIT_VEC) -DEF_ICON(VICO_EDITMODE_DEHLT) -DEF_ICON(VICO_EDITMODE_HLT) -DEF_ICON(VICO_DISCLOSURE_TRI_RIGHT_VEC) -DEF_ICON(VICO_DISCLOSURE_TRI_DOWN_VEC) -DEF_ICON(VICO_MOVE_UP_VEC) -DEF_ICON(VICO_MOVE_DOWN_VEC) -DEF_ICON(VICO_X_VEC) -DEF_ICON(VICO_SMALL_TRI_RIGHT_VEC) +DEF_ICON(BRUSH_ADD) +DEF_ICON(BRUSH_BLOB) +DEF_ICON(BRUSH_BLUR) +DEF_ICON(BRUSH_CLAY) +DEF_ICON(BRUSH_CLONE) +DEF_ICON(BRUSH_CREASE) +DEF_ICON(BRUSH_DARKEN) +DEF_ICON(BRUSH_FILL) +DEF_ICON(BRUSH_FLATTEN) +DEF_ICON(BRUSH_GRAB) +DEF_ICON(BRUSH_INFLATE) +DEF_ICON(BRUSH_LAYER) +DEF_ICON(BRUSH_LIGHTEN) +DEF_ICON(BRUSH_MIX) +DEF_ICON(BRUSH_MULTIPLY) +DEF_ICON(BRUSH_NUDGE) +DEF_ICON(BRUSH_PINCH) +DEF_ICON(BRUSH_SCRAPE) +DEF_ICON(BRUSH_SCULPT_DRAW) +DEF_ICON(BRUSH_SMEAR) +DEF_ICON(BRUSH_SMOOTH) +DEF_ICON(BRUSH_SNAKE_HOOK) +DEF_ICON(BRUSH_SOFTEN) +DEF_ICON(BRUSH_SUBTRACT) +DEF_ICON(BRUSH_TEXDRAW) +DEF_ICON(BRUSH_THUMB) +DEF_ICON(BRUSH_ROTATE) +DEF_ICON(BRUSH_VERTEXDRAW) +/* vector icons, VICO_ prefix added */ +DEF_VICO(VIEW3D_VEC) +DEF_VICO(EDIT_VEC) +DEF_VICO(EDITMODE_DEHLT) +DEF_VICO(EDITMODE_HLT) +DEF_VICO(DISCLOSURE_TRI_RIGHT_VEC) +DEF_VICO(DISCLOSURE_TRI_DOWN_VEC) +DEF_VICO(MOVE_UP_VEC) +DEF_VICO(MOVE_DOWN_VEC) +DEF_VICO(X_VEC) +DEF_VICO(SMALL_TRI_RIGHT_VEC) diff --git a/source/blender/editors/include/UI_resources.h b/source/blender/editors/include/UI_resources.h index af3f91f8ba8..e3c83291089 100644 --- a/source/blender/editors/include/UI_resources.h +++ b/source/blender/editors/include/UI_resources.h @@ -35,7 +35,8 @@ /* elubie: TODO: move the typedef for icons to UI_interface_icons.h */ /* and add/replace include of UI_resources.h by UI_interface_icons.h */ -#define DEF_ICON(name) name, +#define DEF_ICON(name) ICON_##name, +#define DEF_VICO(name) VICO_##name, typedef enum { #define BIFICONID_FIRST (ICON_BLENDER) @@ -45,6 +46,7 @@ typedef enum { #define BIFNICONIDS (BIFICONID_LAST-BIFICONID_FIRST + 1) } BIFIconID; #undef DEF_ICON +#undef DEF_VICO typedef enum { diff --git a/source/blender/editors/mesh/editmesh_add.c b/source/blender/editors/mesh/editmesh_add.c index 89991015419..5dd1b1227a3 100644 --- a/source/blender/editors/mesh/editmesh_add.c +++ b/source/blender/editors/mesh/editmesh_add.c @@ -138,8 +138,11 @@ printf("%d\n", event->val); float nor[3]= {0.0, 0.0, 0.0}; /* 2D normal calc */ - float mval_f[2]= {(float)event->mval[0], (float)event->mval[1]}; - + float mval_f[2]; + + mval_f[0]= (float)event->mval[0]; + mval_f[1]= (float)event->mval[1]; + done= 0; /* calculate the normal for selected edges */ diff --git a/source/blender/editors/physics/particle_edit.c b/source/blender/editors/physics/particle_edit.c index 0357083fc63..fed4b8d9722 100644 --- a/source/blender/editors/physics/particle_edit.c +++ b/source/blender/editors/physics/particle_edit.c @@ -1890,7 +1890,7 @@ static void rekey_particle(PEData *data, int pa_index) { PTCacheEdit *edit= data->edit; ParticleSystem *psys= edit->psys; - ParticleSimulationData sim = {data->scene, data->ob, edit->psys, NULL}; + ParticleSimulationData sim= {0}; ParticleData *pa= psys->particles + pa_index; PTCacheEditPoint *point = edit->points + pa_index; ParticleKey state; @@ -1899,6 +1899,10 @@ static void rekey_particle(PEData *data, int pa_index) float dval, sta, end; int k; + sim.scene= data->scene; + sim.ob= data->ob; + sim.psys= edit->psys; + pa->flag |= PARS_REKEY; key= new_keys= MEM_callocN(data->totrekey * sizeof(HairKey),"Hair re-key keys"); @@ -1983,7 +1987,7 @@ static void rekey_particle_to_time(Scene *scene, Object *ob, int pa_index, float { PTCacheEdit *edit= PE_get_current(scene, ob); ParticleSystem *psys; - ParticleSimulationData sim = {scene, ob, edit ? edit->psys : NULL, NULL}; + ParticleSimulationData sim= {0}; ParticleData *pa; ParticleKey state; HairKey *new_keys, *key; @@ -1994,6 +1998,10 @@ static void rekey_particle_to_time(Scene *scene, Object *ob, int pa_index, float psys = edit->psys; + sim.scene= scene; + sim.ob= ob; + sim.psys= psys; + pa= psys->particles + pa_index; pa->flag |= PARS_REKEY; @@ -2188,7 +2196,7 @@ static void subdivide_particle(PEData *data, int pa_index) { PTCacheEdit *edit= data->edit; ParticleSystem *psys= edit->psys; - ParticleSimulationData sim = {data->scene, data->ob, edit->psys, NULL}; + ParticleSimulationData sim= {0}; ParticleData *pa= psys->particles + pa_index; PTCacheEditPoint *point = edit->points + pa_index; ParticleKey state; @@ -2199,6 +2207,10 @@ static void subdivide_particle(PEData *data, int pa_index) short totnewkey=0; float endtime; + sim.scene= data->scene; + sim.ob= data->ob; + sim.psys= edit->psys; + for(k=0, ekey=point->keys; k<pa->totkey-1; k++,ekey++) { if(ekey->flag&PEK_SELECT && (ekey+1)->flag&PEK_SELECT) totnewkey++; @@ -3088,13 +3100,13 @@ static int brush_add(PEData *data, short number) ParticleSystem *psys= edit->psys; ParticleData *add_pars= MEM_callocN(number*sizeof(ParticleData),"ParticleData add"); ParticleSystemModifierData *psmd= psys_get_modifier(ob,psys); - ParticleSimulationData sim = {scene, ob, psys, psmd}; + ParticleSimulationData sim= {0}; ParticleEditSettings *pset= PE_settings(scene); int i, k, n= 0, totpart= psys->totpart; float mco[2]; short dmx= 0, dmy= 0; float co1[3], co2[3], min_d, imat[4][4]; - float framestep, timestep= psys_get_timestep(&sim); + float framestep, timestep; short size= pset->brush[PE_BRUSH_ADD].size; short size2= size*size; DerivedMesh *dm=0; @@ -3104,7 +3116,14 @@ static int brush_add(PEData *data, short number) return 0; BLI_srandom(psys->seed+data->mval[0]+data->mval[1]); - + + sim.scene= scene; + sim.ob= ob; + sim.psys= psys; + sim.psmd= psmd; + + timestep= psys_get_timestep(&sim); + /* painting onto the deformed mesh, could be an option? */ if(psmd->dm->deformedOnly) dm= psmd->dm; diff --git a/source/blender/editors/sculpt_paint/paint_image.c b/source/blender/editors/sculpt_paint/paint_image.c index 939955353c8..b6e7c823c9d 100644 --- a/source/blender/editors/sculpt_paint/paint_image.c +++ b/source/blender/editors/sculpt_paint/paint_image.c @@ -1011,8 +1011,11 @@ static void uv_image_outset(float (*orig_uv)[2], float (*outset_uv)[2], const fl float puv[4][2]; /* pixelspace uv's */ float no1[2], no2[2], no3[2], no4[2]; /* normals */ float dir1[2], dir2[2], dir3[2], dir4[2]; - float ibuf_inv[2] = {1.0f / (float)ibuf_x, 1.0f / (float)ibuf_y}; - + float ibuf_inv[2]; + + ibuf_inv[0]= 1.0f / (float)ibuf_x; + ibuf_inv[1]= 1.0f / (float)ibuf_y; + /* make UV's in pixel space so we can */ puv[0][0] = orig_uv[0][0] * ibuf_x; puv[0][1] = orig_uv[0][1] * ibuf_y; diff --git a/source/blender/editors/space_console/console_draw.c b/source/blender/editors/space_console/console_draw.c index edbb539e836..f1fead47a0a 100644 --- a/source/blender/editors/space_console/console_draw.c +++ b/source/blender/editors/space_console/console_draw.c @@ -270,7 +270,11 @@ static int console_draw_string(ConsoleDrawContext *cdc, char *str, int str_len, BLF_draw(mono, str); if(cdc->sel[0] != cdc->sel[1]) { - int isel[2]= {str_len - cdc->sel[1], str_len - cdc->sel[0]}; + int isel[2]; + + isel[0]= str_len - cdc->sel[1]; + isel[1]= str_len - cdc->sel[0]; + // glColor4ub(255, 255, 0, 96); // debug console_draw_sel(isel, cdc->xy, str_len, cdc->cwidth, cdc->lheight); STEP_SEL(-(str_len + 1)); @@ -447,8 +451,12 @@ int console_text_height(struct SpaceConsole *sc, struct ARegion *ar, ReportList void *console_text_pick(struct SpaceConsole *sc, struct ARegion *ar, ReportList *reports, int mouse_y) { - int mval[2] = {0, mouse_y}; void *mouse_pick= NULL; + int mval[2]; + + mval[0]= 0; + mval[1]= mouse_y; + console_text_main__internal(sc, ar, reports, 0, mval, &mouse_pick, NULL); return (void *)mouse_pick; } diff --git a/source/blender/editors/space_console/console_ops.c b/source/blender/editors/space_console/console_ops.c index 2b419b0a833..ceb16d2aab9 100644 --- a/source/blender/editors/space_console/console_ops.c +++ b/source/blender/editors/space_console/console_ops.c @@ -404,12 +404,17 @@ static int insert_invoke(bContext *C, wmOperator *op, wmEvent *event) { // if(!RNA_property_is_set(op->ptr, "text")) { /* always set from keymap XXX */ if(!RNA_string_length(op->ptr, "text")) { - char str[2] = {event->ascii, '\0'}; /* if alt/ctrl/super are pressed pass through */ - if(event->ctrl || event->oskey) + if(event->ctrl || event->oskey) { return OPERATOR_PASS_THROUGH; + } + else { + char str[2]; + str[0]= event->ascii; + str[1]= '\0'; - RNA_string_set(op->ptr, "text", str); + RNA_string_set(op->ptr, "text", str); + } } return insert_exec(C, op); } @@ -863,7 +868,10 @@ static void console_modal_select_apply(bContext *C, wmOperator *op, wmEvent *eve SpaceConsole *sc= CTX_wm_space_console(C); ARegion *ar= CTX_wm_region(C); SetConsoleCursor *scu= op->customdata; - int mval[2] = {event->mval[0], event->mval[1]}; + int mval[2]; + + mval[0]= event->mval[0]; + mval[1]= event->mval[1]; set_cursor_to_pos(sc, ar, scu, mval, TRUE); ED_area_tag_redraw(CTX_wm_area(C)); diff --git a/source/blender/editors/space_text/text_ops.c b/source/blender/editors/space_text/text_ops.c index d2defb0341d..1a0514c9735 100644 --- a/source/blender/editors/space_text/text_ops.c +++ b/source/blender/editors/space_text/text_ops.c @@ -2603,12 +2603,16 @@ static int insert_invoke(bContext *C, wmOperator *op, wmEvent *event) // if(!RNA_property_is_set(op->ptr, "text")) { /* always set from keymap XXX */ if(!RNA_string_length(op->ptr, "text")) { - char str[2] = {event->ascii, '\0'}; /* if alt/ctrl/super are pressed pass through */ - if(event->ctrl || event->oskey) + if(event->ctrl || event->oskey) { return OPERATOR_PASS_THROUGH; - - RNA_string_set(op->ptr, "text", str); + } + else { + char str[2]; + str[0]= event->ascii; + str[1]= '\0'; + RNA_string_set(op->ptr, "text", str); + } } ret = insert_exec(C, op); diff --git a/source/blender/editors/transform/transform.c b/source/blender/editors/transform/transform.c index 8cf790f7a6e..57298bdd0d3 100644 --- a/source/blender/editors/transform/transform.c +++ b/source/blender/editors/transform/transform.c @@ -1230,7 +1230,10 @@ static void drawHelpline(bContext *UNUSED(C), int x, int y, void *customdata) if (t->helpline != HLP_NONE && !(t->flag & T_USES_MANIPULATOR)) { float vecrot[3], cent[2]; - int mval[2] = {x, y}; + int mval[2]; + + mval[0]= x; + mval[1]= y; VECCOPY(vecrot, t->center); if(t->flag & T_EDIT) { diff --git a/source/blender/editors/transform/transform_conversions.c b/source/blender/editors/transform/transform_conversions.c index 818e5c2df66..123db2ce65a 100644 --- a/source/blender/editors/transform/transform_conversions.c +++ b/source/blender/editors/transform/transform_conversions.c @@ -3868,8 +3868,13 @@ static void SeqTransInfo(TransInfo *t, Sequence *seq, int *recursive, int *count #ifdef XXX_DURIAN_ANIM_TX_HACK /* hack */ if((seq->flag & SELECT)==0 && seq->type & SEQ_EFFECT) { - Sequence *seq_t[3] = {seq->seq1, seq->seq2, seq->seq3}; + Sequence *seq_t[3]; int i; + + seq_t[0]= seq->seq1; + seq_t[1]= seq->seq2; + seq_t[2]= seq->seq3; + for(i=0; i<3; i++) { if (seq_t[i] && ((seq_t[i])->flag & SELECT) && !(seq_t[i]->flag & SEQ_LOCK) && !(seq_t[i]->flag & (SEQ_LEFTSEL|SEQ_RIGHTSEL))) seq->flag |= SELECT; diff --git a/source/blender/editors/transform/transform_generics.c b/source/blender/editors/transform/transform_generics.c index 453a48bd500..7ff93be87ee 100644 --- a/source/blender/editors/transform/transform_generics.c +++ b/source/blender/editors/transform/transform_generics.c @@ -1572,8 +1572,13 @@ void calculatePropRatio(TransInfo *t) float get_drawsize(ARegion *ar, float *co) { RegionView3D *rv3d= ar->regiondata; - float vec[3]= {rv3d->persmat[0][3], rv3d->persmat[1][3], rv3d->persmat[2][3]}; float size= rv3d->pixsize * 5; + float vec[3]; + + vec[0]= rv3d->persmat[0][3]; + vec[1]= rv3d->persmat[1][3]; + vec[2]= rv3d->persmat[2][3]; + size *= dot_v3v3(vec, co) + rv3d->persmat[3][3]; return size; } diff --git a/source/blender/gpu/intern/gpu_buffers.c b/source/blender/gpu/intern/gpu_buffers.c index 90c33f68c65..7d2006a3aab 100644 --- a/source/blender/gpu/intern/gpu_buffers.c +++ b/source/blender/gpu/intern/gpu_buffers.c @@ -491,7 +491,11 @@ void *GPU_build_mesh_buffers(GHash *map, MVert *mvert, MFace *mface, if(tri_data) { for(i = 0; i < totface; ++i) { MFace *f = mface + face_indices[i]; - int v[3] = {f->v1, f->v2, f->v3}; + int v[3]; + + v[0]= f->v1; + v[1]= f->v2; + v[2]= f->v3; for(j = 0; j < (f->v4 ? 2 : 1); ++j) { for(k = 0; k < 3; ++k) { diff --git a/source/blender/imbuf/intern/divers.c b/source/blender/imbuf/intern/divers.c index dfe316628f6..245dcfb7fae 100644 --- a/source/blender/imbuf/intern/divers.c +++ b/source/blender/imbuf/intern/divers.c @@ -163,7 +163,13 @@ void IMB_rect_from_float(struct ImBuf *ibuf) if (dither != 0.f) { for (i = ibuf->x * ibuf->y; i > 0; i--, to+=4, tof+=4) { const float d = (BLI_frand()-0.5)*dither; - const float col[4] = {d+tof[0], d+tof[1], d+tof[2], d+tof[3]}; + float col[4]; + + col[0]= d + tof[0]; + col[1]= d + tof[1]; + col[2]= d + tof[2]; + col[3]= d + tof[3]; + to[0] = FTOCHAR(col[0]); to[1] = FTOCHAR(col[1]); to[2] = FTOCHAR(col[2]); diff --git a/source/blender/makesrna/intern/rna_define.c b/source/blender/makesrna/intern/rna_define.c index 66ef0f3b950..85f31e245d4 100644 --- a/source/blender/makesrna/intern/rna_define.c +++ b/source/blender/makesrna/intern/rna_define.c @@ -2240,8 +2240,11 @@ PropertyRNA *RNA_def_float_matrix(StructOrFunctionRNA *cont_, const char *identi { ContainerRNA *cont= cont_; PropertyRNA *prop; - int length[2]= {rows, columns}; - + int length[2]; + + length[0]= rows; + length[1]= columns; + prop= RNA_def_property(cont, identifier, PROP_FLOAT, PROP_MATRIX); RNA_def_property_multi_array(prop, 2, length); if(default_value) RNA_def_property_float_array_default(prop, default_value); diff --git a/source/blender/makesrna/intern/rna_ui_api.c b/source/blender/makesrna/intern/rna_ui_api.c index a230a51e792..dfecd016f45 100644 --- a/source/blender/makesrna/intern/rna_ui_api.c +++ b/source/blender/makesrna/intern/rna_ui_api.c @@ -65,11 +65,14 @@ static PointerRNA rna_uiItemO(uiLayout *layout, char *opname, char *name, int ic #else -#define DEF_ICON(name) {name, (#name)+5, 0, (#name)+5, ""}, +#define DEF_ICON(name) {ICON_##name, (#name), 0, (#name), ""}, +#define DEF_VICO(name) {VICO_##name, (#name), 0, (#name), ""}, + static EnumPropertyItem icon_items[] = { #include "UI_icons.h" {0, NULL, 0, NULL, NULL}}; #undef DEF_ICON +#undef DEF_VICO static void api_ui_item_common(FunctionRNA *func) { diff --git a/source/blender/modifiers/intern/MOD_explode.c b/source/blender/modifiers/intern/MOD_explode.c index dd2c4b6efb6..9e93557968d 100644 --- a/source/blender/modifiers/intern/MOD_explode.c +++ b/source/blender/modifiers/intern/MOD_explode.c @@ -663,7 +663,7 @@ static DerivedMesh * explodeMesh(ExplodeModifierData *emd, DerivedMesh *explode, *dm=to_explode; MFace *mf=0, *mface; ParticleSettings *part=psmd->psys->part; - ParticleSimulationData sim = {scene, ob, psmd->psys, psmd}; + ParticleSimulationData sim= {0}; ParticleData *pa=NULL, *pars=psmd->psys->particles; ParticleKey state; EdgeHash *vertpahash; @@ -680,6 +680,11 @@ static DerivedMesh * explodeMesh(ExplodeModifierData *emd, mface= dm->getFaceArray(dm); totpart= psmd->psys->totpart; + sim.scene= scene; + sim.ob= ob; + sim.psys= psmd->psys; + sim.psmd= psmd; + timestep= psys_get_timestep(&sim); //if(part->flag & PART_GLOB_TIME) |