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-03-05Add stub needed for blenderplayer compilation.Sergey Sharybin
2012-02-27Code Cleanup:Campbell Barton
* made bmesh_structure.h function names more consistant. * remove unused code in bmesh_structure.c * removed 'Edge Flip' operator (missing from bmesh but looked into trunk feature and dont think its worth keeping). * tagged some BMESH_TODO's
2012-02-27style cleanup (mostly whitespace)Campbell Barton
2012-02-22Fix blenderplayer linking with recent additions to bmesh python. We should ↵Antony Riakiotakis
really start building with player on so that mistakes like this can be detected early.
2012-02-20Fixed blenderplayer compile for msvc.Miika Hamalainen
2012-02-18svn merge ^/trunk/blender -r44204:44213Campbell Barton
2012-02-18- Fixed linking errors of blender player with CMake and XDND enabledSergey Sharybin
- Rest of changes to make XDND switch-off-able: link against extern_xdnd only if XDND is enabled
2012-01-20svn merge ^/trunk/blender -r43530:43554Campbell Barton
2012-01-20- Fix for commit 43551 which caused a linking error in blenderplayer.Andrew Hale
- Minor clean up for commit 43551.
2012-01-18svn merge ^/trunk/blender -r43461:43472Campbell Barton
2012-01-17Uv Tools branch GSOC 2011Antony Riakiotakis
========================= Documentation: http://wiki.blender.org/index.php/User:Psy-Fi/UV_Tools Major features include: *16 bit image support in viewport *Subsurf aware unwrapping *Smart Stitch(snap/rotate islands, preview, middlepoint/endpoint stitching) *Seams from islands tool (marks seams and sharp, depending on settings) *Uv Sculpting(Grab/Pinch/Rotate) All tools are complete apart from stitching that is considered stable but with an extra edge mode under development(will be in soc-2011-onion-uv-tools).
2012-01-17svn merge ^/trunk/blender -r43420:43436Campbell Barton
2012-01-16Corrected fix for linking issues with blenderplayer enabledSergey Sharybin
2012-01-16Fix for compilation error using cmake+msvcSergey Sharybin
2012-01-11svn merge ^/trunk/blender -r43278:43294Campbell Barton
2012-01-11svn merge ^/trunk/blender -r43220:43278 --accept postponeCampbell Barton
2012-01-11minor cleanup for string use - no functional changesCampbell Barton
- use more logical names for strings, noticed too many strings called `str` when reviewing name patch. - pass __func__ macro to uiBeginBlock(), quite a few names were wrong (copy/paste error).
2012-01-09Cycles: multi GPU rendering support.Brecht Van Lommel
The rendering device is now set in User Preferences > System, where you can choose between OpenCL/CUDA and devices. Per scene you can then still choose to use CPU or GPU rendering. Load balancing still needs to be improved, now it just splits the entire render in two, that will be done in a separate commit.
2011-12-31Fix blenderplayer build (by adding missing bad level call stubs)Andrew Wiggin
2011-12-31svn merge ^/trunk/blender -r43009:43033Campbell Barton
2011-12-31Add remesh modifier (dual contouring).Nicholas Bishop
This patch adds a new remeshing modifier. The algorithm is based on the paper "Dual Contouring of Hermite Data", and the implementation was contributed to Blender by Dr. Tao Ju. The contributed code is in intern/dualcon, and was modified to compile under gcc and work on 64-bit systems. Files not needed for Blender were removed and a small C wrapper was added in order to interface it with Blender. The rest of the patch is just standard modifier stuff. Reviewed by Sergey, code review link: http://codereview.appspot.com/5491053/ The remesh icon was contributed by Zafio: http://blenderartists.org/forum/showthread.php?240751-Request-for-modifier-icon/page2. Thanks to everyone in that thread for the icon proposals and discussion. Documentation and examples on the Blender wiki: http://wiki.blender.org/index.php/User:Nicholasbishop/RemeshModifier In case the history is needed for anything, check the remesh-modifier branch of this git repository: https://gitorious.org/~nicholasbishop/blenderprojects/nicholasbishop-blender
2011-12-01Add stubs for bad level calls found when doing a release build (including ↵Andrew Wiggin
more features) while working on the last commit
2011-11-28svn merge ^/trunk/blender -r42197:42221Campbell Barton
2011-11-28remove duplicate extern_colamd from blenderplayer cmakeAntony Riakiotakis
2011-11-23svn merge ^/trunk/blender -r42080:42095Campbell Barton
2011-11-23Fix compilation error of blenderplayer caused by recent commit.Sergey Sharybin
2011-11-22svn merge ^/trunk/blender -r42009:42053Campbell Barton
2011-11-22fix for blenderplayer buildDalai Felinto
2011-11-22image save operator now shares settings and UI with render & image out node.Campbell Barton
details: - setting format options from python isnt possible anymore since this isnt exposed via op->properties, python should use image.save() function instead. - image save UI now hides 'Relative' option when copy is selected since it has no effect. - default image depth is set to 8 or more if the image has no float buffer, otherwise its set to 32 or less. other fixes: - image new was adding an image with a filepath set to "untitled", if this file happened to exist in the current directory a save on the generated image would overwrite it, now initialize to empty path. - BKE_ftype_to_imtype was returning an invalid value if ftype==0.
2011-11-20svn merge ^/trunk/blender -r41961:41998Campbell Barton
2011-11-18Updated stubs so blenderplayer is compiling again.Sergey Sharybin
2011-11-18svn merge ^/trunk/blender -r41939:41954Campbell Barton
2011-11-17pydrivers: 'frame' is now in the driver namespace,Campbell Barton
- no need to link to scenes when using a frame from the pydriver, this made linking rigs for eg, quite messy. - advantage that we get subframe values (where scenes from was fixed to a whole number).
2011-11-15svn merge -r41779:41847 ^/trunk/blenderCampbell Barton
2011-11-14minor cleanup Campbell Barton
- use NULL rather then 0 for pointers - use static functions where possible - add own includes to ensure func's and their declarations don't get out of sync.
2011-11-11svn merge -r41723:41751 ^/trunk/blenderCampbell Barton
2011-11-11svn merge -r41722:41723 ^/trunk/blenderCampbell Barton
2011-11-10Cycles: fix crash in image assign/remove in image editor.Brecht Van Lommel
2011-11-10svn merge -r41650:41655 ^/trunk/blender --- cycles merge, this wont copile, ↵Campbell Barton
still need to manually update some funcs
2011-11-10svn merge -r41649:41650 ^/trunk/blenderCampbell Barton
2011-11-09Merge with trunk r41701soc-2011-carrotMiika Hamalainen
2011-11-08Texturing: texture and 3d view draw type changes, these should only have anyBrecht Van Lommel
effect for a render engine using new shading nodes. In short: * No longer uses images assigned to faces in the uv layer, rather the active image texture node is what is edited/painted/drawn. * Textured draw type now shows the active image texture node, with solid lighting. * Material draw mode shows GLSL shader of a simplified material node tree, using solid lighting. * Textures for modifiers, brushes, etc, are now available from a dropdown in the texture tab in the properties editor. These do not use new shading nodes yet. http://wiki.blender.org/index.php/Dev:2.6/Source/Render/TextureWorkflow
2011-11-08Code cleanup: fix compile warning.Brecht Van Lommel
2011-11-08svn merge ^/trunk/blender -r41602:41638 .Campbell Barton
2011-11-08UI/Nodes: templates to edit nodes from the properties editor using a tree view,Brecht Van Lommel
to be used by cycles. For testing there's a panel in the node editor if you set debug to 777, didn't enable it because I'm not sure it's very useful there.
2011-11-07Merge with trunk r41625Miika Hamalainen
2011-11-07Camera tracking integrationSergey Sharybin
=========================== Commiting camera tracking integration gsoc project into trunk. This commit includes: - Bundled version of libmv library (with some changes against official repo, re-sync with libmv repo a bit later) - New datatype ID called MovieClip which is optimized to work with movie clips (both of movie files and image sequences) and doing camera/motion tracking operations. - New editor called Clip Editor which is currently used for motion/tracking stuff only, but which can be easily extended to work with masks too. This editor supports: * Loading movie files/image sequences * Build proxies with different size for loaded movie clip, also supports building undistorted proxies to increase speed of playback in undistorted mode. * Manual lens distortion mode calibration using grid and grease pencil * Supervised 2D tracking using two different algorithms KLT and SAD. * Basic algorithm for feature detection * Camera motion solving. scene orientation - New constraints to "link" scene objects with solved motions from clip: * Follow Track (make object follow 2D motion of track with given name or parent object to reconstructed 3D position of track) * Camera Solver to make camera moving in the same way as reconstructed camera This commit NOT includes changes from tomato branch: - New nodes (they'll be commited as separated patch) - Automatic image offset guessing for image input node and image editor (need to do more tests and gather more feedback) - Code cleanup in libmv-capi. It's not so critical cleanup, just increasing readability and understanadability of code. Better to make this chaneg when Keir will finish his current patch. More details about this project can be found on this page: http://wiki.blender.org/index.php/User:Nazg-gul/GSoC-2011 Further development of small features would be done in trunk, bigger/experimental features would first be implemented in tomato branch.
2011-11-05Merge with trunk r41545Miika Hamalainen
2011-11-04svn merge -r41480:41503 ^/trunk/blenderCampbell Barton
2011-11-03correct error in stubCampbell Barton