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
2017-02-19OpenGL immediate mode: transform_manipulator.cClément Foucault
2017-02-17Merge branch 'master' into blender2.8Bastien Montagne
Conflicts: source/blender/editors/animation/anim_draw.c
2017-02-14`BKE_boundbox_ensure_minimum_dimensions` is no longer necessaryGermano Cavalcante
The bug T46099 no longer applies since the addition of `dist_squared_to_projected_aabb_simple` Has also been added comments that relates to an occlusion bug with the ruler. I'll investigate this.
2017-02-14transform_snap_object: Remove `do_bb` parameter. It is always trueGermano Cavalcante
2017-02-11OpenGL immediate mode: Convert leftover UI_ThemeColor callsLuca Rood
Some `UI_ThemeColor` calls were left in converted files, in some cases because they were just overlooked, and in the case of text drawing, because the new BLF color functions were not yet implemented at the time of conversion. Also converted one `drawcircball` call that was left in transform_constraints.c Part of T49043
2017-02-09More housecleaning (BASACT > BASACT_NEW)Dalai Felinto
2017-02-09Fix widget not showing upDalai Felinto
(and more Scene.base > SceneLayer.object_bases changes in transforma code)
2017-02-08Bring back Lasso and Circle selection backDalai Felinto
(and replace more instances of BaseLegacy/scene->base with Base/sl->object_bases) Still need mouse selection, box selection, and menu selection Also, there is still a problem with BA_WAS_SEL, at the moment only the objects centers are highlighted.
2017-02-08Merge branch 'master' into blender2.8Sybren A. Stüvel
# Conflicts: # source/blender/blenloader/intern/writefile.c
2017-02-07Render Layers and Collections (merge from render-layers)Dalai Felinto
Design Documents ---------------- * https://wiki.blender.org/index.php/Dev:2.8/Source/Layers * https://wiki.blender.org/index.php/Dev:2.8/Source/DataDesignRevised User Commit Log --------------- * New Layer and Collection system to replace render layers and viewport layers. * A layer is a set of collections of objects (and their drawing options) required for specific tasks. * A collection is a set of objects, equivalent of the old layers in Blender. A collection can be shared across multiple layers. * All Scenes have a master collection that all other collections are children of. * New collection "context" tab (in Properties Editor) * New temporary viewport "collections" panel to control per-collection visibility Missing User Features --------------------- * Collection "Filter" Option to add objects based on their names * Collection Manager operators The existing buttons are placeholders * Collection Manager drawing The editor main region is empty * Collection Override * Per-Collection engine settings This will come as a separate commit, as part of the clay-engine branch Dev Commit Log -------------- * New DNA file (DNA_layer_types.h) with the new structs We are replacing Base by a new extended Base while keeping it backward compatible with some legacy settings (i.e., lay, flag_legacy). Renamed all Base to BaseLegacy to make it clear the areas of code that still need to be converted Note: manual changes were required on - deg_builder_nodes.h, rna_object.c, KX_Light.cpp * Unittesting for main syncronization requirements - read, write, add/copy/remove objects, copy scene, collection link/unlinking, context) * New Editor: Collection Manager Based on patch by Julian Eisel This is extracted from the layer-manager branch. With the following changes: - Renamed references of layer manager to collections manager - I doesn't include the editors/space_collections/ draw and util files - The drawing code itself will be implemented separately by Julian * Base / Object: A little note about them. Original Blender code would try to keep them in sync through the code, juggling flags back and forth. This will now be handled by Depsgraph, keeping Object and Bases more separated throughout the non-rendering code. Scene.base is being cleared in doversion, and the old viewport drawing code was poorly converted to use the new bases while the new viewport code doesn't get merged and replace the old one. Python API Changes ------------------ ``` - scene.layers + # no longer exists - scene.objects + scene.scene_layers.active.objects - scene.objects.active + scene.render_layers.active.objects.active - bpy.context.scene.objects.link() + bpy.context.scene_collection.objects.link() - bpy_extras.object_utils.object_data_add(context, obdata, operator=None, use_active_layer=True, name=None) + bpy_extras.object_utils.object_data_add(context, obdata, operator=None, name=None) - bpy.context.object.select + bpy.context.object.select = True + bpy.context.object.select = False + bpy.context.object.select_get() + bpy.context.object.select_set(action='SELECT') + bpy.context.object.select_set(action='DESELECT') -AddObjectHelper.layers + # no longer exists ```
2017-02-06fix T50602: Avoid crash when executing ↵Germano Cavalcante
`transform_snap_context_project_view3d_mixed` with `dist_px` NULL
2017-02-05fix most UI text colorMike Erwin
There are still many places to fix. I'll miss the bright yellow! This commit also uses the new BLF_default function where possible. Part of T49043 since we call glColor less often.
2017-02-05fix T50592: Scene.raycast not workingGermano Cavalcante
Ray_start and ray_normal values were being ignored
2017-02-04Fix (unreported) crash in new snap code.Bastien Montagne
Looks like `object_map` and `mem_arena` may be NULL sometimes... Also, cleaned up function pointers declaration of Nearest2dUserData, those were warning out in gcc. Please, *always* use typdef defined prototypes for function pointers, it is sooooo much cleaner and clearer that way. And easy to convert from compatible functions too.
2017-02-04Snap System: Use callbaks to differentiate how referenced vertives of ↵Germano Cavalcante
DerivedMeshs and Bmeshs Before it was informed the type of object in the `userdata`, and a same function ran between the types to obtain the coordinates of the vertices
2017-02-04Remove flag: `SNAP_OBJECT_USE_CACHE` from snap_contextGermano Cavalcante
Since the cache is created in one way or another, this flag is not really making a difference More details here: D2496
2017-02-03fix T46892: snap to closest point now works with Individual OriginsGermano Cavalcante
The code looks for the closest element between its centers. In the case of islands, the center of each vertex is the center of the island. The solution here is to skip the search for islands when the operation is translation
2017-02-03Forgotten in committee ddf99214dc06Germano Cavalcante
In obect mode, the rotation matrix need to be restored to the initial value if a snap point is not found
2017-02-03fix T49494: snap_align_rotation should use a local pivot to make the ↵Germano Cavalcante
transformation The problem was simple, just transform the global coordinates of t->tsnap.snapTarget to local coordinates. (Some comments were added to the code)
2017-02-03Fix shaders in some immBindBuiltinProgram callsLuca Rood
Had mistakenly used 3D shaders for some 2D drawings... Replaced those now. Part of T49043
2017-02-02Merge branch 'master' into blender2.8Bastien Montagne
2017-02-02OpenGL immediate mode: transform_snap.c and part of drawnode.cLuca Rood
Also converted ED_node_draw_snap from drawnode.c Committing these together, as they are inter-dependent. Part of T49043
2017-02-01OpenGL immediate mode: transform_constraints.cLuca Rood
Differential Revision: https://developer.blender.org/D2483 Part of T49043
2017-02-01OpenGL immediate mode: transform_generics.cLuca Rood
Differential Revision: https://developer.blender.org/D2482 Part of T49043
2017-02-01Snap System: BVH: Ignore calculations, in parent nodes, used only in ↵Germano Cavalcante
perspective view Strangely this change does not affect the performance very much. Suzanne subdividide 6x (ortho view): Before:0.00013983 After :0.00013920 But it makes it easier to read the code
2017-01-31Snap System: Invert the test order of the elements to snap (useful for ruler)Germano Cavalcante
When the function that tests snap on multiple elements starts from the face and ends at the vertex, the transition between elements becomes much smoother.
2017-01-31Fix variable shadow and avoid calculating same value twiceSergey Sharybin
2017-01-31Merge branch 'master' into blender2.8Bastien Montagne
Conflicts: source/blender/blenkernel/intern/depsgraph.c source/blender/blenkernel/intern/library_query.c
2017-01-31Fix bug not reported: Ruler/Protractor: Snap to vertices and edges was not ↵Germano Cavalcante
considering the depth variation Taking advantage of the area, the depth is decreased 0.01 BU to each loop to give priority to elements in order: Vertice > Edge > Face. This increases the threshold and improves the snap to multiple elements
2017-01-31Snap System: Return depth by snapping to edges and vertices, because the ↵Germano Cavalcante
Ruler only works right this way The Ruler snaps to the element with the lowest depth.
2017-01-31Use the same solution to test the pixel distance to the AABB, with BoundBoxGermano Cavalcante
The previous solution took arbitrary values to determine if the mouse was near or not to the Bound Box (it simply scaled the Bound Box). Now the same function that detected the distance from the BVHTree nodes to the mouse is used in the Bound Box
2017-01-31Fix T49632: Grease pencil in "Edit Strokes" mode: Snap tool did not snap ↵Germano Cavalcante
points to active object A simple confusion between enums: ~SNAP_NOT_ACTIVE~
2017-01-30Cleanup: Unused function and and variables in snap codeSergey Sharybin
Please doublecheck ED_transform_snap_object_project_ray_ex() is really valid, it's weird to have extra arguments here unused.
2017-01-30Snap System: BVH: ignore AABBs behind rayGermano Cavalcante
This provides a slight improvement in performance in specific cases, such as when the observer is inside a high poly object and executes snap to edge or vertex
2017-01-30Fix unreported bug: parameter ray_start repeatedGermano Cavalcante
The bug would only be seen in terms of performance
2017-01-30Solve compilation error: Field has incomplete type 'enum eViewProj'Germano Cavalcante
Error reported by @tomjpsun Patch D2491
2017-01-29Remove `BKE_boundbox_ray_hit_check`Germano Cavalcante
Remove `BKE_boundbox_ray_hit_check` since it is no longer being used and can be easily replaced by `isect_ray_aabb_v3_simple`
2017-01-29New math_geom function `isect_ray_aabb_v3_simple`Germano Cavalcante
The new `isect_ray_aabb_v3_simple` function replaces the `BKE_boundbox_ray_hit_check` and can be used in BVHTree Root (first AABB). So it is much more efficient.
2017-01-29Rename func `set_SnapData` to `snap_data_set`Germano Cavalcante
Don't use CamelCase in functions and try to keep area affected first, and action last, in names
2017-01-29fix T50486: Don't always do the `ray_start_correction` in the ortho viewGermano Cavalcante
You need to make sure that ray_start is really far away, because even in the Orthografic view, in some cases, the ray can start inside the object
2017-01-29Remove struct `PreDefProject` and store all immutable parameters within the ↵Germano Cavalcante
new struct `SnapData` In order to simplify the reading of these functions, the parameters: `snap_to`, `mval`, `ray_start`, `ray_dir`, `view_proj` and `depth_range` are now stored in the struct `SnapData`
2017-01-27Snap Functions: Remove the use of the function ↵Germano Cavalcante
'BLI_bvhtree_find_nearest_to_ray' in transform_snap_object Although the "BLI_bvhtree_find_nearest_to_ray" function is more practical than the generic "BLI_bvhtree_walk_dfs", it does not work to snap in perspective view. This makes it necessary to add "ifs" and functions that make the code difficult to understand patch: D2474
2017-01-24Depsgraph: Remove legacy depsgraph code from transformSergey Sharybin
2017-01-22Merge branch 'master' into blender2.8Julian Eisel
Conflicts: source/blender/editors/space_action/action_draw.c
2017-01-19OpenGL: convert legacy calls in transform.cMike Erwin
Took pieces from D2316 and D2359, changed a few more things. - use new immediate mode - use new matrix stack - remove state push/pop Part of T49043 and T49450
2017-01-18Transform manipulator: Allow first clicking Shift before selecting axisSergey Sharybin
Avoids possible jumps when one is trying to do some really preciese tweak. Quite striaghtforward change for mouse input initialization: take Shift state into account. However, this will interfere with the axis exclusion which is currently also uses Shift (the feature to move something in a plane which doesn't have selected axis). This is probably not so commonly used feature (nobody in the studio even knew of it) and the only downside now would be that such a constrainted movement will become accurate by default. That's easy to deal from user side by just unholding Shift key. Reviewers: brecht, mont29, Severin Differential Revision: https://developer.blender.org/D2418
2017-01-16Merge branch 'master' into blender2.8Bastien Montagne
2017-01-16Cleanup/refactor: Add new BLI_string_util.Bastien Montagne
Things like `BLI_uniquename` had nothing, but really nothing to do in BLI_path_util files! Also, got rid of length limitation in `BLI_uniquename_cb`, we can use alloca here to avoid overhead of malloc while keeping free size (within reasonable limits of course).
2016-12-28Revert particle system and point cache removal in blender2.8 branch.Lukas Tönne
This reverts commit 5aa19be91263a249ffae75573e3b32f24269d890 and b4a721af694817fa921b119df83d33ede7d7fed0. Due to postponement of particle system rewrite it was decided to put particle code back into the 2.8 branch for the time being.
2016-12-17Merge branch 'master' into blender2.8Bastien Montagne
Conflicts: intern/cycles/blender/CMakeLists.txt source/blender/editors/gpencil/drawgpencil.c source/blender/editors/physics/physics_ops.c