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-05-19svn merge ^/trunk/blender -c56867v2.67aCampbell Barton
2013-05-19svn merge ^/trunk/blender -c56892 -c56894 -c56896 -c56897 -c56898 -c56901 ↵Campbell Barton
-c56902 -c56905 -c56906 -c56912
2013-05-16svn merge ^/trunk/blender -c56826 -c56836 -c56839Campbell Barton
2013-05-16svn merge ^/trunk/blender -c56620 -c56639 -c56643 -c56647 -c56648 -c56650 ↵Campbell Barton
-c56651 -c56653 -c56654 -c56661 -c56662 -c56663 -c56668 -c56670 -c56671 -c56672 -c56673 -c56674 -c56676 -c56678 -c56679 -c56680 -c56682 -c56688 -c56689 -c56698 -c56700 -c56707 -c56711 -c56735 -c56745 -c56747 -c56748 -c56749 -c56755 -c56756 -c56759 -c56760 -c56763 -c56766 -c56767 -c56773 -c56778 -c56783 -c56784 -c56785 -c56790 -c56791 -c56793 -c56800 -c56806 -c56807 -c56809 -c56815 -c56816 -c56820
2013-05-05correction for uv template, also some doxygen comment corrections. Campbell Barton
2013-05-03Minor code clean-up.Tamito Kajiyama
2013-05-01Fix for [#35116] Freestyle StringUtils::toAscii breakes non-ascii path values.Tamito Kajiyama
Just removed all calls of StringUtils::toAscii() as well as the function definitions.
2013-05-01remove headers from FRS_freestyle.hCampbell Barton
2013-04-29More build fixes for visual studio 2012.Brecht Van Lommel
Patch #35019, #35131 and #35152 by Jurgen Herrmann.
2013-04-24Fix for full-sample anti-aliasing (FSAA) not working with Freestyle.Tamito Kajiyama
Reverted the trunk revision 56136 and part of revision 56127 concerning the local Main for Freestyle and temporary scene generation for stroke rendering. The function do_merge_fullsample() in pipeline.c has access to the Scene of each Render, so that the temporary Scene generated by Freestyle has to be kept for FSAA even after stroke rendering has been done. By the same token, the local Main has been moved from the BlenderStrokeRenderer class to Render. It is noted that free_all_freestyle_renders() in pipeline.c is intended to get the temporary Scene of each Render released specifically taking account of the FSAA case.
2013-04-21Minor code clean-up & removal of unused code segments.Tamito Kajiyama
2013-04-21Fix for a crash due to uninitialized local Main (introduced in revision 56127).Tamito Kajiyama
2013-04-18Fix for access freed scene when doing freestyle renderSergey Sharybin
It's more like an ownership thing, but it's not so much clear who actually is an owner of temporary scene, so for now just ensure Render does not have link to it after strokes are rendered. There're also suspicious thing related on why separate RE_free_database is needed for freestyle renders, but that's also another story.
2013-04-18Make freestyle use local Main for temporary objectsSergey Sharybin
This means main database is no longer pollutes with temporary scene and objects needed for freestyle render. Actually, there're few of separated temporary mains now. Ideally it's better to use single one, but it's not so much trivial to pass it to all classes. Not so big deal actually. Required some changes to blender kernel, to make it possible to add object to a given main, also to check on mesh materials for objects in given main. This is all straightforward changes. As an additional, solved issue with main database being infinitely polluted with text blocks created by create_lineset_handler function. This fixes: - #35003: Freestyle crashes if user expands objects in FRS1_Scene - #35012: ctrl+f12 rendering crashes when using Freestyle
2013-04-16Blender Internal Render in viewportTon Roosendaal
Because of our release soon, feature has been added behind the Debug Menu. CTRL+ALT+D and set it to -1. Or commandline --debug-value -1. When debug set to -1, you can put the viewport to 'render' mode, just like for Cycles. Notes for testers: (and please no bugs in tracker for this :) - It renders without AA, MBlur, Panorama, Sequence, Composite - Only active render layer gets rendered. Select another layer will re-render. - But yes: it works for FreeStyle renders! - Also does great for local view. - BI is not well suited for incremental renders on view changes. This only works for non-raytrace scenes, or zoom in ortho or camera mode, or for Material changes. In most cases a full re-render is being done. - ESC works to stop the preview render. - Borders render as well. (CTRL+B) - Force a refresh with arrow key left/right. A lot of settings don't trigger re-render yet. Tech notes: - FreeStyle is adding a lot of temp objects/meshes in the Main database. This caused DepsGraph to trigger changes (and redraws). I've prepended the names for these temp objects with char number 27 (ESC), and made these names be ignored for tag update checking. - Fixed some bugs that were noticable with such excessive re-renders, like for opening file window, quit during renders.
2013-04-16Fix for line instability with the Polygonization geometry modifier.Tamito Kajiyama
Extra long straight lines showed up randomly due to the use of an uninitialized variable as a line length parameter.
2013-04-16Fix a few warnings. One was an actual bug in freestyle where stroke attributesBrecht Van Lommel
were not properly interpolated.
2013-04-12code cleanup: warnings and style.Campbell Barton
2013-04-11code cleanup: unused vars, make other vars static.Campbell Barton
2013-04-11Fix for a crash in the Bezier Curve geometry modifier.Tamito Kajiyama
Least-squares fitting parameters were stored in a fixed size array, causing a buffer overflow depending on the number of input points. Problem report with a .blend file to reproduce the issue and a bugfix patch by christiankrupa and jensverwiebe on IRC, thanks a lot! Many thanks also to Bastien Montagne for forwarding the problem report by email.
2013-04-09Attempt to fix a potential name conflict between Freestyle and the compositor.Tamito Kajiyama
A crash in the Freestyle renderer was reported by Ton on IRC with a stack trace below. Note that #2 is in Freestyle, whereas #1 is in the compositor. The problem was observed in a debug build on OS X 10.7 (gcc 4.2, openmp disabled, no llvm). ---------------------------------------------------------------------- Program received signal EXC_BAD_ACCESS, Could not access memory. Reason: 13 at address: 0x0000000000000000 [Switching to process 72386 thread 0xf303] 0x0000000100c129f3 in NodeBase::~NodeBase (this=0x10e501c80) at COM_NodeBase.cpp:43 43 delete (this->m_outputsockets.back()); Current language: auto; currently c++ (gdb) where #0 0x0000000100c129f3 in NodeBase::~NodeBase (this=0x10e501c80) at COM_NodeBase.cpp:43 #1 0x0000000100c29066 in Node::~Node (this=0x10e501c80) at COM_Node.h:49 #2 0x000000010089c273 in NodeShape::~NodeShape (this=0x10e501c80) at NodeShape.cpp:43 #3 0x000000010089910b in NodeGroup::destroy (this=0x10e501da0) at NodeGroup.cpp:61 #4 0x00000001008990cd in NodeGroup::destroy (this=0x10e5014b0) at NodeGroup.cpp:59 #5 0x00000001008990cd in NodeGroup::destroy (this=0x114e18da0) at NodeGroup.cpp:59 #6 0x00000001007e6602 in Controller::ClearRootNode (this=0x114e19640) at Controller.cpp:329 #7 0x00000001007ea52e in Controller::LoadMesh (this=0x114e19640, re=0x10aba4638, srl=0x1140f5258) at Controller.cpp:302 #8 0x00000001008030ad in prepare (re=0x10aba4638, srl=0x1140f5258) at FRS_freestyle.cpp:302 #9 0x000000010080457a in FRS_do_stroke_rendering (re=0x10aba4638, srl=0x1140f5258) at FRS_freestyle.cpp:600 #10 0x00000001006aeb9d in add_freestyle (re=0x10aba4638) at pipeline.c:1584 #11 0x00000001006aceb7 in do_render_3d (re=0x10aba4638) at pipeline.c:1094 #12 0x00000001006ae061 in do_render_fields_blur_3d (re=0x10aba4638) at pipeline.c:1367 #13 0x00000001006afa16 in do_render_composite_fields_blur_3d (re=0x10aba4638) at pipeline.c:1815 #14 0x00000001006b04e4 in do_render_all_options (re=0x10aba4638) at pipeline.c:2021 ---------------------------------------------------------------------- Apparently a name conflict between the two Blender modules is taking place. The present commit hence intends to address it by putting all the Freestyle C++ classes in the namespace 'Freestyle'. This revision will also prevent potential name conflicts with other Blender modules in the future. Special thanks to Lukas Toenne for the help with C++ namespace.
2013-04-08code cleanup: unused macrosCampbell Barton
2013-04-08style cleanupCampbell Barton
2013-04-07use lowercase name for freestyle module (as with all other blender modules).Campbell Barton
2013-04-04quiet warnings (building with -Werror)Campbell Barton
2013-04-03Use of text datablocks for storing Python style modules.Tamito Kajiyama
Suggested by Brecht Van Lommel and Campbell Barton through code review comments. Previously style modules were external Python script files whose absolute paths were kept in .blend files. Now style modules are stored in .blend files as text datablocks. Style modules are configured in three steps: 1. Open an external style module file (or create a new text datablock) in the Text Editor in Blender. 2. Add a style module to the list of style modules (by pressing the "Add" button) in the Render Layer properties window. 3. Click the name entry and select the style module from the drop-down menu.
2013-03-31remove blender foundation copyright from freestyle files.Campbell Barton
this can be added back on case-by-case basis, but better not assume ownership of another projects work by default.
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-24Removed a Freestyle-specific function call from bf_windowmanager.Tamito Kajiyama
Suggested by Sergey Sharybin through a code review of the branch.
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-22Fix for default values different from the factory settings.Tamito Kajiyama
Suggested by IRIE Shinsuke through a code review of the branch.
2013-03-19quiet warnings by making undeclared vars staticCampbell Barton
2013-03-19fix for some errors.Campbell Barton
2013-03-17Fix for a crash due to a bug in the handling of singularity in stroke creation,Tamito Kajiyama
where additions of a small offset (to prevent vertices from being at the same point) were not properly done when vertices were shifted in the reverse order. A problem report by Vicente Carro through personal communications, thanks a lot!
2013-03-16Fix for a crash due to mesh faces with wire frame materials not properly ↵Tamito Kajiyama
handled. A problem report by Vicente Carro through personal communications, many thanks!
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-11Another big code clean-up patch from Bastien Montagne, thanks again!Tamito Kajiyama
2013-03-08A big code clean-up patch from Bastien Montagne, many thanks!Tamito Kajiyama
2013-03-03Fix for exceptions in converting Python float objects to C variables not ↵Tamito Kajiyama
properly handled. Based on review comment from Campbell.
2013-03-03Code clean-up: used copy_m4_m4() and unit_m4() instead of verbose loops.Tamito Kajiyama
Based on review comment from Campbell.
2013-03-03Removed redundant definitions of __min and __max macros by replacing them withTamito Kajiyama
std::min() and std::max(), respectively. Based on review comment from Campbell.
2013-03-03Moved operations on blend file data from C++ class destructor to a specific ↵Tamito Kajiyama
method for releasing resources. Based on review comment from Campbell.
2013-03-02Fix for a buffer overflow, by simply removing the unnecessary string copy.Tamito Kajiyama
Review comment from Campbell.
2013-03-02Removed paths to a browser command and help index that are no longer used in ↵Tamito Kajiyama
Freestyle for Blender. Review comment from Campbell.
2013-02-24Freestyle Python API improvements - part 8.Tamito Kajiyama
* Proper handling of keyword arguments was implemented in Operators and ContextFunctions, as well as in methods of Interface0D, Interface1D, Iterator, their subclasses, Noise and IntegrationType. * Operators' methods and functions in the ContextFunctions module were renamed from CamelCase to lower cases + underscores. Style modules were updated accordingly. * Additional code clean-up was also made.
2013-02-24Code clean-up and fix for typos in docstrings.Tamito Kajiyama
2013-02-23Code style clean-up.Tamito Kajiyama
2013-02-23Added GNU GPL header blocks.Tamito Kajiyama
2013-02-23Fix for __repr__() depending on .getName() and .getExactTypeName().Tamito Kajiyama
API users no longer need to define them in user-defined Functions, Predicates and StrokeShaders. Also removed all .getName() and .getExactTypeName() definitions in pre-defined Functions, Predicates and StrokeShaders subclasses.
2013-02-23Minor docstring fixes.Tamito Kajiyama