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
2013-03-28svn merge ^/trunk/blender -r55594:55635Campbell Barton
2013-03-27Fix for timing print in renders.Ton Roosendaal
The time it was printing was excluding the time spent on color and file saving. Now it includes this too, plus it prints the time spent on color/files. Makes quite a difference when you do sequencer conversions or grading in terminals - time that was printed was very misleading. For readablity of logs, also added an extra empty line after this print.
2013-03-26Freestyle changes:Sergey Sharybin
- Revert some stylistic changes made in branch They weren't directly related on freestyle project and better be handled in trunk. Helps reading patches ad prevents possible merge conflicts. - Solved issue introduced with recent deprecation of RenderData.maximize,
2013-03-26Merging r55547 through r55594 from trunk into soc-2008-mxcurioniSergey Sharybin
2013-03-26style cleanup:Campbell Barton
also rename mesh_getVertexCos() --> BKE_mesh_vertexCos_get() to match curve function.
2013-03-24Merged changes in the trunk up to revision 55546.Tamito Kajiyama
Conflicts resolved: source/blenderplayer/bad_level_call_stubs/SConscript Partly reverted changes to intern/cycles/blender/addon/ui.py in revision 52899 to make it easier to merge trunk changes.
2013-03-24fix for struct definition building with msvc2008 and some style cleanup.Campbell Barton
2013-03-23A major code update for making the DNA file specification of Freestyle settingsTamito Kajiyama
and RNA for it independent of the build flag for enabling Freestyle. Suggested by Sergey Sharybin through a code review of the branch. * Many #ifdef WITH_FREESTYLE blocks were removed to always have Freestyle-specific DNA file specification and RNA for it built in Blender. This will allow Freestyle setting survive even when a non-Freestyle build is used for loading and saving files. It is noted that operations are still conditionally built through #ifdef WITH_FREESTYLE blocks. * To this end, new blenkernel files BKE_freestyle.h and intern/freestyle.c have been added. All API functions in FRS_freestyle_config.h as well as some of those in FRS_freestyle.h were moved to the new files. Now the relocated API functions have BKE_ prefix instead of FRS_.
2013-03-21code cleanup: misc warnings/styleCampbell Barton
2013-03-21code cleanup: use bool where values are true/false, for view3d and related ↵Campbell Barton
functions.
2013-03-19svn merge ^/trunk/blender -r55372:55392Campbell Barton
2013-03-19svn merge ^/trunk/blender -r55357:55372Campbell Barton
2013-03-18code cleanupCampbell Barton
2013-03-18Merge of the PyNodes branch (aka "custom nodes") into trunk.Lukas Toenne
PyNodes opens up the node system in Blender to scripters and adds a number of UI-level improvements. === Dynamic node type registration === Node types can now be added at runtime, using the RNA registration mechanism from python. This enables addons such as render engines to create a complete user interface with nodes. Examples of how such nodes can be defined can be found in my personal wiki docs atm [1] and as a script template in release/scripts/templates_py/custom_nodes.py [2]. === Node group improvements === Each node editor now has a tree history of edited node groups, which allows opening and editing nested node groups. The node editor also supports pinning now, so that different spaces can be used to edit different node groups simultaneously. For more ramblings and rationale see (really old) blog post on code.blender.org [3]. The interface of node groups has been overhauled. Sockets of a node group are no longer displayed in columns on either side, but instead special input/output nodes are used to mirror group sockets inside a node tree. This solves the problem of long node lines in groups and allows more adaptable node layout. Internal sockets can be exposed from a group by either connecting to the extension sockets in input/output nodes (shown as empty circle) or by adding sockets from the node property bar in the "Interface" panel. Further details such as the socket name can also be changed there. [1] http://wiki.blender.org/index.php/User:Phonybone/Python_Nodes [2] http://projects.blender.org/scm/viewvc.php/trunk/blender/release/scripts/templates_py/custom_nodes.py?view=markup&root=bf-blender [3] http://code.blender.org/index.php/2012/01/improving-node-group-interface-editing/
2013-03-18style cleanupCampbell Barton
2013-03-18Merged changes in the trunk up to revision 55357.Tamito Kajiyama
Resolved conflicts: release/datafiles/startup.blend source/blender/editors/space_nla/nla_buttons.c Also updated source/blender/blenkernel/intern/linestyle.c as a follow-up of recent changes for the use of bool.
2013-03-14Border rendering now works for all scenes used in compositor,Sergey Sharybin
before this only active scene would be rendered with border. When do_render_fields_blur_3d() is finished, it'll modify render's display rect so it'll correspond bordered render result placed on black backgrund. Actual border is stored nowhere, which makes it only way to re-calculate disprect for all other renders used in compo based on source. Not so big deal actually. Also needed to modify Cycles a bit, because before this patch it used border settings from scene being rendered. Now made it so render data is passing to external engines. Using a property inside RenderEngine structure for this. Not best ever design for passing render data, but this would prevent API breakage. So now external engines could access engine.render to access active rendering settings. Reviewed by Brecht, thanks!
2013-03-13Fix for build error with previous commit, seems the order of #includes ↵Brecht Van Lommel
matters here.
2013-03-13New implementation of Freestyle edge/face marksTamito Kajiyama
The previous implementation of Freestyle edge/face marks was refactored based on suggestions from the latest code review by Campbell. The new implementation relies on mesh CustomData to store edge/face marks, instead of introducing extra flags in the core Mesh and BMesh data structures. The CustomData-based implementation will allow further additions of new edge/face attributes because of the independence from Mesh/BMesh. This revision is work in progress, mainly intended to address the review comments and ask for further code review in view of the trunk merger in the upcoming 2.67 release.
2013-03-10More UI message i18n fixes and improvements...Bastien Montagne
Rendering messages are now translatable.
2013-03-09code cleanup: favor braces when blocks have mixed brace use.Campbell Barton
2013-03-08code cleanup: 0 --> NULLCampbell Barton
2013-03-08style cleanupCampbell Barton
2013-03-07Change !BLI_ghashIterator_isDone to BLI_ghashIterator_notDone. It isAntony Riakiotakis
always used in that context so we can at least avoid reverting it twice :p.
2013-03-05code cleanup: also change BKE_blender.h BLENDER_VERSION_CHAR to 'a' so as ↵Campbell Barton
not to confuse things.
2013-03-05patch [#34103] path_util_split_dirstring.patch, ↵Campbell Barton
path_util_split_dirstring_2.patch, path_util_split_dirstring_3.patch from Lawrence D'Oliveiro (ldo) Get rid of BLI_splitdirstring, replace with calls to BLI_split_dirfile, BLI_split_dir_part and BLI_split_file_part as appropriate.
2013-03-05patch [#34103] fileops_1.patchCampbell Barton
from Lawrence D'Oliveiro (ldo) Add comments and use of bool type in fileops.c
2013-03-05patch [#34103]Campbell Barton
from Lawrence D'Oliveiro (ldo) More use of bool type, necessitating adding inclusion of BLI_utildefines.h, or moving it up in the inclusion order if it was already included, in various places - storage.c: make some variables only used in bli_builddir local to that - storage.c: BLI_file_descriptor_size should allow 0 as a valid file descriptor - path_util.c: make pointers to non-reentrant storage returned from folder routines const, necessitating making variables holding these returned pointers const elsewhere as well - path_util.c: BLI_string_to_utf8 closes iconv context in case of conversion error - blf_lang.c: fill_locales routine now has its own "languages" local variable to construct paths (was stealing internal storage belonging to BLI_get_folder before)
2013-03-04Fix for image transparency backwards compatibility. Now the texture ↵Brecht Van Lommel
datablock has a Use Alpha option again. This makes the case where you enabled Premultiply on the image and disabled Use Alpha on the texture work again. That's mostly useful when you have a straight alpha image file which has no useful RGB colors in zero alpha regions (e.g. renders). Then sometimes you don't want to use the alpha for the texture stack mixing, but you still want to multiply it into the RGB channels to avoid a blocky transition into zero alpha regions. This also removes the version patch that copied image datablocks because it's not reliable and might be causing bug #34434. This does mean we are no longer backwards compatible for cases where two different texture datablocks with Use Alpha enabled and disabled where using the same image.
2013-03-04Fix #34501: Painting on image editor with texture brush causes memory leaks ↵Sergey Sharybin
in render module Issue was caused by svn rev54721 where donequeue wasn't fully handled in cases rendering was canceled, which lead to some render results unfreed.
2013-03-03Merged changes in the trunk up to revision 54992.Tamito Kajiyama
Resolved conflicts: release/scripts/startup/bl_ui/space_view3d.py
2013-03-03code cleanup: ~400 duplicate lines for AO form factor math.Campbell Barton
2013-02-28More UI messages fixes...Bastien Montagne
2013-02-27Fix various warnings with clang build, and adjust cmake clang warnings flagsBrecht Van Lommel
to include a few more that gcc is using too.
2013-02-24Merged changes in the trunk up to revision 54802.Tamito Kajiyama
2013-02-22Fix #34351: Displacement map Bake margin does not workSergey Sharybin
2013-02-21Blender Internal: optimization to remove sleep() calls from the render threadingBrecht Van Lommel
code. This gives a speedup up to a couple of seconds based only on the image resolution and tile size. For complex renders a second or two is not so noticeable but for quick ones it's nice to save some time. On the default cube this gives me about half a second speedup. Patch by Johan Walles, based on the render branch implementation by me.
2013-02-21code cleanup: remove unused runtime var - World.fastcolCampbell Barton
2013-02-20Fix visible seams on normal map bake due to clear colour being black:Antony Riakiotakis
This is a special case, tangent space normal maps should be cleared to 0.5, 0.5, 1.0. This is good practice but there's no reason why not to automate this (for artists whose bump map fu may be a bit shallow). Thanks to Morten Mikkelsen for reporting.
2013-02-16Merged changes in the trunk up to revision 54594.Tamito Kajiyama
2013-02-14Divide by 3 instead of multiplying by variations of 0.333Sergej Reich
Fixes small precision problems.
2013-02-13remove redundant if statement.Campbell Barton
2013-02-12Bug fix #34213 (2)Ton Roosendaal
Adding non-RGBA float buffers as texture crashes MipMap code. Images with less than 4 channels not supported (yet). Not sure if we ever should even... normals, Z, vectors, UV, Index, all don't like downsampling.
2013-02-11Fix #34194: Render Layer node didn't initialize color management flag properlySergey Sharybin
Bang! How we didn't notice this for so long -- seems scenes came from render layer node were rendering as if color management disabled (byte image wouldn't be linearized).
2013-02-11style cleanup: also some typosCampbell Barton
2013-02-10Merged changes in the trunk up to revision 54421.Tamito Kajiyama
Conflicts resolved: release/datafiles/startup.blend release/scripts/startup/bl_ui/properties_render.py source/blender/SConscript source/blender/blenloader/intern/readfile.c
2013-02-10Fix #34186: VSE: Incorrect movie output when scene strip is muted by keyframeSergey Sharybin
2013-02-08Corrections to alpha pipeline do_versionsSergey Sharybin
Basically they're aimed to solve issues when scene with sky was used for compositing. If compo used alpha output result of current trunk would be completely different form hwo it was before. Two heuristics here: - If there's no world or world color is black, it completely equals to straight alpha mode, no further magic is needed to preserve compatibility - If scene is used as Render Layer node and something is connected to Alpha output of this node, ensure alpha mode for this scene is set to Premultiplied. Basically it shall give better compatibility and make 4K mango project just happy! :)
2013-02-08fix for error in own recent commit, null check before assignment.Campbell Barton
2013-02-07Fix #34156: Spec. and Alpha Intensity OpenGL issueSergey Sharybin
Issue was caused by alpha pipeline cleanup: apparently depending on use_alpha flag different channels for spec/alpha would be used. Made it so talpha is computed from Image->ignore_alpha instead of always considering to be TRUTH. This is not so much trivial to understand what's going on here, but it's not new issue. Anyway, if someone have got ideas how to improve feedback here -- ideas are welcome! For now only regression is fixed.