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-12-27Merge branch 'master' into soc-2013-depsgraph_mtsoc-2013-depsgraph_mtSergey Sharybin
Conflicts: source/blender/blenkernel/intern/constraint.c source/blender/blenkernel/intern/depsgraph.c source/blender/blenkernel/intern/object.c source/blender/blenkernel/intern/scene.c source/blender/blenkernel/intern/shrinkwrap.c source/blender/collada/AnimationExporter.cpp source/blender/editors/space_image/image_ops.c source/blender/editors/space_view3d/view3d_view.c source/blender/makesrna/intern/rna_scene.c source/blender/modifiers/intern/MOD_util.c source/blender/render/intern/source/pipeline.c
2013-12-27Code Cleanup: styleCampbell Barton
2013-12-27API Docs: use a simpler example for merging namespacesCampbell Barton
2013-12-27Cycles / Hair: Avoid duplicate calculations and remove redundant if branch, ↵Thomas Dinges
instead add the condition to the one above.
2013-12-27Rigidbody: Code cleanupSergej Reich
Make some functions private. Remove unneeded nested if statements. Avoid mixing short and bool.
2013-12-27Rigidbody: Code cleanupSergej Reich
Remove redundant extern keyword.
2013-12-27Fix T37955: Freestyle render misalignmentSergey Sharybin
Issue was caused by missing objects update for temporary freestyle objects. This happened because of the fact that such objects doesn't have any relations, as in they're corresponding to root nodes in the DAG. This situation wasn't handled by DAG_threaded_update_begin() which considered there's only one root node in the DAG.
2013-12-27Fix out-of-date comment which came from DAG-MT branchSergey Sharybin
2013-12-26Rigidbody: Allow triangle mesh shapes to deform during simulationSergej Reich
Only supported when using the "Deform" mesh source.
2013-12-26Rigidbody: Use own structure to store mesh data for collision shapesSergej Reich
This gives us better access to the data and should also be faster to create.
2013-12-26Rigidbody: Add option to choose mesh source for collision shapesSergej Reich
The options are: Base: Base mesh Deform: shape keys and deform modifiers Final: All deformations and modifiers It would be nice to have a way of specifying where exactly in the modifier stack the collision shape is generated. However this is not staight forward since the rigid body simulation is not part of the modifier system and would require hacks to make it work.
2013-12-26Usual minor UI messages fixes...Bastien Montagne
2013-12-26Avoid temporary change of animation data flags for nodes filterSergey Sharybin
Use temporary runtime flag of filter_mode argument instead. This commit also fixes some weirdo mix of filter_mode with filterflag bits.
2013-12-26Bullet: Update to svn r2719Sergej Reich
Fixes part of T37905, fixed constraint didn't work correctly.
2013-12-26Threaded object update and EvaluationContextSergey Sharybin
Summary: Made objects update happening from multiple threads. It is a task-based scheduling system which uses current dependency graph for spawning new tasks. This means threading happens on object level, but the system is flexible enough for higher granularity. Technical details: - Uses task scheduler which was recently committed to trunk (that one which Brecht ported from Cycles). - Added two utility functions to dependency graph: * DAG_threaded_update_begin, which is called to initialize threaded objects update. It will also schedule root DAG node to the queue, hence starting evaluation process. Initialization will calculate how much parents are to be evaluation before current DAG node can be scheduled. This value is used by task threads for faster detecting which nodes might be scheduled. * DAG_threaded_update_handle_node_updated which is called from task thread function when node was fully handled. This function decreases num_pending_parents of node children and schedules children with zero valency. As it might have become clear, task thread receives DAG nodes and decides which callback to call for it. Currently only BKE_object_handle_update is called for object nodes. In the future it'll call node->callback() from Ali's new DAG. - This required adding some workarounds to the render pipeline. Mainly to stop using get_object_dm() from modifiers' apply callback. Such a call was only a workaround for dependency graph glitch when rendering scene with, say, boolean modifiers before displaying this scene. Such change moves workaround from one place to another, so overall hackentropy remains the same. - Added paradigm of EvaluaitonContext. Currently it's more like just a more reliable replacement for G.is_rendering which fails in some circumstances. Future idea of this context is to also store all the local data needed for objects evaluation such as local time, Copy-on-Write data and so. There're two types of EvaluationContext: * Context used for viewport updated and owned by Main. In the future this context might be easily moved to Window or Screen to allo per-window/per-screen local time. * Context used by render engines to evaluate objects for render purposes. Render engine is an owner of this context. This context is passed to all object update routines. Reviewers: brecht, campbellbarton Reviewed By: brecht CC: lukastoenne Differential Revision: https://developer.blender.org/D94
2013-12-26Fix T37945: Crash after undoSergey Sharybin
Issue was caused by some typos in readfile.c made in original commit of image cache rewrite.
2013-12-26Simplify isect_point_poly_v2 functions using angle_signed_v2v2Campbell Barton
2013-12-26Cycles / Hair: Further cleanup of UI and internals.Thomas Dinges
* UI: Remove deprecated condition (CURVE_RIBBONS) and hide backface property, when it's hardcoded in C (Curve/Line segments && Ribbons). * Remove "use_tangent_normal" and "CURVE_KN_TANGENTGNORMAL" as its unused (follow up for last commit).
2013-12-26Polyfill: minor changes to which fix rare errors with float precisionCampbell Barton
2013-12-26Fix T37946: Error filling ngonsCampbell Barton
2013-12-26Cycles / Hair: Some cleanup and optimizations for hair code.Thomas Dinges
* Remove dead code from line segments BVH refine. CURVE_KN_TANGENTGNORMAL and CURVE_KN_TRUETANGENTGNORMAL are either both true, or both false. Therefore a true/false condition is impossible. This was a leftover of CURVE_CUSTOM, which was removed in r59234. * Use "else if" in blender_curves.cpp.
2013-12-26correction to last commitCampbell Barton
2013-12-26Correct alloc string and comment in makesdnaCampbell Barton
2013-12-26Fix T37939: Crash on exit (reading from freed node trees)Campbell Barton
2013-12-26correction to last commitCampbell Barton
2013-12-26BGE: Add missing NULL check from recent LOD updatesCampbell Barton
2013-12-26Code Cleanup: remove object arg to CDDM_from_mesh mesh_create_derivedCampbell Barton
2013-12-25Missed this in last commitSergej Reich
2013-12-253D View: Draw rigid body collision shapes.Sergej Reich
2013-12-253D View: Fix drawing bounds for game engineSergej Reich
Needs to be drawn around the origin to accurately represent collision shapes.
2013-12-25Code cleanup: no need to switch to threaded alloc, it's done by task poolSergey Sharybin
2013-12-25Use generic task scheduler for threaded image processorSergey Sharybin
It allows to schedule tasks of smaller size without having threads overhead or extra worry about splitting tasks into smaller pieces. This simplifies code in color management which was manually splitting task into smaller chunks to keep memory usage low. Further optimization is possible by avoid malloc called from threads, but that's how it used to work for ages already and would be optimized as a separate patch.
2013-12-25Motion tracking curves: correct some operator's poll functionsSergey Sharybin
Curve selection and transform were allowed in cases track's motion curve wasn't visible.
2013-12-25Implement per-frame track reprojection error visualizationSergey Sharybin
It is now possible to display per-frame track reprojection error in curve view of clip editor. Simply enable corresponding option in filter buttons. Currently displayed using blue color which might confuse with average reprojection error, further color tweaks are possible and easy. Also changed icon track x/y curves. Better icons here are really appreciated.
2013-12-25Fix T37709: Memory corruption when freeing custom bone shape objectsSergey Sharybin
Summary: Issue was caused by access to pchan->custom object from channel free function when freeing all objects from main. Order of objects free is not defined and such an access might easily end up with access to freed memory. We don't need to do user counter stuff when freeing main, so added an _ex functions with do_id_user flag which is used when freeing main. We had the same issue with other datablocks, so now it should be easier to support relevant user counter. This issue was caused by the fix for T36391, so perhaps that's indeed high time to do real user counter. Reviewers: brecht, campbellbarton Reviewed By: campbellbarton Maniphest Tasks: T37709 Differential Revision: https://developer.blender.org/D137
2013-12-24Cycles / OpenCL: Let the OpenCL runtime determine its optimal work-group ↵Thomas Dinges
size automatically, by passing a NULL pointer here. This is recommended in the Intel OpenCL optimization docs (http://software.intel.com/en-us/vcsource/samples/optimizing-opencl) and I can confirm a small performance increase here (1-2% on nVidia OpenCL, up to 8% on Intel OpenCL).
2013-12-24Use HTTPS protocol for arcSergey Sharybin
2013-12-24String API: BLI_ascii_strtolower/upper now check NULL terminatorCampbell Barton
This wasn't needed before now, but since recent change to bUnit_ReplaceString, it uses in a context where NULL terminator is expected - best add. (spotted by Sergey)
2013-12-24find_package(OPENAL) does not play nice with our current library naming ↵Martijn Berger
nonvention
2013-12-24Fix for own recent commitCampbell Barton
2013-12-24UI: Display alpha checkers in image info's color swatch.Campbell Barton
2013-12-24UI: fix for slight glitch drawing image infoCampbell Barton
Using sub-pixel position made the text clip badly sometimes.
2013-12-24Fix T37914: Mask modifier behaves differently until paintedCampbell Barton
2013-12-24Cycles / Hair: No need to calculate curvepoint() when we use Ribbon curves.Thomas Dinges
Also some style cleanup.
2013-12-24BMesh optimize face splitting by taking loops rather then vertsCampbell Barton
- add BM_vert_pair_share_face - add BM_loop_is_adjacent - remove BM_verts_connect
2013-12-23Style cleanup: BGEHG1
2013-12-23Code Cleanup: styleCampbell Barton
2013-12-23UI: communicate external data autopack better in the UI.Simon Repp
Previously there was no way to see if autopack was enabled. Now the external data menu has 3 entries instead of 2: * Automatically Pack Into .blend (with checkbox to indicate autopack on/off) * Pack All Into .blend * Unpack All Into Files Fixes T37608, includes modifications by Brecht from the original patch. Reviewed By: brecht Differential Revision: http://developer.blender.org/D118
2013-12-23Merge branch 'master' into soc-2013-depsgraph_mtSergey Sharybin
2013-12-23Move python threading stuff to own file in bf_python_extSergey Sharybin
This way blender player can easily use BPY_thread_save/restore. Not so much important for master branch, but crucial to solve linking issues in threaded depsgraph branch.