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-03-28Merge branch 'master' into blender2.8Bastien Montagne
Conflicts: source/blender/blenloader/intern/readfile.c source/blender/windowmanager/intern/wm_window.c
2017-03-26PyAPI: add missing class registrationCampbell Barton
2017-03-25Merge branch 'master' into blender2.8Campbell Barton
2017-03-23UI: allow to extend camera as a menuCampbell Barton
Needed for T46853
2017-03-20Merge branch 'master' into blender2.8Bastien Montagne
2017-03-20Cleanup: especially non pep8 parts of Py UICampbell Barton
2017-03-20Merge branch 'master' into blender2.8Campbell Barton
2017-03-19Moving classes to separate listing broke panel orderCampbell Barton
Although this wasn't so obvious since it only showed up for factory settings and in the preferences window. Panel display order depends on registration order, Sorry for the noise. On the bright side we no longer need to move classes around to re-arrange panels.
2017-03-18PyAPI: remove bpy.utils.register_module()Campbell Barton
In preparation for it being removed, see: T47811
2017-03-12Merge branch 'master' into blender2.8Campbell Barton
2017-03-12UI: expose mesh conversion in apply menuCampbell Barton
The mesh convert operator can 'freeze' a mesh (WYSIWYG, modifiers, shape keys etc). However its not very obvious that the way to perform this operation is to convert a mesh to a mesh. Expose this as 'Visual Geometry to Mesh' in the 'Apply' menu, since this is where users might expect to see it.
2017-02-17Merge branch 'master' into blender2.8Bastien Montagne
Conflicts: source/blender/editors/animation/anim_draw.c
2017-02-15Layers: Separate between scene render layer (F12) and context render layer ↵Dalai Felinto
(everything else) For now they are the same. However with workspaces they will be different, and should be treated differently.
2017-02-10Do not overide textAaron Carlisle
2017-02-10Fix T50629 -- Add remove doubles to the cleanup menuAaron Carlisle
Also move it up in the verticies menu
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-03Fix T50125: Shortcut keys missing in menus for Clear Location, Rotation, and ↵Bastien Montagne
Scale. Menu entries and shortcuts did not have exact same behavior, now they do (using shortcuts' behavior).
2017-01-05Merge branch 'master' into blender2.8Julian Eisel
Conflicts: source/blender/editors/gpencil/drawgpencil.c
2017-01-03Revert "Remove double menu entries"Aaron Carlisle
This reverts commit e2d7efc9503720770b9652284e25006eecbec8d4.
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
2016-12-16Remove double menu entriesAaron Carlisle
These were already present in the "Select" menu.
2016-12-12Merge branch 'master' into blender2.8Bastien Montagne
Conflicts: source/blender/blenkernel/intern/depsgraph.c source/blender/blenloader/intern/versioning_270.c source/blender/depsgraph/intern/builder/deg_builder_relations.cc source/blender/makesrna/intern/rna_main_api.c source/blender/makesrna/intern/rna_particle.c
2016-12-01GPencil: Include various new operators into the 3D View menus tooJoshua Leung
Quite a few of the operators added for 2.78 were not included in the menus
2016-11-16Merge remote-tracking branch 'origin/master' into blender2.8Dalai Felinto
2016-11-15Fix menu inconsistenciesAaron Carlisle
This commit fixes two issues: - UV/Image editor uvs menu did not match the 3D View's which was changed in rB2b240b043078 - Circle select tool was missing in particle edit mode Reviewers: Severin Differential Revision: https://developer.blender.org/D2329
2016-11-12Fix Make Vertex Parent operator missing from vertex/curve/lattice menus.Geoffroy Krantz
Reviewed By: brecht Differential Revision: https://developer.blender.org/D2346
2016-10-25Merge remote-tracking branch 'origin/master' into blender2.8Dalai Felinto
2016-10-24Viewport: move the background to the "modern" viewportDalai Felinto
This also leaves room for the gradient background Mike Erwin wants to implement.
2016-10-21Viewport: use depth shader to debug the depthDalai Felinto
At the moment this already shows that the depth is the same after the solid plates and in the very end of drawing, while they should be different. Later on we can adapt this to show different buffers we want to debug. I am using near=0.1, far=2.0 for my tests. I decided not to make a doversion for near/far because this is for debugging only
2016-10-21Fix T49804: Display grid Scale/Subdivision are sometimes disabled in View3D ↵Bastien Montagne
when they should not. Not really possible to precisely detect all cases in which they should or should not be active, but at least now it won't show as disabled when it actually has some effects.
2016-10-07Move panel for new viewport upJulian Eisel
Makes it easier to enable it and avoids jumping of the panel when activating/deactivating it (because some panels disappear then). Also changed how panel title is drawn to make it behave like other panels.
2016-10-05Barebones for viewport code apart from 2.7x drawing codeDalai Felinto
A new option (set in the properties region) allows the user to pick the "new viewport" for the rendering (in the UI: Modern Viewport). For now we have a semi-blank file (view3d_draw.c) that can starts to take over the drawing pipeline. I can't guarantee we will be able to keep both drawing systems working through the entire 2.8 development, but it should do for now. also, we can use branches for some of the viewport development, but it's better to keep things in 2.8 whenever we can, so people can test it.
2016-09-23Merge branch 'master' into blender2.8Julian Eisel
Conflicts: intern/ghost/intern/GHOST_ContextCGL.mm intern/ghost/intern/GHOST_WindowCocoa.mm source/blender/makesrna/intern/rna_main.c
2016-09-19Fix T49375: align rotation with snap target isn't toggleable in edit mode.Bastien Montagne
Based on D2237, but fixed patch always hiding 'snap on self' button... Should be safe for 2.78.
2016-09-16Merge branch 'master' into blender2.8Sergey Sharybin
2016-09-05Correction to previous commit (PEP 8)Julian Eisel
2016-09-05Combine all Proportional Editing options under one menuJulian Eisel
Image of the result of this patch: {F352849} The only thing different from the above image and this patch is I added a colon after "Falloff" after I took the screen shot. Reviewers: Severin, meta-androcto Subscribers: plyczkowski Tags: #bf_blender, #user_interface Maniphest Tasks: T33436 Differential Revision: https://developer.blender.org/D2195
2016-09-05Fix menu drawing printing 'unknown operator' warning when building without ↵Julian Eisel
WITH_BULLET
2016-09-04Merge branch 'master' into blender2.8Bastien Montagne
Conflicts: intern/cycles/blender/blender_particles.cpp source/blender/blenkernel/intern/particle.c source/blender/gpu/intern/gpu_shader.c
2016-08-26Fix: Use submenu for GPencil -> Select GroupedJoshua Leung
2016-08-06Merge branch 'master' into blender2.8Bastien Montagne
Conflicts: release/scripts/startup/bl_ui/properties_particle.py release/scripts/startup/bl_ui/properties_physics_cloth.py release/scripts/startup/bl_ui/properties_physics_dynamicpaint.py release/scripts/startup/bl_ui/properties_physics_softbody.py source/blender/blenkernel/BKE_library.h source/blender/blenkernel/BKE_particle.h source/blender/blenkernel/intern/cloth.c source/blender/blenkernel/intern/library.c source/blender/blenkernel/intern/library_query.c source/blender/blenkernel/intern/particle_system.c source/blender/blenkernel/intern/scene.c source/blender/blenkernel/intern/softbody.c source/blender/blenloader/intern/readfile.c source/blender/blenloader/intern/versioning_270.c source/blender/editors/space_file/filesel.c source/blender/editors/space_outliner/outliner_intern.h source/blender/makesdna/DNA_ID.h source/blender/makesdna/DNA_object_force.h source/blender/makesdna/DNA_particle_types.h source/blender/makesrna/intern/rna_particle.c source/blender/makesrna/intern/rna_sculpt_paint.c source/blender/makesrna/intern/rna_smoke.c source/blender/makesrna/intern/rna_space.c
2016-08-04Grease Pencil v2 BranchAntonio Vazquez
Improve current Grease Pencil in order to get a better 2D animation tool. More info in WIKI pages: https://wiki.blender.org/index.php/User:Antoniov Reviewed By: Severin, aligorith, campbellbarton Patch by @antoniov, with edits by @Severin. Differential Revision: https://developer.blender.org/D2115
2016-08-01Cleanup: unused vars, imports, pep8Campbell Barton
2016-07-25Merge branch 'master' into blender2.8Bastien Montagne
Conflicts: source/blender/blenkernel/BKE_particle.h source/blender/blenkernel/intern/library.c source/blender/blenkernel/intern/particle.c
2016-07-22Add Subdivide Edge-Ring to menuCampbell Barton
2016-07-18Merge branch 'master' into blender2.8Campbell Barton
2016-07-15Add "Snap Selection to Active" option in menuCampbell Barton
D1963 by @wisaac, re-worked to de-duplicate logic
2016-07-12Merge branch 'master' into blender2.8Bastien Montagne
Conflicts: intern/cycles/blender/addon/ui.py source/blender/blenkernel/BKE_particle.h source/blender/blenkernel/intern/dynamicpaint.c source/blender/blenkernel/intern/library.c source/blender/blenkernel/intern/object.c source/blender/blenkernel/intern/particle.c source/blender/blenkernel/intern/particle_distribute.c source/blender/blenkernel/intern/texture.c source/blender/editors/object/object_add.c source/blender/editors/object/object_relations.c source/blender/editors/physics/particle_edit.c source/blender/editors/physics/particle_object.c source/blender/editors/transform/transform_snap_object.c