Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2012-04-24Add libMV and Scons support for MinGW-w64, patches by Caleb Joseph with ↵Antony Riakiotakis
slight modifications. Thanks!
2012-03-17Fix for yesterday i18n own commit (r44924): we now need to define ↵Bastien Montagne
WITH_INTERNATIONAL everywhere TIP_/IFACE_ macros are used (else, we get non-international, dummy NOP macros instead!). Also fixed in main CMakeList file, when no addon dir found, we want to disable WITH_PYTHON (I guess, certainly not WITH_INTERNATIONAL ;) ).
2011-05-09=bmesh= merge from trunk at r36529Joseph Eagar
2011-05-07Code cleanup: remove source/kernel module, this wasn't really the kernel ofBrecht Van Lommel
anything, only contained a hash map and functions to pass command line args to the game engine. Moved those to container and BlenderRoutines modules.
2011-02-27merge with/from trunk at r35190Joseph Eagar
2011-02-21I swear, it was just an innocence change in guardedalloc!Nathan Letwory
The butterfly wing flap, causing a nice storm in the rest of blender. Now all dependencies should point ok again. CMakers, do double-test.
2010-10-31rename definition for enabling the game engine GAMEBLENDER==1 --> ↵Campbell Barton
WITH_GAMEENGINE
2010-08-30Finally change SConscript tabs to spaces.Nathan Letwory
2010-07-19part 1 of merge from trunk at r30358; it compiles, but doesn't link quite yet :)Joseph Eagar
2010-04-15Merge various small changes from render branch:Brecht Van Lommel
* Division by zero fix for TNT SVD code. * Sound fix, in case ffmpeg decode fails, don't use the samples. * Fix for incorrect bounds of transformed objects in new raytracing code. * Gave memory arena's a name used for allocations for easier memory usage debugging. * Dupligroup no_draw option was using layers but not restrict view/render setting. (not a bugfix exactly but would do display list context switching while drawing for no reason). * Fix objects instanced on hair particles not giving consistent results when the object is transformed. * New math functions: madd_v4_v4fl, len_squared_v3v3, interp_v4_v4v4v4, mul_v4_m4v4, SH and form factor functions, box_minmax_bounds_m4. * mul_m4_m4m4 and mul_m3_m3m3 now accept the same pointers for multiple arguments. * endjob callback for WM jobs system. * Geometry node uv/color layer now has search list/autocomplete. * Various small buildsystem tweaks, not strictly needed yet in trunk.
2009-11-29ok, apparently didn't commit this either. apparently includes a merge with ↵Joseph Eagar
trunk/2.5 at r24811 I thought I'd committed but did not, yeek.
2009-11-22Patch #19953: [2.5] repeated include entries in a number of SConscript filesJoshua Leung
Thanks for the patch Jeff Doyle (nfz)
2009-11-21patch [#19796] GLEW update by Mitchell Stokes (Moguri)Dalai Felinto
GLEW update to version 1.5.1 [11-03-08] this opens room for Geometry Shader support. * - Brecht, Campbell told me you did some local changes in order to make it right in Linux. I get to you in order to know what those changes are (or feel free to commit them directly)
2009-09-16merge with 2.5/trunk at r23271Joseph Eagar
2009-09-02* quick fix from Moguri to get things compiling again.Nathan Letwory
2009-08-06merge with 2.5 (not trunk, last merge message said that on accident) at r22252Joseph Eagar
2009-07-30BF2.5: First commit of smoke code.Daniel Genrich
Not working: a) rendering (since volumterics branch is not merged yet) b) moving collision objects of any kind c) saving of collision objects (because that's what I am working on) d) pointcache e) A bunch of other things I already know of So please do not report any bugs on this one yet :-)
2009-07-16merge with 2.5 at r21568Joseph Eagar
2009-06-13GameEngine WIP,Campbell Barton
* pressing P starts the BGE in the 3D view * redraw window clipping isnt right * BGE python api works in py3k (without __import__ override or Mathutils, BGL, Geometry) * no events yet (so there is no way to exit)
2009-05-23merge with 2.5 at r20307. note there were some python hacking necassary for ↵Joseph Eagar
this to work, so um hopefully there's not too much cruft from that. [[Split portion of a mixed commit.]]
2009-05-16NOTE: do not test. work-in-progress commit with editmesh ripped out and ↵Joseph Eagar
replaced with bmesh. this is not usable by any means. for those who read through this, note the design is still fairly messy in places, and fyi BMTessMesh is the replacement for EditMesh, I need to rename it to BMEditMesh.
2009-05-06Big, big commit!!Diego Borghetti
1) Remove WITH_FREETYPE2 from code, so now blender always need freetype2 2) Remove the old bmfont 3) Remove ftfont and bFTGL library 4) Implement a new BLF_draw_default function for place that still need/use the old BMF api. I try to update both, scons and cmake, but I only can test with make, so hope all work fine. MSVC is broken, but I don't have Windows, things to search and fix are any reference to WITH_FREETYPE2, FTGL and BMFONT (take in care that blenkernel also have a BKE_bmfont.h, this don't have anything to do with bmfont). Always have to link/include the freetype2 library Remove any reference to libbmfont Remove any reference to libftfont Remove any reference to libbftgl (or libbFTGL)
2008-12-242.5 / SConsNathan Letwory
New priorities for most libs, at least core. This is still for Blender proper, BGE and such still to come.
2008-12-232.5 / SConsNathan Letwory
Blender builds and links on Linux. For now without BGE and its player, but that will come. Priorities are still a mess, so expect more commits soon.
2008-12-212.5 - Object name display in 3d-view now highlights on frames with keyframes ↵Joshua Leung
again. * Re-exposed relevant parts of anim_keyframing.c code that doesn't have external dependencies. * Added get_active_posechannel() to blenkernel api for poses/posechannels to solve the only missing link I found. This should have been moved there ages ago!
2008-12-192.5Ton Roosendaal
View3d: middle mouse rotate, translate, zoom. (using default mouse map)
2008-12-192.5Ton Roosendaal
Drawing code for space_view3d module. It's still not cleaned, have to check on context usage still. Also missing is editmodes, armatures, and probably more. Known issue: splitting to 2nd window gives bad opengl lighting. Picture for fun: http://www.blender.org/bf/rt2.jpg Current stat: brought back almost 10k lines! :)
2008-12-182.5Ton Roosendaal
Drawing and viewing code for view3d back (no not objects :). Quick test: converted 2250 ugly lines of code in 2.5 hours. With about 300k lines todo, this will be 333 hours = 30 days? Whoa!
2008-12-122.5Ton Roosendaal
Scons was missing WM includes
2008-11-13Merge of trunk into blender 2.5:Brecht Van Lommel
svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r12987:17416 Issues: * GHOST/X11 had conflicting changes. Some code was added in 2.5, which was later added in trunk also, but reverted partially, specifically revision 16683. I have left out this reversion in the 2.5 branch since I think it is needed there. http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=16683 * Scons had various conflicting changes, I decided to go with trunk version for everything except priorities and some library renaming. * In creator.c, there were various fixes and fixes for fixes related to the -w -W and -p options. In 2.5 -w and -W is not coded yet, and -p is done differently. Since this is changed so much, and I don't think those fixes would be needed in 2.5, I've left them out. * Also in creator.c: there was code for a python bugfix where the screen was not initialized when running with -P. The code that initializes the screen there I had to disable, that can't work in 2.5 anymore but left it commented as a reminder. Further I had to disable some new function calls. using src/ and python/, as was done already in this branch, disabled function calls: * bpath.c: error reporting * BME_conversions.c: editmesh conversion functions. * SHD_dynamic: disabled almost completely, there is no python/. * KX_PythonInit.cpp and Ketsji/ build files: Mathutils is not there, disabled. * text.c: clipboard copy call. * object.c: OB_SUPPORT_MATERIAL. * DerivedMesh.c and subsurf_ccg, stipple_quarttone. Still to be done: * Go over files and functions that were moved to a different location but could still use changes that were done in trunk.
2008-01-08* fix linking order for l00nixNathan Letwory
2008-01-08* tweak linking priorities - should help for GCC usersNathan Letwory
* some lib renaming
2008-01-08* update scons-files to build with Ton's latest commits.Nathan Letwory