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
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-10Cycles: fix crash in image assign/remove in image editor.Brecht Van Lommel
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-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-03correct error in stubCampbell Barton
2011-11-02RenderEngine api: support for viewport rendering, details here:Brecht Van Lommel
http://wiki.blender.org/index.php/Dev:2.6/Source/Render/RenderEngineAPI * This adds a Rendered draw type in the 3D view, only available when the render engine implements the view_draw callback. * 3D view now stores a pointer to a RenderEngine. * view_draw() callback will do OpenGL drawing instead of the viewport. * view_update() callback is called after depsgraph updates.
2011-10-28Merge with trunk r41342Miika Hamalainen
2011-10-28Dynamic Paint:Miika Hamalainen
* More code changes pointed by Brecht in codereview. * Some user interface improvements. * Updating brush settings now also updates canvas preview.
2011-10-23remove $Id: tags after discussion on the mailign list: ↵Campbell Barton
http://markmail.org/message/fp7ozcywxum3ar7n
2011-10-22Render API: add update_progress() function to update progress bar progress fromBrecht Van Lommel
external render engines. Also refactoring to move some render engine registration stuff out of RNA and into render module.
2011-10-22Merge with trunk r41197Miika Hamalainen
2011-10-22Dynamic Paint:Miika Hamalainen
* Some changes and cleanup pointed on the codereview.
2011-10-21Code cleanup: don't use btempdir/bprogdir/bprogname globals anymore, but wrapBrecht Van Lommel
in BLI_ functions.
2011-10-14Merge with trunk r40991Miika Hamalainen
2011-10-14Dynamic Paint:Miika Hamalainen
* Fix: Wave "timescale" also changed simulation behavior. Now different timescale values will lead to nearly identical results, just slower or faster. * Added "Displace Factor" setting for vertex displace surfaces. You can use it to adjust final displace strength or use negative values to paint bumps. * Added clamp/map value to wave image sequence output settings. * RNA description tweaking. * General code tweaking.
2011-10-04Update blenderplayer stubs to deal with recent keymaps commit.Sergey Sharybin
2011-10-04Merge with trunk r40782Miika Hamalainen
2011-09-27OSX: fix player bundle_creationJens Verwiebe
2011-09-26OSX - cmake: blenderplayer part 2: Jens Verwiever co-patchDalai Felinto
Using OSX Bundle (in oppose to Blender dummy .app) as start point for binary. That way we don't need to move the blenderplayer after the bundle is finished and we can rebuild it without doing `make install` I will test more tomorrow, but it should be working now
2011-09-21Translation: reload font on enabling/disabling use international fonts.Brecht Van Lommel
2011-09-20Merge with trunk r40409Miika Hamalainen
2011-09-14move ED_object_pose_armature --> object_pose_armature_get to so we dont get ↵Campbell Barton
bad level calls in the weight paint branch.
2011-09-14resolve bad level calls from blenkenel/ into editors/ & remove editors from ↵Campbell Barton
the include path from CMake & SCons. * ED_curve_editnurbs --> curve_editnurbs * ED_sculpt_modifiers_changed --> object_sculpt_modifiers_changed
2011-09-11partial fix for blenderplayer linking problems (decast retour)Dalai Felinto
This fix the problem of linking the extern components for the KX module. The remaining linking issues are related to actual bad level access so the fix is a bit more complex. Remaining linking issues (osx cmake gcc) ########### Undefined symbols: "_buildNavMeshDataByDerivedMesh", referenced from: KX_NavMeshObject::BuildVertIndArrays(float*&, int&, unsigned short*&, int&, unsigned short*&, float*&, int&, unsigned short*&, int&, int&)in libge_logic_ketsji.a(KX_NavMeshObject.cpp.o) _applyModifier in libbf_modifiers.a(MOD_navmesh.cpp.o) "_polyIsConvex", referenced from: _applyModifier in libbf_modifiers.a(MOD_navmesh.cpp.o) "_polyNumVerts", referenced from: KX_NavMeshObject::BuildVertIndArrays(float*&, int&, unsigned short*&, int&, unsigned short*&, float*&, int&, unsigned short*&, int&, int&)in libge_logic_ketsji.a(KX_NavMeshObject.cpp.o) "_polyFindVertex", referenced from: KX_NavMeshObject::BuildVertIndArrays(float*&, int&, unsigned short*&, int&, unsigned short*&, float*&, int&, unsigned short*&, int&, int&)in libge_logic_ketsji.a(KX_NavMeshObject.cpp.o) KX_NavMeshObject::BuildVertIndArrays(float*&, int&, unsigned short*&, int&, unsigned short*&, float*&, int&, unsigned short*&, int&, int&)in libge_logic_ketsji.a(KX_NavMeshObject.cpp.o) KX_NavMeshObject::BuildVertIndArrays(float*&, int&, unsigned short*&, int&, unsigned short*&, float*&, int&, unsigned short*&, int&, int&)in libge_logic_ketsji.a(KX_NavMeshObject.cpp.o) ############
2011-09-10Dynamic Paint:Miika Hamalainen
* Enabled modifier "Apply" button since it can now be used to apply displacement or output layers to the mesh. * Default surface output names are now unique in case canvas has multiple surfaces of same type. * Merged "face aligned" and "non-closed" brush options to a single "Project" toggle, available for "Proximity" brushes. * Added more icons to user interface selections. * Increased default proximity distance. * Set proximity falloff ramp to only affect alpha by default. * Removed some no longer required render ext. functions. * Fix: geometry node vertex alpha didn't work unless "Vertex Color Paint/Light" was enabled from material.
2011-09-06Fix for blender player linker bug, missing a stub function used in RNA.Lukas Toenne
2011-09-05Merge with trunk r39928Miika Hamalainen
2011-09-05Dynamic Paint:Miika Hamalainen
* Added "Initial Color" setting for surfaces. You can for example set color from UV mapped texture or from vertex colors. * Added clamping option for "wave" brushes. * Merged smudge and drip adjacency search code. This fixes some issues with drip effect and makes code easier to maintain. * Some adjustments to the bounding box generation code. * OpenMP is now completely disabled if no compile flag is set. * Wetness values are now properly clamped on vertex surfaces. No more black dots on >1.0 wetness. * Textured brushes now use same function calls as internal renderer, instead of modified duplicates. * Moved operator code to editors/physics/. * Re-enabled some particle brush optimizations. * Fixed sometimes incorrect volume brush influence. * Fixed possible crash when using a brush that uses "Voxel Data" texture simultaneously with material preview or render. * Fixed texture mapping issues for "Object Center" brush. * Fixed possible crash/corruption when duplicating brush object that uses color ramps. * Other tweaking and code cleanup.
2011-08-30* Merge trunk up to r39790.soc-2011-pepperJoerg Mueller
* Subversion bump (also for init_userdef_do_versions). * Minor fix for compilation without ffmpeg.
2011-08-29Fix player build error after envmap commit.Brecht Van Lommel
2011-08-28Merge with trunk r39750Miika Hamalainen
2011-08-23Merging trunk up to r39637.Joerg Mueller
2011-08-22fix for buildinfo changes with blenderplayerCampbell Barton
2011-08-21Merge with trunk r39589Miika Hamalainen
2011-08-17Adding ANIM_validate_keyingset to stubs.c so the Blenderplayer builds again.Mitchell Stokes
2011-08-11svn merge -r39286:39298 ↵Campbell Barton
https://svn.blender.org/svnroot/bf-blender/trunk/blender, ensure some edits in trunk dont get merged back into pepper
2011-08-11use ghash for operator and menu types, was doing string lookup in the ↵Campbell Barton
operator list (containing over 1000 items) for each button draw. gives small speedup for UI drawing and overall startup time.
2011-08-07Merging trunk up to r39145.Joerg Mueller
2011-08-06KEYMAP REFACTORINGBrecht Van Lommel
Diff Keymaps User edited keymaps now no longer override the builtin keymaps entirely, but rather save only the difference and reapply those changes. This means they can stay better in sync when the builtin keymaps change. The diff/patch algorithm is not perfect, but better for the common case where only a few items are changed rather than entire keymaps The main weakness is that if a builtin keymap item changes, user modification of that item may need to be redone in some cases. Keymap Editor The most noticeable change here is that there is no longer an "Edit" button for keymaps, all are editable immediately, but a "Restore" buttons shows for keymaps and items that have been edited. Shortcuts for addons can also be edited in the keymap editor. Addons Addons now should only modify the new addon keyconfiguration, the keymap items there will be added to the builtin ones for handling events, and not get lost when starting new files. Example code of register/unregister: km = wm.keyconfigs.addon.keymaps.new("3D View", space_type="VIEW_3D") km.keymap_items.new('my.operator', 'ESC', 'PRESS') km = wm.keyconfigs.addon.keymaps["3D View"] km.keymap_items.remove(km.keymap_items["my.operator"]) Compatibility The changes made are not forward compatible, i.e. if you save user preferences with newer versions, older versions will not have key configuration changes that were made.
2011-08-03Merge with trunk r39000Miika Hamalainen
2011-08-03Dynamic Paint:Miika Hamalainen
* Object velocity can now be used to determine brush influence and color. * Brushes can now be set to "smudge" existing paint. * Added new operators to easily add and remove surface output mesh data layers from Dynamic Paint ui. * Fixed drip effect algorithm to work properly on forces pointing towards surface. * Adjusted drip effect speed. * Drip effect can now use canvas velocity and acceleration to influence drip direction. * Fixed texture mapping for material enabled brushes. * "Object Center" type brushes can now use "material color" as well. * Improved surface partitioning grid generation algorithm. * Fixed possible invalid brush collision detection when OpenMP enabled. * Fixed incorrect random sized particle displace/wave influence. * Fixed "Object Center" brush color ramp falloff. * Fixed invalid zero alpha sampling when rendering vertex colors. * Lots of smaller tweaking.
2011-07-30Merging up to trunk r38834.Joerg Mueller
2011-07-26py api:Campbell Barton
- added menu templates - move template menu into the header of the text editor (so users will find more easily) - updated mathutils examples, switching the order of multiplication.
2011-07-22Merge with trunk r38619Miika Hamalainen
2011-07-22Dynamic Paint:Miika Hamalainen
* Surface bake data is no longer recalculated every frame, but only when surface mesh has moved/transformed. Results in multiple times better performance on high resolution surfaces when using sub-steps or surface is still. * Heavily optimized particle brushes when random particle size enabled. Up to 10x speedup with large radius particles. * Added an additional "grid" space partitioning structure for surfaces. * Added bounding box checks for brushes. * Smaller overall optimization. * Further OpenMP parallelization. * Added physics tab link to modifier panel. * Fix: "Point Density" texture cache wasn't properly updated. Brushes can now use Point Density textures as well. * Fix: Paint dissolve resulted in black color. * Fix: KD-tree checkups weren't completely thread safe. Fixes possible crash with OpenMP enabled particle brushes. * Fix: When brush was set to use a specific material, it was saved incorrectly and resulted in potential crashes on next load.