2022-02-11 09:07:11 +11:00
|
|
|
/* SPDX-License-Identifier: GPL-2.0-or-later
|
|
|
|
|
* Copyright 2001-2002 NaN Holding BV. All rights reserved. */
|
2009-09-16 17:43:09 +00:00
|
|
|
|
2019-02-18 08:08:12 +11:00
|
|
|
/** \file
|
|
|
|
|
* \ingroup edobj
|
2011-02-27 20:29:51 +00:00
|
|
|
*/
|
|
|
|
|
|
2009-09-16 17:43:09 +00:00
|
|
|
#include <stdio.h>
|
|
|
|
|
#include <stdlib.h>
|
|
|
|
|
#include <string.h>
|
|
|
|
|
|
|
|
|
|
#include "MEM_guardedalloc.h"
|
|
|
|
|
|
|
|
|
|
#include "DNA_anim_types.h"
|
2013-02-12 14:42:46 +00:00
|
|
|
#include "DNA_armature_types.h"
|
2019-06-11 20:48:52 +02:00
|
|
|
#include "DNA_camera_types.h"
|
2018-08-29 15:32:50 +02:00
|
|
|
#include "DNA_collection_types.h"
|
2009-09-16 17:43:09 +00:00
|
|
|
#include "DNA_constraint_types.h"
|
2019-06-11 20:48:52 +02:00
|
|
|
#include "DNA_gpencil_types.h"
|
2020-06-30 12:04:44 +02:00
|
|
|
#include "DNA_key_types.h"
|
2009-09-16 17:43:09 +00:00
|
|
|
#include "DNA_lattice_types.h"
|
2020-03-19 09:33:03 +01:00
|
|
|
#include "DNA_light_types.h"
|
2009-09-16 17:43:09 +00:00
|
|
|
#include "DNA_material_types.h"
|
2019-06-11 20:48:52 +02:00
|
|
|
#include "DNA_mesh_types.h"
|
2009-09-16 17:43:09 +00:00
|
|
|
#include "DNA_meta_types.h"
|
2019-06-11 20:48:52 +02:00
|
|
|
#include "DNA_object_types.h"
|
2009-09-16 17:43:09 +00:00
|
|
|
#include "DNA_particle_types.h"
|
|
|
|
|
#include "DNA_scene_types.h"
|
2012-08-03 13:27:58 +00:00
|
|
|
#include "DNA_vfont_types.h"
|
2019-06-11 20:48:52 +02:00
|
|
|
#include "DNA_world_types.h"
|
2009-09-16 17:43:09 +00:00
|
|
|
|
2020-03-19 09:33:03 +01:00
|
|
|
#include "BLI_kdtree.h"
|
2012-07-18 09:45:50 +00:00
|
|
|
#include "BLI_linklist.h"
|
2020-03-19 09:33:03 +01:00
|
|
|
#include "BLI_listbase.h"
|
|
|
|
|
#include "BLI_math.h"
|
2009-09-16 17:43:09 +00:00
|
|
|
#include "BLI_string.h"
|
2011-01-07 18:36:47 +00:00
|
|
|
#include "BLI_utildefines.h"
|
2009-09-16 17:43:09 +00:00
|
|
|
|
2015-08-16 17:32:01 +10:00
|
|
|
#include "BLT_translation.h"
|
2013-02-15 08:31:00 +00:00
|
|
|
|
2020-03-19 09:33:03 +01:00
|
|
|
#include "BKE_DerivedMesh.h"
|
2009-09-16 17:43:09 +00:00
|
|
|
#include "BKE_action.h"
|
2020-04-03 13:07:36 +02:00
|
|
|
#include "BKE_anim_data.h"
|
2009-09-16 17:43:09 +00:00
|
|
|
#include "BKE_armature.h"
|
2011-11-05 13:00:39 +00:00
|
|
|
#include "BKE_camera.h"
|
Render Layers and Collections (merge from render-layers)
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-07 10:18:38 +01:00
|
|
|
#include "BKE_collection.h"
|
2009-09-16 17:43:09 +00:00
|
|
|
#include "BKE_constraint.h"
|
2020-03-19 09:33:03 +01:00
|
|
|
#include "BKE_context.h"
|
2009-09-16 17:43:09 +00:00
|
|
|
#include "BKE_curve.h"
|
Curves: Rename "Hair" types, variables, and functions to "Curves"
Based on discussions from T95355 and T94193, the plan is to use
the name "Curves" to describe the data-block container for multiple
curves. Eventually this will replace the existing "Curve" data-block.
However, it will be a while before the curve data-block can be replaced
so in order to distinguish the two curve types in the UI, "Hair Curves"
will be used, but eventually changed back to "Curves".
This patch renames "hair-related" files, functions, types, and variable
names to this convention. A deep rename is preferred to keep code
consistent and to avoid any "hair" terminology from leaking, since the
new data-block is meant for all curve types, not just hair use cases.
The downside of this naming is that the difference between "Curve"
and "Curves" has become important. That was considered during
design discussons and deemed acceptable, especially given the
non-permanent nature of the somewhat common conflict.
Some points of interest:
- All DNA compatibility is lost, just like rBf59767ff9729.
- I renamed `ID_HA` to `ID_CV` so there is no complete mismatch.
- `hair_curves` is used where necessary to distinguish from the
existing "curves" plural.
- I didn't rename any of the cycles/rendering code function names,
since that is also used by the old hair particle system.
Differential Revision: https://developer.blender.org/D14007
2022-02-07 11:55:54 -06:00
|
|
|
#include "BKE_curves.h"
|
2009-09-16 17:43:09 +00:00
|
|
|
#include "BKE_displist.h"
|
2018-11-07 18:00:24 +01:00
|
|
|
#include "BKE_editmesh.h"
|
2010-10-21 10:28:06 +00:00
|
|
|
#include "BKE_fcurve.h"
|
2020-03-19 09:33:03 +01:00
|
|
|
#include "BKE_gpencil.h"
|
Datablock ID Properties
The absence of datablock properties "will certainly be resolved soon as the need for them is becoming obvious" said the [[http://wiki.blender.org/index.php/Dev:Ref/Release_Notes/2.67/Python_Nodes|Python Nodes release notes]]. So this patch allows Python scripts to create ID Properties which reference datablocks.
This functionality is implemented for `PointerProperty` and now such properties can be created with Python.
In addition to the standard update callback, `PointerProperty` can have a `poll` callback (standard RNA) which is useful for search menus. For details see the test included in this patch.
Original author: @artfunkel
Alexander (Blend4Web Team)
Reviewers: brecht, artfunkel, mont29, campbellbarton
Reviewed By: mont29, campbellbarton
Subscribers: jta, sergey, campbellbarton, wisaac, poseidon4o, mont29, homyachetser, Evgeny_Rodygin, AlexKowel, yurikovelenov, fjuhec, sharlybg, cardboard, duarteframos, blueprintrandom, a.romanov, BYOB, disnel, aditiapratama, bliblubli, dfelinto, lukastoenne
Maniphest Tasks: T37754
Differential Revision: https://developer.blender.org/D113
2017-04-13 12:30:03 +03:00
|
|
|
#include "BKE_idprop.h"
|
2020-06-30 12:04:44 +02:00
|
|
|
#include "BKE_idtype.h"
|
2009-09-16 17:43:09 +00:00
|
|
|
#include "BKE_lattice.h"
|
Render Layers and Collections (merge from render-layers)
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-07 10:18:38 +01:00
|
|
|
#include "BKE_layer.h"
|
2020-02-10 12:58:59 +01:00
|
|
|
#include "BKE_lib_id.h"
|
|
|
|
|
#include "BKE_lib_override.h"
|
|
|
|
|
#include "BKE_lib_query.h"
|
|
|
|
|
#include "BKE_lib_remap.h"
|
2020-03-19 09:33:03 +01:00
|
|
|
#include "BKE_light.h"
|
2017-11-30 10:57:48 -02:00
|
|
|
#include "BKE_lightprobe.h"
|
2009-09-16 17:43:09 +00:00
|
|
|
#include "BKE_main.h"
|
|
|
|
|
#include "BKE_material.h"
|
|
|
|
|
#include "BKE_mball.h"
|
|
|
|
|
#include "BKE_mesh.h"
|
|
|
|
|
#include "BKE_modifier.h"
|
2017-05-29 11:00:01 +02:00
|
|
|
#include "BKE_node.h"
|
2009-09-16 17:43:09 +00:00
|
|
|
#include "BKE_object.h"
|
2020-03-17 14:41:48 +01:00
|
|
|
#include "BKE_pointcloud.h"
|
2009-09-16 17:43:09 +00:00
|
|
|
#include "BKE_report.h"
|
2009-11-04 10:25:57 +00:00
|
|
|
#include "BKE_scene.h"
|
2011-08-04 07:12:03 +00:00
|
|
|
#include "BKE_speaker.h"
|
2009-09-16 17:43:09 +00:00
|
|
|
#include "BKE_texture.h"
|
2020-03-17 14:41:48 +01:00
|
|
|
#include "BKE_volume.h"
|
2009-09-16 17:43:09 +00:00
|
|
|
|
2017-06-08 10:14:53 +02:00
|
|
|
#include "DEG_depsgraph.h"
|
|
|
|
|
#include "DEG_depsgraph_build.h"
|
2019-02-05 15:43:34 +01:00
|
|
|
#include "DEG_depsgraph_query.h"
|
2017-06-08 10:14:53 +02:00
|
|
|
|
2009-09-16 17:43:09 +00:00
|
|
|
#include "WM_api.h"
|
|
|
|
|
#include "WM_types.h"
|
|
|
|
|
|
|
|
|
|
#include "UI_interface.h"
|
|
|
|
|
#include "UI_resources.h"
|
|
|
|
|
|
|
|
|
|
#include "RNA_access.h"
|
|
|
|
|
#include "RNA_define.h"
|
2009-11-04 10:25:57 +00:00
|
|
|
#include "RNA_enum_types.h"
|
2009-09-16 17:43:09 +00:00
|
|
|
|
|
|
|
|
#include "ED_armature.h"
|
|
|
|
|
#include "ED_curve.h"
|
2018-08-30 12:22:55 +02:00
|
|
|
#include "ED_gpencil.h"
|
2010-10-21 10:28:06 +00:00
|
|
|
#include "ED_keyframing.h"
|
2011-09-21 17:15:54 +00:00
|
|
|
#include "ED_mesh.h"
|
2020-03-19 09:33:03 +01:00
|
|
|
#include "ED_object.h"
|
2009-09-16 17:43:09 +00:00
|
|
|
#include "ED_screen.h"
|
Drag and drop 2.5 integration! Finally, slashdot regulars can use
Blender too now! :)
** Drag works as follows:
- drag-able items are defined by the standard interface ui toolkit
- each button can get this feature, via uiButSetDragXXX(but, ...).
There are calls to define drag-able images, ID blocks, RNA paths,
file paths, and so on. By default you drag an icon, exceptionally
an ImBuf
- Drag items are registered centrally in the WM, it allows more drag
items simultaneous too, but not implemented
** Drop works as follows:
- On mouse release, and if drag items exist in the WM, it converts
the mouse event to an EVT_DROP type. This event then gets the full
drag info as customdata
- drop regions are defined with WM_dropbox_add(), similar to keymaps
you can make a "drop map" this way, which become 'drop map handlers'
in the queues.
- next to that the UI kit handles some common button types (like
accepting ID or names) to be catching a drop event too.
- Every "drop box" has two callbacks:
- poll() = check if the event drag data is relevant for this box
- copy() = fill in custom properties in the dropbox to initialize
an operator
- The dropbox handler then calls its standard Operator with its
dropbox properties.
** Currently implemented
Drag items:
- ID icons in browse buttons
- ID icons in context menu of properties region
- ID icons in outliner and rna viewer
- FileBrowser icons
- FileBrowser preview images
Drag-able icons are subtly visualized by making them brighter a bit
on mouse-over. In case the icon is a button or UI element too (most
cases), the drag-able feature will make the item react to
mouse-release instead of mouse-press.
Drop options:
- UI buttons: ID and text buttons (paste name)
- View3d: Object ID drop copies object
- View3d: Material ID drop assigns to object under cursor
- View3d: Image ID drop assigns to object UV texture under cursor
- Sequencer: Path drop will add either Image or Movie strip
- Image window: Path drop will open image
** Drag and drop Notes:
- Dropping into another Blender window (from same application) works
too. I've added code that passes on mousemoves and clicks to other
windows, without activating them though. This does make using multi-window
Blender a bit friendler.
- Dropping a file path to an image, is not the same as dropping an
Image ID... keep this in mind. Sequencer for example wants paths to
be dropped, textures in 3d window wants an Image ID.
- Although drop boxes could be defined via Python, I suggest they're
part of the UI and editor design (= how we want an editor to work), and
not default offered configurable like keymaps.
- At the moment only one item can be dragged at a time. This is for
several reasons.... For one, Blender doesn't have a well defined
uniform way to define "what is selected" (files, outliner items, etc).
Secondly there's potential conflicts on what todo when you drop mixed
drag sets on spots. All undefined stuff... nice for later.
- Example to bypass the above: a collection of images that form a strip,
should be represented in filewindow as a single sequence anyway.
This then will fit well and gets handled neatly by design.
- Another option to check is to allow multiple options per drop... it
could show the operator as a sort of menu, allowing arrow or scrollwheel
to choose. For time being I'd prefer to try to design a singular drop
though, just offer only one drop action per data type on given spots.
- What does work already, but a tad slow, is to use a function that
detects an object (type) under cursor, so a drag item's option can be
further refined (like drop object on object = parent). (disabled)
** More notes
- Added saving for Region layouts (like split points for toolbar)
- Label buttons now handle mouse over
- File list: added full path entry for drop feature.
- Filesel bugfix: wm_operator_exec() got called there and fully handled,
while WM event code tried same. Added new OPERATOR_HANDLED flag for this.
Maybe python needs it too?
- Cocoa: added window move event, so multi-win setups work OK (didnt save).
- Interface_handlers.c: removed win->active
- Severe area copy bug: area handlers were not set to NULL
- Filesel bugfix: next/prev folder list was not copied on area copies
** Leftover todos
- Cocoa windows seem to hang on cases still... needs check
- Cocoa 'draw overlap' swap doesn't work
- Cocoa window loses focus permanently on using Spotlight
(for these reasons, makefile building has Carbon as default atm)
- ListView templates in UI cannot become dragged yet, needs review...
it consists of two overlapping UI elements, preventing handling icon clicks.
- There's already Ghost library code to handle dropping from OS
into Blender window. I've noticed this code is unfinished for Macs, but
seems to be complete for Windows. Needs test... currently, an external
drop event will print in console when succesfully delivered to Blender's WM.
2010-01-26 18:18:21 +00:00
|
|
|
#include "ED_view3d.h"
|
2009-09-16 17:43:09 +00:00
|
|
|
|
|
|
|
|
#include "object_intern.h"
|
|
|
|
|
|
2020-03-26 10:24:44 +11:00
|
|
|
/* ------------------------------------------------------------------- */
|
|
|
|
|
/** \name Make Vertex Parent Operator
|
|
|
|
|
* \{ */
|
2009-09-16 17:43:09 +00:00
|
|
|
|
2018-07-02 11:47:00 +02:00
|
|
|
static bool vertex_parent_set_poll(bContext *C)
|
2009-09-16 17:43:09 +00:00
|
|
|
{
|
|
|
|
|
return ED_operator_editmesh(C) || ED_operator_editsurfcurve(C) || ED_operator_editlattice(C);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static int vertex_parent_set_exec(bContext *C, wmOperator *op)
|
|
|
|
|
{
|
2012-04-28 15:42:27 +00:00
|
|
|
Main *bmain = CTX_data_main(C);
|
|
|
|
|
Scene *scene = CTX_data_scene(C);
|
2018-09-25 18:50:57 +02:00
|
|
|
View3D *v3d = CTX_wm_view3d(C);
|
2019-07-25 16:36:22 +02:00
|
|
|
Depsgraph *depsgraph = CTX_data_ensure_evaluated_depsgraph(C);
|
2017-11-23 13:51:49 -02:00
|
|
|
ViewLayer *view_layer = CTX_data_view_layer(C);
|
2012-04-28 15:42:27 +00:00
|
|
|
Object *obedit = CTX_data_edit_object(C);
|
2009-09-16 17:43:09 +00:00
|
|
|
Object *par;
|
2020-08-28 11:08:03 +02:00
|
|
|
|
|
|
|
|
#define INDEX_UNSET -1
|
|
|
|
|
int par1, par2, par3, par4;
|
|
|
|
|
par1 = par2 = par3 = par4 = INDEX_UNSET;
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2009-09-16 17:43:09 +00:00
|
|
|
/* we need 1 to 3 selected vertices */
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2012-04-28 15:42:27 +00:00
|
|
|
if (obedit->type == OB_MESH) {
|
|
|
|
|
Mesh *me = obedit->data;
|
2011-09-21 17:15:54 +00:00
|
|
|
BMEditMesh *em;
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2018-06-13 16:29:12 +02:00
|
|
|
EDBM_mesh_load(bmain, obedit);
|
2018-03-14 02:02:05 +11:00
|
|
|
EDBM_mesh_make(obedit, scene->toolsettings->selectmode, true);
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2017-06-08 10:14:53 +02:00
|
|
|
DEG_id_tag_update(obedit->data, 0);
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2019-02-17 18:05:18 +11:00
|
|
|
em = me->edit_mesh;
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2021-06-14 22:56:03 +10:00
|
|
|
BKE_editmesh_looptri_and_normals_calc(em);
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2019-04-08 12:41:57 +02:00
|
|
|
/* Make sure the evaluated mesh is updated.
|
2019-03-20 17:19:26 +01:00
|
|
|
*
|
|
|
|
|
* Most reliable way is to update the tagged objects, which will ensure
|
|
|
|
|
* proper copy-on-write update, but also will make sure all dependent
|
|
|
|
|
* objects are also up to date. */
|
|
|
|
|
BKE_scene_graph_update_tagged(depsgraph, bmain);
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2020-08-28 11:08:03 +02:00
|
|
|
BMVert *eve;
|
|
|
|
|
BMIter iter;
|
|
|
|
|
int curr_index;
|
|
|
|
|
BM_ITER_MESH_INDEX (eve, &iter, em->bm, BM_VERTS_OF_MESH, curr_index) {
|
2012-02-12 10:51:45 +00:00
|
|
|
if (BM_elem_flag_test(eve, BM_ELEM_SELECT)) {
|
2020-08-28 11:08:03 +02:00
|
|
|
if (par1 == INDEX_UNSET) {
|
|
|
|
|
par1 = curr_index;
|
2019-04-22 09:19:45 +10:00
|
|
|
}
|
2020-08-28 11:08:03 +02:00
|
|
|
else if (par2 == INDEX_UNSET) {
|
|
|
|
|
par2 = curr_index;
|
2019-04-22 09:19:45 +10:00
|
|
|
}
|
2020-08-28 11:08:03 +02:00
|
|
|
else if (par3 == INDEX_UNSET) {
|
|
|
|
|
par3 = curr_index;
|
2019-04-22 09:19:45 +10:00
|
|
|
}
|
2020-08-28 11:08:03 +02:00
|
|
|
else if (par4 == INDEX_UNSET) {
|
|
|
|
|
par4 = curr_index;
|
2019-04-22 09:19:45 +10:00
|
|
|
}
|
|
|
|
|
else {
|
2009-09-16 17:43:09 +00:00
|
|
|
break;
|
2019-04-22 09:19:45 +10:00
|
|
|
}
|
2009-09-16 17:43:09 +00:00
|
|
|
}
|
2019-04-17 06:17:24 +02:00
|
|
|
}
|
2009-09-16 17:43:09 +00:00
|
|
|
}
|
2022-02-18 09:50:29 -06:00
|
|
|
else if (ELEM(obedit->type, OB_SURF, OB_CURVES_LEGACY)) {
|
2012-04-28 15:42:27 +00:00
|
|
|
ListBase *editnurb = object_editcurve_get(obedit);
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2020-08-28 11:08:03 +02:00
|
|
|
for (Nurb *nu = editnurb->first; nu != NULL; nu = nu->next) {
|
2012-03-24 06:38:07 +00:00
|
|
|
if (nu->type == CU_BEZIER) {
|
2020-08-28 11:08:03 +02:00
|
|
|
BezTriple *bezt = nu->bezt;
|
|
|
|
|
for (int curr_index = 0; curr_index < nu->pntsu; curr_index++, bezt++) {
|
2018-09-25 18:50:57 +02:00
|
|
|
if (BEZT_ISSEL_ANY_HIDDENHANDLES(v3d, bezt)) {
|
2020-08-28 11:08:03 +02:00
|
|
|
if (par1 == INDEX_UNSET) {
|
|
|
|
|
par1 = curr_index;
|
2019-04-22 09:19:45 +10:00
|
|
|
}
|
2020-08-28 11:08:03 +02:00
|
|
|
else if (par2 == INDEX_UNSET) {
|
|
|
|
|
par2 = curr_index;
|
2019-04-22 09:19:45 +10:00
|
|
|
}
|
2020-08-28 11:08:03 +02:00
|
|
|
else if (par3 == INDEX_UNSET) {
|
|
|
|
|
par3 = curr_index;
|
2019-04-22 09:19:45 +10:00
|
|
|
}
|
2020-08-28 11:08:03 +02:00
|
|
|
else if (par4 == INDEX_UNSET) {
|
|
|
|
|
par4 = curr_index;
|
2019-04-22 09:19:45 +10:00
|
|
|
}
|
|
|
|
|
else {
|
2009-09-16 17:43:09 +00:00
|
|
|
break;
|
2019-04-22 09:19:45 +10:00
|
|
|
}
|
2009-09-16 17:43:09 +00:00
|
|
|
}
|
|
|
|
|
}
|
2019-04-17 06:17:24 +02:00
|
|
|
}
|
2009-09-16 17:43:09 +00:00
|
|
|
else {
|
2020-08-28 11:08:03 +02:00
|
|
|
BPoint *bp = nu->bp;
|
|
|
|
|
const int num_points = nu->pntsu * nu->pntsv;
|
|
|
|
|
for (int curr_index = 0; curr_index < num_points; curr_index++, bp++) {
|
2012-03-24 06:38:07 +00:00
|
|
|
if (bp->f1 & SELECT) {
|
2020-08-28 11:08:03 +02:00
|
|
|
if (par1 == INDEX_UNSET) {
|
|
|
|
|
par1 = curr_index;
|
2019-04-22 09:19:45 +10:00
|
|
|
}
|
2020-08-28 11:08:03 +02:00
|
|
|
else if (par2 == INDEX_UNSET) {
|
|
|
|
|
par2 = curr_index;
|
2019-04-22 09:19:45 +10:00
|
|
|
}
|
2020-08-28 11:08:03 +02:00
|
|
|
else if (par3 == INDEX_UNSET) {
|
|
|
|
|
par3 = curr_index;
|
2019-04-22 09:19:45 +10:00
|
|
|
}
|
2020-08-28 11:08:03 +02:00
|
|
|
else if (par4 == INDEX_UNSET) {
|
|
|
|
|
par4 = curr_index;
|
2019-04-22 09:19:45 +10:00
|
|
|
}
|
|
|
|
|
else {
|
2009-09-16 17:43:09 +00:00
|
|
|
break;
|
2019-04-22 09:19:45 +10:00
|
|
|
}
|
2009-09-16 17:43:09 +00:00
|
|
|
}
|
|
|
|
|
}
|
2019-04-17 06:17:24 +02:00
|
|
|
}
|
2009-09-16 17:43:09 +00:00
|
|
|
}
|
2019-04-17 06:17:24 +02:00
|
|
|
}
|
2012-04-28 15:42:27 +00:00
|
|
|
else if (obedit->type == OB_LATTICE) {
|
|
|
|
|
Lattice *lt = obedit->data;
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2020-08-28 11:08:03 +02:00
|
|
|
const int num_points = lt->editlatt->latt->pntsu * lt->editlatt->latt->pntsv *
|
|
|
|
|
lt->editlatt->latt->pntsw;
|
|
|
|
|
BPoint *bp = lt->editlatt->latt->def;
|
|
|
|
|
for (int curr_index = 0; curr_index < num_points; curr_index++, bp++) {
|
2012-03-24 06:38:07 +00:00
|
|
|
if (bp->f1 & SELECT) {
|
2020-08-28 11:08:03 +02:00
|
|
|
if (par1 == INDEX_UNSET) {
|
|
|
|
|
par1 = curr_index;
|
2019-04-22 09:19:45 +10:00
|
|
|
}
|
2020-08-28 11:08:03 +02:00
|
|
|
else if (par2 == INDEX_UNSET) {
|
|
|
|
|
par2 = curr_index;
|
2019-04-22 09:19:45 +10:00
|
|
|
}
|
2020-08-28 11:08:03 +02:00
|
|
|
else if (par3 == INDEX_UNSET) {
|
|
|
|
|
par3 = curr_index;
|
2019-04-22 09:19:45 +10:00
|
|
|
}
|
2020-08-28 11:08:03 +02:00
|
|
|
else if (par4 == INDEX_UNSET) {
|
|
|
|
|
par4 = curr_index;
|
2019-04-22 09:19:45 +10:00
|
|
|
}
|
|
|
|
|
else {
|
2009-09-16 17:43:09 +00:00
|
|
|
break;
|
2019-04-22 09:19:45 +10:00
|
|
|
}
|
2009-09-16 17:43:09 +00:00
|
|
|
}
|
|
|
|
|
}
|
2019-04-17 06:17:24 +02:00
|
|
|
}
|
|
|
|
|
|
2020-08-28 11:08:03 +02:00
|
|
|
if (par4 != INDEX_UNSET || par1 == INDEX_UNSET || (par2 != INDEX_UNSET && par3 == INDEX_UNSET)) {
|
2009-09-16 17:43:09 +00:00
|
|
|
BKE_report(op->reports, RPT_ERROR, "Select either 1 or 3 vertices to parent to");
|
|
|
|
|
return OPERATOR_CANCELLED;
|
|
|
|
|
}
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2012-04-30 16:22:40 +00:00
|
|
|
CTX_DATA_BEGIN (C, Object *, ob, selected_editable_objects) {
|
2012-03-24 06:38:07 +00:00
|
|
|
if (ob != obedit) {
|
2018-12-06 17:52:37 +01:00
|
|
|
DEG_id_tag_update(&ob->id, ID_RECALC_TRANSFORM | ID_RECALC_GEOMETRY | ID_RECALC_ANIMATION);
|
2012-04-28 15:42:27 +00:00
|
|
|
par = obedit->parent;
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2014-10-10 18:26:46 +02:00
|
|
|
if (BKE_object_parent_loop_check(par, ob)) {
|
2009-09-16 17:43:09 +00:00
|
|
|
BKE_report(op->reports, RPT_ERROR, "Loop in parents");
|
|
|
|
|
}
|
|
|
|
|
else {
|
|
|
|
|
Object workob;
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2017-11-23 13:51:49 -02:00
|
|
|
ob->parent = BASACT(view_layer)->object;
|
2020-08-28 11:08:03 +02:00
|
|
|
if (par3 != INDEX_UNSET) {
|
2012-04-28 15:42:27 +00:00
|
|
|
ob->partype = PARVERT3;
|
2020-08-28 11:08:03 +02:00
|
|
|
ob->par1 = par1;
|
|
|
|
|
ob->par2 = par2;
|
|
|
|
|
ob->par3 = par3;
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2009-09-16 17:43:09 +00:00
|
|
|
/* inverse parent matrix */
|
2018-04-06 12:07:27 +02:00
|
|
|
BKE_object_workob_calc_parent(depsgraph, scene, ob, &workob);
|
2009-11-10 20:43:45 +00:00
|
|
|
invert_m4_m4(ob->parentinv, workob.obmat);
|
2009-09-16 17:43:09 +00:00
|
|
|
}
|
|
|
|
|
else {
|
2012-04-28 15:42:27 +00:00
|
|
|
ob->partype = PARVERT1;
|
2020-08-28 11:08:03 +02:00
|
|
|
ob->par1 = par1;
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2009-09-16 17:43:09 +00:00
|
|
|
/* inverse parent matrix */
|
2018-04-06 12:07:27 +02:00
|
|
|
BKE_object_workob_calc_parent(depsgraph, scene, ob, &workob);
|
2009-11-10 20:43:45 +00:00
|
|
|
invert_m4_m4(ob->parentinv, workob.obmat);
|
2009-09-16 17:43:09 +00:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
2019-04-17 06:17:24 +02:00
|
|
|
}
|
2009-09-16 17:43:09 +00:00
|
|
|
CTX_DATA_END;
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2017-06-08 10:14:53 +02:00
|
|
|
DEG_relations_tag_update(bmain);
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2009-09-16 17:43:09 +00:00
|
|
|
WM_event_add_notifier(C, NC_OBJECT, NULL);
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2009-09-16 17:43:09 +00:00
|
|
|
return OPERATOR_FINISHED;
|
2020-08-28 11:08:03 +02:00
|
|
|
|
|
|
|
|
#undef INDEX_UNSET
|
2009-09-16 17:43:09 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void OBJECT_OT_vertex_parent_set(wmOperatorType *ot)
|
|
|
|
|
{
|
|
|
|
|
/* identifiers */
|
2012-03-22 07:26:09 +00:00
|
|
|
ot->name = "Make Vertex Parent";
|
2010-02-10 21:15:44 +00:00
|
|
|
ot->description = "Parent selected objects to the selected vertices";
|
2012-03-22 07:26:09 +00:00
|
|
|
ot->idname = "OBJECT_OT_vertex_parent_set";
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2009-09-16 17:43:09 +00:00
|
|
|
/* api callbacks */
|
2012-03-22 07:26:09 +00:00
|
|
|
ot->invoke = WM_operator_confirm;
|
|
|
|
|
ot->poll = vertex_parent_set_poll;
|
|
|
|
|
ot->exec = vertex_parent_set_exec;
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2009-09-16 17:43:09 +00:00
|
|
|
/* flags */
|
2012-04-28 15:42:27 +00:00
|
|
|
ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
|
2009-09-16 17:43:09 +00:00
|
|
|
}
|
|
|
|
|
|
2020-03-26 10:24:44 +11:00
|
|
|
/** \} */
|
|
|
|
|
|
|
|
|
|
/* ------------------------------------------------------------------- */
|
|
|
|
|
/** \name Clear Parent Operator
|
|
|
|
|
* \{ */
|
2009-09-16 17:43:09 +00:00
|
|
|
|
2012-01-22 10:20:30 +00:00
|
|
|
EnumPropertyItem prop_clear_parent_types[] = {
|
2014-10-10 18:26:46 +02:00
|
|
|
{CLEAR_PARENT_ALL,
|
|
|
|
|
"CLEAR",
|
|
|
|
|
0,
|
|
|
|
|
"Clear Parent",
|
2016-06-24 11:00:19 +02:00
|
|
|
"Completely clear the parenting relationship, including involved modifiers if any"},
|
2014-10-10 18:26:46 +02:00
|
|
|
{CLEAR_PARENT_KEEP_TRANSFORM,
|
|
|
|
|
"CLEAR_KEEP_TRANSFORM",
|
|
|
|
|
0,
|
|
|
|
|
"Clear and Keep Transformation",
|
2014-10-11 11:39:21 +02:00
|
|
|
"As 'Clear Parent', but keep the current visual transformations of the object"},
|
2014-10-10 18:26:46 +02:00
|
|
|
{CLEAR_PARENT_INVERSE,
|
|
|
|
|
"CLEAR_INVERSE",
|
|
|
|
|
0,
|
|
|
|
|
"Clear Parent Inverse",
|
2014-10-11 11:39:21 +02:00
|
|
|
"Reset the transform corrections applied to the parenting relationship, does not remove "
|
|
|
|
|
"parenting itself"},
|
2019-02-03 14:01:45 +11:00
|
|
|
{0, NULL, 0, NULL, NULL},
|
2009-09-16 17:43:09 +00:00
|
|
|
};
|
|
|
|
|
|
2012-10-15 03:00:27 +00:00
|
|
|
/* Helper for ED_object_parent_clear() - Remove deform-modifiers associated with parent */
|
|
|
|
|
static void object_remove_parent_deform_modifiers(Object *ob, const Object *par)
|
2012-05-29 18:12:13 +00:00
|
|
|
{
|
2022-02-18 09:50:29 -06:00
|
|
|
if (ELEM(par->type, OB_ARMATURE, OB_LATTICE, OB_CURVES_LEGACY)) {
|
2012-10-15 03:00:27 +00:00
|
|
|
ModifierData *md, *mdn;
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2012-10-15 03:00:27 +00:00
|
|
|
/* assume that we only need to remove the first instance of matching deform modifier here */
|
|
|
|
|
for (md = ob->modifiers.first; md; md = mdn) {
|
2014-04-01 11:34:00 +11:00
|
|
|
bool free = false;
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2012-10-15 03:00:27 +00:00
|
|
|
mdn = md->next;
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2012-10-15 03:00:27 +00:00
|
|
|
/* need to match types (modifier + parent) and references */
|
|
|
|
|
if ((md->type == eModifierType_Armature) && (par->type == OB_ARMATURE)) {
|
|
|
|
|
ArmatureModifierData *amd = (ArmatureModifierData *)md;
|
|
|
|
|
if (amd->object == par) {
|
2014-04-01 11:34:00 +11:00
|
|
|
free = true;
|
2012-10-15 03:00:27 +00:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
else if ((md->type == eModifierType_Lattice) && (par->type == OB_LATTICE)) {
|
|
|
|
|
LatticeModifierData *lmd = (LatticeModifierData *)md;
|
|
|
|
|
if (lmd->object == par) {
|
2014-04-01 11:34:00 +11:00
|
|
|
free = true;
|
2012-10-15 03:00:27 +00:00
|
|
|
}
|
|
|
|
|
}
|
2022-02-18 09:50:29 -06:00
|
|
|
else if ((md->type == eModifierType_Curve) && (par->type == OB_CURVES_LEGACY)) {
|
2012-10-15 03:00:27 +00:00
|
|
|
CurveModifierData *cmd = (CurveModifierData *)md;
|
|
|
|
|
if (cmd->object == par) {
|
2014-04-01 11:34:00 +11:00
|
|
|
free = true;
|
2012-10-15 03:00:27 +00:00
|
|
|
}
|
|
|
|
|
}
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2012-10-15 03:00:27 +00:00
|
|
|
/* free modifier if match */
|
|
|
|
|
if (free) {
|
2020-12-02 13:35:07 +01:00
|
|
|
BKE_modifier_remove_from_list(ob, md);
|
2020-05-08 10:14:02 +02:00
|
|
|
BKE_modifier_free(md);
|
2012-10-15 03:00:27 +00:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
2012-05-29 18:12:13 +00:00
|
|
|
|
2014-10-10 18:26:46 +02:00
|
|
|
void ED_object_parent_clear(Object *ob, const int type)
|
2012-10-15 03:00:27 +00:00
|
|
|
{
|
2019-04-22 09:19:45 +10:00
|
|
|
if (ob->parent == NULL) {
|
2012-05-29 18:12:13 +00:00
|
|
|
return;
|
2019-04-22 09:19:45 +10:00
|
|
|
}
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2012-10-15 03:00:27 +00:00
|
|
|
switch (type) {
|
|
|
|
|
case CLEAR_PARENT_ALL: {
|
2019-01-15 23:24:20 +11:00
|
|
|
/* for deformers, remove corresponding modifiers to prevent
|
|
|
|
|
* a large number of modifiers building up */
|
2012-10-15 03:00:27 +00:00
|
|
|
object_remove_parent_deform_modifiers(ob, ob->parent);
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2012-10-15 03:00:27 +00:00
|
|
|
/* clear parenting relationship completely */
|
|
|
|
|
ob->parent = NULL;
|
2021-06-04 16:39:12 +02:00
|
|
|
ob->partype = PAROBJECT;
|
|
|
|
|
ob->parsubstr[0] = 0;
|
2013-07-19 15:23:42 +00:00
|
|
|
break;
|
2012-10-15 03:00:27 +00:00
|
|
|
}
|
|
|
|
|
case CLEAR_PARENT_KEEP_TRANSFORM: {
|
2019-01-15 23:24:20 +11:00
|
|
|
/* remove parent, and apply the parented transform
|
|
|
|
|
* result as object's local transforms */
|
2012-10-15 03:00:27 +00:00
|
|
|
ob->parent = NULL;
|
2014-04-01 11:34:00 +11:00
|
|
|
BKE_object_apply_mat4(ob, ob->obmat, true, false);
|
2013-07-19 15:23:42 +00:00
|
|
|
break;
|
2012-10-15 03:00:27 +00:00
|
|
|
}
|
|
|
|
|
case CLEAR_PARENT_INVERSE: {
|
2019-01-15 23:24:20 +11:00
|
|
|
/* object stays parented, but the parent inverse
|
|
|
|
|
* (i.e. offset from parent to retain binding state)
|
2014-10-10 16:57:29 +02:00
|
|
|
* is cleared. In other words: nothing to do here! */
|
2013-07-19 15:23:42 +00:00
|
|
|
break;
|
2019-04-17 06:17:24 +02:00
|
|
|
}
|
2012-10-15 03:00:27 +00:00
|
|
|
}
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2014-10-10 16:57:29 +02:00
|
|
|
/* Always clear parentinv matrix for sake of consistency, see T41950. */
|
|
|
|
|
unit_m4(ob->parentinv);
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2018-12-06 17:52:37 +01:00
|
|
|
DEG_id_tag_update(&ob->id, ID_RECALC_TRANSFORM | ID_RECALC_GEOMETRY | ID_RECALC_ANIMATION);
|
2012-05-29 18:12:13 +00:00
|
|
|
}
|
|
|
|
|
|
2021-07-03 23:08:40 +10:00
|
|
|
/* NOTE: poll should check for editable scene. */
|
2012-05-29 18:12:13 +00:00
|
|
|
static int parent_clear_exec(bContext *C, wmOperator *op)
|
2009-09-16 17:43:09 +00:00
|
|
|
{
|
2012-04-28 15:42:27 +00:00
|
|
|
Main *bmain = CTX_data_main(C);
|
2014-10-10 18:26:46 +02:00
|
|
|
const int type = RNA_enum_get(op->ptr, "type");
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2012-04-30 16:22:40 +00:00
|
|
|
CTX_DATA_BEGIN (C, Object *, ob, selected_editable_objects) {
|
2012-05-29 18:12:13 +00:00
|
|
|
ED_object_parent_clear(ob, type);
|
2009-09-16 17:43:09 +00:00
|
|
|
}
|
|
|
|
|
CTX_DATA_END;
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2017-06-08 10:14:53 +02:00
|
|
|
DEG_relations_tag_update(bmain);
|
2012-04-28 15:42:27 +00:00
|
|
|
WM_event_add_notifier(C, NC_OBJECT | ND_TRANSFORM, NULL);
|
|
|
|
|
WM_event_add_notifier(C, NC_OBJECT | ND_PARENT, NULL);
|
2009-09-16 17:43:09 +00:00
|
|
|
return OPERATOR_FINISHED;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void OBJECT_OT_parent_clear(wmOperatorType *ot)
|
|
|
|
|
{
|
|
|
|
|
/* identifiers */
|
2012-03-22 07:26:09 +00:00
|
|
|
ot->name = "Clear Parent";
|
2010-02-10 21:15:44 +00:00
|
|
|
ot->description = "Clear the object's parenting";
|
2012-03-22 07:26:09 +00:00
|
|
|
ot->idname = "OBJECT_OT_parent_clear";
|
2014-10-10 18:44:37 +02:00
|
|
|
|
2009-09-16 17:43:09 +00:00
|
|
|
/* api callbacks */
|
2012-03-22 07:26:09 +00:00
|
|
|
ot->invoke = WM_menu_invoke;
|
|
|
|
|
ot->exec = parent_clear_exec;
|
2014-10-10 18:44:37 +02:00
|
|
|
|
2009-09-16 17:43:09 +00:00
|
|
|
/* flags */
|
2012-04-28 15:42:27 +00:00
|
|
|
ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
|
2014-10-10 18:44:37 +02:00
|
|
|
|
2013-04-05 00:53:37 +00:00
|
|
|
ot->prop = RNA_def_enum(ot->srna, "type", prop_clear_parent_types, CLEAR_PARENT_ALL, "Type", "");
|
2009-09-16 17:43:09 +00:00
|
|
|
}
|
|
|
|
|
|
2020-03-26 10:24:44 +11:00
|
|
|
/** \} */
|
|
|
|
|
|
|
|
|
|
/* ------------------------------------------------------------------- */
|
|
|
|
|
/** \name Make Parent Operator
|
|
|
|
|
* \{ */
|
2009-09-16 17:43:09 +00:00
|
|
|
|
2014-10-10 18:26:46 +02:00
|
|
|
void ED_object_parent(Object *ob, Object *par, const int type, const char *substr)
|
2009-09-16 17:43:09 +00:00
|
|
|
{
|
2014-10-10 16:57:29 +02:00
|
|
|
/* Always clear parentinv matrix for sake of consistency, see T41950. */
|
|
|
|
|
unit_m4(ob->parentinv);
|
|
|
|
|
|
2011-12-16 10:39:43 +00:00
|
|
|
if (!par || BKE_object_parent_loop_check(par, ob)) {
|
2012-04-28 15:42:27 +00:00
|
|
|
ob->parent = NULL;
|
|
|
|
|
ob->partype = PAROBJECT;
|
|
|
|
|
ob->parsubstr[0] = 0;
|
2009-09-16 17:43:09 +00:00
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
2015-06-23 17:35:55 +02:00
|
|
|
/* Other partypes are deprecated, do not use here! */
|
|
|
|
|
BLI_assert(ELEM(type & PARTYPE, PAROBJECT, PARSKEL, PARVERT1, PARVERT3, PARBONE));
|
|
|
|
|
|
2009-09-16 17:43:09 +00:00
|
|
|
/* this could use some more checks */
|
|
|
|
|
|
2012-04-28 15:42:27 +00:00
|
|
|
ob->parent = par;
|
2009-09-16 17:43:09 +00:00
|
|
|
ob->partype &= ~PARTYPE;
|
|
|
|
|
ob->partype |= type;
|
|
|
|
|
BLI_strncpy(ob->parsubstr, substr, sizeof(ob->parsubstr));
|
|
|
|
|
}
|
|
|
|
|
|
2012-01-22 10:20:30 +00:00
|
|
|
/* Operator Property */
|
|
|
|
|
EnumPropertyItem prop_make_parent_types[] = {
|
|
|
|
|
{PAR_OBJECT, "OBJECT", 0, "Object", ""},
|
|
|
|
|
{PAR_ARMATURE, "ARMATURE", 0, "Armature Deform", ""},
|
|
|
|
|
{PAR_ARMATURE_NAME, "ARMATURE_NAME", 0, " With Empty Groups", ""},
|
|
|
|
|
{PAR_ARMATURE_AUTO, "ARMATURE_AUTO", 0, " With Automatic Weights", ""},
|
|
|
|
|
{PAR_ARMATURE_ENVELOPE, "ARMATURE_ENVELOPE", 0, " With Envelope Weights", ""},
|
|
|
|
|
{PAR_BONE, "BONE", 0, "Bone", ""},
|
2013-02-12 14:42:46 +00:00
|
|
|
{PAR_BONE_RELATIVE, "BONE_RELATIVE", 0, "Bone Relative", ""},
|
2012-01-22 10:20:30 +00:00
|
|
|
{PAR_CURVE, "CURVE", 0, "Curve Deform", ""},
|
|
|
|
|
{PAR_FOLLOW, "FOLLOW", 0, "Follow Path", ""},
|
|
|
|
|
{PAR_PATH_CONST, "PATH_CONST", 0, "Path Constraint", ""},
|
|
|
|
|
{PAR_LATTICE, "LATTICE", 0, "Lattice Deform", ""},
|
|
|
|
|
{PAR_VERTEX, "VERTEX", 0, "Vertex", ""},
|
2013-09-01 22:01:21 +00:00
|
|
|
{PAR_VERTEX_TRI, "VERTEX_TRI", 0, "Vertex (Triangle)", ""},
|
2019-02-03 14:01:45 +11:00
|
|
|
{0, NULL, 0, NULL, NULL},
|
2012-01-22 10:20:30 +00:00
|
|
|
};
|
|
|
|
|
|
2017-07-21 11:53:13 +02:00
|
|
|
bool ED_object_parent_set(ReportList *reports,
|
|
|
|
|
const bContext *C,
|
|
|
|
|
Scene *scene,
|
2020-09-08 10:04:41 +02:00
|
|
|
Object *const ob,
|
|
|
|
|
Object *const par,
|
2014-10-10 18:26:46 +02:00
|
|
|
int partype,
|
|
|
|
|
const bool xmirror,
|
|
|
|
|
const bool keep_transform,
|
|
|
|
|
const int vert_par[3])
|
2009-09-16 17:43:09 +00:00
|
|
|
{
|
2017-07-21 11:53:13 +02:00
|
|
|
Main *bmain = CTX_data_main(C);
|
2019-07-25 16:36:22 +02:00
|
|
|
Depsgraph *depsgraph = CTX_data_ensure_evaluated_depsgraph(C);
|
2012-04-28 15:42:27 +00:00
|
|
|
bPoseChannel *pchan = NULL;
|
2019-02-05 15:43:34 +01:00
|
|
|
bPoseChannel *pchan_eval = NULL;
|
|
|
|
|
Object *parent_eval = DEG_get_evaluated_object(depsgraph, par);
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2019-02-05 15:43:34 +01:00
|
|
|
DEG_id_tag_update(&par->id, ID_RECALC_TRANSFORM | ID_RECALC_GEOMETRY);
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2020-09-08 10:04:41 +02:00
|
|
|
/* Preconditions. */
|
|
|
|
|
if (ob == par) {
|
|
|
|
|
/* Parenting an object to itself is impossible. */
|
2020-11-02 10:56:45 +01:00
|
|
|
return false;
|
2020-09-08 10:04:41 +02:00
|
|
|
}
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2020-09-08 10:04:41 +02:00
|
|
|
if (BKE_object_parent_loop_check(par, ob)) {
|
|
|
|
|
BKE_report(reports, RPT_ERROR, "Loop in parents");
|
|
|
|
|
return false;
|
|
|
|
|
}
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2020-09-08 10:04:41 +02:00
|
|
|
switch (partype) {
|
|
|
|
|
case PAR_FOLLOW:
|
|
|
|
|
case PAR_PATH_CONST: {
|
2022-02-18 09:50:29 -06:00
|
|
|
if (par->type != OB_CURVES_LEGACY) {
|
2020-09-08 10:04:41 +02:00
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
Curve *cu = par->data;
|
|
|
|
|
Curve *cu_eval = parent_eval->data;
|
|
|
|
|
if ((cu->flag & CU_PATH) == 0) {
|
|
|
|
|
cu->flag |= CU_PATH | CU_FOLLOW;
|
|
|
|
|
cu_eval->flag |= CU_PATH | CU_FOLLOW;
|
|
|
|
|
/* force creation of path data */
|
2021-06-28 15:14:43 -05:00
|
|
|
BKE_displist_make_curveTypes(depsgraph, scene, par, false);
|
2020-09-08 10:04:41 +02:00
|
|
|
}
|
|
|
|
|
else {
|
|
|
|
|
cu->flag |= CU_FOLLOW;
|
|
|
|
|
cu_eval->flag |= CU_FOLLOW;
|
2010-10-21 10:28:06 +00:00
|
|
|
}
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2020-09-08 10:04:41 +02:00
|
|
|
/* if follow, add F-Curve for ctime (i.e. "eval_time") so that path-follow works */
|
|
|
|
|
if (partype == PAR_FOLLOW) {
|
|
|
|
|
/* get or create F-Curve */
|
|
|
|
|
bAction *act = ED_id_action_ensure(bmain, &cu->id);
|
|
|
|
|
FCurve *fcu = ED_action_fcurve_ensure(bmain, act, NULL, NULL, "eval_time", 0);
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2020-09-08 10:04:41 +02:00
|
|
|
/* setup dummy 'generator' modifier here to get 1-1 correspondence still working */
|
|
|
|
|
if (!fcu->bezt && !fcu->fpt && !fcu->modifiers.first) {
|
|
|
|
|
add_fmodifier(&fcu->modifiers, FMODIFIER_TYPE_GENERATOR, fcu);
|
|
|
|
|
}
|
|
|
|
|
}
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2020-09-08 10:04:41 +02:00
|
|
|
/* fall back on regular parenting now (for follow only) */
|
|
|
|
|
if (partype == PAR_FOLLOW) {
|
|
|
|
|
partype = PAR_OBJECT;
|
|
|
|
|
}
|
|
|
|
|
break;
|
2012-02-22 07:56:15 +00:00
|
|
|
}
|
2020-09-08 10:04:41 +02:00
|
|
|
case PAR_BONE:
|
|
|
|
|
case PAR_BONE_RELATIVE:
|
2021-11-09 12:22:06 +01:00
|
|
|
pchan = BKE_pose_channel_active_if_layer_visible(par);
|
|
|
|
|
pchan_eval = BKE_pose_channel_active_if_layer_visible(parent_eval);
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2020-09-08 10:04:41 +02:00
|
|
|
if (pchan == NULL) {
|
|
|
|
|
BKE_report(reports, RPT_ERROR, "No active bone");
|
|
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
}
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2020-09-08 10:04:41 +02:00
|
|
|
Object workob;
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2020-09-08 10:04:41 +02:00
|
|
|
/* Apply transformation of previous parenting. */
|
|
|
|
|
if (keep_transform) {
|
2020-09-30 20:09:02 +10:00
|
|
|
/* Was removed because of bug T23577,
|
|
|
|
|
* but this can be handy in some cases too T32616, so make optional. */
|
2020-09-08 10:04:41 +02:00
|
|
|
BKE_object_apply_mat4(ob, ob->obmat, false, false);
|
|
|
|
|
}
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2020-09-08 10:04:41 +02:00
|
|
|
/* Set the parent (except for follow-path constraint option). */
|
|
|
|
|
if (partype != PAR_PATH_CONST) {
|
|
|
|
|
ob->parent = par;
|
|
|
|
|
/* Always clear parentinv matrix for sake of consistency, see T41950. */
|
|
|
|
|
unit_m4(ob->parentinv);
|
|
|
|
|
DEG_id_tag_update(&ob->id, ID_RECALC_TRANSFORM);
|
|
|
|
|
}
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2020-09-08 10:04:41 +02:00
|
|
|
/* Handle types. */
|
|
|
|
|
if (pchan) {
|
|
|
|
|
BLI_strncpy(ob->parsubstr, pchan->name, sizeof(ob->parsubstr));
|
|
|
|
|
}
|
|
|
|
|
else {
|
|
|
|
|
ob->parsubstr[0] = 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
switch (partype) {
|
|
|
|
|
case PAR_PATH_CONST:
|
|
|
|
|
/* Don't do anything here, since this is not technically "parenting". */
|
|
|
|
|
break;
|
|
|
|
|
case PAR_CURVE:
|
|
|
|
|
case PAR_LATTICE:
|
|
|
|
|
case PAR_ARMATURE:
|
|
|
|
|
case PAR_ARMATURE_NAME:
|
|
|
|
|
case PAR_ARMATURE_ENVELOPE:
|
|
|
|
|
case PAR_ARMATURE_AUTO:
|
2020-07-03 15:42:22 +02:00
|
|
|
/* partype is now set to PAROBJECT so that invisible 'virtual'
|
|
|
|
|
* modifiers don't need to be created.
|
|
|
|
|
* NOTE: the old (2.4x) method was to set ob->partype = PARSKEL,
|
|
|
|
|
* creating the virtual modifiers.
|
|
|
|
|
*/
|
2021-07-03 23:08:40 +10:00
|
|
|
ob->partype = PAROBJECT; /* NOTE: DNA define, not operator property. */
|
|
|
|
|
/* ob->partype = PARSKEL; */ /* NOTE: DNA define, not operator property. */
|
2020-07-03 15:42:22 +02:00
|
|
|
|
|
|
|
|
/* BUT, to keep the deforms, we need a modifier,
|
|
|
|
|
* and then we need to set the object that it uses
|
|
|
|
|
* - We need to ensure that the modifier we're adding doesn't already exist,
|
|
|
|
|
* so we check this by assuming that the parent is selected too.
|
|
|
|
|
*/
|
|
|
|
|
/* XXX currently this should only happen for meshes, curves, surfaces,
|
2021-05-14 17:35:22 +10:00
|
|
|
* and lattices - this stuff isn't available for meta-balls yet. */
|
2022-02-18 09:50:29 -06:00
|
|
|
if (ELEM(ob->type, OB_MESH, OB_CURVES_LEGACY, OB_SURF, OB_FONT, OB_LATTICE)) {
|
2020-07-03 15:42:22 +02:00
|
|
|
ModifierData *md;
|
|
|
|
|
|
|
|
|
|
switch (partype) {
|
|
|
|
|
case PAR_CURVE: /* curve deform */
|
|
|
|
|
if (BKE_modifiers_is_deformed_by_curve(ob) != par) {
|
|
|
|
|
md = ED_object_modifier_add(reports, bmain, scene, ob, NULL, eModifierType_Curve);
|
|
|
|
|
if (md) {
|
|
|
|
|
((CurveModifierData *)md)->object = par;
|
2014-10-21 19:16:29 +06:00
|
|
|
}
|
2021-04-08 15:51:08 +02:00
|
|
|
if (par->runtime.curve_cache &&
|
|
|
|
|
par->runtime.curve_cache->anim_path_accum_length == NULL) {
|
2020-07-03 15:42:22 +02:00
|
|
|
DEG_id_tag_update(&par->id, ID_RECALC_GEOMETRY);
|
2012-10-15 03:56:01 +00:00
|
|
|
}
|
2020-07-03 15:42:22 +02:00
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
case PAR_LATTICE: /* lattice deform */
|
|
|
|
|
if (BKE_modifiers_is_deformed_by_lattice(ob) != par) {
|
|
|
|
|
md = ED_object_modifier_add(reports, bmain, scene, ob, NULL, eModifierType_Lattice);
|
|
|
|
|
if (md) {
|
|
|
|
|
((LatticeModifierData *)md)->object = par;
|
2012-10-15 03:16:38 +00:00
|
|
|
}
|
2020-07-03 15:42:22 +02:00
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
default: /* armature deform */
|
|
|
|
|
if (BKE_modifiers_is_deformed_by_armature(ob) != par) {
|
|
|
|
|
md = ED_object_modifier_add(reports, bmain, scene, ob, NULL, eModifierType_Armature);
|
|
|
|
|
if (md) {
|
|
|
|
|
((ArmatureModifierData *)md)->object = par;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
break;
|
2019-02-05 15:43:34 +01:00
|
|
|
}
|
2013-02-12 14:42:46 +00:00
|
|
|
}
|
2020-09-08 10:04:41 +02:00
|
|
|
break;
|
|
|
|
|
case PAR_BONE:
|
2021-07-03 23:08:40 +10:00
|
|
|
ob->partype = PARBONE; /* NOTE: DNA define, not operator property. */
|
2020-07-03 15:42:22 +02:00
|
|
|
if (pchan->bone) {
|
|
|
|
|
pchan->bone->flag &= ~BONE_RELATIVE_PARENTING;
|
|
|
|
|
pchan_eval->bone->flag &= ~BONE_RELATIVE_PARENTING;
|
2013-09-01 22:01:21 +00:00
|
|
|
}
|
2020-09-08 10:04:41 +02:00
|
|
|
break;
|
|
|
|
|
case PAR_BONE_RELATIVE:
|
2021-07-03 23:08:40 +10:00
|
|
|
ob->partype = PARBONE; /* NOTE: DNA define, not operator property. */
|
2020-07-03 15:42:22 +02:00
|
|
|
if (pchan->bone) {
|
|
|
|
|
pchan->bone->flag |= BONE_RELATIVE_PARENTING;
|
|
|
|
|
pchan_eval->bone->flag |= BONE_RELATIVE_PARENTING;
|
2013-09-01 22:01:21 +00:00
|
|
|
}
|
2020-09-08 10:04:41 +02:00
|
|
|
break;
|
|
|
|
|
case PAR_VERTEX:
|
2020-07-03 15:42:22 +02:00
|
|
|
ob->partype = PARVERT1;
|
|
|
|
|
ob->par1 = vert_par[0];
|
2020-09-08 10:04:41 +02:00
|
|
|
break;
|
|
|
|
|
case PAR_VERTEX_TRI:
|
2020-07-03 15:42:22 +02:00
|
|
|
ob->partype = PARVERT3;
|
|
|
|
|
copy_v3_v3_int(&ob->par1, vert_par);
|
2020-09-08 10:04:41 +02:00
|
|
|
break;
|
|
|
|
|
case PAR_OBJECT:
|
|
|
|
|
case PAR_FOLLOW:
|
2021-07-03 23:08:40 +10:00
|
|
|
ob->partype = PAROBJECT; /* NOTE: DNA define, not operator property. */
|
2020-09-08 10:04:41 +02:00
|
|
|
break;
|
|
|
|
|
}
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2020-09-08 10:04:41 +02:00
|
|
|
/* Constraint and set parent inverse. */
|
|
|
|
|
const bool is_armature_parent = ELEM(
|
|
|
|
|
partype, PAR_ARMATURE, PAR_ARMATURE_NAME, PAR_ARMATURE_ENVELOPE, PAR_ARMATURE_AUTO);
|
|
|
|
|
if (partype == PAR_PATH_CONST) {
|
|
|
|
|
bConstraint *con;
|
|
|
|
|
bFollowPathConstraint *data;
|
|
|
|
|
float cmat[4][4], vec[3];
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2020-09-08 10:04:41 +02:00
|
|
|
con = BKE_constraint_add_for_object(ob, "AutoPath", CONSTRAINT_TYPE_FOLLOWPATH);
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2020-09-08 10:04:41 +02:00
|
|
|
data = con->data;
|
|
|
|
|
data->tar = par;
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2020-09-08 10:04:41 +02:00
|
|
|
BKE_constraint_target_matrix_get(
|
|
|
|
|
depsgraph, scene, con, 0, CONSTRAINT_OBTYPE_OBJECT, NULL, cmat, scene->r.cfra);
|
|
|
|
|
sub_v3_v3v3(vec, ob->obmat[3], cmat[3]);
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2020-09-08 10:04:41 +02:00
|
|
|
copy_v3_v3(ob->loc, vec);
|
|
|
|
|
}
|
|
|
|
|
else if (is_armature_parent && (ob->type == OB_MESH) && (par->type == OB_ARMATURE)) {
|
|
|
|
|
if (partype == PAR_ARMATURE_NAME) {
|
|
|
|
|
ED_object_vgroup_calc_from_armature(
|
|
|
|
|
reports, depsgraph, scene, ob, par, ARM_GROUPS_NAME, false);
|
|
|
|
|
}
|
|
|
|
|
else if (partype == PAR_ARMATURE_ENVELOPE) {
|
|
|
|
|
ED_object_vgroup_calc_from_armature(
|
|
|
|
|
reports, depsgraph, scene, ob, par, ARM_GROUPS_ENVELOPE, xmirror);
|
|
|
|
|
}
|
|
|
|
|
else if (partype == PAR_ARMATURE_AUTO) {
|
2021-03-05 10:36:57 +01:00
|
|
|
WM_cursor_wait(true);
|
2020-09-08 10:04:41 +02:00
|
|
|
ED_object_vgroup_calc_from_armature(
|
|
|
|
|
reports, depsgraph, scene, ob, par, ARM_GROUPS_AUTO, xmirror);
|
2021-03-05 10:36:57 +01:00
|
|
|
WM_cursor_wait(false);
|
2020-09-08 10:04:41 +02:00
|
|
|
}
|
|
|
|
|
/* get corrected inverse */
|
|
|
|
|
ob->partype = PAROBJECT;
|
|
|
|
|
BKE_object_workob_calc_parent(depsgraph, scene, ob, &workob);
|
2019-06-25 13:59:59 +02:00
|
|
|
|
2020-09-08 10:04:41 +02:00
|
|
|
invert_m4_m4(ob->parentinv, workob.obmat);
|
|
|
|
|
}
|
|
|
|
|
else if (is_armature_parent && (ob->type == OB_GPENCIL) && (par->type == OB_ARMATURE)) {
|
|
|
|
|
if (partype == PAR_ARMATURE) {
|
|
|
|
|
ED_gpencil_add_armature(C, reports, ob, par);
|
2020-07-03 15:42:22 +02:00
|
|
|
}
|
2020-09-08 10:04:41 +02:00
|
|
|
else if (partype == PAR_ARMATURE_NAME) {
|
|
|
|
|
ED_gpencil_add_armature_weights(C, reports, ob, par, GP_PAR_ARMATURE_NAME);
|
2020-07-03 15:42:22 +02:00
|
|
|
}
|
2020-11-06 12:30:59 +11:00
|
|
|
else if (ELEM(partype, PAR_ARMATURE_AUTO, PAR_ARMATURE_ENVELOPE)) {
|
2021-03-05 10:36:57 +01:00
|
|
|
WM_cursor_wait(true);
|
2020-09-08 10:04:41 +02:00
|
|
|
ED_gpencil_add_armature_weights(C, reports, ob, par, GP_PAR_ARMATURE_AUTO);
|
2021-03-05 10:36:57 +01:00
|
|
|
WM_cursor_wait(false);
|
2009-09-16 17:43:09 +00:00
|
|
|
}
|
2020-09-08 10:04:41 +02:00
|
|
|
/* get corrected inverse */
|
|
|
|
|
ob->partype = PAROBJECT;
|
|
|
|
|
BKE_object_workob_calc_parent(depsgraph, scene, ob, &workob);
|
|
|
|
|
|
|
|
|
|
invert_m4_m4(ob->parentinv, workob.obmat);
|
|
|
|
|
}
|
|
|
|
|
else if ((ob->type == OB_GPENCIL) && (par->type == OB_LATTICE)) {
|
|
|
|
|
/* Add Lattice modifier */
|
|
|
|
|
if (partype == PAR_LATTICE) {
|
|
|
|
|
ED_gpencil_add_lattice_modifier(C, reports, ob, par);
|
2020-07-03 15:42:22 +02:00
|
|
|
}
|
2020-09-08 10:04:41 +02:00
|
|
|
/* get corrected inverse */
|
|
|
|
|
ob->partype = PAROBJECT;
|
|
|
|
|
BKE_object_workob_calc_parent(depsgraph, scene, ob, &workob);
|
2020-07-03 15:42:22 +02:00
|
|
|
|
2020-09-08 10:04:41 +02:00
|
|
|
invert_m4_m4(ob->parentinv, workob.obmat);
|
|
|
|
|
}
|
|
|
|
|
else {
|
|
|
|
|
/* calculate inverse parent matrix */
|
|
|
|
|
BKE_object_workob_calc_parent(depsgraph, scene, ob, &workob);
|
|
|
|
|
invert_m4_m4(ob->parentinv, workob.obmat);
|
2009-09-16 17:43:09 +00:00
|
|
|
}
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2020-09-08 10:04:41 +02:00
|
|
|
DEG_id_tag_update(&ob->id, ID_RECALC_TRANSFORM | ID_RECALC_GEOMETRY);
|
2014-10-10 18:26:46 +02:00
|
|
|
return true;
|
2012-01-22 10:20:30 +00:00
|
|
|
}
|
|
|
|
|
|
2019-03-20 00:46:33 +11:00
|
|
|
static void parent_set_vert_find(KDTree_3d *tree, Object *child, int vert_par[3], bool is_tri)
|
2013-09-01 22:01:21 +00:00
|
|
|
{
|
|
|
|
|
const float *co_find = child->obmat[3];
|
|
|
|
|
if (is_tri) {
|
2019-03-20 00:46:33 +11:00
|
|
|
KDTreeNearest_3d nearest[3];
|
2013-09-01 22:01:21 +00:00
|
|
|
int tot;
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2019-03-20 00:46:33 +11:00
|
|
|
tot = BLI_kdtree_3d_find_nearest_n(tree, co_find, nearest, 3);
|
2013-09-01 22:01:21 +00:00
|
|
|
BLI_assert(tot == 3);
|
2015-01-11 21:03:15 +01:00
|
|
|
UNUSED_VARS(tot);
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2013-09-01 22:01:21 +00:00
|
|
|
vert_par[0] = nearest[0].index;
|
|
|
|
|
vert_par[1] = nearest[1].index;
|
|
|
|
|
vert_par[2] = nearest[2].index;
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2013-09-01 22:01:21 +00:00
|
|
|
BLI_assert(min_iii(UNPACK3(vert_par)) >= 0);
|
|
|
|
|
}
|
|
|
|
|
else {
|
2019-03-20 00:46:33 +11:00
|
|
|
vert_par[0] = BLI_kdtree_3d_find_nearest(tree, co_find, NULL);
|
2013-09-01 22:01:21 +00:00
|
|
|
BLI_assert(vert_par[0] >= 0);
|
|
|
|
|
vert_par[1] = 0;
|
|
|
|
|
vert_par[2] = 0;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2020-09-07 16:30:34 +02:00
|
|
|
struct ParentingContext {
|
|
|
|
|
ReportList *reports;
|
|
|
|
|
Scene *scene;
|
|
|
|
|
Object *par;
|
|
|
|
|
int partype;
|
|
|
|
|
bool is_vertex_tri;
|
|
|
|
|
bool xmirror;
|
|
|
|
|
bool keep_transform;
|
|
|
|
|
};
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2020-09-07 16:30:34 +02:00
|
|
|
static bool parent_set_nonvertex_parent(bContext *C, struct ParentingContext *parenting_context)
|
|
|
|
|
{
|
|
|
|
|
CTX_DATA_BEGIN (C, Object *, ob, selected_editable_objects) {
|
2020-11-02 10:56:45 +01:00
|
|
|
if (ob == parenting_context->par) {
|
|
|
|
|
/* ED_object_parent_set() will fail (and thus return false), but this case shouldn't break
|
|
|
|
|
* this loop. It's expected that the active object is also selected. */
|
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
|
2020-09-07 16:30:34 +02:00
|
|
|
if (!ED_object_parent_set(parenting_context->reports,
|
|
|
|
|
C,
|
|
|
|
|
parenting_context->scene,
|
|
|
|
|
ob,
|
|
|
|
|
parenting_context->par,
|
|
|
|
|
parenting_context->partype,
|
|
|
|
|
parenting_context->xmirror,
|
|
|
|
|
parenting_context->keep_transform,
|
|
|
|
|
NULL)) {
|
|
|
|
|
return false;
|
2019-04-17 06:17:24 +02:00
|
|
|
}
|
2013-09-01 22:01:21 +00:00
|
|
|
}
|
2020-09-07 16:30:34 +02:00
|
|
|
CTX_DATA_END;
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2020-09-07 16:30:34 +02:00
|
|
|
return true;
|
|
|
|
|
}
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2020-09-07 16:30:34 +02:00
|
|
|
static bool parent_set_vertex_parent_with_kdtree(bContext *C,
|
|
|
|
|
struct ParentingContext *parenting_context,
|
|
|
|
|
struct KDTree_3d *tree)
|
|
|
|
|
{
|
|
|
|
|
int vert_par[3] = {0, 0, 0};
|
|
|
|
|
|
|
|
|
|
CTX_DATA_BEGIN (C, Object *, ob, selected_editable_objects) {
|
2020-11-02 10:56:45 +01:00
|
|
|
if (ob == parenting_context->par) {
|
|
|
|
|
/* ED_object_parent_set() will fail (and thus return false), but this case shouldn't break
|
|
|
|
|
* this loop. It's expected that the active object is also selected. */
|
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
|
2020-09-07 16:30:34 +02:00
|
|
|
parent_set_vert_find(tree, ob, vert_par, parenting_context->is_vertex_tri);
|
|
|
|
|
if (!ED_object_parent_set(parenting_context->reports,
|
|
|
|
|
C,
|
|
|
|
|
parenting_context->scene,
|
|
|
|
|
ob,
|
|
|
|
|
parenting_context->par,
|
|
|
|
|
parenting_context->partype,
|
|
|
|
|
parenting_context->xmirror,
|
|
|
|
|
parenting_context->keep_transform,
|
|
|
|
|
vert_par)) {
|
|
|
|
|
return false;
|
2012-02-22 07:56:15 +00:00
|
|
|
}
|
|
|
|
|
}
|
2020-09-07 16:30:34 +02:00
|
|
|
CTX_DATA_END;
|
|
|
|
|
return true;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static bool parent_set_vertex_parent(bContext *C, struct ParentingContext *parenting_context)
|
|
|
|
|
{
|
|
|
|
|
struct KDTree_3d *tree = NULL;
|
|
|
|
|
int tree_tot;
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2020-09-07 16:30:34 +02:00
|
|
|
tree = BKE_object_as_kdtree(parenting_context->par, &tree_tot);
|
|
|
|
|
BLI_assert(tree != NULL);
|
|
|
|
|
|
|
|
|
|
if (tree_tot < (parenting_context->is_vertex_tri ? 3 : 1)) {
|
|
|
|
|
BKE_report(parenting_context->reports, RPT_ERROR, "Not enough vertices for vertex-parent");
|
2019-03-20 00:46:33 +11:00
|
|
|
BLI_kdtree_3d_free(tree);
|
2020-09-07 16:30:34 +02:00
|
|
|
return false;
|
2013-09-01 22:01:21 +00:00
|
|
|
}
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2020-09-07 16:30:34 +02:00
|
|
|
const bool ok = parent_set_vertex_parent_with_kdtree(C, parenting_context, tree);
|
|
|
|
|
BLI_kdtree_3d_free(tree);
|
|
|
|
|
return ok;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static int parent_set_exec(bContext *C, wmOperator *op)
|
|
|
|
|
{
|
|
|
|
|
const int partype = RNA_enum_get(op->ptr, "type");
|
|
|
|
|
struct ParentingContext parenting_context = {
|
|
|
|
|
.reports = op->reports,
|
|
|
|
|
.scene = CTX_data_scene(C),
|
|
|
|
|
.par = ED_object_active_context(C),
|
|
|
|
|
.partype = partype,
|
|
|
|
|
.is_vertex_tri = partype == PAR_VERTEX_TRI,
|
|
|
|
|
.xmirror = RNA_boolean_get(op->ptr, "xmirror"),
|
|
|
|
|
.keep_transform = RNA_boolean_get(op->ptr, "keep_transform"),
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
bool ok;
|
|
|
|
|
if (ELEM(parenting_context.partype, PAR_VERTEX, PAR_VERTEX_TRI)) {
|
|
|
|
|
ok = parent_set_vertex_parent(C, &parenting_context);
|
|
|
|
|
}
|
|
|
|
|
else {
|
|
|
|
|
ok = parent_set_nonvertex_parent(C, &parenting_context);
|
|
|
|
|
}
|
2019-04-22 09:19:45 +10:00
|
|
|
if (!ok) {
|
2012-01-22 10:20:30 +00:00
|
|
|
return OPERATOR_CANCELLED;
|
2019-04-22 09:19:45 +10:00
|
|
|
}
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2020-09-07 16:30:34 +02:00
|
|
|
Main *bmain = CTX_data_main(C);
|
2017-06-08 10:14:53 +02:00
|
|
|
DEG_relations_tag_update(bmain);
|
2012-04-28 15:42:27 +00:00
|
|
|
WM_event_add_notifier(C, NC_OBJECT | ND_TRANSFORM, NULL);
|
|
|
|
|
WM_event_add_notifier(C, NC_OBJECT | ND_PARENT, NULL);
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2012-02-22 07:56:15 +00:00
|
|
|
return OPERATOR_FINISHED;
|
2009-09-16 17:43:09 +00:00
|
|
|
}
|
|
|
|
|
|
2019-04-29 15:40:50 +10:00
|
|
|
static int parent_set_invoke_menu(bContext *C, wmOperatorType *ot)
|
2009-09-16 17:43:09 +00:00
|
|
|
{
|
2019-01-23 15:20:35 +01:00
|
|
|
Object *parent = ED_object_active_context(C);
|
2014-11-09 21:20:40 +01:00
|
|
|
uiPopupMenu *pup = UI_popup_menu_begin(C, IFACE_("Set Parent To"), ICON_NONE);
|
|
|
|
|
uiLayout *layout = UI_popup_menu_layout(pup);
|
2012-09-27 12:24:38 +00:00
|
|
|
|
|
|
|
|
PointerRNA opptr;
|
|
|
|
|
#if 0
|
|
|
|
|
uiItemEnumO_ptr(layout, ot, NULL, 0, "type", PAR_OBJECT);
|
|
|
|
|
#else
|
2017-10-31 16:58:26 +11:00
|
|
|
uiItemFullO_ptr(layout, ot, IFACE_("Object"), ICON_NONE, NULL, WM_OP_EXEC_DEFAULT, 0, &opptr);
|
2012-09-27 12:24:38 +00:00
|
|
|
RNA_enum_set(&opptr, "type", PAR_OBJECT);
|
2014-04-01 11:34:00 +11:00
|
|
|
RNA_boolean_set(&opptr, "keep_transform", false);
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2017-10-31 16:58:26 +11:00
|
|
|
uiItemFullO_ptr(layout,
|
|
|
|
|
ot,
|
|
|
|
|
IFACE_("Object (Keep Transform)"),
|
|
|
|
|
ICON_NONE,
|
|
|
|
|
NULL,
|
|
|
|
|
WM_OP_EXEC_DEFAULT,
|
|
|
|
|
0,
|
|
|
|
|
&opptr);
|
2012-09-27 12:24:38 +00:00
|
|
|
RNA_enum_set(&opptr, "type", PAR_OBJECT);
|
2014-04-01 11:34:00 +11:00
|
|
|
RNA_boolean_set(&opptr, "keep_transform", true);
|
2012-09-27 12:24:38 +00:00
|
|
|
#endif
|
2019-01-23 15:20:35 +01:00
|
|
|
|
Object: Set Parent (Keep Transform Without Inverse)
**Relevant to Artists:** This patch adds an option to the Parenting
menu, `Object (Keep Transform Without Inverse)`, and Apply menu, `Parent
Inverse`. The operators preserve the child's world transform without
using the parent inverse matrix. Effectively, we set the child's origin
to the parent. When the child has an identity local transform, then the
child is world-space aligned with its parent (scale excluded).
**Technical:** In both cases, the hidden parent inverse matrix is
generally set to identity (cleared or "not used") as long as the parent
has no shear. If the parent has shear, then this matrix will not be
entirely cleared. It will contain shear to counter the parent's shear.
This is required, otherwise the object's local matrix cannot be properly
decomposed into location, rotation and scale, and thus cannot preserve
the world transform.
If the child's world transform has shear, then its world transform is
not preserved. This is currently not supported for consistency in the
handling of shear during the other parenting ops: Parent (Keep
Transform), Clear [Parent] and Keep Transform. If it should work, then
another patch should add the support for all of them.
Reviewed By: sybren, RiggingDojo
Differential Revision: https://developer.blender.org/D14581
2022-04-14 18:16:23 -04:00
|
|
|
uiItemBooleanO(layout,
|
|
|
|
|
IFACE_("Object (Without Inverse)"),
|
|
|
|
|
ICON_NONE,
|
|
|
|
|
"OBJECT_OT_parent_no_inverse_set",
|
|
|
|
|
"keep_transform",
|
|
|
|
|
0);
|
|
|
|
|
|
|
|
|
|
uiItemBooleanO(layout,
|
|
|
|
|
IFACE_("Object (Keep Transform Without Inverse)"),
|
|
|
|
|
ICON_NONE,
|
|
|
|
|
"OBJECT_OT_parent_no_inverse_set",
|
|
|
|
|
"keep_transform",
|
|
|
|
|
1);
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2019-01-23 15:20:35 +01:00
|
|
|
struct {
|
|
|
|
|
bool mesh, gpencil;
|
|
|
|
|
} has_children_of_type = {0};
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2019-01-23 15:20:35 +01:00
|
|
|
CTX_DATA_BEGIN (C, Object *, child, selected_editable_objects) {
|
|
|
|
|
if (child == parent) {
|
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
if (child->type == OB_MESH) {
|
|
|
|
|
has_children_of_type.mesh = true;
|
|
|
|
|
}
|
|
|
|
|
if (child->type == OB_GPENCIL) {
|
|
|
|
|
has_children_of_type.gpencil = true;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
CTX_DATA_END;
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2019-01-23 15:20:35 +01:00
|
|
|
if (parent->type == OB_ARMATURE) {
|
2012-09-27 12:24:38 +00:00
|
|
|
uiItemEnumO_ptr(layout, ot, NULL, 0, "type", PAR_ARMATURE);
|
|
|
|
|
uiItemEnumO_ptr(layout, ot, NULL, 0, "type", PAR_ARMATURE_NAME);
|
2020-02-07 17:46:29 +01:00
|
|
|
if (!has_children_of_type.gpencil) {
|
|
|
|
|
uiItemEnumO_ptr(layout, ot, NULL, 0, "type", PAR_ARMATURE_ENVELOPE);
|
|
|
|
|
}
|
2019-01-23 15:20:35 +01:00
|
|
|
if (has_children_of_type.mesh || has_children_of_type.gpencil) {
|
|
|
|
|
uiItemEnumO_ptr(layout, ot, NULL, 0, "type", PAR_ARMATURE_AUTO);
|
|
|
|
|
}
|
2012-09-27 12:24:38 +00:00
|
|
|
uiItemEnumO_ptr(layout, ot, NULL, 0, "type", PAR_BONE);
|
2013-02-12 14:42:46 +00:00
|
|
|
uiItemEnumO_ptr(layout, ot, NULL, 0, "type", PAR_BONE_RELATIVE);
|
2009-09-16 17:43:09 +00:00
|
|
|
}
|
2022-02-18 09:50:29 -06:00
|
|
|
else if (parent->type == OB_CURVES_LEGACY) {
|
2012-09-27 12:24:38 +00:00
|
|
|
uiItemEnumO_ptr(layout, ot, NULL, 0, "type", PAR_CURVE);
|
|
|
|
|
uiItemEnumO_ptr(layout, ot, NULL, 0, "type", PAR_FOLLOW);
|
|
|
|
|
uiItemEnumO_ptr(layout, ot, NULL, 0, "type", PAR_PATH_CONST);
|
2009-09-16 17:43:09 +00:00
|
|
|
}
|
2019-01-23 15:20:35 +01:00
|
|
|
else if (parent->type == OB_LATTICE) {
|
2012-09-27 12:24:38 +00:00
|
|
|
uiItemEnumO_ptr(layout, ot, NULL, 0, "type", PAR_LATTICE);
|
2009-09-16 17:43:09 +00:00
|
|
|
}
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2013-09-01 22:01:21 +00:00
|
|
|
/* vertex parenting */
|
2019-01-23 15:20:35 +01:00
|
|
|
if (OB_TYPE_SUPPORT_PARVERT(parent->type)) {
|
2013-09-01 22:01:21 +00:00
|
|
|
uiItemEnumO_ptr(layout, ot, NULL, 0, "type", PAR_VERTEX);
|
|
|
|
|
uiItemEnumO_ptr(layout, ot, NULL, 0, "type", PAR_VERTEX_TRI);
|
|
|
|
|
}
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2014-11-09 21:20:40 +01:00
|
|
|
UI_popup_menu_end(C, pup);
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2014-10-28 17:51:06 +01:00
|
|
|
return OPERATOR_INTERFACE;
|
2009-09-16 17:43:09 +00:00
|
|
|
}
|
|
|
|
|
|
2019-04-29 15:40:50 +10:00
|
|
|
static int parent_set_invoke(bContext *C, wmOperator *op, const wmEvent *UNUSED(event))
|
|
|
|
|
{
|
|
|
|
|
if (RNA_property_is_set(op->ptr, op->type->prop)) {
|
|
|
|
|
return parent_set_exec(C, op);
|
|
|
|
|
}
|
|
|
|
|
return parent_set_invoke_menu(C, op->type);
|
|
|
|
|
}
|
|
|
|
|
|
2018-07-26 17:35:33 +10:00
|
|
|
static bool parent_set_poll_property(const bContext *UNUSED(C),
|
|
|
|
|
wmOperator *op,
|
|
|
|
|
const PropertyRNA *prop)
|
2012-07-15 12:53:16 +00:00
|
|
|
{
|
|
|
|
|
const char *prop_id = RNA_property_identifier(prop);
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2012-07-15 12:53:16 +00:00
|
|
|
/* Only show XMirror for PAR_ARMATURE_ENVELOPE and PAR_ARMATURE_AUTO! */
|
2013-03-19 23:17:44 +00:00
|
|
|
if (STREQ(prop_id, "xmirror")) {
|
2018-07-26 17:35:33 +10:00
|
|
|
const int type = RNA_enum_get(op->ptr, "type");
|
2019-04-22 09:19:45 +10:00
|
|
|
if (ELEM(type, PAR_ARMATURE_ENVELOPE, PAR_ARMATURE_AUTO)) {
|
2013-03-19 23:17:44 +00:00
|
|
|
return true;
|
2019-04-22 09:19:45 +10:00
|
|
|
}
|
2020-07-03 15:42:22 +02:00
|
|
|
return false;
|
2012-07-15 12:53:16 +00:00
|
|
|
}
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2013-03-19 23:17:44 +00:00
|
|
|
return true;
|
2012-07-15 12:53:16 +00:00
|
|
|
}
|
|
|
|
|
|
2009-09-16 17:43:09 +00:00
|
|
|
void OBJECT_OT_parent_set(wmOperatorType *ot)
|
|
|
|
|
{
|
|
|
|
|
/* identifiers */
|
2012-03-22 07:26:09 +00:00
|
|
|
ot->name = "Make Parent";
|
2010-02-10 21:15:44 +00:00
|
|
|
ot->description = "Set the object's parenting";
|
2012-03-22 07:26:09 +00:00
|
|
|
ot->idname = "OBJECT_OT_parent_set";
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2009-09-16 17:43:09 +00:00
|
|
|
/* api callbacks */
|
2012-03-22 07:26:09 +00:00
|
|
|
ot->invoke = parent_set_invoke;
|
|
|
|
|
ot->exec = parent_set_exec;
|
|
|
|
|
ot->poll = ED_operator_object_active;
|
2018-07-26 17:35:33 +10:00
|
|
|
ot->poll_property = parent_set_poll_property;
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2009-09-16 17:43:09 +00:00
|
|
|
/* flags */
|
2012-04-28 15:42:27 +00:00
|
|
|
ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2015-01-29 17:34:05 +01:00
|
|
|
ot->prop = RNA_def_enum(ot->srna, "type", prop_make_parent_types, 0, "Type", "");
|
2014-04-01 11:34:00 +11:00
|
|
|
RNA_def_boolean(
|
|
|
|
|
ot->srna,
|
|
|
|
|
"xmirror",
|
|
|
|
|
false,
|
|
|
|
|
"X Mirror",
|
2012-07-15 12:53:16 +00:00
|
|
|
"Apply weights symmetrically along X axis, for Envelope/Automatic vertex groups creation");
|
2014-04-01 11:34:00 +11:00
|
|
|
RNA_def_boolean(ot->srna,
|
|
|
|
|
"keep_transform",
|
|
|
|
|
false,
|
|
|
|
|
"Keep Transform",
|
2012-09-27 12:24:38 +00:00
|
|
|
"Apply transformation before parenting");
|
2009-09-16 17:43:09 +00:00
|
|
|
}
|
|
|
|
|
|
2020-03-26 10:24:44 +11:00
|
|
|
/** \} */
|
|
|
|
|
|
|
|
|
|
/* ------------------------------------------------------------------- */
|
|
|
|
|
/** \name Make Parent Without Inverse Operator
|
|
|
|
|
* \{ */
|
2009-10-26 11:20:16 +00:00
|
|
|
|
|
|
|
|
static int parent_noinv_set_exec(bContext *C, wmOperator *op)
|
|
|
|
|
{
|
2012-04-28 15:42:27 +00:00
|
|
|
Main *bmain = CTX_data_main(C);
|
|
|
|
|
Object *par = ED_object_active_context(C);
|
2019-04-17 06:17:24 +02:00
|
|
|
|
Object: Set Parent (Keep Transform Without Inverse)
**Relevant to Artists:** This patch adds an option to the Parenting
menu, `Object (Keep Transform Without Inverse)`, and Apply menu, `Parent
Inverse`. The operators preserve the child's world transform without
using the parent inverse matrix. Effectively, we set the child's origin
to the parent. When the child has an identity local transform, then the
child is world-space aligned with its parent (scale excluded).
**Technical:** In both cases, the hidden parent inverse matrix is
generally set to identity (cleared or "not used") as long as the parent
has no shear. If the parent has shear, then this matrix will not be
entirely cleared. It will contain shear to counter the parent's shear.
This is required, otherwise the object's local matrix cannot be properly
decomposed into location, rotation and scale, and thus cannot preserve
the world transform.
If the child's world transform has shear, then its world transform is
not preserved. This is currently not supported for consistency in the
handling of shear during the other parenting ops: Parent (Keep
Transform), Clear [Parent] and Keep Transform. If it should work, then
another patch should add the support for all of them.
Reviewed By: sybren, RiggingDojo
Differential Revision: https://developer.blender.org/D14581
2022-04-14 18:16:23 -04:00
|
|
|
const bool keep_transform = RNA_boolean_get(op->ptr, "keep_transform");
|
|
|
|
|
|
2018-12-06 17:52:37 +01:00
|
|
|
DEG_id_tag_update(&par->id, ID_RECALC_TRANSFORM);
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2011-01-02 19:00:32 +00:00
|
|
|
/* context iterator */
|
2012-04-30 16:22:40 +00:00
|
|
|
CTX_DATA_BEGIN (C, Object *, ob, selected_editable_objects) {
|
2009-10-26 11:20:16 +00:00
|
|
|
if (ob != par) {
|
2011-12-16 10:39:43 +00:00
|
|
|
if (BKE_object_parent_loop_check(par, ob)) {
|
2009-10-26 11:20:16 +00:00
|
|
|
BKE_report(op->reports, RPT_ERROR, "Loop in parents");
|
|
|
|
|
}
|
|
|
|
|
else {
|
|
|
|
|
/* set recalc flags */
|
2018-12-06 17:52:37 +01:00
|
|
|
DEG_id_tag_update(&ob->id, ID_RECALC_TRANSFORM | ID_RECALC_GEOMETRY);
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2009-10-26 11:20:16 +00:00
|
|
|
/* set parenting type for object - object only... */
|
2012-04-28 15:42:27 +00:00
|
|
|
ob->parent = par;
|
2021-07-03 23:08:40 +10:00
|
|
|
ob->partype = PAROBJECT; /* NOTE: DNA define, not operator property. */
|
Object: Set Parent (Keep Transform Without Inverse)
**Relevant to Artists:** This patch adds an option to the Parenting
menu, `Object (Keep Transform Without Inverse)`, and Apply menu, `Parent
Inverse`. The operators preserve the child's world transform without
using the parent inverse matrix. Effectively, we set the child's origin
to the parent. When the child has an identity local transform, then the
child is world-space aligned with its parent (scale excluded).
**Technical:** In both cases, the hidden parent inverse matrix is
generally set to identity (cleared or "not used") as long as the parent
has no shear. If the parent has shear, then this matrix will not be
entirely cleared. It will contain shear to counter the parent's shear.
This is required, otherwise the object's local matrix cannot be properly
decomposed into location, rotation and scale, and thus cannot preserve
the world transform.
If the child's world transform has shear, then its world transform is
not preserved. This is currently not supported for consistency in the
handling of shear during the other parenting ops: Parent (Keep
Transform), Clear [Parent] and Keep Transform. If it should work, then
another patch should add the support for all of them.
Reviewed By: sybren, RiggingDojo
Differential Revision: https://developer.blender.org/D14581
2022-04-14 18:16:23 -04:00
|
|
|
|
|
|
|
|
if (keep_transform) {
|
|
|
|
|
BKE_object_apply_parent_inverse(ob);
|
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* clear inverse matrix and also the object location */
|
|
|
|
|
unit_m4(ob->parentinv);
|
|
|
|
|
memset(ob->loc, 0, sizeof(float[3]));
|
2009-10-26 11:20:16 +00:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
CTX_DATA_END;
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2017-06-08 10:14:53 +02:00
|
|
|
DEG_relations_tag_update(bmain);
|
2012-04-28 15:42:27 +00:00
|
|
|
WM_event_add_notifier(C, NC_OBJECT | ND_TRANSFORM, NULL);
|
2020-10-21 11:04:39 +02:00
|
|
|
WM_event_add_notifier(C, NC_OBJECT | ND_PARENT, NULL);
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2009-10-26 11:20:16 +00:00
|
|
|
return OPERATOR_FINISHED;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void OBJECT_OT_parent_no_inverse_set(wmOperatorType *ot)
|
|
|
|
|
{
|
|
|
|
|
/* identifiers */
|
2012-03-22 07:26:09 +00:00
|
|
|
ot->name = "Make Parent without Inverse";
|
2010-02-10 21:15:44 +00:00
|
|
|
ot->description = "Set the object's parenting without setting the inverse parent correction";
|
2012-03-22 07:26:09 +00:00
|
|
|
ot->idname = "OBJECT_OT_parent_no_inverse_set";
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2009-10-26 11:20:16 +00:00
|
|
|
/* api callbacks */
|
2012-03-22 07:26:09 +00:00
|
|
|
ot->invoke = WM_operator_confirm;
|
|
|
|
|
ot->exec = parent_noinv_set_exec;
|
|
|
|
|
ot->poll = ED_operator_object_active_editable;
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2009-10-26 11:20:16 +00:00
|
|
|
/* flags */
|
2012-04-28 15:42:27 +00:00
|
|
|
ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
|
Object: Set Parent (Keep Transform Without Inverse)
**Relevant to Artists:** This patch adds an option to the Parenting
menu, `Object (Keep Transform Without Inverse)`, and Apply menu, `Parent
Inverse`. The operators preserve the child's world transform without
using the parent inverse matrix. Effectively, we set the child's origin
to the parent. When the child has an identity local transform, then the
child is world-space aligned with its parent (scale excluded).
**Technical:** In both cases, the hidden parent inverse matrix is
generally set to identity (cleared or "not used") as long as the parent
has no shear. If the parent has shear, then this matrix will not be
entirely cleared. It will contain shear to counter the parent's shear.
This is required, otherwise the object's local matrix cannot be properly
decomposed into location, rotation and scale, and thus cannot preserve
the world transform.
If the child's world transform has shear, then its world transform is
not preserved. This is currently not supported for consistency in the
handling of shear during the other parenting ops: Parent (Keep
Transform), Clear [Parent] and Keep Transform. If it should work, then
another patch should add the support for all of them.
Reviewed By: sybren, RiggingDojo
Differential Revision: https://developer.blender.org/D14581
2022-04-14 18:16:23 -04:00
|
|
|
|
|
|
|
|
RNA_def_boolean(ot->srna,
|
|
|
|
|
"keep_transform",
|
|
|
|
|
false,
|
|
|
|
|
"Keep Transform",
|
|
|
|
|
"Preserve the world transform throughout parenting");
|
2009-10-26 11:20:16 +00:00
|
|
|
}
|
|
|
|
|
|
2020-03-26 10:24:44 +11:00
|
|
|
/** \} */
|
|
|
|
|
|
|
|
|
|
/* ------------------------------------------------------------------- */
|
|
|
|
|
/** \name Clear Track Operator
|
|
|
|
|
* \{ */
|
2009-09-16 17:43:09 +00:00
|
|
|
|
2014-10-10 18:26:46 +02:00
|
|
|
enum {
|
|
|
|
|
CLEAR_TRACK = 1,
|
|
|
|
|
CLEAR_TRACK_KEEP_TRANSFORM = 2,
|
|
|
|
|
};
|
|
|
|
|
|
2017-10-18 15:07:26 +11:00
|
|
|
static const EnumPropertyItem prop_clear_track_types[] = {
|
2014-10-10 18:26:46 +02:00
|
|
|
{CLEAR_TRACK, "CLEAR", 0, "Clear Track", ""},
|
|
|
|
|
{CLEAR_TRACK_KEEP_TRANSFORM,
|
|
|
|
|
"CLEAR_KEEP_TRANSFORM",
|
|
|
|
|
0,
|
|
|
|
|
"Clear and Keep Transformation (Clear Track)",
|
|
|
|
|
""},
|
2019-02-03 14:01:45 +11:00
|
|
|
{0, NULL, 0, NULL, NULL},
|
2009-09-16 17:43:09 +00:00
|
|
|
};
|
|
|
|
|
|
2021-07-03 23:08:40 +10:00
|
|
|
/* NOTE: poll should check for editable scene. */
|
2009-09-16 17:43:09 +00:00
|
|
|
static int object_track_clear_exec(bContext *C, wmOperator *op)
|
|
|
|
|
{
|
2012-04-28 15:42:27 +00:00
|
|
|
Main *bmain = CTX_data_main(C);
|
2014-10-10 18:26:46 +02:00
|
|
|
const int type = RNA_enum_get(op->ptr, "type");
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2012-03-24 06:38:07 +00:00
|
|
|
if (CTX_data_edit_object(C)) {
|
2012-10-26 17:32:50 +00:00
|
|
|
BKE_report(op->reports, RPT_ERROR, "Operation cannot be performed in edit mode");
|
2009-09-16 17:43:09 +00:00
|
|
|
return OPERATOR_CANCELLED;
|
|
|
|
|
}
|
2012-04-30 16:22:40 +00:00
|
|
|
CTX_DATA_BEGIN (C, Object *, ob, selected_editable_objects) {
|
2010-02-21 11:42:32 +00:00
|
|
|
bConstraint *con, *pcon;
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2010-02-21 11:05:52 +00:00
|
|
|
/* remove track-object for old track */
|
2012-04-28 15:42:27 +00:00
|
|
|
ob->track = NULL;
|
2018-12-06 17:52:37 +01:00
|
|
|
DEG_id_tag_update(&ob->id, ID_RECALC_TRANSFORM | ID_RECALC_GEOMETRY | ID_RECALC_ANIMATION);
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2010-02-21 11:42:32 +00:00
|
|
|
/* also remove all tracking constraints */
|
2012-04-28 15:42:27 +00:00
|
|
|
for (con = ob->constraints.last; con; con = pcon) {
|
|
|
|
|
pcon = con->prev;
|
2014-07-20 01:30:29 +10:00
|
|
|
if (ELEM(con->type,
|
|
|
|
|
CONSTRAINT_TYPE_TRACKTO,
|
|
|
|
|
CONSTRAINT_TYPE_LOCKTRACK,
|
2019-04-22 09:19:45 +10:00
|
|
|
CONSTRAINT_TYPE_DAMPTRACK)) {
|
2014-04-11 11:47:07 +10:00
|
|
|
BKE_constraint_remove(&ob->constraints, con);
|
2019-04-22 09:19:45 +10:00
|
|
|
}
|
2010-02-21 11:42:32 +00:00
|
|
|
}
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2019-04-22 09:19:45 +10:00
|
|
|
if (type == CLEAR_TRACK_KEEP_TRANSFORM) {
|
2014-04-01 11:34:00 +11:00
|
|
|
BKE_object_apply_mat4(ob, ob->obmat, true, true);
|
2019-04-22 09:19:45 +10:00
|
|
|
}
|
2009-09-16 17:43:09 +00:00
|
|
|
}
|
|
|
|
|
CTX_DATA_END;
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2017-06-08 10:14:53 +02:00
|
|
|
DEG_relations_tag_update(bmain);
|
2012-04-28 15:42:27 +00:00
|
|
|
WM_event_add_notifier(C, NC_OBJECT | ND_TRANSFORM, NULL);
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2009-09-16 17:43:09 +00:00
|
|
|
return OPERATOR_FINISHED;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void OBJECT_OT_track_clear(wmOperatorType *ot)
|
|
|
|
|
{
|
|
|
|
|
/* identifiers */
|
2013-01-27 07:23:58 +00:00
|
|
|
ot->name = "Clear Track";
|
2010-02-10 21:15:44 +00:00
|
|
|
ot->description = "Clear tracking constraint or flag from object";
|
2012-03-22 07:26:09 +00:00
|
|
|
ot->idname = "OBJECT_OT_track_clear";
|
2014-10-10 18:44:37 +02:00
|
|
|
|
2009-09-16 17:43:09 +00:00
|
|
|
/* api callbacks */
|
2012-03-22 07:26:09 +00:00
|
|
|
ot->invoke = WM_menu_invoke;
|
|
|
|
|
ot->exec = object_track_clear_exec;
|
2014-10-10 18:44:37 +02:00
|
|
|
|
2012-03-22 07:26:09 +00:00
|
|
|
ot->poll = ED_operator_objectmode;
|
2014-10-10 18:44:37 +02:00
|
|
|
|
2009-09-16 17:43:09 +00:00
|
|
|
/* flags */
|
2012-04-28 15:42:27 +00:00
|
|
|
ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
|
2014-10-10 18:44:37 +02:00
|
|
|
|
2012-03-22 07:26:09 +00:00
|
|
|
ot->prop = RNA_def_enum(ot->srna, "type", prop_clear_track_types, 0, "Type", "");
|
2009-09-16 17:43:09 +00:00
|
|
|
}
|
|
|
|
|
|
2020-03-26 10:24:44 +11:00
|
|
|
/** \} */
|
|
|
|
|
|
|
|
|
|
/* ------------------------------------------------------------------- */
|
|
|
|
|
/** \name Make Track Operator
|
|
|
|
|
* \{ */
|
2009-09-16 17:43:09 +00:00
|
|
|
|
2014-10-10 18:26:46 +02:00
|
|
|
enum {
|
|
|
|
|
CREATE_TRACK_DAMPTRACK = 1,
|
|
|
|
|
CREATE_TRACK_TRACKTO = 2,
|
|
|
|
|
CREATE_TRACK_LOCKTRACK = 3,
|
|
|
|
|
};
|
|
|
|
|
|
2017-10-18 15:07:26 +11:00
|
|
|
static const EnumPropertyItem prop_make_track_types[] = {
|
2014-10-10 18:26:46 +02:00
|
|
|
{CREATE_TRACK_DAMPTRACK, "DAMPTRACK", 0, "Damped Track Constraint", ""},
|
2020-10-24 11:42:17 -07:00
|
|
|
{CREATE_TRACK_TRACKTO, "TRACKTO", 0, "Track to Constraint", ""},
|
2014-10-10 18:26:46 +02:00
|
|
|
{CREATE_TRACK_LOCKTRACK, "LOCKTRACK", 0, "Lock Track Constraint", ""},
|
2019-02-03 14:01:45 +11:00
|
|
|
{0, NULL, 0, NULL, NULL},
|
2009-09-16 17:43:09 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
|
|
static int track_set_exec(bContext *C, wmOperator *op)
|
|
|
|
|
{
|
2012-04-28 15:42:27 +00:00
|
|
|
Main *bmain = CTX_data_main(C);
|
|
|
|
|
Object *obact = ED_object_active_context(C);
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2014-10-10 18:26:46 +02:00
|
|
|
const int type = RNA_enum_get(op->ptr, "type");
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2014-10-10 18:26:46 +02:00
|
|
|
switch (type) {
|
|
|
|
|
case CREATE_TRACK_DAMPTRACK: {
|
|
|
|
|
bConstraint *con;
|
|
|
|
|
bDampTrackConstraint *data;
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2014-10-10 18:26:46 +02:00
|
|
|
CTX_DATA_BEGIN (C, Object *, ob, selected_editable_objects) {
|
|
|
|
|
if (ob != obact) {
|
|
|
|
|
con = BKE_constraint_add_for_object(ob, "AutoTrack", CONSTRAINT_TYPE_DAMPTRACK);
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2014-10-10 18:26:46 +02:00
|
|
|
data = con->data;
|
|
|
|
|
data->tar = obact;
|
2018-12-06 17:52:37 +01:00
|
|
|
DEG_id_tag_update(&ob->id,
|
|
|
|
|
ID_RECALC_TRANSFORM | ID_RECALC_GEOMETRY | ID_RECALC_ANIMATION);
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2019-02-27 10:46:48 +11:00
|
|
|
/* Light, Camera and Speaker track differently by default */
|
2014-10-10 18:26:46 +02:00
|
|
|
if (ELEM(ob->type, OB_LAMP, OB_CAMERA, OB_SPEAKER)) {
|
|
|
|
|
data->trackflag = TRACK_nZ;
|
|
|
|
|
}
|
2013-12-09 17:07:59 +11:00
|
|
|
}
|
2010-02-21 11:42:32 +00:00
|
|
|
}
|
2014-10-10 18:26:46 +02:00
|
|
|
CTX_DATA_END;
|
|
|
|
|
break;
|
2010-02-21 11:42:32 +00:00
|
|
|
}
|
2014-10-10 18:26:46 +02:00
|
|
|
case CREATE_TRACK_TRACKTO: {
|
|
|
|
|
bConstraint *con;
|
|
|
|
|
bTrackToConstraint *data;
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2014-10-10 18:26:46 +02:00
|
|
|
CTX_DATA_BEGIN (C, Object *, ob, selected_editable_objects) {
|
|
|
|
|
if (ob != obact) {
|
|
|
|
|
con = BKE_constraint_add_for_object(ob, "AutoTrack", CONSTRAINT_TYPE_TRACKTO);
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2014-10-10 18:26:46 +02:00
|
|
|
data = con->data;
|
|
|
|
|
data->tar = obact;
|
2018-12-06 17:52:37 +01:00
|
|
|
DEG_id_tag_update(&ob->id,
|
|
|
|
|
ID_RECALC_TRANSFORM | ID_RECALC_GEOMETRY | ID_RECALC_ANIMATION);
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2019-02-27 10:46:48 +11:00
|
|
|
/* Light, Camera and Speaker track differently by default */
|
2014-10-10 18:26:46 +02:00
|
|
|
if (ELEM(ob->type, OB_LAMP, OB_CAMERA, OB_SPEAKER)) {
|
|
|
|
|
data->reserved1 = TRACK_nZ;
|
|
|
|
|
data->reserved2 = UP_Y;
|
|
|
|
|
}
|
2009-09-16 17:43:09 +00:00
|
|
|
}
|
|
|
|
|
}
|
2014-10-10 18:26:46 +02:00
|
|
|
CTX_DATA_END;
|
|
|
|
|
break;
|
2009-09-16 17:43:09 +00:00
|
|
|
}
|
2014-10-10 18:26:46 +02:00
|
|
|
case CREATE_TRACK_LOCKTRACK: {
|
|
|
|
|
bConstraint *con;
|
|
|
|
|
bLockTrackConstraint *data;
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2014-10-10 18:26:46 +02:00
|
|
|
CTX_DATA_BEGIN (C, Object *, ob, selected_editable_objects) {
|
|
|
|
|
if (ob != obact) {
|
|
|
|
|
con = BKE_constraint_add_for_object(ob, "AutoTrack", CONSTRAINT_TYPE_LOCKTRACK);
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2014-10-10 18:26:46 +02:00
|
|
|
data = con->data;
|
|
|
|
|
data->tar = obact;
|
2018-12-06 17:52:37 +01:00
|
|
|
DEG_id_tag_update(&ob->id,
|
|
|
|
|
ID_RECALC_TRANSFORM | ID_RECALC_GEOMETRY | ID_RECALC_ANIMATION);
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2019-02-27 10:46:48 +11:00
|
|
|
/* Light, Camera and Speaker track differently by default */
|
2014-10-10 18:26:46 +02:00
|
|
|
if (ELEM(ob->type, OB_LAMP, OB_CAMERA, OB_SPEAKER)) {
|
|
|
|
|
data->trackflag = TRACK_nZ;
|
|
|
|
|
data->lockflag = LOCK_Y;
|
|
|
|
|
}
|
2009-09-16 17:43:09 +00:00
|
|
|
}
|
|
|
|
|
}
|
2014-10-10 18:26:46 +02:00
|
|
|
CTX_DATA_END;
|
|
|
|
|
break;
|
2009-09-16 17:43:09 +00:00
|
|
|
}
|
|
|
|
|
}
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2017-06-08 10:14:53 +02:00
|
|
|
DEG_relations_tag_update(bmain);
|
2012-04-28 15:42:27 +00:00
|
|
|
WM_event_add_notifier(C, NC_OBJECT | ND_TRANSFORM, NULL);
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2009-09-16 17:43:09 +00:00
|
|
|
return OPERATOR_FINISHED;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void OBJECT_OT_track_set(wmOperatorType *ot)
|
|
|
|
|
{
|
|
|
|
|
/* identifiers */
|
2012-03-22 07:26:09 +00:00
|
|
|
ot->name = "Make Track";
|
2014-10-10 18:26:46 +02:00
|
|
|
ot->description = "Make the object track another object, using various methods/constraints";
|
2012-03-22 07:26:09 +00:00
|
|
|
ot->idname = "OBJECT_OT_track_set";
|
2014-10-10 18:44:37 +02:00
|
|
|
|
2009-09-16 17:43:09 +00:00
|
|
|
/* api callbacks */
|
2012-03-22 07:26:09 +00:00
|
|
|
ot->invoke = WM_menu_invoke;
|
|
|
|
|
ot->exec = track_set_exec;
|
2014-10-10 18:44:37 +02:00
|
|
|
|
2012-03-22 07:26:09 +00:00
|
|
|
ot->poll = ED_operator_objectmode;
|
2014-10-10 18:44:37 +02:00
|
|
|
|
2009-09-16 17:43:09 +00:00
|
|
|
/* flags */
|
2012-04-28 15:42:27 +00:00
|
|
|
ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
|
2014-10-10 18:44:37 +02:00
|
|
|
|
2009-09-16 17:43:09 +00:00
|
|
|
/* properties */
|
2012-03-22 07:26:09 +00:00
|
|
|
ot->prop = RNA_def_enum(ot->srna, "type", prop_make_track_types, 0, "Type", "");
|
2009-09-16 17:43:09 +00:00
|
|
|
}
|
|
|
|
|
|
2020-03-26 10:24:44 +11:00
|
|
|
/** \} */
|
|
|
|
|
|
|
|
|
|
/* ------------------------------------------------------------------- */
|
|
|
|
|
/** \name Link to Scene Operator
|
|
|
|
|
* \{ */
|
2009-09-16 17:43:09 +00:00
|
|
|
|
|
|
|
|
#if 0
|
2020-04-03 16:21:24 +11:00
|
|
|
static void link_to_scene(Main *UNUSED(bmain), ushort UNUSED(nr))
|
2.5: Object module
* Split object_edit.c into multiple files:
object_add.c, object_edit.c, object_hook.c, object_relations.c,
object_select.c, object_transform.c.
* Rename files to have consistent object_ and mball_ prefix:
object_shapekey.c, object_lattice.c, object_vgroup.c, mball_edit.c.
* Added operators:
* vertex group menu and set active
* apply location, rotation, scale, visual transform (location is new)
* make local
* make vertex parent
* move to layer
* convert to curve/mesh (not finished yet)
* Many small fixes for marked issues, but still much code to be cleaned
up here...
2009-09-09 11:52:56 +00:00
|
|
|
{
|
2019-04-17 08:24:14 +02:00
|
|
|
Scene *sce = (Scene *)BLI_findlink(&bmain->scene, G.curscreen->scenenr - 1);
|
2009-09-16 17:43:09 +00:00
|
|
|
Base *base, *nbase;
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2019-05-31 23:21:16 +10:00
|
|
|
if (sce == NULL) {
|
2019-04-17 08:24:14 +02:00
|
|
|
return;
|
2019-05-31 23:21:16 +10:00
|
|
|
}
|
|
|
|
|
if (sce->id.lib) {
|
2019-04-17 08:24:14 +02:00
|
|
|
return;
|
2019-05-31 23:21:16 +10:00
|
|
|
}
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2012-04-28 15:42:27 +00:00
|
|
|
for (base = FIRSTBASE; base; base = base->next) {
|
2019-01-08 18:19:12 +01:00
|
|
|
if (BASE_SELECTED(v3d, base)) {
|
2012-04-28 15:42:27 +00:00
|
|
|
nbase = MEM_mallocN(sizeof(Base), "newbase");
|
|
|
|
|
*nbase = *base;
|
|
|
|
|
BLI_addhead(&(sce->base), nbase);
|
2009-09-16 17:43:09 +00:00
|
|
|
id_us_plus((ID *)base->object);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
2011-02-17 22:34:41 +00:00
|
|
|
#endif
|
2009-09-16 17:43:09 +00:00
|
|
|
|
2009-11-04 10:25:57 +00:00
|
|
|
static int make_links_scene_exec(bContext *C, wmOperator *op)
|
2009-09-16 17:43:09 +00:00
|
|
|
{
|
Collections and groups unification
OVERVIEW
* In 2.7 terminology, all layers and groups are now collection datablocks.
* These collections are nestable, linkable, instanceable, overrideable, ..
which opens up new ways to set up scenes and link + override data.
* Viewport/render visibility and selectability are now a part of the collection
and shared across all view layers and linkable.
* View layers define which subset of the scene collection hierarchy is excluded
for each. For many workflows one view layer can be used, these are more of an
advanced feature now.
OUTLINER
* The outliner now has a "View Layer" display mode instead of "Collections",
which can display the collections and/or objects in the view layer.
* In this display mode, collections can be excluded with the right click menu.
These will then be greyed out and their objects will be excluded.
* To view collections not linked to any scene, the "Blender File" display mode
can be used, with the new filtering option to just see Colleciton datablocks.
* The outliner right click menus for collections and objects were reorganized.
* Drag and drop still needs to be improved. Like before, dragging the icon or
text gives different results, we'll unify this later.
LINKING AND OVERRIDES
* Collections can now be linked into the scene without creating an instance,
with the link/append operator or from the collections view in the outliner.
* Collections can get static overrides with the right click menu in the outliner,
but this is rather unreliable and not clearly communicated at the moment.
* We still need to improve the make override operator to turn collection instances
into collections with overrides directly in the scene.
PERFORMANCE
* We tried to make performance not worse than before and improve it in some
cases. The main thing that's still a bit slower is multiple scenes, we have to
change the layer syncing to only updated affected scenes.
* Collections keep a list of their parent collections for faster incremental
updates in syncing and caching.
* View layer bases are now in a object -> base hash to avoid quadratic time
lookups internally and in API functions like visible_get().
VERSIONING
* Compatibility with 2.7 files should be improved due to the new visibility
controls. Of course users may not want to set up their scenes differently
now to avoid having separate layers and groups.
* Compatibility with 2.8 is mostly there, and was tested on Eevee demo and Hero
files. There's a few things which are know to be not quite compatible, like
nested layer collections inside groups.
* The versioning code for 2.8 files is quite complicated, and isolated behind
#ifdef so it can be removed at the end of the release cycle.
KNOWN ISSUES
* The G-key group operators in the 3D viewport were left mostly as is, they
need to be modified still to fit better.
* Same for the groups panel in the object properties. This needs to be updated
still, or perhaps replaced by something better.
* Collections must all have a unique name. Less restrictive namespacing is to
be done later, we'll have to see how important this is as all objects within
the collections must also have a unique name anyway.
* Full scene copy and delete scene are exactly doing the right thing yet.
Differential Revision: https://developer.blender.org/D3383
https://code.blender.org/2018/05/collections-and-groups/
2018-04-30 15:57:22 +02:00
|
|
|
Main *bmain = CTX_data_main(C);
|
2019-03-08 09:29:17 +11:00
|
|
|
Scene *scene_to = BLI_findlink(&bmain->scenes, RNA_enum_get(op->ptr, "scene"));
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2012-05-29 18:12:13 +00:00
|
|
|
if (scene_to == NULL) {
|
2012-10-26 17:32:50 +00:00
|
|
|
BKE_report(op->reports, RPT_ERROR, "Could not find scene");
|
2012-05-29 18:12:13 +00:00
|
|
|
return OPERATOR_CANCELLED;
|
|
|
|
|
}
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2012-03-24 06:38:07 +00:00
|
|
|
if (scene_to == CTX_data_scene(C)) {
|
2012-10-26 17:32:50 +00:00
|
|
|
BKE_report(op->reports, RPT_ERROR, "Cannot link objects into the same scene");
|
2009-11-04 10:25:57 +00:00
|
|
|
return OPERATOR_CANCELLED;
|
2011-05-09 02:45:52 +00:00
|
|
|
}
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2022-03-28 17:34:36 +02:00
|
|
|
if (!BKE_id_is_editable(bmain, &scene_to->id)) {
|
2012-10-26 17:32:50 +00:00
|
|
|
BKE_report(op->reports, RPT_ERROR, "Cannot link objects into a linked scene");
|
2012-05-29 18:12:13 +00:00
|
|
|
return OPERATOR_CANCELLED;
|
|
|
|
|
}
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2019-09-02 14:31:19 +02:00
|
|
|
Collection *collection_to = scene_to->master_collection;
|
2012-04-30 16:22:40 +00:00
|
|
|
CTX_DATA_BEGIN (C, Base *, base, selected_bases) {
|
Collections and groups unification
OVERVIEW
* In 2.7 terminology, all layers and groups are now collection datablocks.
* These collections are nestable, linkable, instanceable, overrideable, ..
which opens up new ways to set up scenes and link + override data.
* Viewport/render visibility and selectability are now a part of the collection
and shared across all view layers and linkable.
* View layers define which subset of the scene collection hierarchy is excluded
for each. For many workflows one view layer can be used, these are more of an
advanced feature now.
OUTLINER
* The outliner now has a "View Layer" display mode instead of "Collections",
which can display the collections and/or objects in the view layer.
* In this display mode, collections can be excluded with the right click menu.
These will then be greyed out and their objects will be excluded.
* To view collections not linked to any scene, the "Blender File" display mode
can be used, with the new filtering option to just see Colleciton datablocks.
* The outliner right click menus for collections and objects were reorganized.
* Drag and drop still needs to be improved. Like before, dragging the icon or
text gives different results, we'll unify this later.
LINKING AND OVERRIDES
* Collections can now be linked into the scene without creating an instance,
with the link/append operator or from the collections view in the outliner.
* Collections can get static overrides with the right click menu in the outliner,
but this is rather unreliable and not clearly communicated at the moment.
* We still need to improve the make override operator to turn collection instances
into collections with overrides directly in the scene.
PERFORMANCE
* We tried to make performance not worse than before and improve it in some
cases. The main thing that's still a bit slower is multiple scenes, we have to
change the layer syncing to only updated affected scenes.
* Collections keep a list of their parent collections for faster incremental
updates in syncing and caching.
* View layer bases are now in a object -> base hash to avoid quadratic time
lookups internally and in API functions like visible_get().
VERSIONING
* Compatibility with 2.7 files should be improved due to the new visibility
controls. Of course users may not want to set up their scenes differently
now to avoid having separate layers and groups.
* Compatibility with 2.8 is mostly there, and was tested on Eevee demo and Hero
files. There's a few things which are know to be not quite compatible, like
nested layer collections inside groups.
* The versioning code for 2.8 files is quite complicated, and isolated behind
#ifdef so it can be removed at the end of the release cycle.
KNOWN ISSUES
* The G-key group operators in the 3D viewport were left mostly as is, they
need to be modified still to fit better.
* Same for the groups panel in the object properties. This needs to be updated
still, or perhaps replaced by something better.
* Collections must all have a unique name. Less restrictive namespacing is to
be done later, we'll have to see how important this is as all objects within
the collections must also have a unique name anyway.
* Full scene copy and delete scene are exactly doing the right thing yet.
Differential Revision: https://developer.blender.org/D3383
https://code.blender.org/2018/05/collections-and-groups/
2018-04-30 15:57:22 +02:00
|
|
|
BKE_collection_object_add(bmain, collection_to, base->object);
|
2011-05-09 02:45:52 +00:00
|
|
|
}
|
2009-11-04 10:25:57 +00:00
|
|
|
CTX_DATA_END;
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2019-03-03 21:14:19 +01:00
|
|
|
DEG_relations_tag_update(bmain);
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2012-09-23 23:44:10 +00:00
|
|
|
/* redraw the 3D view because the object center points are colored differently */
|
|
|
|
|
WM_event_add_notifier(C, NC_OBJECT | ND_DRAW, NULL);
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2020-08-28 11:08:03 +02:00
|
|
|
/* one day multiple scenes will be visible, then we should have some update function for them
|
|
|
|
|
*/
|
2009-11-04 10:25:57 +00:00
|
|
|
return OPERATOR_FINISHED;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
enum {
|
2014-10-10 18:26:46 +02:00
|
|
|
MAKE_LINKS_OBDATA = 1,
|
|
|
|
|
MAKE_LINKS_MATERIALS = 2,
|
|
|
|
|
MAKE_LINKS_ANIMDATA = 3,
|
|
|
|
|
MAKE_LINKS_GROUP = 4,
|
Collections and groups unification
OVERVIEW
* In 2.7 terminology, all layers and groups are now collection datablocks.
* These collections are nestable, linkable, instanceable, overrideable, ..
which opens up new ways to set up scenes and link + override data.
* Viewport/render visibility and selectability are now a part of the collection
and shared across all view layers and linkable.
* View layers define which subset of the scene collection hierarchy is excluded
for each. For many workflows one view layer can be used, these are more of an
advanced feature now.
OUTLINER
* The outliner now has a "View Layer" display mode instead of "Collections",
which can display the collections and/or objects in the view layer.
* In this display mode, collections can be excluded with the right click menu.
These will then be greyed out and their objects will be excluded.
* To view collections not linked to any scene, the "Blender File" display mode
can be used, with the new filtering option to just see Colleciton datablocks.
* The outliner right click menus for collections and objects were reorganized.
* Drag and drop still needs to be improved. Like before, dragging the icon or
text gives different results, we'll unify this later.
LINKING AND OVERRIDES
* Collections can now be linked into the scene without creating an instance,
with the link/append operator or from the collections view in the outliner.
* Collections can get static overrides with the right click menu in the outliner,
but this is rather unreliable and not clearly communicated at the moment.
* We still need to improve the make override operator to turn collection instances
into collections with overrides directly in the scene.
PERFORMANCE
* We tried to make performance not worse than before and improve it in some
cases. The main thing that's still a bit slower is multiple scenes, we have to
change the layer syncing to only updated affected scenes.
* Collections keep a list of their parent collections for faster incremental
updates in syncing and caching.
* View layer bases are now in a object -> base hash to avoid quadratic time
lookups internally and in API functions like visible_get().
VERSIONING
* Compatibility with 2.7 files should be improved due to the new visibility
controls. Of course users may not want to set up their scenes differently
now to avoid having separate layers and groups.
* Compatibility with 2.8 is mostly there, and was tested on Eevee demo and Hero
files. There's a few things which are know to be not quite compatible, like
nested layer collections inside groups.
* The versioning code for 2.8 files is quite complicated, and isolated behind
#ifdef so it can be removed at the end of the release cycle.
KNOWN ISSUES
* The G-key group operators in the 3D viewport were left mostly as is, they
need to be modified still to fit better.
* Same for the groups panel in the object properties. This needs to be updated
still, or perhaps replaced by something better.
* Collections must all have a unique name. Less restrictive namespacing is to
be done later, we'll have to see how important this is as all objects within
the collections must also have a unique name anyway.
* Full scene copy and delete scene are exactly doing the right thing yet.
Differential Revision: https://developer.blender.org/D3383
https://code.blender.org/2018/05/collections-and-groups/
2018-04-30 15:57:22 +02:00
|
|
|
MAKE_LINKS_DUPLICOLLECTION = 5,
|
2014-10-10 18:26:46 +02:00
|
|
|
MAKE_LINKS_MODIFIERS = 6,
|
|
|
|
|
MAKE_LINKS_FONTS = 7,
|
2020-12-10 23:04:54 +01:00
|
|
|
MAKE_LINKS_SHADERFX = 8,
|
2009-11-04 10:25:57 +00:00
|
|
|
};
|
2.5: Object module
* Split object_edit.c into multiple files:
object_add.c, object_edit.c, object_hook.c, object_relations.c,
object_select.c, object_transform.c.
* Rename files to have consistent object_ and mball_ prefix:
object_shapekey.c, object_lattice.c, object_vgroup.c, mball_edit.c.
* Added operators:
* vertex group menu and set active
* apply location, rotation, scale, visual transform (location is new)
* make local
* make vertex parent
* move to layer
* convert to curve/mesh (not finished yet)
* Many small fixes for marked issues, but still much code to be cleaned
up here...
2009-09-09 11:52:56 +00:00
|
|
|
|
2014-10-10 18:26:46 +02:00
|
|
|
/* Return true if make link data is allowed, false otherwise */
|
|
|
|
|
static bool allow_make_links_data(const int type, Object *ob_src, Object *ob_dst)
|
2010-06-08 20:24:28 +00:00
|
|
|
{
|
2012-07-18 09:45:50 +00:00
|
|
|
switch (type) {
|
2010-06-27 23:18:04 +00:00
|
|
|
case MAKE_LINKS_OBDATA:
|
2014-10-10 18:26:46 +02:00
|
|
|
if (ob_src->type == ob_dst->type && ob_src->type != OB_EMPTY) {
|
|
|
|
|
return true;
|
|
|
|
|
}
|
2010-06-27 23:18:04 +00:00
|
|
|
break;
|
|
|
|
|
case MAKE_LINKS_MATERIALS:
|
2021-01-06 17:53:37 +01:00
|
|
|
if (OB_TYPE_SUPPORT_MATERIAL(ob_src->type) && OB_TYPE_SUPPORT_MATERIAL(ob_dst->type) &&
|
|
|
|
|
/* Linking non-grease-pencil materials to a grease-pencil object causes issues.
|
|
|
|
|
* We make sure that if one of the objects is a grease-pencil object, the other must be
|
|
|
|
|
* as well. */
|
|
|
|
|
((ob_src->type == OB_GPENCIL) == (ob_dst->type == OB_GPENCIL))) {
|
2014-10-10 18:26:46 +02:00
|
|
|
return true;
|
2011-10-03 17:29:43 +00:00
|
|
|
}
|
2010-06-27 23:18:04 +00:00
|
|
|
break;
|
2019-03-27 14:57:13 +01:00
|
|
|
case MAKE_LINKS_DUPLICOLLECTION:
|
|
|
|
|
if (ob_dst->type == OB_EMPTY) {
|
|
|
|
|
return true;
|
|
|
|
|
}
|
|
|
|
|
break;
|
2010-06-27 23:18:04 +00:00
|
|
|
case MAKE_LINKS_ANIMDATA:
|
2012-07-18 09:45:50 +00:00
|
|
|
case MAKE_LINKS_GROUP:
|
2014-10-10 18:26:46 +02:00
|
|
|
return true;
|
2010-06-27 23:18:04 +00:00
|
|
|
case MAKE_LINKS_MODIFIERS:
|
2014-10-10 18:26:46 +02:00
|
|
|
if (!ELEM(OB_EMPTY, ob_src->type, ob_dst->type)) {
|
|
|
|
|
return true;
|
|
|
|
|
}
|
2010-06-27 23:18:04 +00:00
|
|
|
break;
|
2012-08-03 13:27:58 +00:00
|
|
|
case MAKE_LINKS_FONTS:
|
2014-10-10 18:26:46 +02:00
|
|
|
if ((ob_src->data != ob_dst->data) && (ob_src->type == OB_FONT) &&
|
|
|
|
|
(ob_dst->type == OB_FONT)) {
|
|
|
|
|
return true;
|
2012-08-03 13:27:58 +00:00
|
|
|
}
|
|
|
|
|
break;
|
2020-12-10 23:04:54 +01:00
|
|
|
case MAKE_LINKS_SHADERFX:
|
|
|
|
|
if ((ob_src->type == OB_GPENCIL) && (ob_dst->type == OB_GPENCIL)) {
|
|
|
|
|
return true;
|
|
|
|
|
}
|
|
|
|
|
break;
|
2010-06-08 20:24:28 +00:00
|
|
|
}
|
2014-10-10 18:26:46 +02:00
|
|
|
return false;
|
2010-06-08 20:24:28 +00:00
|
|
|
}
|
|
|
|
|
|
2009-11-04 10:25:57 +00:00
|
|
|
static int make_links_data_exec(bContext *C, wmOperator *op)
|
2.5: Object module
* Split object_edit.c into multiple files:
object_add.c, object_edit.c, object_hook.c, object_relations.c,
object_select.c, object_transform.c.
* Rename files to have consistent object_ and mball_ prefix:
object_shapekey.c, object_lattice.c, object_vgroup.c, mball_edit.c.
* Added operators:
* vertex group menu and set active
* apply location, rotation, scale, visual transform (location is new)
* make local
* make vertex parent
* move to layer
* convert to curve/mesh (not finished yet)
* Many small fixes for marked issues, but still much code to be cleaned
up here...
2009-09-09 11:52:56 +00:00
|
|
|
{
|
2018-06-18 11:21:33 +02:00
|
|
|
Scene *scene = CTX_data_scene(C);
|
2012-04-28 15:42:27 +00:00
|
|
|
Main *bmain = CTX_data_main(C);
|
2012-07-18 09:45:50 +00:00
|
|
|
const int type = RNA_enum_get(op->ptr, "type");
|
|
|
|
|
Object *ob_src;
|
2013-06-28 18:39:39 +00:00
|
|
|
ID *obdata_id;
|
2.5: Object module
* Split object_edit.c into multiple files:
object_add.c, object_edit.c, object_hook.c, object_relations.c,
object_select.c, object_transform.c.
* Rename files to have consistent object_ and mball_ prefix:
object_shapekey.c, object_lattice.c, object_vgroup.c, mball_edit.c.
* Added operators:
* vertex group menu and set active
* apply location, rotation, scale, visual transform (location is new)
* make local
* make vertex parent
* move to layer
* convert to curve/mesh (not finished yet)
* Many small fixes for marked issues, but still much code to be cleaned
up here...
2009-09-09 11:52:56 +00:00
|
|
|
int a;
|
2019-04-17 06:17:24 +02:00
|
|
|
|
Collections and groups unification
OVERVIEW
* In 2.7 terminology, all layers and groups are now collection datablocks.
* These collections are nestable, linkable, instanceable, overrideable, ..
which opens up new ways to set up scenes and link + override data.
* Viewport/render visibility and selectability are now a part of the collection
and shared across all view layers and linkable.
* View layers define which subset of the scene collection hierarchy is excluded
for each. For many workflows one view layer can be used, these are more of an
advanced feature now.
OUTLINER
* The outliner now has a "View Layer" display mode instead of "Collections",
which can display the collections and/or objects in the view layer.
* In this display mode, collections can be excluded with the right click menu.
These will then be greyed out and their objects will be excluded.
* To view collections not linked to any scene, the "Blender File" display mode
can be used, with the new filtering option to just see Colleciton datablocks.
* The outliner right click menus for collections and objects were reorganized.
* Drag and drop still needs to be improved. Like before, dragging the icon or
text gives different results, we'll unify this later.
LINKING AND OVERRIDES
* Collections can now be linked into the scene without creating an instance,
with the link/append operator or from the collections view in the outliner.
* Collections can get static overrides with the right click menu in the outliner,
but this is rather unreliable and not clearly communicated at the moment.
* We still need to improve the make override operator to turn collection instances
into collections with overrides directly in the scene.
PERFORMANCE
* We tried to make performance not worse than before and improve it in some
cases. The main thing that's still a bit slower is multiple scenes, we have to
change the layer syncing to only updated affected scenes.
* Collections keep a list of their parent collections for faster incremental
updates in syncing and caching.
* View layer bases are now in a object -> base hash to avoid quadratic time
lookups internally and in API functions like visible_get().
VERSIONING
* Compatibility with 2.7 files should be improved due to the new visibility
controls. Of course users may not want to set up their scenes differently
now to avoid having separate layers and groups.
* Compatibility with 2.8 is mostly there, and was tested on Eevee demo and Hero
files. There's a few things which are know to be not quite compatible, like
nested layer collections inside groups.
* The versioning code for 2.8 files is quite complicated, and isolated behind
#ifdef so it can be removed at the end of the release cycle.
KNOWN ISSUES
* The G-key group operators in the 3D viewport were left mostly as is, they
need to be modified still to fit better.
* Same for the groups panel in the object properties. This needs to be updated
still, or perhaps replaced by something better.
* Collections must all have a unique name. Less restrictive namespacing is to
be done later, we'll have to see how important this is as all objects within
the collections must also have a unique name anyway.
* Full scene copy and delete scene are exactly doing the right thing yet.
Differential Revision: https://developer.blender.org/D3383
https://code.blender.org/2018/05/collections-and-groups/
2018-04-30 15:57:22 +02:00
|
|
|
/* collection */
|
|
|
|
|
LinkNode *ob_collections = NULL;
|
2013-06-28 18:39:39 +00:00
|
|
|
bool is_cycle = false;
|
|
|
|
|
bool is_lib = false;
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2012-07-18 09:45:50 +00:00
|
|
|
ob_src = ED_object_active_context(C);
|
2019-04-17 06:17:24 +02:00
|
|
|
|
Collections and groups unification
OVERVIEW
* In 2.7 terminology, all layers and groups are now collection datablocks.
* These collections are nestable, linkable, instanceable, overrideable, ..
which opens up new ways to set up scenes and link + override data.
* Viewport/render visibility and selectability are now a part of the collection
and shared across all view layers and linkable.
* View layers define which subset of the scene collection hierarchy is excluded
for each. For many workflows one view layer can be used, these are more of an
advanced feature now.
OUTLINER
* The outliner now has a "View Layer" display mode instead of "Collections",
which can display the collections and/or objects in the view layer.
* In this display mode, collections can be excluded with the right click menu.
These will then be greyed out and their objects will be excluded.
* To view collections not linked to any scene, the "Blender File" display mode
can be used, with the new filtering option to just see Colleciton datablocks.
* The outliner right click menus for collections and objects were reorganized.
* Drag and drop still needs to be improved. Like before, dragging the icon or
text gives different results, we'll unify this later.
LINKING AND OVERRIDES
* Collections can now be linked into the scene without creating an instance,
with the link/append operator or from the collections view in the outliner.
* Collections can get static overrides with the right click menu in the outliner,
but this is rather unreliable and not clearly communicated at the moment.
* We still need to improve the make override operator to turn collection instances
into collections with overrides directly in the scene.
PERFORMANCE
* We tried to make performance not worse than before and improve it in some
cases. The main thing that's still a bit slower is multiple scenes, we have to
change the layer syncing to only updated affected scenes.
* Collections keep a list of their parent collections for faster incremental
updates in syncing and caching.
* View layer bases are now in a object -> base hash to avoid quadratic time
lookups internally and in API functions like visible_get().
VERSIONING
* Compatibility with 2.7 files should be improved due to the new visibility
controls. Of course users may not want to set up their scenes differently
now to avoid having separate layers and groups.
* Compatibility with 2.8 is mostly there, and was tested on Eevee demo and Hero
files. There's a few things which are know to be not quite compatible, like
nested layer collections inside groups.
* The versioning code for 2.8 files is quite complicated, and isolated behind
#ifdef so it can be removed at the end of the release cycle.
KNOWN ISSUES
* The G-key group operators in the 3D viewport were left mostly as is, they
need to be modified still to fit better.
* Same for the groups panel in the object properties. This needs to be updated
still, or perhaps replaced by something better.
* Collections must all have a unique name. Less restrictive namespacing is to
be done later, we'll have to see how important this is as all objects within
the collections must also have a unique name anyway.
* Full scene copy and delete scene are exactly doing the right thing yet.
Differential Revision: https://developer.blender.org/D3383
https://code.blender.org/2018/05/collections-and-groups/
2018-04-30 15:57:22 +02:00
|
|
|
/* avoid searching all collections in source object each time */
|
2012-07-18 09:45:50 +00:00
|
|
|
if (type == MAKE_LINKS_GROUP) {
|
2019-03-12 19:55:33 -03:00
|
|
|
ob_collections = BKE_object_groups(bmain, scene, ob_src);
|
2012-07-18 09:45:50 +00:00
|
|
|
}
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2012-07-18 09:45:50 +00:00
|
|
|
CTX_DATA_BEGIN (C, Base *, base_dst, selected_editable_bases) {
|
|
|
|
|
Object *ob_dst = base_dst->object;
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2012-07-18 09:45:50 +00:00
|
|
|
if (ob_src != ob_dst) {
|
|
|
|
|
if (allow_make_links_data(type, ob_src, ob_dst)) {
|
2013-06-28 18:39:39 +00:00
|
|
|
obdata_id = ob_dst->data;
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2012-07-18 09:45:50 +00:00
|
|
|
switch (type) {
|
2012-04-28 15:42:27 +00:00
|
|
|
case MAKE_LINKS_OBDATA: /* obdata */
|
2015-11-09 19:47:10 +01:00
|
|
|
id_us_min(obdata_id);
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2013-06-28 18:39:39 +00:00
|
|
|
obdata_id = ob_src->data;
|
|
|
|
|
id_us_plus(obdata_id);
|
|
|
|
|
ob_dst->data = obdata_id;
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2012-04-28 15:42:27 +00:00
|
|
|
/* if amount of material indices changed: */
|
2020-02-05 11:23:58 +01:00
|
|
|
BKE_object_materials_test(bmain, ob_dst, ob_dst->data);
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2018-12-06 17:52:37 +01:00
|
|
|
DEG_id_tag_update(&ob_dst->id, ID_RECALC_GEOMETRY);
|
2012-04-28 15:42:27 +00:00
|
|
|
break;
|
|
|
|
|
case MAKE_LINKS_MATERIALS:
|
|
|
|
|
/* new approach, using functions from kernel */
|
2012-07-18 09:45:50 +00:00
|
|
|
for (a = 0; a < ob_src->totcol; a++) {
|
2020-02-05 11:23:58 +01:00
|
|
|
Material *ma = BKE_object_material_get(ob_src, a + 1);
|
2019-01-15 23:24:20 +11:00
|
|
|
/* also works with `ma == NULL` */
|
2020-02-05 11:23:58 +01:00
|
|
|
BKE_object_material_assign(bmain, ob_dst, ma, a + 1, BKE_MAT_ASSIGN_USERPREF);
|
2012-04-28 15:42:27 +00:00
|
|
|
}
|
2018-12-06 17:52:37 +01:00
|
|
|
DEG_id_tag_update(&ob_dst->id, ID_RECALC_GEOMETRY);
|
2012-04-28 15:42:27 +00:00
|
|
|
break;
|
|
|
|
|
case MAKE_LINKS_ANIMDATA:
|
2018-11-07 13:55:29 +01:00
|
|
|
BKE_animdata_copy_id(bmain, (ID *)ob_dst, (ID *)ob_src, 0);
|
2013-07-03 20:37:09 +00:00
|
|
|
if (ob_dst->data && ob_src->data) {
|
2022-03-28 17:34:36 +02:00
|
|
|
if (!BKE_id_is_editable(bmain, obdata_id)) {
|
2013-07-03 20:37:09 +00:00
|
|
|
is_lib = true;
|
|
|
|
|
break;
|
|
|
|
|
}
|
2018-11-07 13:55:29 +01:00
|
|
|
BKE_animdata_copy_id(bmain, (ID *)ob_dst->data, (ID *)ob_src->data, 0);
|
2013-06-28 18:39:39 +00:00
|
|
|
}
|
2018-12-06 17:52:37 +01:00
|
|
|
DEG_id_tag_update(&ob_dst->id,
|
|
|
|
|
ID_RECALC_TRANSFORM | ID_RECALC_GEOMETRY | ID_RECALC_ANIMATION);
|
2012-04-28 15:42:27 +00:00
|
|
|
break;
|
2012-07-18 09:45:50 +00:00
|
|
|
case MAKE_LINKS_GROUP: {
|
Collections and groups unification
OVERVIEW
* In 2.7 terminology, all layers and groups are now collection datablocks.
* These collections are nestable, linkable, instanceable, overrideable, ..
which opens up new ways to set up scenes and link + override data.
* Viewport/render visibility and selectability are now a part of the collection
and shared across all view layers and linkable.
* View layers define which subset of the scene collection hierarchy is excluded
for each. For many workflows one view layer can be used, these are more of an
advanced feature now.
OUTLINER
* The outliner now has a "View Layer" display mode instead of "Collections",
which can display the collections and/or objects in the view layer.
* In this display mode, collections can be excluded with the right click menu.
These will then be greyed out and their objects will be excluded.
* To view collections not linked to any scene, the "Blender File" display mode
can be used, with the new filtering option to just see Colleciton datablocks.
* The outliner right click menus for collections and objects were reorganized.
* Drag and drop still needs to be improved. Like before, dragging the icon or
text gives different results, we'll unify this later.
LINKING AND OVERRIDES
* Collections can now be linked into the scene without creating an instance,
with the link/append operator or from the collections view in the outliner.
* Collections can get static overrides with the right click menu in the outliner,
but this is rather unreliable and not clearly communicated at the moment.
* We still need to improve the make override operator to turn collection instances
into collections with overrides directly in the scene.
PERFORMANCE
* We tried to make performance not worse than before and improve it in some
cases. The main thing that's still a bit slower is multiple scenes, we have to
change the layer syncing to only updated affected scenes.
* Collections keep a list of their parent collections for faster incremental
updates in syncing and caching.
* View layer bases are now in a object -> base hash to avoid quadratic time
lookups internally and in API functions like visible_get().
VERSIONING
* Compatibility with 2.7 files should be improved due to the new visibility
controls. Of course users may not want to set up their scenes differently
now to avoid having separate layers and groups.
* Compatibility with 2.8 is mostly there, and was tested on Eevee demo and Hero
files. There's a few things which are know to be not quite compatible, like
nested layer collections inside groups.
* The versioning code for 2.8 files is quite complicated, and isolated behind
#ifdef so it can be removed at the end of the release cycle.
KNOWN ISSUES
* The G-key group operators in the 3D viewport were left mostly as is, they
need to be modified still to fit better.
* Same for the groups panel in the object properties. This needs to be updated
still, or perhaps replaced by something better.
* Collections must all have a unique name. Less restrictive namespacing is to
be done later, we'll have to see how important this is as all objects within
the collections must also have a unique name anyway.
* Full scene copy and delete scene are exactly doing the right thing yet.
Differential Revision: https://developer.blender.org/D3383
https://code.blender.org/2018/05/collections-and-groups/
2018-04-30 15:57:22 +02:00
|
|
|
LinkNode *collection_node;
|
2019-04-17 06:17:24 +02:00
|
|
|
|
Collections and groups unification
OVERVIEW
* In 2.7 terminology, all layers and groups are now collection datablocks.
* These collections are nestable, linkable, instanceable, overrideable, ..
which opens up new ways to set up scenes and link + override data.
* Viewport/render visibility and selectability are now a part of the collection
and shared across all view layers and linkable.
* View layers define which subset of the scene collection hierarchy is excluded
for each. For many workflows one view layer can be used, these are more of an
advanced feature now.
OUTLINER
* The outliner now has a "View Layer" display mode instead of "Collections",
which can display the collections and/or objects in the view layer.
* In this display mode, collections can be excluded with the right click menu.
These will then be greyed out and their objects will be excluded.
* To view collections not linked to any scene, the "Blender File" display mode
can be used, with the new filtering option to just see Colleciton datablocks.
* The outliner right click menus for collections and objects were reorganized.
* Drag and drop still needs to be improved. Like before, dragging the icon or
text gives different results, we'll unify this later.
LINKING AND OVERRIDES
* Collections can now be linked into the scene without creating an instance,
with the link/append operator or from the collections view in the outliner.
* Collections can get static overrides with the right click menu in the outliner,
but this is rather unreliable and not clearly communicated at the moment.
* We still need to improve the make override operator to turn collection instances
into collections with overrides directly in the scene.
PERFORMANCE
* We tried to make performance not worse than before and improve it in some
cases. The main thing that's still a bit slower is multiple scenes, we have to
change the layer syncing to only updated affected scenes.
* Collections keep a list of their parent collections for faster incremental
updates in syncing and caching.
* View layer bases are now in a object -> base hash to avoid quadratic time
lookups internally and in API functions like visible_get().
VERSIONING
* Compatibility with 2.7 files should be improved due to the new visibility
controls. Of course users may not want to set up their scenes differently
now to avoid having separate layers and groups.
* Compatibility with 2.8 is mostly there, and was tested on Eevee demo and Hero
files. There's a few things which are know to be not quite compatible, like
nested layer collections inside groups.
* The versioning code for 2.8 files is quite complicated, and isolated behind
#ifdef so it can be removed at the end of the release cycle.
KNOWN ISSUES
* The G-key group operators in the 3D viewport were left mostly as is, they
need to be modified still to fit better.
* Same for the groups panel in the object properties. This needs to be updated
still, or perhaps replaced by something better.
* Collections must all have a unique name. Less restrictive namespacing is to
be done later, we'll have to see how important this is as all objects within
the collections must also have a unique name anyway.
* Full scene copy and delete scene are exactly doing the right thing yet.
Differential Revision: https://developer.blender.org/D3383
https://code.blender.org/2018/05/collections-and-groups/
2018-04-30 15:57:22 +02:00
|
|
|
/* first clear collections */
|
2019-03-12 19:55:33 -03:00
|
|
|
BKE_object_groups_clear(bmain, scene, ob_dst);
|
2019-04-17 06:17:24 +02:00
|
|
|
|
Collections and groups unification
OVERVIEW
* In 2.7 terminology, all layers and groups are now collection datablocks.
* These collections are nestable, linkable, instanceable, overrideable, ..
which opens up new ways to set up scenes and link + override data.
* Viewport/render visibility and selectability are now a part of the collection
and shared across all view layers and linkable.
* View layers define which subset of the scene collection hierarchy is excluded
for each. For many workflows one view layer can be used, these are more of an
advanced feature now.
OUTLINER
* The outliner now has a "View Layer" display mode instead of "Collections",
which can display the collections and/or objects in the view layer.
* In this display mode, collections can be excluded with the right click menu.
These will then be greyed out and their objects will be excluded.
* To view collections not linked to any scene, the "Blender File" display mode
can be used, with the new filtering option to just see Colleciton datablocks.
* The outliner right click menus for collections and objects were reorganized.
* Drag and drop still needs to be improved. Like before, dragging the icon or
text gives different results, we'll unify this later.
LINKING AND OVERRIDES
* Collections can now be linked into the scene without creating an instance,
with the link/append operator or from the collections view in the outliner.
* Collections can get static overrides with the right click menu in the outliner,
but this is rather unreliable and not clearly communicated at the moment.
* We still need to improve the make override operator to turn collection instances
into collections with overrides directly in the scene.
PERFORMANCE
* We tried to make performance not worse than before and improve it in some
cases. The main thing that's still a bit slower is multiple scenes, we have to
change the layer syncing to only updated affected scenes.
* Collections keep a list of their parent collections for faster incremental
updates in syncing and caching.
* View layer bases are now in a object -> base hash to avoid quadratic time
lookups internally and in API functions like visible_get().
VERSIONING
* Compatibility with 2.7 files should be improved due to the new visibility
controls. Of course users may not want to set up their scenes differently
now to avoid having separate layers and groups.
* Compatibility with 2.8 is mostly there, and was tested on Eevee demo and Hero
files. There's a few things which are know to be not quite compatible, like
nested layer collections inside groups.
* The versioning code for 2.8 files is quite complicated, and isolated behind
#ifdef so it can be removed at the end of the release cycle.
KNOWN ISSUES
* The G-key group operators in the 3D viewport were left mostly as is, they
need to be modified still to fit better.
* Same for the groups panel in the object properties. This needs to be updated
still, or perhaps replaced by something better.
* Collections must all have a unique name. Less restrictive namespacing is to
be done later, we'll have to see how important this is as all objects within
the collections must also have a unique name anyway.
* Full scene copy and delete scene are exactly doing the right thing yet.
Differential Revision: https://developer.blender.org/D3383
https://code.blender.org/2018/05/collections-and-groups/
2018-04-30 15:57:22 +02:00
|
|
|
/* now add in the collections from the link nodes */
|
|
|
|
|
for (collection_node = ob_collections; collection_node;
|
|
|
|
|
collection_node = collection_node->next) {
|
2019-02-17 19:00:54 +11:00
|
|
|
if (ob_dst->instance_collection != collection_node->link) {
|
Collections and groups unification
OVERVIEW
* In 2.7 terminology, all layers and groups are now collection datablocks.
* These collections are nestable, linkable, instanceable, overrideable, ..
which opens up new ways to set up scenes and link + override data.
* Viewport/render visibility and selectability are now a part of the collection
and shared across all view layers and linkable.
* View layers define which subset of the scene collection hierarchy is excluded
for each. For many workflows one view layer can be used, these are more of an
advanced feature now.
OUTLINER
* The outliner now has a "View Layer" display mode instead of "Collections",
which can display the collections and/or objects in the view layer.
* In this display mode, collections can be excluded with the right click menu.
These will then be greyed out and their objects will be excluded.
* To view collections not linked to any scene, the "Blender File" display mode
can be used, with the new filtering option to just see Colleciton datablocks.
* The outliner right click menus for collections and objects were reorganized.
* Drag and drop still needs to be improved. Like before, dragging the icon or
text gives different results, we'll unify this later.
LINKING AND OVERRIDES
* Collections can now be linked into the scene without creating an instance,
with the link/append operator or from the collections view in the outliner.
* Collections can get static overrides with the right click menu in the outliner,
but this is rather unreliable and not clearly communicated at the moment.
* We still need to improve the make override operator to turn collection instances
into collections with overrides directly in the scene.
PERFORMANCE
* We tried to make performance not worse than before and improve it in some
cases. The main thing that's still a bit slower is multiple scenes, we have to
change the layer syncing to only updated affected scenes.
* Collections keep a list of their parent collections for faster incremental
updates in syncing and caching.
* View layer bases are now in a object -> base hash to avoid quadratic time
lookups internally and in API functions like visible_get().
VERSIONING
* Compatibility with 2.7 files should be improved due to the new visibility
controls. Of course users may not want to set up their scenes differently
now to avoid having separate layers and groups.
* Compatibility with 2.8 is mostly there, and was tested on Eevee demo and Hero
files. There's a few things which are know to be not quite compatible, like
nested layer collections inside groups.
* The versioning code for 2.8 files is quite complicated, and isolated behind
#ifdef so it can be removed at the end of the release cycle.
KNOWN ISSUES
* The G-key group operators in the 3D viewport were left mostly as is, they
need to be modified still to fit better.
* Same for the groups panel in the object properties. This needs to be updated
still, or perhaps replaced by something better.
* Collections must all have a unique name. Less restrictive namespacing is to
be done later, we'll have to see how important this is as all objects within
the collections must also have a unique name anyway.
* Full scene copy and delete scene are exactly doing the right thing yet.
Differential Revision: https://developer.blender.org/D3383
https://code.blender.org/2018/05/collections-and-groups/
2018-04-30 15:57:22 +02:00
|
|
|
BKE_collection_object_add(bmain, collection_node->link, ob_dst);
|
2012-07-18 09:45:50 +00:00
|
|
|
}
|
|
|
|
|
else {
|
2014-04-01 11:34:00 +11:00
|
|
|
is_cycle = true;
|
2019-04-17 06:17:24 +02:00
|
|
|
}
|
2012-07-18 09:45:50 +00:00
|
|
|
}
|
2013-07-03 17:16:24 +00:00
|
|
|
break;
|
2012-07-18 09:45:50 +00:00
|
|
|
}
|
Collections and groups unification
OVERVIEW
* In 2.7 terminology, all layers and groups are now collection datablocks.
* These collections are nestable, linkable, instanceable, overrideable, ..
which opens up new ways to set up scenes and link + override data.
* Viewport/render visibility and selectability are now a part of the collection
and shared across all view layers and linkable.
* View layers define which subset of the scene collection hierarchy is excluded
for each. For many workflows one view layer can be used, these are more of an
advanced feature now.
OUTLINER
* The outliner now has a "View Layer" display mode instead of "Collections",
which can display the collections and/or objects in the view layer.
* In this display mode, collections can be excluded with the right click menu.
These will then be greyed out and their objects will be excluded.
* To view collections not linked to any scene, the "Blender File" display mode
can be used, with the new filtering option to just see Colleciton datablocks.
* The outliner right click menus for collections and objects were reorganized.
* Drag and drop still needs to be improved. Like before, dragging the icon or
text gives different results, we'll unify this later.
LINKING AND OVERRIDES
* Collections can now be linked into the scene without creating an instance,
with the link/append operator or from the collections view in the outliner.
* Collections can get static overrides with the right click menu in the outliner,
but this is rather unreliable and not clearly communicated at the moment.
* We still need to improve the make override operator to turn collection instances
into collections with overrides directly in the scene.
PERFORMANCE
* We tried to make performance not worse than before and improve it in some
cases. The main thing that's still a bit slower is multiple scenes, we have to
change the layer syncing to only updated affected scenes.
* Collections keep a list of their parent collections for faster incremental
updates in syncing and caching.
* View layer bases are now in a object -> base hash to avoid quadratic time
lookups internally and in API functions like visible_get().
VERSIONING
* Compatibility with 2.7 files should be improved due to the new visibility
controls. Of course users may not want to set up their scenes differently
now to avoid having separate layers and groups.
* Compatibility with 2.8 is mostly there, and was tested on Eevee demo and Hero
files. There's a few things which are know to be not quite compatible, like
nested layer collections inside groups.
* The versioning code for 2.8 files is quite complicated, and isolated behind
#ifdef so it can be removed at the end of the release cycle.
KNOWN ISSUES
* The G-key group operators in the 3D viewport were left mostly as is, they
need to be modified still to fit better.
* Same for the groups panel in the object properties. This needs to be updated
still, or perhaps replaced by something better.
* Collections must all have a unique name. Less restrictive namespacing is to
be done later, we'll have to see how important this is as all objects within
the collections must also have a unique name anyway.
* Full scene copy and delete scene are exactly doing the right thing yet.
Differential Revision: https://developer.blender.org/D3383
https://code.blender.org/2018/05/collections-and-groups/
2018-04-30 15:57:22 +02:00
|
|
|
case MAKE_LINKS_DUPLICOLLECTION:
|
2019-02-17 19:00:54 +11:00
|
|
|
ob_dst->instance_collection = ob_src->instance_collection;
|
|
|
|
|
if (ob_dst->instance_collection) {
|
|
|
|
|
id_us_plus(&ob_dst->instance_collection->id);
|
Collections and groups unification
OVERVIEW
* In 2.7 terminology, all layers and groups are now collection datablocks.
* These collections are nestable, linkable, instanceable, overrideable, ..
which opens up new ways to set up scenes and link + override data.
* Viewport/render visibility and selectability are now a part of the collection
and shared across all view layers and linkable.
* View layers define which subset of the scene collection hierarchy is excluded
for each. For many workflows one view layer can be used, these are more of an
advanced feature now.
OUTLINER
* The outliner now has a "View Layer" display mode instead of "Collections",
which can display the collections and/or objects in the view layer.
* In this display mode, collections can be excluded with the right click menu.
These will then be greyed out and their objects will be excluded.
* To view collections not linked to any scene, the "Blender File" display mode
can be used, with the new filtering option to just see Colleciton datablocks.
* The outliner right click menus for collections and objects were reorganized.
* Drag and drop still needs to be improved. Like before, dragging the icon or
text gives different results, we'll unify this later.
LINKING AND OVERRIDES
* Collections can now be linked into the scene without creating an instance,
with the link/append operator or from the collections view in the outliner.
* Collections can get static overrides with the right click menu in the outliner,
but this is rather unreliable and not clearly communicated at the moment.
* We still need to improve the make override operator to turn collection instances
into collections with overrides directly in the scene.
PERFORMANCE
* We tried to make performance not worse than before and improve it in some
cases. The main thing that's still a bit slower is multiple scenes, we have to
change the layer syncing to only updated affected scenes.
* Collections keep a list of their parent collections for faster incremental
updates in syncing and caching.
* View layer bases are now in a object -> base hash to avoid quadratic time
lookups internally and in API functions like visible_get().
VERSIONING
* Compatibility with 2.7 files should be improved due to the new visibility
controls. Of course users may not want to set up their scenes differently
now to avoid having separate layers and groups.
* Compatibility with 2.8 is mostly there, and was tested on Eevee demo and Hero
files. There's a few things which are know to be not quite compatible, like
nested layer collections inside groups.
* The versioning code for 2.8 files is quite complicated, and isolated behind
#ifdef so it can be removed at the end of the release cycle.
KNOWN ISSUES
* The G-key group operators in the 3D viewport were left mostly as is, they
need to be modified still to fit better.
* Same for the groups panel in the object properties. This needs to be updated
still, or perhaps replaced by something better.
* Collections must all have a unique name. Less restrictive namespacing is to
be done later, we'll have to see how important this is as all objects within
the collections must also have a unique name anyway.
* Full scene copy and delete scene are exactly doing the right thing yet.
Differential Revision: https://developer.blender.org/D3383
https://code.blender.org/2018/05/collections-and-groups/
2018-04-30 15:57:22 +02:00
|
|
|
ob_dst->transflag |= OB_DUPLICOLLECTION;
|
2012-04-28 15:42:27 +00:00
|
|
|
}
|
2019-07-25 10:02:00 +02:00
|
|
|
DEG_id_tag_update(&ob_dst->id, ID_RECALC_COPY_ON_WRITE);
|
2012-04-28 15:42:27 +00:00
|
|
|
break;
|
|
|
|
|
case MAKE_LINKS_MODIFIERS:
|
2020-03-03 12:35:51 +01:00
|
|
|
BKE_object_link_modifiers(ob_dst, ob_src);
|
2018-12-06 17:52:37 +01:00
|
|
|
DEG_id_tag_update(&ob_dst->id,
|
|
|
|
|
ID_RECALC_TRANSFORM | ID_RECALC_GEOMETRY | ID_RECALC_ANIMATION);
|
2012-04-28 15:42:27 +00:00
|
|
|
break;
|
2012-08-03 13:27:58 +00:00
|
|
|
case MAKE_LINKS_FONTS: {
|
|
|
|
|
Curve *cu_src = ob_src->data;
|
|
|
|
|
Curve *cu_dst = ob_dst->data;
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2022-03-28 17:34:36 +02:00
|
|
|
if (!BKE_id_is_editable(bmain, obdata_id)) {
|
2013-06-28 18:39:39 +00:00
|
|
|
is_lib = true;
|
|
|
|
|
break;
|
|
|
|
|
}
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2019-04-22 09:19:45 +10:00
|
|
|
if (cu_dst->vfont) {
|
2015-11-09 19:47:10 +01:00
|
|
|
id_us_min(&cu_dst->vfont->id);
|
2019-04-22 09:19:45 +10:00
|
|
|
}
|
2012-08-03 13:27:58 +00:00
|
|
|
cu_dst->vfont = cu_src->vfont;
|
|
|
|
|
id_us_plus((ID *)cu_dst->vfont);
|
2019-04-22 09:19:45 +10:00
|
|
|
if (cu_dst->vfontb) {
|
2015-11-09 19:47:10 +01:00
|
|
|
id_us_min(&cu_dst->vfontb->id);
|
2019-04-22 09:19:45 +10:00
|
|
|
}
|
2012-08-03 13:27:58 +00:00
|
|
|
cu_dst->vfontb = cu_src->vfontb;
|
|
|
|
|
id_us_plus((ID *)cu_dst->vfontb);
|
2019-04-22 09:19:45 +10:00
|
|
|
if (cu_dst->vfonti) {
|
2015-11-09 19:47:10 +01:00
|
|
|
id_us_min(&cu_dst->vfonti->id);
|
2019-04-22 09:19:45 +10:00
|
|
|
}
|
2012-08-03 13:27:58 +00:00
|
|
|
cu_dst->vfonti = cu_src->vfonti;
|
|
|
|
|
id_us_plus((ID *)cu_dst->vfonti);
|
2019-04-22 09:19:45 +10:00
|
|
|
if (cu_dst->vfontbi) {
|
2015-11-09 19:47:10 +01:00
|
|
|
id_us_min(&cu_dst->vfontbi->id);
|
2019-04-22 09:19:45 +10:00
|
|
|
}
|
2012-08-03 13:27:58 +00:00
|
|
|
cu_dst->vfontbi = cu_src->vfontbi;
|
|
|
|
|
id_us_plus((ID *)cu_dst->vfontbi);
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2018-12-06 17:52:37 +01:00
|
|
|
DEG_id_tag_update(&ob_dst->id,
|
|
|
|
|
ID_RECALC_TRANSFORM | ID_RECALC_GEOMETRY | ID_RECALC_ANIMATION);
|
2012-08-03 13:27:58 +00:00
|
|
|
break;
|
|
|
|
|
}
|
2020-12-10 23:04:54 +01:00
|
|
|
case MAKE_LINKS_SHADERFX:
|
|
|
|
|
ED_object_shaderfx_link(ob_dst, ob_src);
|
|
|
|
|
DEG_id_tag_update(&ob_dst->id,
|
|
|
|
|
ID_RECALC_TRANSFORM | ID_RECALC_GEOMETRY | ID_RECALC_ANIMATION);
|
|
|
|
|
break;
|
2011-05-09 02:45:52 +00:00
|
|
|
}
|
2.5: Object module
* Split object_edit.c into multiple files:
object_add.c, object_edit.c, object_hook.c, object_relations.c,
object_select.c, object_transform.c.
* Rename files to have consistent object_ and mball_ prefix:
object_shapekey.c, object_lattice.c, object_vgroup.c, mball_edit.c.
* Added operators:
* vertex group menu and set active
* apply location, rotation, scale, visual transform (location is new)
* make local
* make vertex parent
* move to layer
* convert to curve/mesh (not finished yet)
* Many small fixes for marked issues, but still much code to be cleaned
up here...
2009-09-09 11:52:56 +00:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
2009-11-04 10:25:57 +00:00
|
|
|
CTX_DATA_END;
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2012-07-18 09:45:50 +00:00
|
|
|
if (type == MAKE_LINKS_GROUP) {
|
Collections and groups unification
OVERVIEW
* In 2.7 terminology, all layers and groups are now collection datablocks.
* These collections are nestable, linkable, instanceable, overrideable, ..
which opens up new ways to set up scenes and link + override data.
* Viewport/render visibility and selectability are now a part of the collection
and shared across all view layers and linkable.
* View layers define which subset of the scene collection hierarchy is excluded
for each. For many workflows one view layer can be used, these are more of an
advanced feature now.
OUTLINER
* The outliner now has a "View Layer" display mode instead of "Collections",
which can display the collections and/or objects in the view layer.
* In this display mode, collections can be excluded with the right click menu.
These will then be greyed out and their objects will be excluded.
* To view collections not linked to any scene, the "Blender File" display mode
can be used, with the new filtering option to just see Colleciton datablocks.
* The outliner right click menus for collections and objects were reorganized.
* Drag and drop still needs to be improved. Like before, dragging the icon or
text gives different results, we'll unify this later.
LINKING AND OVERRIDES
* Collections can now be linked into the scene without creating an instance,
with the link/append operator or from the collections view in the outliner.
* Collections can get static overrides with the right click menu in the outliner,
but this is rather unreliable and not clearly communicated at the moment.
* We still need to improve the make override operator to turn collection instances
into collections with overrides directly in the scene.
PERFORMANCE
* We tried to make performance not worse than before and improve it in some
cases. The main thing that's still a bit slower is multiple scenes, we have to
change the layer syncing to only updated affected scenes.
* Collections keep a list of their parent collections for faster incremental
updates in syncing and caching.
* View layer bases are now in a object -> base hash to avoid quadratic time
lookups internally and in API functions like visible_get().
VERSIONING
* Compatibility with 2.7 files should be improved due to the new visibility
controls. Of course users may not want to set up their scenes differently
now to avoid having separate layers and groups.
* Compatibility with 2.8 is mostly there, and was tested on Eevee demo and Hero
files. There's a few things which are know to be not quite compatible, like
nested layer collections inside groups.
* The versioning code for 2.8 files is quite complicated, and isolated behind
#ifdef so it can be removed at the end of the release cycle.
KNOWN ISSUES
* The G-key group operators in the 3D viewport were left mostly as is, they
need to be modified still to fit better.
* Same for the groups panel in the object properties. This needs to be updated
still, or perhaps replaced by something better.
* Collections must all have a unique name. Less restrictive namespacing is to
be done later, we'll have to see how important this is as all objects within
the collections must also have a unique name anyway.
* Full scene copy and delete scene are exactly doing the right thing yet.
Differential Revision: https://developer.blender.org/D3383
https://code.blender.org/2018/05/collections-and-groups/
2018-04-30 15:57:22 +02:00
|
|
|
if (ob_collections) {
|
|
|
|
|
BLI_linklist_free(ob_collections, NULL);
|
2012-07-18 09:45:50 +00:00
|
|
|
}
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2012-07-18 09:45:50 +00:00
|
|
|
if (is_cycle) {
|
Collections and groups unification
OVERVIEW
* In 2.7 terminology, all layers and groups are now collection datablocks.
* These collections are nestable, linkable, instanceable, overrideable, ..
which opens up new ways to set up scenes and link + override data.
* Viewport/render visibility and selectability are now a part of the collection
and shared across all view layers and linkable.
* View layers define which subset of the scene collection hierarchy is excluded
for each. For many workflows one view layer can be used, these are more of an
advanced feature now.
OUTLINER
* The outliner now has a "View Layer" display mode instead of "Collections",
which can display the collections and/or objects in the view layer.
* In this display mode, collections can be excluded with the right click menu.
These will then be greyed out and their objects will be excluded.
* To view collections not linked to any scene, the "Blender File" display mode
can be used, with the new filtering option to just see Colleciton datablocks.
* The outliner right click menus for collections and objects were reorganized.
* Drag and drop still needs to be improved. Like before, dragging the icon or
text gives different results, we'll unify this later.
LINKING AND OVERRIDES
* Collections can now be linked into the scene without creating an instance,
with the link/append operator or from the collections view in the outliner.
* Collections can get static overrides with the right click menu in the outliner,
but this is rather unreliable and not clearly communicated at the moment.
* We still need to improve the make override operator to turn collection instances
into collections with overrides directly in the scene.
PERFORMANCE
* We tried to make performance not worse than before and improve it in some
cases. The main thing that's still a bit slower is multiple scenes, we have to
change the layer syncing to only updated affected scenes.
* Collections keep a list of their parent collections for faster incremental
updates in syncing and caching.
* View layer bases are now in a object -> base hash to avoid quadratic time
lookups internally and in API functions like visible_get().
VERSIONING
* Compatibility with 2.7 files should be improved due to the new visibility
controls. Of course users may not want to set up their scenes differently
now to avoid having separate layers and groups.
* Compatibility with 2.8 is mostly there, and was tested on Eevee demo and Hero
files. There's a few things which are know to be not quite compatible, like
nested layer collections inside groups.
* The versioning code for 2.8 files is quite complicated, and isolated behind
#ifdef so it can be removed at the end of the release cycle.
KNOWN ISSUES
* The G-key group operators in the 3D viewport were left mostly as is, they
need to be modified still to fit better.
* Same for the groups panel in the object properties. This needs to be updated
still, or perhaps replaced by something better.
* Collections must all have a unique name. Less restrictive namespacing is to
be done later, we'll have to see how important this is as all objects within
the collections must also have a unique name anyway.
* Full scene copy and delete scene are exactly doing the right thing yet.
Differential Revision: https://developer.blender.org/D3383
https://code.blender.org/2018/05/collections-and-groups/
2018-04-30 15:57:22 +02:00
|
|
|
BKE_report(op->reports, RPT_WARNING, "Skipped some collections because of cycle detected");
|
2012-07-18 09:45:50 +00:00
|
|
|
}
|
|
|
|
|
}
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2013-06-28 18:39:39 +00:00
|
|
|
if (is_lib) {
|
|
|
|
|
BKE_report(op->reports, RPT_WARNING, "Skipped editing library object data");
|
|
|
|
|
}
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2017-06-08 10:14:53 +02:00
|
|
|
DEG_relations_tag_update(bmain);
|
2021-03-11 17:30:39 +01:00
|
|
|
WM_event_add_notifier(C, NC_SPACE | ND_SPACE_VIEW3D, NULL);
|
2014-06-29 14:17:32 +02:00
|
|
|
WM_event_add_notifier(C, NC_ANIMATION | ND_NLA_ACTCHANGE, CTX_wm_view3d(C));
|
2013-03-11 19:50:11 +00:00
|
|
|
WM_event_add_notifier(C, NC_OBJECT, NULL);
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2009-11-04 10:25:57 +00:00
|
|
|
return OPERATOR_FINISHED;
|
2009-09-16 17:43:09 +00:00
|
|
|
}
|
|
|
|
|
|
2009-11-04 10:25:57 +00:00
|
|
|
void OBJECT_OT_make_links_scene(wmOperatorType *ot)
|
2009-09-16 17:43:09 +00:00
|
|
|
{
|
2009-11-04 10:25:57 +00:00
|
|
|
PropertyRNA *prop;
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2009-11-04 10:25:57 +00:00
|
|
|
/* identifiers */
|
2012-03-22 07:26:09 +00:00
|
|
|
ot->name = "Link Objects to Scene";
|
2011-07-09 17:09:28 +00:00
|
|
|
ot->description = "Link selection to another scene";
|
2012-03-22 07:26:09 +00:00
|
|
|
ot->idname = "OBJECT_OT_make_links_scene";
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2009-11-04 10:25:57 +00:00
|
|
|
/* api callbacks */
|
2012-03-22 07:26:09 +00:00
|
|
|
ot->invoke = WM_enum_search_invoke;
|
|
|
|
|
ot->exec = make_links_scene_exec;
|
2009-11-04 10:25:57 +00:00
|
|
|
/* better not run the poll check */
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2009-11-04 10:25:57 +00:00
|
|
|
/* flags */
|
2012-04-28 15:42:27 +00:00
|
|
|
ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2009-11-04 10:25:57 +00:00
|
|
|
/* properties */
|
2012-04-28 15:42:27 +00:00
|
|
|
prop = RNA_def_enum(ot->srna, "scene", DummyRNA_NULL_items, 0, "Scene", "");
|
2010-05-05 15:41:38 +00:00
|
|
|
RNA_def_enum_funcs(prop, RNA_scene_local_itemf);
|
2014-05-05 15:09:29 +10:00
|
|
|
RNA_def_property_flag(prop, PROP_ENUM_NO_TRANSLATE);
|
2012-03-22 07:26:09 +00:00
|
|
|
ot->prop = prop;
|
2009-11-04 10:25:57 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void OBJECT_OT_make_links_data(wmOperatorType *ot)
|
|
|
|
|
{
|
2017-10-18 15:07:26 +11:00
|
|
|
static const EnumPropertyItem make_links_items[] = {
|
2021-01-20 20:48:14 +11:00
|
|
|
{MAKE_LINKS_OBDATA, "OBDATA", 0, "Link Object Data", "Replace assigned Object Data"},
|
|
|
|
|
{MAKE_LINKS_MATERIALS, "MATERIAL", 0, "Link Materials", "Replace assigned Materials"},
|
|
|
|
|
{MAKE_LINKS_ANIMDATA,
|
|
|
|
|
"ANIMATION",
|
|
|
|
|
0,
|
|
|
|
|
"Link Animation Data",
|
|
|
|
|
"Replace assigned Animation Data"},
|
|
|
|
|
{MAKE_LINKS_GROUP, "GROUPS", 0, "Link Collections", "Replace assigned Collections"},
|
|
|
|
|
{MAKE_LINKS_DUPLICOLLECTION,
|
|
|
|
|
"DUPLICOLLECTION",
|
|
|
|
|
0,
|
|
|
|
|
"Link Instance Collection",
|
|
|
|
|
"Replace assigned Collection Instance"},
|
|
|
|
|
{MAKE_LINKS_FONTS, "FONTS", 0, "Link Fonts to Text", "Replace Text object Fonts"},
|
2022-05-31 14:07:15 +10:00
|
|
|
RNA_ENUM_ITEM_SEPR,
|
2021-01-20 20:48:14 +11:00
|
|
|
{MAKE_LINKS_MODIFIERS, "MODIFIERS", 0, "Copy Modifiers", "Replace Modifiers"},
|
|
|
|
|
{MAKE_LINKS_SHADERFX,
|
|
|
|
|
"EFFECTS",
|
|
|
|
|
0,
|
|
|
|
|
"Copy Grease Pencil Effects",
|
|
|
|
|
"Replace Grease Pencil Effects"},
|
2019-02-03 14:01:45 +11:00
|
|
|
{0, NULL, 0, NULL, NULL},
|
|
|
|
|
};
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2009-11-04 10:25:57 +00:00
|
|
|
/* identifiers */
|
2021-01-20 20:48:14 +11:00
|
|
|
ot->name = "Link/Transfer Data";
|
|
|
|
|
ot->description = "Transfer data from active object to selected objects";
|
2012-03-22 07:26:09 +00:00
|
|
|
ot->idname = "OBJECT_OT_make_links_data";
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2009-11-04 10:25:57 +00:00
|
|
|
/* api callbacks */
|
2012-03-22 07:26:09 +00:00
|
|
|
ot->exec = make_links_data_exec;
|
|
|
|
|
ot->poll = ED_operator_object_active;
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2009-11-04 10:25:57 +00:00
|
|
|
/* flags */
|
2012-04-28 15:42:27 +00:00
|
|
|
ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2009-11-04 10:25:57 +00:00
|
|
|
/* properties */
|
2012-03-22 07:26:09 +00:00
|
|
|
ot->prop = RNA_def_enum(ot->srna, "type", make_links_items, 0, "Type", "");
|
2009-09-16 17:43:09 +00:00
|
|
|
}
|
|
|
|
|
|
2020-03-26 10:24:44 +11:00
|
|
|
/** \} */
|
|
|
|
|
|
|
|
|
|
/* ------------------------------------------------------------------- */
|
|
|
|
|
/** \name Make Single User Operator
|
|
|
|
|
* \{ */
|
2009-09-16 17:43:09 +00:00
|
|
|
|
2021-10-21 17:34:05 +02:00
|
|
|
static bool single_data_needs_duplication(ID *id)
|
|
|
|
|
{
|
2021-10-24 19:31:08 +11:00
|
|
|
/* NOTE: When dealing with linked data, we always make a local copy of it.
|
2021-10-21 17:34:05 +02:00
|
|
|
* While in theory we could rather make it local when it only has one user, this is difficult
|
|
|
|
|
* in practice with current code of this function. */
|
|
|
|
|
return (id != NULL && (id->us > 1 || ID_IS_LINKED(id)));
|
|
|
|
|
}
|
|
|
|
|
|
2021-10-28 11:22:43 +02:00
|
|
|
static void libblock_relink_collection(Main *bmain,
|
|
|
|
|
Collection *collection,
|
|
|
|
|
const bool do_collection)
|
Render Layers and Collections (merge from render-layers)
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-07 10:18:38 +01:00
|
|
|
{
|
2020-01-14 12:07:24 +01:00
|
|
|
if (do_collection) {
|
2021-11-01 15:19:17 +01:00
|
|
|
BKE_libblock_relink_to_newid(bmain, &collection->id, 0);
|
2020-01-14 12:07:24 +01:00
|
|
|
}
|
Render Layers and Collections (merge from render-layers)
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-07 10:18:38 +01:00
|
|
|
|
2018-10-30 16:14:33 +01:00
|
|
|
for (CollectionObject *cob = collection->gobject.first; cob != NULL; cob = cob->next) {
|
2021-11-01 15:19:17 +01:00
|
|
|
BKE_libblock_relink_to_newid(bmain, &cob->ob->id, 0);
|
2018-10-30 16:14:33 +01:00
|
|
|
}
|
|
|
|
|
|
2020-04-03 19:15:01 +02:00
|
|
|
LISTBASE_FOREACH (CollectionChild *, child, &collection->children) {
|
2021-10-28 11:22:43 +02:00
|
|
|
libblock_relink_collection(bmain, child->collection, true);
|
Render Layers and Collections (merge from render-layers)
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-07 10:18:38 +01:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2019-04-01 21:10:25 +02:00
|
|
|
static Collection *single_object_users_collection(Main *bmain,
|
2018-10-24 14:45:18 +02:00
|
|
|
Scene *scene,
|
|
|
|
|
Collection *collection,
|
|
|
|
|
const int flag,
|
|
|
|
|
const bool copy_collections,
|
|
|
|
|
const bool is_master_collection)
|
Render Layers and Collections (merge from render-layers)
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-07 10:18:38 +01:00
|
|
|
{
|
2018-10-24 14:45:18 +02:00
|
|
|
/* Generate new copies for objects in given collection and all its children,
|
2019-08-01 13:53:25 +10:00
|
|
|
* and optionally also copy collections themselves. */
|
2018-10-24 14:45:18 +02:00
|
|
|
if (copy_collections && !is_master_collection) {
|
2021-10-21 17:38:23 +02:00
|
|
|
Collection *collection_new = (Collection *)BKE_id_copy_ex(
|
|
|
|
|
bmain, &collection->id, NULL, LIB_ID_COPY_DEFAULT | LIB_ID_COPY_ACTIONS);
|
2020-06-16 15:18:55 +02:00
|
|
|
id_us_min(&collection_new->id);
|
|
|
|
|
collection = ID_NEW_SET(collection, collection_new);
|
2018-10-24 14:45:18 +02:00
|
|
|
}
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2018-10-24 14:45:18 +02:00
|
|
|
/* We do not remap to new objects here, this is done in separate step. */
|
2020-04-03 19:15:01 +02:00
|
|
|
LISTBASE_FOREACH (CollectionObject *, cob, &collection->gobject) {
|
Collections and groups unification
OVERVIEW
* In 2.7 terminology, all layers and groups are now collection datablocks.
* These collections are nestable, linkable, instanceable, overrideable, ..
which opens up new ways to set up scenes and link + override data.
* Viewport/render visibility and selectability are now a part of the collection
and shared across all view layers and linkable.
* View layers define which subset of the scene collection hierarchy is excluded
for each. For many workflows one view layer can be used, these are more of an
advanced feature now.
OUTLINER
* The outliner now has a "View Layer" display mode instead of "Collections",
which can display the collections and/or objects in the view layer.
* In this display mode, collections can be excluded with the right click menu.
These will then be greyed out and their objects will be excluded.
* To view collections not linked to any scene, the "Blender File" display mode
can be used, with the new filtering option to just see Colleciton datablocks.
* The outliner right click menus for collections and objects were reorganized.
* Drag and drop still needs to be improved. Like before, dragging the icon or
text gives different results, we'll unify this later.
LINKING AND OVERRIDES
* Collections can now be linked into the scene without creating an instance,
with the link/append operator or from the collections view in the outliner.
* Collections can get static overrides with the right click menu in the outliner,
but this is rather unreliable and not clearly communicated at the moment.
* We still need to improve the make override operator to turn collection instances
into collections with overrides directly in the scene.
PERFORMANCE
* We tried to make performance not worse than before and improve it in some
cases. The main thing that's still a bit slower is multiple scenes, we have to
change the layer syncing to only updated affected scenes.
* Collections keep a list of their parent collections for faster incremental
updates in syncing and caching.
* View layer bases are now in a object -> base hash to avoid quadratic time
lookups internally and in API functions like visible_get().
VERSIONING
* Compatibility with 2.7 files should be improved due to the new visibility
controls. Of course users may not want to set up their scenes differently
now to avoid having separate layers and groups.
* Compatibility with 2.8 is mostly there, and was tested on Eevee demo and Hero
files. There's a few things which are know to be not quite compatible, like
nested layer collections inside groups.
* The versioning code for 2.8 files is quite complicated, and isolated behind
#ifdef so it can be removed at the end of the release cycle.
KNOWN ISSUES
* The G-key group operators in the 3D viewport were left mostly as is, they
need to be modified still to fit better.
* Same for the groups panel in the object properties. This needs to be updated
still, or perhaps replaced by something better.
* Collections must all have a unique name. Less restrictive namespacing is to
be done later, we'll have to see how important this is as all objects within
the collections must also have a unique name anyway.
* Full scene copy and delete scene are exactly doing the right thing yet.
Differential Revision: https://developer.blender.org/D3383
https://code.blender.org/2018/05/collections-and-groups/
2018-04-30 15:57:22 +02:00
|
|
|
Object *ob = cob->ob;
|
Render Layers and Collections (merge from render-layers)
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-07 10:18:38 +01:00
|
|
|
/* an object may be in more than one collection */
|
|
|
|
|
if ((ob->id.newid == NULL) && ((ob->flag & flag) == flag)) {
|
2019-02-09 13:20:59 +01:00
|
|
|
if (!ID_IS_LINKED(ob) && BKE_object_scenes_users_get(bmain, ob) > 1) {
|
2021-10-21 17:38:23 +02:00
|
|
|
ID_NEW_SET(
|
|
|
|
|
ob, BKE_id_copy_ex(bmain, &ob->id, NULL, LIB_ID_COPY_DEFAULT | LIB_ID_COPY_ACTIONS));
|
2020-10-07 18:01:25 +02:00
|
|
|
id_us_min(ob->id.newid);
|
2018-03-13 16:10:20 -03:00
|
|
|
}
|
Render Layers and Collections (merge from render-layers)
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-07 10:18:38 +01:00
|
|
|
}
|
|
|
|
|
}
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2019-04-22 00:18:34 +10:00
|
|
|
/* Since master collection has already be duplicated as part of scene copy,
|
2019-08-18 04:11:50 +10:00
|
|
|
* we do not duplicate it here.
|
2019-04-22 00:18:34 +10:00
|
|
|
* However, this means its children need to be re-added manually here,
|
|
|
|
|
* otherwise their parent lists are empty (which will lead to crashes, see T63101). */
|
2019-04-01 21:10:25 +02:00
|
|
|
CollectionChild *child_next, *child = collection->children.first;
|
2019-04-02 21:50:17 +02:00
|
|
|
CollectionChild *orig_child_last = collection->children.last;
|
|
|
|
|
for (; child != NULL; child = child_next) {
|
2019-04-01 21:10:25 +02:00
|
|
|
child_next = child->next;
|
|
|
|
|
Collection *collection_child_new = single_object_users_collection(
|
|
|
|
|
bmain, scene, child->collection, flag, copy_collections, false);
|
2020-01-17 19:34:05 +01:00
|
|
|
|
2019-04-02 21:50:17 +02:00
|
|
|
if (is_master_collection && copy_collections && child->collection != collection_child_new) {
|
2020-01-25 20:09:20 +11:00
|
|
|
/* We do not want a collection sync here, our collections are in a complete uninitialized
|
2020-08-28 11:08:03 +02:00
|
|
|
* state currently. With current code, that would lead to a memory leak - because of
|
|
|
|
|
* reasons. It would be a useless loss of computing anyway, since caller has to fully
|
|
|
|
|
* refresh view-layers/collections caching at the end. */
|
Fix memory leak when full-copying a scene after recent changes.
Once again, am not exactly sure why that was working before, and not
anymore - but in any case, doing that kind of update here is not only
useless (since we have to do it at the end of the whole
collections/objects duplication and remapping anyway), it is also rather
dangerous, as collections are currently in rather invalid states at that
point of the code...
Note that in ideal world, `BKE_main_collection_sync()` & co would be
lazy (setting only a flag, then code actually needing this to be valid
again should call some sort of `BKE_main_collection_sync_ensure()`).
Then we would not have to worry about such things (and we'd get nice
performance improvements in some cases, also in main remapping code,
etc.).
Food for some refactoring, some day...
2020-01-17 19:54:09 +01:00
|
|
|
BKE_collection_child_add_no_sync(collection, collection_child_new);
|
2019-04-02 21:50:17 +02:00
|
|
|
BLI_remlink(&collection->children, child);
|
2019-04-01 21:10:25 +02:00
|
|
|
MEM_freeN(child);
|
2019-04-02 21:50:17 +02:00
|
|
|
if (child == orig_child_last) {
|
|
|
|
|
break;
|
|
|
|
|
}
|
2019-04-01 21:10:25 +02:00
|
|
|
}
|
Render Layers and Collections (merge from render-layers)
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-07 10:18:38 +01:00
|
|
|
}
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2019-04-01 21:10:25 +02:00
|
|
|
return collection;
|
Render Layers and Collections (merge from render-layers)
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-07 10:18:38 +01:00
|
|
|
}
|
|
|
|
|
|
Collections and groups unification
OVERVIEW
* In 2.7 terminology, all layers and groups are now collection datablocks.
* These collections are nestable, linkable, instanceable, overrideable, ..
which opens up new ways to set up scenes and link + override data.
* Viewport/render visibility and selectability are now a part of the collection
and shared across all view layers and linkable.
* View layers define which subset of the scene collection hierarchy is excluded
for each. For many workflows one view layer can be used, these are more of an
advanced feature now.
OUTLINER
* The outliner now has a "View Layer" display mode instead of "Collections",
which can display the collections and/or objects in the view layer.
* In this display mode, collections can be excluded with the right click menu.
These will then be greyed out and their objects will be excluded.
* To view collections not linked to any scene, the "Blender File" display mode
can be used, with the new filtering option to just see Colleciton datablocks.
* The outliner right click menus for collections and objects were reorganized.
* Drag and drop still needs to be improved. Like before, dragging the icon or
text gives different results, we'll unify this later.
LINKING AND OVERRIDES
* Collections can now be linked into the scene without creating an instance,
with the link/append operator or from the collections view in the outliner.
* Collections can get static overrides with the right click menu in the outliner,
but this is rather unreliable and not clearly communicated at the moment.
* We still need to improve the make override operator to turn collection instances
into collections with overrides directly in the scene.
PERFORMANCE
* We tried to make performance not worse than before and improve it in some
cases. The main thing that's still a bit slower is multiple scenes, we have to
change the layer syncing to only updated affected scenes.
* Collections keep a list of their parent collections for faster incremental
updates in syncing and caching.
* View layer bases are now in a object -> base hash to avoid quadratic time
lookups internally and in API functions like visible_get().
VERSIONING
* Compatibility with 2.7 files should be improved due to the new visibility
controls. Of course users may not want to set up their scenes differently
now to avoid having separate layers and groups.
* Compatibility with 2.8 is mostly there, and was tested on Eevee demo and Hero
files. There's a few things which are know to be not quite compatible, like
nested layer collections inside groups.
* The versioning code for 2.8 files is quite complicated, and isolated behind
#ifdef so it can be removed at the end of the release cycle.
KNOWN ISSUES
* The G-key group operators in the 3D viewport were left mostly as is, they
need to be modified still to fit better.
* Same for the groups panel in the object properties. This needs to be updated
still, or perhaps replaced by something better.
* Collections must all have a unique name. Less restrictive namespacing is to
be done later, we'll have to see how important this is as all objects within
the collections must also have a unique name anyway.
* Full scene copy and delete scene are exactly doing the right thing yet.
Differential Revision: https://developer.blender.org/D3383
https://code.blender.org/2018/05/collections-and-groups/
2018-04-30 15:57:22 +02:00
|
|
|
/* Warning, sets ID->newid pointers of objects and collections, but does not clear them. */
|
|
|
|
|
static void single_object_users(
|
|
|
|
|
Main *bmain, Scene *scene, View3D *v3d, const int flag, const bool copy_collections)
|
2009-09-16 17:43:09 +00:00
|
|
|
{
|
2018-10-24 14:45:18 +02:00
|
|
|
/* duplicate all the objects of the scene (and matching collections, if required). */
|
2019-09-02 14:31:19 +02:00
|
|
|
Collection *master_collection = scene->master_collection;
|
2018-10-24 14:45:18 +02:00
|
|
|
single_object_users_collection(bmain, scene, master_collection, flag, copy_collections, true);
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2020-01-17 19:34:05 +01:00
|
|
|
/* Will also handle the master collection. */
|
2021-11-01 15:19:17 +01:00
|
|
|
BKE_libblock_relink_to_newid(bmain, &scene->id, 0);
|
2013-04-24 23:09:25 +00:00
|
|
|
|
2020-01-17 19:34:05 +01:00
|
|
|
/* Collection and object pointers in collections */
|
2021-10-28 11:22:43 +02:00
|
|
|
libblock_relink_collection(bmain, scene->master_collection, false);
|
2014-10-10 18:44:37 +02:00
|
|
|
|
2020-01-17 19:34:05 +01:00
|
|
|
/* We also have to handle runtime things in UI. */
|
2019-03-26 14:39:43 +01:00
|
|
|
if (v3d) {
|
|
|
|
|
ID_NEW_REMAP(v3d->camera);
|
|
|
|
|
}
|
2014-10-10 18:44:37 +02:00
|
|
|
|
2019-04-22 00:18:34 +10:00
|
|
|
/* Making single user may affect other scenes if they share
|
|
|
|
|
* with current one some collections in their ViewLayer. */
|
2020-01-17 19:30:47 +01:00
|
|
|
BKE_main_collection_sync_remap(bmain);
|
2009-09-16 17:43:09 +00:00
|
|
|
}
|
|
|
|
|
|
2013-04-24 23:09:25 +00:00
|
|
|
void ED_object_single_user(Main *bmain, Scene *scene, Object *ob)
|
2011-08-08 08:22:01 +00:00
|
|
|
{
|
2018-03-01 19:00:54 +11:00
|
|
|
FOREACH_SCENE_OBJECT_BEGIN (scene, ob_iter) {
|
Render Layers and Collections (merge from render-layers)
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-07 10:18:38 +01:00
|
|
|
ob_iter->flag &= ~OB_DONE;
|
2011-08-08 08:22:01 +00:00
|
|
|
}
|
2018-03-09 11:44:42 +11:00
|
|
|
FOREACH_SCENE_OBJECT_END;
|
2011-08-08 08:22:01 +00:00
|
|
|
|
Render Layers and Collections (merge from render-layers)
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-07 10:18:38 +01:00
|
|
|
/* tag only the one object */
|
|
|
|
|
ob->flag |= OB_DONE;
|
2016-11-30 15:25:54 +01:00
|
|
|
|
Render Layers and Collections (merge from render-layers)
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-07 10:18:38 +01:00
|
|
|
single_object_users(bmain, scene, NULL, OB_DONE, false);
|
2021-05-27 22:44:02 +10:00
|
|
|
BKE_main_id_newptr_and_tag_clear(bmain);
|
2011-08-08 08:22:01 +00:00
|
|
|
}
|
|
|
|
|
|
2018-12-14 09:20:56 -02:00
|
|
|
static void single_obdata_users(
|
|
|
|
|
Main *bmain, Scene *scene, ViewLayer *view_layer, View3D *v3d, const int flag)
|
2009-09-16 17:43:09 +00:00
|
|
|
{
|
2019-02-27 10:46:48 +11:00
|
|
|
Light *la;
|
2009-09-16 17:43:09 +00:00
|
|
|
Curve *cu;
|
2019-06-11 20:48:52 +02:00
|
|
|
Camera *cam;
|
2009-09-16 17:43:09 +00:00
|
|
|
Mesh *me;
|
2013-06-03 12:28:46 +00:00
|
|
|
Lattice *lat;
|
2009-09-16 17:43:09 +00:00
|
|
|
ID *id;
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2018-12-14 09:20:56 -02:00
|
|
|
FOREACH_OBJECT_FLAG_BEGIN (scene, view_layer, v3d, flag, ob) {
|
2022-03-28 17:34:36 +02:00
|
|
|
if (BKE_id_is_editable(bmain, &ob->id)) {
|
2012-04-28 15:42:27 +00:00
|
|
|
id = ob->data;
|
2021-10-21 17:34:05 +02:00
|
|
|
if (single_data_needs_duplication(id)) {
|
2018-12-06 17:52:37 +01:00
|
|
|
DEG_id_tag_update(&ob->id, ID_RECALC_GEOMETRY);
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2012-04-28 06:31:57 +00:00
|
|
|
switch (ob->type) {
|
2012-04-28 15:42:27 +00:00
|
|
|
case OB_LAMP:
|
2021-10-21 17:38:23 +02:00
|
|
|
ob->data = la = ID_NEW_SET(
|
|
|
|
|
ob->data,
|
|
|
|
|
BKE_id_copy_ex(bmain, ob->data, NULL, LIB_ID_COPY_DEFAULT | LIB_ID_COPY_ACTIONS));
|
2012-04-28 15:42:27 +00:00
|
|
|
break;
|
|
|
|
|
case OB_CAMERA:
|
2021-10-21 17:38:23 +02:00
|
|
|
cam = ob->data = ID_NEW_SET(
|
|
|
|
|
ob->data,
|
|
|
|
|
BKE_id_copy_ex(bmain, ob->data, NULL, LIB_ID_COPY_DEFAULT | LIB_ID_COPY_ACTIONS));
|
2019-06-11 20:48:52 +02:00
|
|
|
ID_NEW_REMAP(cam->dof.focus_object);
|
2012-04-28 15:42:27 +00:00
|
|
|
break;
|
|
|
|
|
case OB_MESH:
|
2016-11-30 15:25:54 +01:00
|
|
|
/* Needed to remap texcomesh below. */
|
2021-10-21 17:38:23 +02:00
|
|
|
me = ob->data = ID_NEW_SET(
|
|
|
|
|
ob->data,
|
|
|
|
|
BKE_id_copy_ex(bmain, ob->data, NULL, LIB_ID_COPY_DEFAULT | LIB_ID_COPY_ACTIONS));
|
2012-04-28 15:42:27 +00:00
|
|
|
break;
|
|
|
|
|
case OB_MBALL:
|
2021-10-21 17:38:23 +02:00
|
|
|
ob->data = ID_NEW_SET(
|
|
|
|
|
ob->data,
|
|
|
|
|
BKE_id_copy_ex(bmain, ob->data, NULL, LIB_ID_COPY_DEFAULT | LIB_ID_COPY_ACTIONS));
|
2012-04-28 15:42:27 +00:00
|
|
|
break;
|
2022-02-18 09:50:29 -06:00
|
|
|
case OB_CURVES_LEGACY:
|
2012-04-28 15:42:27 +00:00
|
|
|
case OB_SURF:
|
|
|
|
|
case OB_FONT:
|
2021-10-21 17:38:23 +02:00
|
|
|
ob->data = cu = ID_NEW_SET(
|
|
|
|
|
ob->data,
|
|
|
|
|
BKE_id_copy_ex(bmain, ob->data, NULL, LIB_ID_COPY_DEFAULT | LIB_ID_COPY_ACTIONS));
|
2016-11-30 15:25:54 +01:00
|
|
|
ID_NEW_REMAP(cu->bevobj);
|
|
|
|
|
ID_NEW_REMAP(cu->taperobj);
|
2012-04-28 15:42:27 +00:00
|
|
|
break;
|
|
|
|
|
case OB_LATTICE:
|
2021-10-21 17:38:23 +02:00
|
|
|
ob->data = lat = ID_NEW_SET(
|
|
|
|
|
ob->data,
|
|
|
|
|
BKE_id_copy_ex(bmain, ob->data, NULL, LIB_ID_COPY_DEFAULT | LIB_ID_COPY_ACTIONS));
|
2012-04-28 15:42:27 +00:00
|
|
|
break;
|
|
|
|
|
case OB_ARMATURE:
|
2018-12-06 17:52:37 +01:00
|
|
|
DEG_id_tag_update(&ob->id, ID_RECALC_GEOMETRY);
|
2021-10-21 17:38:23 +02:00
|
|
|
ob->data = ID_NEW_SET(
|
|
|
|
|
ob->data,
|
|
|
|
|
BKE_id_copy_ex(bmain, ob->data, NULL, LIB_ID_COPY_DEFAULT | LIB_ID_COPY_ACTIONS));
|
2018-07-31 11:38:10 +02:00
|
|
|
BKE_pose_rebuild(bmain, ob, ob->data, true);
|
2012-04-28 15:42:27 +00:00
|
|
|
break;
|
|
|
|
|
case OB_SPEAKER:
|
2021-10-21 17:38:23 +02:00
|
|
|
ob->data = ID_NEW_SET(
|
|
|
|
|
ob->data,
|
|
|
|
|
BKE_id_copy_ex(bmain, ob->data, NULL, LIB_ID_COPY_DEFAULT | LIB_ID_COPY_ACTIONS));
|
2012-04-28 15:42:27 +00:00
|
|
|
break;
|
2017-11-30 10:57:48 -02:00
|
|
|
case OB_LIGHTPROBE:
|
2021-10-21 17:38:23 +02:00
|
|
|
ob->data = ID_NEW_SET(
|
|
|
|
|
ob->data,
|
|
|
|
|
BKE_id_copy_ex(bmain, ob->data, NULL, LIB_ID_COPY_DEFAULT | LIB_ID_COPY_ACTIONS));
|
2017-11-30 10:57:48 -02:00
|
|
|
break;
|
2018-07-31 10:22:19 +02:00
|
|
|
case OB_GPENCIL:
|
2021-10-21 17:38:23 +02:00
|
|
|
ob->data = ID_NEW_SET(
|
|
|
|
|
ob->data,
|
|
|
|
|
BKE_id_copy_ex(bmain, ob->data, NULL, LIB_ID_COPY_DEFAULT | LIB_ID_COPY_ACTIONS));
|
2018-07-31 10:22:19 +02:00
|
|
|
break;
|
Curves: Rename "Hair" types, variables, and functions to "Curves"
Based on discussions from T95355 and T94193, the plan is to use
the name "Curves" to describe the data-block container for multiple
curves. Eventually this will replace the existing "Curve" data-block.
However, it will be a while before the curve data-block can be replaced
so in order to distinguish the two curve types in the UI, "Hair Curves"
will be used, but eventually changed back to "Curves".
This patch renames "hair-related" files, functions, types, and variable
names to this convention. A deep rename is preferred to keep code
consistent and to avoid any "hair" terminology from leaking, since the
new data-block is meant for all curve types, not just hair use cases.
The downside of this naming is that the difference between "Curve"
and "Curves" has become important. That was considered during
design discussons and deemed acceptable, especially given the
non-permanent nature of the somewhat common conflict.
Some points of interest:
- All DNA compatibility is lost, just like rBf59767ff9729.
- I renamed `ID_HA` to `ID_CV` so there is no complete mismatch.
- `hair_curves` is used where necessary to distinguish from the
existing "curves" plural.
- I didn't rename any of the cycles/rendering code function names,
since that is also used by the old hair particle system.
Differential Revision: https://developer.blender.org/D14007
2022-02-07 11:55:54 -06:00
|
|
|
case OB_CURVES:
|
2021-10-21 17:38:23 +02:00
|
|
|
ob->data = ID_NEW_SET(
|
|
|
|
|
ob->data,
|
|
|
|
|
BKE_id_copy_ex(bmain, ob->data, NULL, LIB_ID_COPY_DEFAULT | LIB_ID_COPY_ACTIONS));
|
2020-03-17 14:41:48 +01:00
|
|
|
break;
|
|
|
|
|
case OB_POINTCLOUD:
|
2021-10-21 17:38:23 +02:00
|
|
|
ob->data = ID_NEW_SET(
|
|
|
|
|
ob->data,
|
|
|
|
|
BKE_id_copy_ex(bmain, ob->data, NULL, LIB_ID_COPY_DEFAULT | LIB_ID_COPY_ACTIONS));
|
2020-03-17 14:41:48 +01:00
|
|
|
break;
|
|
|
|
|
case OB_VOLUME:
|
2021-10-21 17:38:23 +02:00
|
|
|
ob->data = ID_NEW_SET(
|
|
|
|
|
ob->data,
|
|
|
|
|
BKE_id_copy_ex(bmain, ob->data, NULL, LIB_ID_COPY_DEFAULT | LIB_ID_COPY_ACTIONS));
|
2020-03-17 14:41:48 +01:00
|
|
|
break;
|
2012-04-28 15:42:27 +00:00
|
|
|
default:
|
2017-11-30 10:37:54 -02:00
|
|
|
printf("ERROR %s: can't copy %s\n", __func__, id->name);
|
2021-07-15 18:23:28 +10:00
|
|
|
BLI_assert_msg(0, "This should never happen.");
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2018-03-01 19:00:54 +11:00
|
|
|
/* We need to end the FOREACH_OBJECT_FLAG_BEGIN iterator to prevent memory leak. */
|
2017-11-30 10:37:54 -02:00
|
|
|
BKE_scene_objects_iterator_end(&iter_macro);
|
2012-04-28 15:42:27 +00:00
|
|
|
return;
|
2009-09-16 17:43:09 +00:00
|
|
|
}
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2015-11-09 19:47:10 +01:00
|
|
|
id_us_min(id);
|
2009-09-16 17:43:09 +00:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
2018-03-09 11:44:42 +11:00
|
|
|
FOREACH_OBJECT_FLAG_END;
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2019-03-08 09:29:17 +11:00
|
|
|
me = bmain->meshes.first;
|
2012-03-24 06:38:07 +00:00
|
|
|
while (me) {
|
2016-11-30 15:25:54 +01:00
|
|
|
ID_NEW_REMAP(me->texcomesh);
|
2012-04-28 15:42:27 +00:00
|
|
|
me = me->id.next;
|
2009-09-16 17:43:09 +00:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2022-03-30 11:06:10 +02:00
|
|
|
void ED_object_single_obdata_user(Main *bmain, Scene *scene, Object *ob)
|
|
|
|
|
{
|
|
|
|
|
FOREACH_SCENE_OBJECT_BEGIN (scene, ob_iter) {
|
|
|
|
|
ob_iter->flag &= ~OB_DONE;
|
|
|
|
|
}
|
|
|
|
|
FOREACH_SCENE_OBJECT_END;
|
|
|
|
|
|
|
|
|
|
/* Tag only the one object. */
|
|
|
|
|
ob->flag |= OB_DONE;
|
|
|
|
|
|
|
|
|
|
single_obdata_users(bmain, scene, NULL, NULL, OB_DONE);
|
|
|
|
|
}
|
|
|
|
|
|
2018-12-14 09:20:56 -02:00
|
|
|
static void single_object_action_users(
|
|
|
|
|
Main *bmain, Scene *scene, ViewLayer *view_layer, View3D *v3d, const int flag)
|
2009-09-16 17:43:09 +00:00
|
|
|
{
|
2018-12-14 09:20:56 -02:00
|
|
|
FOREACH_OBJECT_FLAG_BEGIN (scene, view_layer, v3d, flag, ob) {
|
2022-03-28 17:34:36 +02:00
|
|
|
if (BKE_id_is_editable(bmain, &ob->id)) {
|
2021-10-21 17:34:05 +02:00
|
|
|
AnimData *adt = BKE_animdata_from_id(&ob->id);
|
|
|
|
|
if (adt == NULL) {
|
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
ID *id_act = (ID *)adt->action;
|
|
|
|
|
if (single_data_needs_duplication(id_act)) {
|
|
|
|
|
DEG_id_tag_update(&ob->id, ID_RECALC_GEOMETRY);
|
|
|
|
|
BKE_animdata_duplicate_id_action(bmain, &ob->id, USER_DUP_ACT | USER_DUP_LINKED_ID);
|
|
|
|
|
}
|
2009-09-16 17:43:09 +00:00
|
|
|
}
|
2018-03-09 11:44:42 +11:00
|
|
|
}
|
|
|
|
|
FOREACH_OBJECT_FLAG_END;
|
2009-09-16 17:43:09 +00:00
|
|
|
}
|
|
|
|
|
|
2021-06-23 13:25:40 +02:00
|
|
|
static void single_objectdata_action_users(
|
|
|
|
|
Main *bmain, Scene *scene, ViewLayer *view_layer, View3D *v3d, const int flag)
|
|
|
|
|
{
|
|
|
|
|
FOREACH_OBJECT_FLAG_BEGIN (scene, view_layer, v3d, flag, ob) {
|
2022-03-28 17:34:36 +02:00
|
|
|
if (BKE_id_is_editable(bmain, &ob->id) && ob->data != NULL) {
|
2021-06-23 13:25:40 +02:00
|
|
|
ID *id_obdata = (ID *)ob->data;
|
|
|
|
|
AnimData *adt = BKE_animdata_from_id(id_obdata);
|
2021-10-21 17:34:05 +02:00
|
|
|
if (adt == NULL) {
|
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
|
2021-06-23 13:25:40 +02:00
|
|
|
ID *id_act = (ID *)adt->action;
|
2021-10-21 17:34:05 +02:00
|
|
|
if (single_data_needs_duplication(id_act)) {
|
2021-06-23 13:25:40 +02:00
|
|
|
DEG_id_tag_update(&ob->id, ID_RECALC_GEOMETRY);
|
2022-05-11 16:52:37 +02:00
|
|
|
BKE_animdata_duplicate_id_action(bmain, id_obdata, USER_DUP_ACT | USER_DUP_LINKED_ID);
|
2021-06-23 13:25:40 +02:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
FOREACH_OBJECT_FLAG_END;
|
|
|
|
|
}
|
|
|
|
|
|
2018-12-14 09:20:56 -02:00
|
|
|
static void single_mat_users(
|
|
|
|
|
Main *bmain, Scene *scene, ViewLayer *view_layer, View3D *v3d, const int flag)
|
2009-09-16 17:43:09 +00:00
|
|
|
{
|
|
|
|
|
Material *ma, *man;
|
Remove Blender Internal and legacy viewport from Blender 2.8.
Brecht authored this commit, but he gave me the honours to actually
do it. Here it goes; Blender Internal. Bye bye, you did great!
* Point density, voxel data, ocean, environment map textures were removed,
as these only worked within BI rendering. Note that the ocean modifier
and the Cycles point density shader node continue to work.
* Dynamic paint using material shading was removed, as this only worked
with BI. If we ever wanted to support this again probably it should go
through the baking API.
* GPU shader export through the Python API was removed. This only worked
for the old BI GLSL shaders, which no longer exists. Doing something
similar for Eevee would be significantly more complicated because it
uses a lot of multiplass rendering and logic outside the shader, it's
probably impractical.
* Collada material import / export code is mostly gone, as it only worked
for BI materials. We need to add Cycles / Eevee material support at some
point.
* The mesh noise operator was removed since it only worked with BI
material texture slots. A displacement modifier can be used instead.
* The delete texture paint slot operator was removed since it only worked
for BI material texture slots. Could be added back with node support.
* Not all legacy viewport features are supported in the new viewport, but
their code was removed. If we need to bring anything back we can look at
older git revisions.
* There is some legacy viewport code that I could not remove yet, and some
that I probably missed.
* Shader node execution code was left mostly intact, even though it is not
used anywhere now. We may eventually use this to replace the texture
nodes with Cycles / Eevee shader nodes.
* The Cycles Bake panel now includes settings for baking multires normal
and displacement maps. The underlying code needs to be merged properly,
and we plan to add back support for multires AO baking and add support
to Cycles baking for features like vertex color, displacement, and other
missing baking features.
* This commit removes DNA and the Python API for BI material, lamp, world
and scene settings. This breaks a lot of addons.
* There is more DNA that can be removed or renamed, where Cycles or Eevee
are reusing some old BI properties but the names are not really correct
anymore.
* Texture slots for materials, lamps and world were removed. They remain
for brushes, particles and freestyle linestyles.
* 'BLENDER_RENDER' remains in the COMPAT_ENGINES of UI panels. Cycles and
other renderers use this to find all panels to show, minus a few panels
that they have their own replacement for.
2018-04-19 17:34:44 +02:00
|
|
|
int a;
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2018-12-14 09:20:56 -02:00
|
|
|
FOREACH_OBJECT_FLAG_BEGIN (scene, view_layer, v3d, flag, ob) {
|
2022-03-28 17:34:36 +02:00
|
|
|
if (BKE_id_is_editable(bmain, &ob->id)) {
|
2012-04-28 15:42:27 +00:00
|
|
|
for (a = 1; a <= ob->totcol; a++) {
|
2021-10-21 17:34:05 +02:00
|
|
|
ma = BKE_object_material_get(ob, (short)a);
|
|
|
|
|
if (single_data_needs_duplication(&ma->id)) {
|
2021-10-21 17:38:23 +02:00
|
|
|
man = (Material *)BKE_id_copy_ex(
|
|
|
|
|
bmain, &ma->id, NULL, LIB_ID_COPY_DEFAULT | LIB_ID_COPY_ACTIONS);
|
2021-10-21 17:34:05 +02:00
|
|
|
man->id.us = 0;
|
|
|
|
|
BKE_object_material_assign(bmain, ob, man, (short)a, BKE_MAT_ASSIGN_USERPREF);
|
2009-09-16 17:43:09 +00:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
2018-03-09 11:44:42 +11:00
|
|
|
}
|
|
|
|
|
FOREACH_OBJECT_FLAG_END;
|
2009-09-16 17:43:09 +00:00
|
|
|
}
|
|
|
|
|
|
2020-03-26 10:24:44 +11:00
|
|
|
/** \} */
|
|
|
|
|
|
|
|
|
|
/* ------------------------------------------------------------------- */
|
|
|
|
|
/** \name Make Local Operator
|
|
|
|
|
* \{ */
|
2009-09-16 17:43:09 +00:00
|
|
|
|
2012-07-05 12:09:43 +00:00
|
|
|
enum {
|
2014-10-10 18:26:46 +02:00
|
|
|
MAKE_LOCAL_SELECT_OB = 1,
|
|
|
|
|
MAKE_LOCAL_SELECT_OBDATA = 2,
|
|
|
|
|
MAKE_LOCAL_SELECT_OBDATA_MATERIAL = 3,
|
|
|
|
|
MAKE_LOCAL_ALL = 4,
|
2012-07-05 12:09:43 +00:00
|
|
|
};
|
|
|
|
|
|
2020-02-13 12:56:10 +01:00
|
|
|
static int tag_localizable_looper(LibraryIDLinkCallbackData *cb_data)
|
2014-03-26 16:55:20 +06:00
|
|
|
{
|
2020-02-13 12:56:10 +01:00
|
|
|
ID **id_pointer = cb_data->id_pointer;
|
2014-03-26 16:55:20 +06:00
|
|
|
if (*id_pointer) {
|
Split id->flag in two, persistent flags and runtime tags.
This is purely internal sanitizing/cleanup, no change in behavior is expected at all.
This change was also needed because we were getting short on ID flags, and
future enhancement of 'user_one' ID behavior requires two new ones.
id->flag remains for persistent data (fakeuser only, so far!), this also allows us
100% backward & forward compatibility.
New id->tag is used for most flags. Though written in .blend files, its content
is cleared at read time.
Note that .blend file version was bumped, so that we can clear runtimeflags from
old .blends, important in case we add new persistent flags in future.
Also, behavior of tags (either status ones, or whether they need to be cleared before/after use)
has been added as comments to their declaration.
Reviewers: sergey, campbellbarton
Differential Revision: https://developer.blender.org/D1683
2015-12-27 11:53:50 +01:00
|
|
|
(*id_pointer)->tag &= ~LIB_TAG_DOIT;
|
2014-03-26 16:55:20 +06:00
|
|
|
}
|
2016-03-24 12:28:41 +01:00
|
|
|
|
|
|
|
|
return IDWALK_RET_NOP;
|
2014-03-26 16:55:20 +06:00
|
|
|
}
|
|
|
|
|
|
2014-10-10 18:26:46 +02:00
|
|
|
static void tag_localizable_objects(bContext *C, const int mode)
|
2014-03-26 16:55:20 +06:00
|
|
|
{
|
|
|
|
|
Main *bmain = CTX_data_main(C);
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2016-02-15 19:35:35 +01:00
|
|
|
BKE_main_id_tag_all(bmain, LIB_TAG_DOIT, false);
|
2019-04-17 06:17:24 +02:00
|
|
|
|
Split id->flag in two, persistent flags and runtime tags.
This is purely internal sanitizing/cleanup, no change in behavior is expected at all.
This change was also needed because we were getting short on ID flags, and
future enhancement of 'user_one' ID behavior requires two new ones.
id->flag remains for persistent data (fakeuser only, so far!), this also allows us
100% backward & forward compatibility.
New id->tag is used for most flags. Though written in .blend files, its content
is cleared at read time.
Note that .blend file version was bumped, so that we can clear runtimeflags from
old .blends, important in case we add new persistent flags in future.
Also, behavior of tags (either status ones, or whether they need to be cleared before/after use)
has been added as comments to their declaration.
Reviewers: sergey, campbellbarton
Differential Revision: https://developer.blender.org/D1683
2015-12-27 11:53:50 +01:00
|
|
|
/* Set LIB_TAG_DOIT flag for all selected objects, so next we can check whether
|
2014-03-26 16:55:20 +06:00
|
|
|
* object is gonna to become local or not.
|
|
|
|
|
*/
|
|
|
|
|
CTX_DATA_BEGIN (C, Object *, object, selected_objects) {
|
Split id->flag in two, persistent flags and runtime tags.
This is purely internal sanitizing/cleanup, no change in behavior is expected at all.
This change was also needed because we were getting short on ID flags, and
future enhancement of 'user_one' ID behavior requires two new ones.
id->flag remains for persistent data (fakeuser only, so far!), this also allows us
100% backward & forward compatibility.
New id->tag is used for most flags. Though written in .blend files, its content
is cleared at read time.
Note that .blend file version was bumped, so that we can clear runtimeflags from
old .blends, important in case we add new persistent flags in future.
Also, behavior of tags (either status ones, or whether they need to be cleared before/after use)
has been added as comments to their declaration.
Reviewers: sergey, campbellbarton
Differential Revision: https://developer.blender.org/D1683
2015-12-27 11:53:50 +01:00
|
|
|
object->id.tag |= LIB_TAG_DOIT;
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2021-10-21 17:34:05 +02:00
|
|
|
/* If obdata is also going to become local, mark it as such too. */
|
2014-05-12 07:49:31 +02:00
|
|
|
if (mode == MAKE_LOCAL_SELECT_OBDATA && object->data) {
|
2014-03-26 16:55:20 +06:00
|
|
|
ID *data_id = (ID *)object->data;
|
Split id->flag in two, persistent flags and runtime tags.
This is purely internal sanitizing/cleanup, no change in behavior is expected at all.
This change was also needed because we were getting short on ID flags, and
future enhancement of 'user_one' ID behavior requires two new ones.
id->flag remains for persistent data (fakeuser only, so far!), this also allows us
100% backward & forward compatibility.
New id->tag is used for most flags. Though written in .blend files, its content
is cleared at read time.
Note that .blend file version was bumped, so that we can clear runtimeflags from
old .blends, important in case we add new persistent flags in future.
Also, behavior of tags (either status ones, or whether they need to be cleared before/after use)
has been added as comments to their declaration.
Reviewers: sergey, campbellbarton
Differential Revision: https://developer.blender.org/D1683
2015-12-27 11:53:50 +01:00
|
|
|
data_id->tag |= LIB_TAG_DOIT;
|
2019-04-17 06:17:24 +02:00
|
|
|
}
|
2014-03-26 16:55:20 +06:00
|
|
|
}
|
|
|
|
|
CTX_DATA_END;
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2014-03-26 16:55:20 +06:00
|
|
|
/* Also forbid making objects local if other library objects are using
|
|
|
|
|
* them for modifiers or constraints.
|
|
|
|
|
*/
|
2019-03-08 09:29:17 +11:00
|
|
|
for (Object *object = bmain->objects.first; object; object = object->id.next) {
|
Split id->flag in two, persistent flags and runtime tags.
This is purely internal sanitizing/cleanup, no change in behavior is expected at all.
This change was also needed because we were getting short on ID flags, and
future enhancement of 'user_one' ID behavior requires two new ones.
id->flag remains for persistent data (fakeuser only, so far!), this also allows us
100% backward & forward compatibility.
New id->tag is used for most flags. Though written in .blend files, its content
is cleared at read time.
Note that .blend file version was bumped, so that we can clear runtimeflags from
old .blends, important in case we add new persistent flags in future.
Also, behavior of tags (either status ones, or whether they need to be cleared before/after use)
has been added as comments to their declaration.
Reviewers: sergey, campbellbarton
Differential Revision: https://developer.blender.org/D1683
2015-12-27 11:53:50 +01:00
|
|
|
if ((object->id.tag & LIB_TAG_DOIT) == 0) {
|
2017-01-30 21:41:44 +01:00
|
|
|
BKE_library_foreach_ID_link(
|
|
|
|
|
NULL, &object->id, tag_localizable_looper, NULL, IDWALK_READONLY);
|
2014-03-26 16:55:20 +06:00
|
|
|
}
|
|
|
|
|
if (object->data) {
|
|
|
|
|
ID *data_id = (ID *)object->data;
|
Split id->flag in two, persistent flags and runtime tags.
This is purely internal sanitizing/cleanup, no change in behavior is expected at all.
This change was also needed because we were getting short on ID flags, and
future enhancement of 'user_one' ID behavior requires two new ones.
id->flag remains for persistent data (fakeuser only, so far!), this also allows us
100% backward & forward compatibility.
New id->tag is used for most flags. Though written in .blend files, its content
is cleared at read time.
Note that .blend file version was bumped, so that we can clear runtimeflags from
old .blends, important in case we add new persistent flags in future.
Also, behavior of tags (either status ones, or whether they need to be cleared before/after use)
has been added as comments to their declaration.
Reviewers: sergey, campbellbarton
Differential Revision: https://developer.blender.org/D1683
2015-12-27 11:53:50 +01:00
|
|
|
if ((data_id->tag & LIB_TAG_DOIT) == 0) {
|
2017-01-30 21:41:44 +01:00
|
|
|
BKE_library_foreach_ID_link(NULL, data_id, tag_localizable_looper, NULL, IDWALK_READONLY);
|
2014-03-26 16:55:20 +06:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2014-03-26 16:55:20 +06:00
|
|
|
/* TODO(sergey): Drivers targets? */
|
|
|
|
|
}
|
|
|
|
|
|
2014-09-04 14:14:42 +10:00
|
|
|
/**
|
|
|
|
|
* Instance indirectly referenced zero user objects,
|
|
|
|
|
* otherwise they're lost on reload, see T40595.
|
|
|
|
|
*/
|
Collections and groups unification
OVERVIEW
* In 2.7 terminology, all layers and groups are now collection datablocks.
* These collections are nestable, linkable, instanceable, overrideable, ..
which opens up new ways to set up scenes and link + override data.
* Viewport/render visibility and selectability are now a part of the collection
and shared across all view layers and linkable.
* View layers define which subset of the scene collection hierarchy is excluded
for each. For many workflows one view layer can be used, these are more of an
advanced feature now.
OUTLINER
* The outliner now has a "View Layer" display mode instead of "Collections",
which can display the collections and/or objects in the view layer.
* In this display mode, collections can be excluded with the right click menu.
These will then be greyed out and their objects will be excluded.
* To view collections not linked to any scene, the "Blender File" display mode
can be used, with the new filtering option to just see Colleciton datablocks.
* The outliner right click menus for collections and objects were reorganized.
* Drag and drop still needs to be improved. Like before, dragging the icon or
text gives different results, we'll unify this later.
LINKING AND OVERRIDES
* Collections can now be linked into the scene without creating an instance,
with the link/append operator or from the collections view in the outliner.
* Collections can get static overrides with the right click menu in the outliner,
but this is rather unreliable and not clearly communicated at the moment.
* We still need to improve the make override operator to turn collection instances
into collections with overrides directly in the scene.
PERFORMANCE
* We tried to make performance not worse than before and improve it in some
cases. The main thing that's still a bit slower is multiple scenes, we have to
change the layer syncing to only updated affected scenes.
* Collections keep a list of their parent collections for faster incremental
updates in syncing and caching.
* View layer bases are now in a object -> base hash to avoid quadratic time
lookups internally and in API functions like visible_get().
VERSIONING
* Compatibility with 2.7 files should be improved due to the new visibility
controls. Of course users may not want to set up their scenes differently
now to avoid having separate layers and groups.
* Compatibility with 2.8 is mostly there, and was tested on Eevee demo and Hero
files. There's a few things which are know to be not quite compatible, like
nested layer collections inside groups.
* The versioning code for 2.8 files is quite complicated, and isolated behind
#ifdef so it can be removed at the end of the release cycle.
KNOWN ISSUES
* The G-key group operators in the 3D viewport were left mostly as is, they
need to be modified still to fit better.
* Same for the groups panel in the object properties. This needs to be updated
still, or perhaps replaced by something better.
* Collections must all have a unique name. Less restrictive namespacing is to
be done later, we'll have to see how important this is as all objects within
the collections must also have a unique name anyway.
* Full scene copy and delete scene are exactly doing the right thing yet.
Differential Revision: https://developer.blender.org/D3383
https://code.blender.org/2018/05/collections-and-groups/
2018-04-30 15:57:22 +02:00
|
|
|
static bool make_local_all__instance_indirect_unused(Main *bmain,
|
|
|
|
|
ViewLayer *view_layer,
|
|
|
|
|
Collection *collection)
|
2014-09-04 14:14:42 +10:00
|
|
|
{
|
|
|
|
|
Object *ob;
|
|
|
|
|
bool changed = false;
|
|
|
|
|
|
2019-03-08 09:29:17 +11:00
|
|
|
for (ob = bmain->objects.first; ob; ob = ob->id.next) {
|
2017-11-06 17:17:10 +01:00
|
|
|
if (ID_IS_LINKED(ob) && (ob->id.us == 0)) {
|
2017-04-21 14:28:23 +02:00
|
|
|
Base *base;
|
2014-09-04 14:14:42 +10:00
|
|
|
|
2015-11-11 20:18:50 +01:00
|
|
|
id_us_plus(&ob->id);
|
2014-09-04 14:14:42 +10:00
|
|
|
|
Collections and groups unification
OVERVIEW
* In 2.7 terminology, all layers and groups are now collection datablocks.
* These collections are nestable, linkable, instanceable, overrideable, ..
which opens up new ways to set up scenes and link + override data.
* Viewport/render visibility and selectability are now a part of the collection
and shared across all view layers and linkable.
* View layers define which subset of the scene collection hierarchy is excluded
for each. For many workflows one view layer can be used, these are more of an
advanced feature now.
OUTLINER
* The outliner now has a "View Layer" display mode instead of "Collections",
which can display the collections and/or objects in the view layer.
* In this display mode, collections can be excluded with the right click menu.
These will then be greyed out and their objects will be excluded.
* To view collections not linked to any scene, the "Blender File" display mode
can be used, with the new filtering option to just see Colleciton datablocks.
* The outliner right click menus for collections and objects were reorganized.
* Drag and drop still needs to be improved. Like before, dragging the icon or
text gives different results, we'll unify this later.
LINKING AND OVERRIDES
* Collections can now be linked into the scene without creating an instance,
with the link/append operator or from the collections view in the outliner.
* Collections can get static overrides with the right click menu in the outliner,
but this is rather unreliable and not clearly communicated at the moment.
* We still need to improve the make override operator to turn collection instances
into collections with overrides directly in the scene.
PERFORMANCE
* We tried to make performance not worse than before and improve it in some
cases. The main thing that's still a bit slower is multiple scenes, we have to
change the layer syncing to only updated affected scenes.
* Collections keep a list of their parent collections for faster incremental
updates in syncing and caching.
* View layer bases are now in a object -> base hash to avoid quadratic time
lookups internally and in API functions like visible_get().
VERSIONING
* Compatibility with 2.7 files should be improved due to the new visibility
controls. Of course users may not want to set up their scenes differently
now to avoid having separate layers and groups.
* Compatibility with 2.8 is mostly there, and was tested on Eevee demo and Hero
files. There's a few things which are know to be not quite compatible, like
nested layer collections inside groups.
* The versioning code for 2.8 files is quite complicated, and isolated behind
#ifdef so it can be removed at the end of the release cycle.
KNOWN ISSUES
* The G-key group operators in the 3D viewport were left mostly as is, they
need to be modified still to fit better.
* Same for the groups panel in the object properties. This needs to be updated
still, or perhaps replaced by something better.
* Collections must all have a unique name. Less restrictive namespacing is to
be done later, we'll have to see how important this is as all objects within
the collections must also have a unique name anyway.
* Full scene copy and delete scene are exactly doing the right thing yet.
Differential Revision: https://developer.blender.org/D3383
https://code.blender.org/2018/05/collections-and-groups/
2018-04-30 15:57:22 +02:00
|
|
|
BKE_collection_object_add(bmain, collection, ob);
|
2017-11-23 13:51:49 -02:00
|
|
|
base = BKE_view_layer_base_find(view_layer, ob);
|
2019-04-23 17:22:27 -03:00
|
|
|
ED_object_base_select(base, BA_SELECT);
|
2018-12-06 17:52:37 +01:00
|
|
|
DEG_id_tag_update(&ob->id, ID_RECALC_TRANSFORM | ID_RECALC_GEOMETRY | ID_RECALC_ANIMATION);
|
2014-09-04 14:14:42 +10:00
|
|
|
|
|
|
|
|
changed = true;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return changed;
|
|
|
|
|
}
|
|
|
|
|
|
2017-06-09 15:58:32 +02:00
|
|
|
static void make_local_animdata_tag_strips(ListBase *strips)
|
2009-09-16 17:43:09 +00:00
|
|
|
{
|
2017-06-09 15:58:32 +02:00
|
|
|
NlaStrip *strip;
|
2014-09-04 14:14:42 +10:00
|
|
|
|
2017-06-09 15:58:32 +02:00
|
|
|
for (strip = strips->first; strip; strip = strip->next) {
|
|
|
|
|
if (strip->act) {
|
|
|
|
|
strip->act->id.tag &= ~LIB_TAG_PRE_EXISTING;
|
|
|
|
|
}
|
2014-09-04 14:14:42 +10:00
|
|
|
|
2017-06-09 15:58:32 +02:00
|
|
|
make_local_animdata_tag_strips(&strip->strips);
|
2009-09-16 17:43:09 +00:00
|
|
|
}
|
2017-06-09 15:58:32 +02:00
|
|
|
}
|
2009-09-16 17:43:09 +00:00
|
|
|
|
2017-06-09 15:58:32 +02:00
|
|
|
/* Tag all actions used by given animdata to be made local. */
|
|
|
|
|
static void make_local_animdata_tag(AnimData *adt)
|
|
|
|
|
{
|
|
|
|
|
if (adt) {
|
|
|
|
|
/* Actions - Active and Temp */
|
|
|
|
|
if (adt->action) {
|
|
|
|
|
adt->action->id.tag &= ~LIB_TAG_PRE_EXISTING;
|
|
|
|
|
}
|
|
|
|
|
if (adt->tmpact) {
|
|
|
|
|
adt->tmpact->id.tag &= ~LIB_TAG_PRE_EXISTING;
|
|
|
|
|
}
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2017-06-09 15:58:32 +02:00
|
|
|
/* Drivers */
|
|
|
|
|
/* TODO: need to handle the ID-targets too? */
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2017-06-09 15:58:32 +02:00
|
|
|
/* NLA Data */
|
2020-04-03 19:15:01 +02:00
|
|
|
LISTBASE_FOREACH (NlaTrack *, nlt, &adt->nla_tracks) {
|
2017-06-09 15:58:32 +02:00
|
|
|
make_local_animdata_tag_strips(&nlt->strips);
|
2009-09-16 17:43:09 +00:00
|
|
|
}
|
|
|
|
|
}
|
2017-06-09 15:58:32 +02:00
|
|
|
}
|
2014-03-26 16:55:20 +06:00
|
|
|
|
2017-06-09 15:58:32 +02:00
|
|
|
static void make_local_material_tag(Material *ma)
|
|
|
|
|
{
|
|
|
|
|
if (ma) {
|
|
|
|
|
ma->id.tag &= ~LIB_TAG_PRE_EXISTING;
|
|
|
|
|
make_local_animdata_tag(BKE_animdata_from_id(&ma->id));
|
2014-10-10 18:44:37 +02:00
|
|
|
|
2019-04-22 00:18:34 +10:00
|
|
|
/* About nodetrees: root one is made local together with material,
|
|
|
|
|
* others we keep linked for now... */
|
2017-06-09 15:58:32 +02:00
|
|
|
}
|
|
|
|
|
}
|
2009-09-16 17:43:09 +00:00
|
|
|
|
2017-06-09 15:58:32 +02:00
|
|
|
static int make_local_exec(bContext *C, wmOperator *op)
|
|
|
|
|
{
|
|
|
|
|
Main *bmain = CTX_data_main(C);
|
|
|
|
|
ParticleSystem *psys;
|
|
|
|
|
Material *ma, ***matarar;
|
|
|
|
|
const int mode = RNA_enum_get(op->ptr, "type");
|
|
|
|
|
int a;
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2021-07-03 23:08:40 +10:00
|
|
|
/* NOTE: we (ab)use LIB_TAG_PRE_EXISTING to cherry pick which ID to make local... */
|
2017-06-09 15:58:32 +02:00
|
|
|
if (mode == MAKE_LOCAL_ALL) {
|
2017-11-22 10:52:39 -02:00
|
|
|
ViewLayer *view_layer = CTX_data_view_layer(C);
|
Collections and groups unification
OVERVIEW
* In 2.7 terminology, all layers and groups are now collection datablocks.
* These collections are nestable, linkable, instanceable, overrideable, ..
which opens up new ways to set up scenes and link + override data.
* Viewport/render visibility and selectability are now a part of the collection
and shared across all view layers and linkable.
* View layers define which subset of the scene collection hierarchy is excluded
for each. For many workflows one view layer can be used, these are more of an
advanced feature now.
OUTLINER
* The outliner now has a "View Layer" display mode instead of "Collections",
which can display the collections and/or objects in the view layer.
* In this display mode, collections can be excluded with the right click menu.
These will then be greyed out and their objects will be excluded.
* To view collections not linked to any scene, the "Blender File" display mode
can be used, with the new filtering option to just see Colleciton datablocks.
* The outliner right click menus for collections and objects were reorganized.
* Drag and drop still needs to be improved. Like before, dragging the icon or
text gives different results, we'll unify this later.
LINKING AND OVERRIDES
* Collections can now be linked into the scene without creating an instance,
with the link/append operator or from the collections view in the outliner.
* Collections can get static overrides with the right click menu in the outliner,
but this is rather unreliable and not clearly communicated at the moment.
* We still need to improve the make override operator to turn collection instances
into collections with overrides directly in the scene.
PERFORMANCE
* We tried to make performance not worse than before and improve it in some
cases. The main thing that's still a bit slower is multiple scenes, we have to
change the layer syncing to only updated affected scenes.
* Collections keep a list of their parent collections for faster incremental
updates in syncing and caching.
* View layer bases are now in a object -> base hash to avoid quadratic time
lookups internally and in API functions like visible_get().
VERSIONING
* Compatibility with 2.7 files should be improved due to the new visibility
controls. Of course users may not want to set up their scenes differently
now to avoid having separate layers and groups.
* Compatibility with 2.8 is mostly there, and was tested on Eevee demo and Hero
files. There's a few things which are know to be not quite compatible, like
nested layer collections inside groups.
* The versioning code for 2.8 files is quite complicated, and isolated behind
#ifdef so it can be removed at the end of the release cycle.
KNOWN ISSUES
* The G-key group operators in the 3D viewport were left mostly as is, they
need to be modified still to fit better.
* Same for the groups panel in the object properties. This needs to be updated
still, or perhaps replaced by something better.
* Collections must all have a unique name. Less restrictive namespacing is to
be done later, we'll have to see how important this is as all objects within
the collections must also have a unique name anyway.
* Full scene copy and delete scene are exactly doing the right thing yet.
Differential Revision: https://developer.blender.org/D3383
https://code.blender.org/2018/05/collections-and-groups/
2018-04-30 15:57:22 +02:00
|
|
|
Collection *collection = CTX_data_collection(C);
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2017-06-09 15:58:32 +02:00
|
|
|
BKE_main_id_tag_all(bmain, LIB_TAG_PRE_EXISTING, false);
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2017-11-08 12:16:49 -02:00
|
|
|
/* De-select so the user can differentiate newly instanced from existing objects. */
|
2017-11-22 10:52:39 -02:00
|
|
|
BKE_view_layer_base_deselect_all(view_layer);
|
2019-04-17 06:17:24 +02:00
|
|
|
|
Collections and groups unification
OVERVIEW
* In 2.7 terminology, all layers and groups are now collection datablocks.
* These collections are nestable, linkable, instanceable, overrideable, ..
which opens up new ways to set up scenes and link + override data.
* Viewport/render visibility and selectability are now a part of the collection
and shared across all view layers and linkable.
* View layers define which subset of the scene collection hierarchy is excluded
for each. For many workflows one view layer can be used, these are more of an
advanced feature now.
OUTLINER
* The outliner now has a "View Layer" display mode instead of "Collections",
which can display the collections and/or objects in the view layer.
* In this display mode, collections can be excluded with the right click menu.
These will then be greyed out and their objects will be excluded.
* To view collections not linked to any scene, the "Blender File" display mode
can be used, with the new filtering option to just see Colleciton datablocks.
* The outliner right click menus for collections and objects were reorganized.
* Drag and drop still needs to be improved. Like before, dragging the icon or
text gives different results, we'll unify this later.
LINKING AND OVERRIDES
* Collections can now be linked into the scene without creating an instance,
with the link/append operator or from the collections view in the outliner.
* Collections can get static overrides with the right click menu in the outliner,
but this is rather unreliable and not clearly communicated at the moment.
* We still need to improve the make override operator to turn collection instances
into collections with overrides directly in the scene.
PERFORMANCE
* We tried to make performance not worse than before and improve it in some
cases. The main thing that's still a bit slower is multiple scenes, we have to
change the layer syncing to only updated affected scenes.
* Collections keep a list of their parent collections for faster incremental
updates in syncing and caching.
* View layer bases are now in a object -> base hash to avoid quadratic time
lookups internally and in API functions like visible_get().
VERSIONING
* Compatibility with 2.7 files should be improved due to the new visibility
controls. Of course users may not want to set up their scenes differently
now to avoid having separate layers and groups.
* Compatibility with 2.8 is mostly there, and was tested on Eevee demo and Hero
files. There's a few things which are know to be not quite compatible, like
nested layer collections inside groups.
* The versioning code for 2.8 files is quite complicated, and isolated behind
#ifdef so it can be removed at the end of the release cycle.
KNOWN ISSUES
* The G-key group operators in the 3D viewport were left mostly as is, they
need to be modified still to fit better.
* Same for the groups panel in the object properties. This needs to be updated
still, or perhaps replaced by something better.
* Collections must all have a unique name. Less restrictive namespacing is to
be done later, we'll have to see how important this is as all objects within
the collections must also have a unique name anyway.
* Full scene copy and delete scene are exactly doing the right thing yet.
Differential Revision: https://developer.blender.org/D3383
https://code.blender.org/2018/05/collections-and-groups/
2018-04-30 15:57:22 +02:00
|
|
|
if (make_local_all__instance_indirect_unused(bmain, view_layer, collection)) {
|
2017-06-09 15:58:32 +02:00
|
|
|
BKE_report(op->reports,
|
|
|
|
|
RPT_INFO,
|
|
|
|
|
"Orphan library objects added to the current scene to avoid loss");
|
2009-09-16 17:43:09 +00:00
|
|
|
}
|
2019-04-17 06:17:24 +02:00
|
|
|
}
|
2017-06-09 15:58:32 +02:00
|
|
|
else {
|
|
|
|
|
BKE_main_id_tag_all(bmain, LIB_TAG_PRE_EXISTING, true);
|
|
|
|
|
tag_localizable_objects(C, mode);
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2012-04-30 16:22:40 +00:00
|
|
|
CTX_DATA_BEGIN (C, Object *, ob, selected_objects) {
|
Split id->flag in two, persistent flags and runtime tags.
This is purely internal sanitizing/cleanup, no change in behavior is expected at all.
This change was also needed because we were getting short on ID flags, and
future enhancement of 'user_one' ID behavior requires two new ones.
id->flag remains for persistent data (fakeuser only, so far!), this also allows us
100% backward & forward compatibility.
New id->tag is used for most flags. Though written in .blend files, its content
is cleared at read time.
Note that .blend file version was bumped, so that we can clear runtimeflags from
old .blends, important in case we add new persistent flags in future.
Also, behavior of tags (either status ones, or whether they need to be cleared before/after use)
has been added as comments to their declaration.
Reviewers: sergey, campbellbarton
Differential Revision: https://developer.blender.org/D1683
2015-12-27 11:53:50 +01:00
|
|
|
if ((ob->id.tag & LIB_TAG_DOIT) == 0) {
|
2014-03-26 16:55:20 +06:00
|
|
|
continue;
|
|
|
|
|
}
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2017-06-09 15:58:32 +02:00
|
|
|
ob->id.tag &= ~LIB_TAG_PRE_EXISTING;
|
|
|
|
|
make_local_animdata_tag(BKE_animdata_from_id(&ob->id));
|
|
|
|
|
for (psys = ob->particlesystem.first; psys; psys = psys->next) {
|
|
|
|
|
psys->part->id.tag &= ~LIB_TAG_PRE_EXISTING;
|
2009-09-16 17:43:09 +00:00
|
|
|
}
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2017-06-09 15:58:32 +02:00
|
|
|
if (mode == MAKE_LOCAL_SELECT_OBDATA_MATERIAL) {
|
2012-04-28 15:42:27 +00:00
|
|
|
for (a = 0; a < ob->totcol; a++) {
|
|
|
|
|
ma = ob->mat[a];
|
2017-06-09 15:58:32 +02:00
|
|
|
if (ma) {
|
|
|
|
|
make_local_material_tag(ma);
|
|
|
|
|
}
|
2009-09-16 17:43:09 +00:00
|
|
|
}
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2020-03-05 08:33:26 +11:00
|
|
|
matarar = BKE_object_material_array_p(ob);
|
2012-03-24 06:38:07 +00:00
|
|
|
if (matarar) {
|
2012-04-28 15:42:27 +00:00
|
|
|
for (a = 0; a < ob->totcol; a++) {
|
|
|
|
|
ma = (*matarar)[a];
|
2017-06-09 15:58:32 +02:00
|
|
|
if (ma) {
|
|
|
|
|
make_local_material_tag(ma);
|
|
|
|
|
}
|
|
|
|
|
}
|
2019-04-17 06:17:24 +02:00
|
|
|
}
|
2017-06-09 15:58:32 +02:00
|
|
|
}
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2017-06-09 15:58:32 +02:00
|
|
|
if (ELEM(mode, MAKE_LOCAL_SELECT_OBDATA, MAKE_LOCAL_SELECT_OBDATA_MATERIAL) &&
|
|
|
|
|
ob->data != NULL) {
|
|
|
|
|
ID *ob_data = ob->data;
|
|
|
|
|
ob_data->tag &= ~LIB_TAG_PRE_EXISTING;
|
|
|
|
|
make_local_animdata_tag(BKE_animdata_from_id(ob_data));
|
|
|
|
|
}
|
2009-09-16 17:43:09 +00:00
|
|
|
}
|
|
|
|
|
CTX_DATA_END;
|
|
|
|
|
}
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2017-06-09 15:58:32 +02:00
|
|
|
BKE_library_make_local(bmain, NULL, NULL, true, false); /* NULL is all libs */
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2017-06-09 15:58:32 +02:00
|
|
|
WM_event_add_notifier(C, NC_WINDOW, NULL);
|
2009-09-16 17:43:09 +00:00
|
|
|
return OPERATOR_FINISHED;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void OBJECT_OT_make_local(wmOperatorType *ot)
|
|
|
|
|
{
|
2017-10-18 15:07:26 +11:00
|
|
|
static const EnumPropertyItem type_items[] = {
|
2012-07-05 12:09:43 +00:00
|
|
|
{MAKE_LOCAL_SELECT_OB, "SELECT_OBJECT", 0, "Selected Objects", ""},
|
|
|
|
|
{MAKE_LOCAL_SELECT_OBDATA, "SELECT_OBDATA", 0, "Selected Objects and Data", ""},
|
|
|
|
|
{MAKE_LOCAL_SELECT_OBDATA_MATERIAL,
|
|
|
|
|
"SELECT_OBDATA_MATERIAL",
|
|
|
|
|
0,
|
|
|
|
|
"Selected Objects, Data and Materials",
|
|
|
|
|
""},
|
|
|
|
|
{MAKE_LOCAL_ALL, "ALL", 0, "All", ""},
|
2019-02-03 14:01:45 +11:00
|
|
|
{0, NULL, 0, NULL, NULL},
|
2012-07-05 12:09:43 +00:00
|
|
|
};
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2009-09-16 17:43:09 +00:00
|
|
|
/* identifiers */
|
2012-03-22 07:26:09 +00:00
|
|
|
ot->name = "Make Local";
|
2016-09-19 16:46:20 +02:00
|
|
|
ot->description = "Make library linked data-blocks local to this file";
|
2012-03-22 07:26:09 +00:00
|
|
|
ot->idname = "OBJECT_OT_make_local";
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2009-09-16 17:43:09 +00:00
|
|
|
/* api callbacks */
|
2012-03-22 07:26:09 +00:00
|
|
|
ot->invoke = WM_menu_invoke;
|
|
|
|
|
ot->exec = make_local_exec;
|
|
|
|
|
ot->poll = ED_operator_objectmode;
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2009-09-16 17:43:09 +00:00
|
|
|
/* flags */
|
2012-04-28 15:42:27 +00:00
|
|
|
ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2009-09-16 17:43:09 +00:00
|
|
|
/* properties */
|
2012-03-22 07:26:09 +00:00
|
|
|
ot->prop = RNA_def_enum(ot->srna, "type", type_items, 0, "Type", "");
|
2009-09-16 17:43:09 +00:00
|
|
|
}
|
|
|
|
|
|
2020-03-26 10:24:44 +11:00
|
|
|
/** \} */
|
|
|
|
|
|
|
|
|
|
/* ------------------------------------------------------------------- */
|
|
|
|
|
/** \name Make Library Override Operator
|
|
|
|
|
* \{ */
|
|
|
|
|
|
2020-10-13 12:17:50 +02:00
|
|
|
static bool make_override_library_object_overridable_check(Main *bmain, Object *object)
|
2020-07-21 11:58:20 +02:00
|
|
|
{
|
2021-02-05 19:07:03 -08:00
|
|
|
/* An object is actually overridable only if it is in at least one local collection.
|
2020-07-22 11:46:27 +10:00
|
|
|
* Unfortunately 'direct link' flag is not enough here. */
|
2020-07-21 11:58:20 +02:00
|
|
|
LISTBASE_FOREACH (Collection *, collection, &bmain->collections) {
|
|
|
|
|
if (!ID_IS_LINKED(collection) && BKE_collection_has_object(collection, object)) {
|
|
|
|
|
return true;
|
|
|
|
|
}
|
|
|
|
|
}
|
2020-10-13 12:26:44 +02:00
|
|
|
LISTBASE_FOREACH (Scene *, scene, &bmain->scenes) {
|
|
|
|
|
if (!ID_IS_LINKED(scene) && BKE_collection_has_object(scene->master_collection, object)) {
|
|
|
|
|
return true;
|
|
|
|
|
}
|
|
|
|
|
}
|
2020-07-21 11:58:20 +02:00
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
|
2019-06-14 23:16:04 +02:00
|
|
|
static int make_override_library_exec(bContext *C, wmOperator *op)
|
2017-11-29 17:14:27 +01:00
|
|
|
{
|
|
|
|
|
Main *bmain = CTX_data_main(C);
|
2020-07-15 18:09:30 +02:00
|
|
|
Scene *scene = CTX_data_scene(C);
|
|
|
|
|
ViewLayer *view_layer = CTX_data_view_layer(C);
|
2018-01-16 17:04:53 +01:00
|
|
|
Object *obact = CTX_data_active_object(C);
|
2020-06-30 12:04:44 +02:00
|
|
|
ID *id_root = NULL;
|
2020-07-21 15:58:28 +02:00
|
|
|
bool is_override_instancing_object = false;
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2022-05-20 11:59:39 +02:00
|
|
|
const bool do_fully_editable = RNA_boolean_get(op->ptr, "do_fully_editable");
|
|
|
|
|
|
|
|
|
|
GSet *user_overrides_objects_uids = do_fully_editable ? NULL :
|
|
|
|
|
BLI_gset_new(BLI_ghashutil_inthash_p,
|
|
|
|
|
BLI_ghashutil_intcmp,
|
|
|
|
|
__func__);
|
2022-03-01 18:02:56 +01:00
|
|
|
bool user_overrides_from_selected_objects = false;
|
|
|
|
|
|
2019-02-17 19:00:54 +11:00
|
|
|
if (!ID_IS_LINKED(obact) && obact->instance_collection != NULL &&
|
|
|
|
|
ID_IS_LINKED(obact->instance_collection)) {
|
2019-09-05 20:43:52 +02:00
|
|
|
if (!ID_IS_OVERRIDABLE_LIBRARY(obact->instance_collection)) {
|
|
|
|
|
BKE_reportf(op->reports,
|
|
|
|
|
RPT_ERROR_INVALID_INPUT,
|
|
|
|
|
"Collection '%s' (instantiated by the active object) is not overridable",
|
|
|
|
|
obact->instance_collection->id.name + 2);
|
|
|
|
|
return OPERATOR_CANCELLED;
|
|
|
|
|
}
|
|
|
|
|
|
2020-06-30 12:04:44 +02:00
|
|
|
id_root = &obact->instance_collection->id;
|
2020-07-21 15:58:28 +02:00
|
|
|
is_override_instancing_object = true;
|
2022-03-01 18:02:56 +01:00
|
|
|
user_overrides_from_selected_objects = false;
|
2020-06-30 12:04:44 +02:00
|
|
|
}
|
2020-10-13 12:17:50 +02:00
|
|
|
else if (!make_override_library_object_overridable_check(bmain, obact)) {
|
2022-06-16 15:52:07 +02:00
|
|
|
const int i = RNA_property_int_get(op->ptr, op->type->prop);
|
|
|
|
|
const uint collection_session_uuid = *((const uint *)&i);
|
2020-07-15 10:58:54 +02:00
|
|
|
if (collection_session_uuid == MAIN_ID_SESSION_UUID_UNSET) {
|
|
|
|
|
BKE_reportf(op->reports,
|
|
|
|
|
RPT_ERROR_INVALID_INPUT,
|
2022-06-16 15:52:07 +02:00
|
|
|
"Could not find an overridable root hierarchy for object '%s'",
|
2020-07-15 10:58:54 +02:00
|
|
|
obact->id.name + 2);
|
|
|
|
|
return OPERATOR_CANCELLED;
|
|
|
|
|
}
|
|
|
|
|
Collection *collection = BLI_listbase_bytes_find(&bmain->collections,
|
|
|
|
|
&collection_session_uuid,
|
|
|
|
|
sizeof(collection_session_uuid),
|
|
|
|
|
offsetof(ID, session_uuid));
|
|
|
|
|
id_root = &collection->id;
|
2022-03-01 18:02:56 +01:00
|
|
|
user_overrides_from_selected_objects = true;
|
2020-06-30 12:04:44 +02:00
|
|
|
}
|
|
|
|
|
/* Else, poll func ensures us that ID_IS_LINKED(obact) is true. */
|
|
|
|
|
else {
|
|
|
|
|
id_root = &obact->id;
|
2022-03-01 18:02:56 +01:00
|
|
|
user_overrides_from_selected_objects = true;
|
|
|
|
|
}
|
|
|
|
|
|
2022-05-20 11:59:39 +02:00
|
|
|
if (do_fully_editable) {
|
|
|
|
|
/* Pass. */
|
|
|
|
|
}
|
|
|
|
|
else if (user_overrides_from_selected_objects) {
|
2022-03-01 18:02:56 +01:00
|
|
|
/* Only selected objects can be 'user overrides'. */
|
|
|
|
|
FOREACH_SELECTED_OBJECT_BEGIN (view_layer, CTX_wm_view3d(C), ob_iter) {
|
|
|
|
|
BLI_gset_add(user_overrides_objects_uids, POINTER_FROM_UINT(ob_iter->id.session_uuid));
|
|
|
|
|
}
|
|
|
|
|
FOREACH_SELECTED_OBJECT_END;
|
|
|
|
|
}
|
|
|
|
|
else {
|
|
|
|
|
/* Only armatures inside the root collection (and their children) can be 'user overrides'. */
|
|
|
|
|
FOREACH_COLLECTION_OBJECT_RECURSIVE_BEGIN ((Collection *)id_root, ob_iter) {
|
|
|
|
|
if (ob_iter->type == OB_ARMATURE) {
|
|
|
|
|
BLI_gset_add(user_overrides_objects_uids, POINTER_FROM_UINT(ob_iter->id.session_uuid));
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
FOREACH_COLLECTION_OBJECT_RECURSIVE_END;
|
2020-06-30 12:04:44 +02:00
|
|
|
}
|
2019-08-29 18:05:34 +02:00
|
|
|
|
2020-06-30 12:04:44 +02:00
|
|
|
BKE_main_id_tag_all(bmain, LIB_TAG_DOIT, false);
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2022-03-01 18:02:56 +01:00
|
|
|
ID *id_root_override;
|
2022-05-20 11:59:39 +02:00
|
|
|
const bool success = BKE_lib_override_library_create(bmain,
|
|
|
|
|
scene,
|
|
|
|
|
view_layer,
|
|
|
|
|
NULL,
|
|
|
|
|
id_root,
|
|
|
|
|
id_root,
|
|
|
|
|
&obact->id,
|
|
|
|
|
&id_root_override,
|
|
|
|
|
do_fully_editable);
|
|
|
|
|
|
|
|
|
|
if (!do_fully_editable) {
|
|
|
|
|
/* Define liboverrides from selected/validated objects as user defined. */
|
|
|
|
|
ID *id_hierarchy_root_override = id_root_override->override_library->hierarchy_root;
|
|
|
|
|
ID *id_iter;
|
|
|
|
|
FOREACH_MAIN_ID_BEGIN (bmain, id_iter) {
|
|
|
|
|
if (ID_IS_LINKED(id_iter) || !ID_IS_OVERRIDE_LIBRARY_REAL(id_iter) ||
|
|
|
|
|
id_iter->override_library->hierarchy_root != id_hierarchy_root_override) {
|
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
if (BLI_gset_haskey(user_overrides_objects_uids,
|
|
|
|
|
POINTER_FROM_UINT(id_iter->override_library->reference->session_uuid))) {
|
|
|
|
|
id_iter->override_library->flag &= ~IDOVERRIDE_LIBRARY_FLAG_SYSTEM_DEFINED;
|
|
|
|
|
}
|
2022-03-01 18:02:56 +01:00
|
|
|
}
|
2022-05-20 11:59:39 +02:00
|
|
|
FOREACH_MAIN_ID_END;
|
2022-03-01 18:02:56 +01:00
|
|
|
|
2022-05-20 11:59:39 +02:00
|
|
|
BLI_gset_free(user_overrides_objects_uids, NULL);
|
|
|
|
|
}
|
2020-06-30 12:04:44 +02:00
|
|
|
|
2022-06-16 15:52:07 +02:00
|
|
|
if (success) {
|
|
|
|
|
if (is_override_instancing_object) {
|
|
|
|
|
/* Remove the instance empty from this scene, the items now have an overridden collection
|
|
|
|
|
* instead. */
|
|
|
|
|
ED_object_base_free_and_unlink(bmain, scene, obact);
|
|
|
|
|
}
|
|
|
|
|
else {
|
|
|
|
|
/* Remove the found root ID from the view layer. */
|
|
|
|
|
switch (GS(id_root->name)) {
|
|
|
|
|
case ID_GR: {
|
|
|
|
|
Collection *collection_root = (Collection *)id_root;
|
|
|
|
|
LISTBASE_FOREACH_MUTABLE (
|
|
|
|
|
CollectionParent *, collection_parent, &collection_root->parents) {
|
|
|
|
|
if (ID_IS_LINKED(collection_parent->collection) ||
|
|
|
|
|
!BKE_view_layer_has_collection(view_layer, collection_parent->collection)) {
|
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
BKE_collection_child_remove(bmain, collection_parent->collection, collection_root);
|
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
case ID_OB: {
|
|
|
|
|
/* TODO: Not sure how well we can handle this case, when we don't have the collections as
|
|
|
|
|
* reference containers... */
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
default:
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
}
|
2020-06-30 12:04:44 +02:00
|
|
|
}
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2020-06-30 12:04:44 +02:00
|
|
|
DEG_id_tag_update(&CTX_data_scene(C)->id, ID_RECALC_BASE_FLAGS | ID_RECALC_COPY_ON_WRITE);
|
2017-11-29 17:14:27 +01:00
|
|
|
WM_event_add_notifier(C, NC_WINDOW, NULL);
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2018-01-16 17:04:53 +01:00
|
|
|
return success ? OPERATOR_FINISHED : OPERATOR_CANCELLED;
|
2017-11-29 17:14:27 +01:00
|
|
|
}
|
|
|
|
|
|
2022-05-16 12:24:42 +02:00
|
|
|
/* Set the object to override. */
|
2022-06-16 15:52:07 +02:00
|
|
|
static int make_override_library_invoke(bContext *C, wmOperator *op, const wmEvent *UNUSED(event))
|
2022-05-16 12:24:42 +02:00
|
|
|
{
|
|
|
|
|
Main *bmain = CTX_data_main(C);
|
|
|
|
|
Scene *scene = CTX_data_scene(C);
|
2022-06-16 15:52:07 +02:00
|
|
|
ViewLayer *view_layer = CTX_data_view_layer(C);
|
2022-05-16 12:24:42 +02:00
|
|
|
Object *obact = ED_object_active_context(C);
|
|
|
|
|
|
|
|
|
|
/* Sanity checks. */
|
|
|
|
|
if (!scene || ID_IS_LINKED(scene) || !obact) {
|
|
|
|
|
return OPERATOR_CANCELLED;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if ((!ID_IS_LINKED(obact) && obact->instance_collection != NULL &&
|
|
|
|
|
ID_IS_OVERRIDABLE_LIBRARY(obact->instance_collection)) ||
|
|
|
|
|
make_override_library_object_overridable_check(bmain, obact)) {
|
|
|
|
|
return make_override_library_exec(C, op);
|
|
|
|
|
}
|
|
|
|
|
|
2022-06-16 15:52:07 +02:00
|
|
|
if (!ID_IS_LINKED(obact)) {
|
|
|
|
|
BKE_report(op->reports, RPT_ERROR, "Cannot make library override from a local object");
|
2022-05-16 12:24:42 +02:00
|
|
|
return OPERATOR_CANCELLED;
|
|
|
|
|
}
|
|
|
|
|
|
2022-06-16 15:52:07 +02:00
|
|
|
int potential_root_collections_num = 0;
|
|
|
|
|
uint collection_session_uuid = MAIN_ID_SESSION_UUID_UNSET;
|
|
|
|
|
LISTBASE_FOREACH (Collection *, collection, &bmain->collections) {
|
|
|
|
|
/* Only check for directly linked collections. */
|
|
|
|
|
if (!ID_IS_LINKED(&collection->id) || (collection->id.tag & LIB_TAG_INDIRECT) != 0 ||
|
|
|
|
|
!BKE_view_layer_has_collection(view_layer, collection)) {
|
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
if (BKE_collection_has_object_recursive(collection, obact)) {
|
|
|
|
|
if (potential_root_collections_num == 0) {
|
|
|
|
|
collection_session_uuid = collection->id.session_uuid;
|
|
|
|
|
}
|
|
|
|
|
potential_root_collections_num++;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (potential_root_collections_num <= 1) {
|
|
|
|
|
RNA_property_int_set(op->ptr, op->type->prop, *((int *)&collection_session_uuid));
|
|
|
|
|
return make_override_library_exec(C, op);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
BKE_reportf(op->reports,
|
|
|
|
|
RPT_ERROR,
|
|
|
|
|
"Too many potential root collections (%d) for the override hierarchy, "
|
|
|
|
|
"please use the Outliner instead",
|
|
|
|
|
potential_root_collections_num);
|
2022-05-16 12:24:42 +02:00
|
|
|
return OPERATOR_CANCELLED;
|
|
|
|
|
}
|
|
|
|
|
|
2019-06-14 23:16:04 +02:00
|
|
|
static bool make_override_library_poll(bContext *C)
|
2017-11-29 17:14:27 +01:00
|
|
|
{
|
|
|
|
|
Object *obact = CTX_data_active_object(C);
|
|
|
|
|
|
|
|
|
|
/* Object must be directly linked to be overridable. */
|
2020-07-13 16:44:41 +02:00
|
|
|
return (ED_operator_objectmode(C) && obact != NULL &&
|
2020-07-15 10:58:54 +02:00
|
|
|
(ID_IS_LINKED(obact) || (obact->instance_collection != NULL &&
|
2021-12-23 10:10:05 +01:00
|
|
|
ID_IS_OVERRIDABLE_LIBRARY(obact->instance_collection) &&
|
|
|
|
|
!ID_IS_OVERRIDE_LIBRARY(obact))));
|
2020-07-15 10:58:54 +02:00
|
|
|
}
|
|
|
|
|
|
2019-06-14 23:16:04 +02:00
|
|
|
void OBJECT_OT_make_override_library(wmOperatorType *ot)
|
2017-11-29 17:14:27 +01:00
|
|
|
{
|
|
|
|
|
/* identifiers */
|
2019-06-14 23:16:04 +02:00
|
|
|
ot->name = "Make Library Override";
|
|
|
|
|
ot->description = "Make a local override of this library linked data-block";
|
|
|
|
|
ot->idname = "OBJECT_OT_make_override_library";
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2017-11-29 17:14:27 +01:00
|
|
|
/* api callbacks */
|
2019-06-14 23:16:04 +02:00
|
|
|
ot->invoke = make_override_library_invoke;
|
|
|
|
|
ot->exec = make_override_library_exec;
|
|
|
|
|
ot->poll = make_override_library_poll;
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2017-11-29 17:14:27 +01:00
|
|
|
/* flags */
|
|
|
|
|
ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2017-11-29 17:14:27 +01:00
|
|
|
/* properties */
|
2018-01-16 17:04:53 +01:00
|
|
|
PropertyRNA *prop;
|
2022-06-16 15:52:07 +02:00
|
|
|
prop = RNA_def_int(ot->srna,
|
|
|
|
|
"collection",
|
|
|
|
|
MAIN_ID_SESSION_UUID_UNSET,
|
|
|
|
|
INT_MIN,
|
|
|
|
|
INT_MAX,
|
|
|
|
|
"Override Collection",
|
|
|
|
|
"Session UUID of the directly linked collection containing the selected "
|
|
|
|
|
"object, to make an override from",
|
|
|
|
|
INT_MIN,
|
|
|
|
|
INT_MAX);
|
|
|
|
|
RNA_def_property_flag(prop, PROP_HIDDEN | PROP_SKIP_SAVE);
|
2018-01-16 17:04:53 +01:00
|
|
|
ot->prop = prop;
|
2022-05-20 11:59:39 +02:00
|
|
|
|
|
|
|
|
prop = RNA_def_boolean(ot->srna,
|
|
|
|
|
"do_fully_editable",
|
|
|
|
|
false,
|
|
|
|
|
"Create Fully Editable",
|
|
|
|
|
"Make all created override data-blocks fully editable");
|
|
|
|
|
RNA_def_property_flag(prop, PROP_HIDDEN | PROP_SKIP_SAVE);
|
2017-11-29 17:14:27 +01:00
|
|
|
}
|
|
|
|
|
|
2020-03-26 10:24:44 +11:00
|
|
|
/** \} */
|
|
|
|
|
|
|
|
|
|
/* ------------------------------------------------------------------- */
|
|
|
|
|
/** \name Make Single User Operator
|
|
|
|
|
* \{ */
|
|
|
|
|
|
2014-10-10 18:26:46 +02:00
|
|
|
enum {
|
2015-01-29 17:34:05 +01:00
|
|
|
MAKE_SINGLE_USER_ALL = 1,
|
|
|
|
|
MAKE_SINGLE_USER_SELECTED = 2,
|
2014-10-10 18:26:46 +02:00
|
|
|
};
|
|
|
|
|
|
2009-11-01 00:06:53 +00:00
|
|
|
static int make_single_user_exec(bContext *C, wmOperator *op)
|
|
|
|
|
{
|
2012-04-28 15:42:27 +00:00
|
|
|
Main *bmain = CTX_data_main(C);
|
|
|
|
|
Scene *scene = CTX_data_scene(C);
|
2017-11-23 13:51:49 -02:00
|
|
|
ViewLayer *view_layer = CTX_data_view_layer(C);
|
2012-04-28 15:42:27 +00:00
|
|
|
View3D *v3d = CTX_wm_view3d(C); /* ok if this is NULL */
|
2015-01-29 17:34:05 +01:00
|
|
|
const int flag = (RNA_enum_get(op->ptr, "type") == MAKE_SINGLE_USER_SELECTED) ? SELECT : 0;
|
Collections and groups unification
OVERVIEW
* In 2.7 terminology, all layers and groups are now collection datablocks.
* These collections are nestable, linkable, instanceable, overrideable, ..
which opens up new ways to set up scenes and link + override data.
* Viewport/render visibility and selectability are now a part of the collection
and shared across all view layers and linkable.
* View layers define which subset of the scene collection hierarchy is excluded
for each. For many workflows one view layer can be used, these are more of an
advanced feature now.
OUTLINER
* The outliner now has a "View Layer" display mode instead of "Collections",
which can display the collections and/or objects in the view layer.
* In this display mode, collections can be excluded with the right click menu.
These will then be greyed out and their objects will be excluded.
* To view collections not linked to any scene, the "Blender File" display mode
can be used, with the new filtering option to just see Colleciton datablocks.
* The outliner right click menus for collections and objects were reorganized.
* Drag and drop still needs to be improved. Like before, dragging the icon or
text gives different results, we'll unify this later.
LINKING AND OVERRIDES
* Collections can now be linked into the scene without creating an instance,
with the link/append operator or from the collections view in the outliner.
* Collections can get static overrides with the right click menu in the outliner,
but this is rather unreliable and not clearly communicated at the moment.
* We still need to improve the make override operator to turn collection instances
into collections with overrides directly in the scene.
PERFORMANCE
* We tried to make performance not worse than before and improve it in some
cases. The main thing that's still a bit slower is multiple scenes, we have to
change the layer syncing to only updated affected scenes.
* Collections keep a list of their parent collections for faster incremental
updates in syncing and caching.
* View layer bases are now in a object -> base hash to avoid quadratic time
lookups internally and in API functions like visible_get().
VERSIONING
* Compatibility with 2.7 files should be improved due to the new visibility
controls. Of course users may not want to set up their scenes differently
now to avoid having separate layers and groups.
* Compatibility with 2.8 is mostly there, and was tested on Eevee demo and Hero
files. There's a few things which are know to be not quite compatible, like
nested layer collections inside groups.
* The versioning code for 2.8 files is quite complicated, and isolated behind
#ifdef so it can be removed at the end of the release cycle.
KNOWN ISSUES
* The G-key group operators in the 3D viewport were left mostly as is, they
need to be modified still to fit better.
* Same for the groups panel in the object properties. This needs to be updated
still, or perhaps replaced by something better.
* Collections must all have a unique name. Less restrictive namespacing is to
be done later, we'll have to see how important this is as all objects within
the collections must also have a unique name anyway.
* Full scene copy and delete scene are exactly doing the right thing yet.
Differential Revision: https://developer.blender.org/D3383
https://code.blender.org/2018/05/collections-and-groups/
2018-04-30 15:57:22 +02:00
|
|
|
const bool copy_collections = false;
|
2014-05-04 08:34:47 +10:00
|
|
|
bool update_deps = false;
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2014-05-04 08:34:47 +10:00
|
|
|
if (RNA_boolean_get(op->ptr, "object")) {
|
Render Layers and Collections (merge from render-layers)
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-07 10:18:38 +01:00
|
|
|
if (flag == SELECT) {
|
2017-11-23 13:51:49 -02:00
|
|
|
BKE_view_layer_selected_objects_tag(view_layer, OB_DONE);
|
Collections and groups unification
OVERVIEW
* In 2.7 terminology, all layers and groups are now collection datablocks.
* These collections are nestable, linkable, instanceable, overrideable, ..
which opens up new ways to set up scenes and link + override data.
* Viewport/render visibility and selectability are now a part of the collection
and shared across all view layers and linkable.
* View layers define which subset of the scene collection hierarchy is excluded
for each. For many workflows one view layer can be used, these are more of an
advanced feature now.
OUTLINER
* The outliner now has a "View Layer" display mode instead of "Collections",
which can display the collections and/or objects in the view layer.
* In this display mode, collections can be excluded with the right click menu.
These will then be greyed out and their objects will be excluded.
* To view collections not linked to any scene, the "Blender File" display mode
can be used, with the new filtering option to just see Colleciton datablocks.
* The outliner right click menus for collections and objects were reorganized.
* Drag and drop still needs to be improved. Like before, dragging the icon or
text gives different results, we'll unify this later.
LINKING AND OVERRIDES
* Collections can now be linked into the scene without creating an instance,
with the link/append operator or from the collections view in the outliner.
* Collections can get static overrides with the right click menu in the outliner,
but this is rather unreliable and not clearly communicated at the moment.
* We still need to improve the make override operator to turn collection instances
into collections with overrides directly in the scene.
PERFORMANCE
* We tried to make performance not worse than before and improve it in some
cases. The main thing that's still a bit slower is multiple scenes, we have to
change the layer syncing to only updated affected scenes.
* Collections keep a list of their parent collections for faster incremental
updates in syncing and caching.
* View layer bases are now in a object -> base hash to avoid quadratic time
lookups internally and in API functions like visible_get().
VERSIONING
* Compatibility with 2.7 files should be improved due to the new visibility
controls. Of course users may not want to set up their scenes differently
now to avoid having separate layers and groups.
* Compatibility with 2.8 is mostly there, and was tested on Eevee demo and Hero
files. There's a few things which are know to be not quite compatible, like
nested layer collections inside groups.
* The versioning code for 2.8 files is quite complicated, and isolated behind
#ifdef so it can be removed at the end of the release cycle.
KNOWN ISSUES
* The G-key group operators in the 3D viewport were left mostly as is, they
need to be modified still to fit better.
* Same for the groups panel in the object properties. This needs to be updated
still, or perhaps replaced by something better.
* Collections must all have a unique name. Less restrictive namespacing is to
be done later, we'll have to see how important this is as all objects within
the collections must also have a unique name anyway.
* Full scene copy and delete scene are exactly doing the right thing yet.
Differential Revision: https://developer.blender.org/D3383
https://code.blender.org/2018/05/collections-and-groups/
2018-04-30 15:57:22 +02:00
|
|
|
single_object_users(bmain, scene, v3d, OB_DONE, copy_collections);
|
Render Layers and Collections (merge from render-layers)
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-07 10:18:38 +01:00
|
|
|
}
|
|
|
|
|
else {
|
Collections and groups unification
OVERVIEW
* In 2.7 terminology, all layers and groups are now collection datablocks.
* These collections are nestable, linkable, instanceable, overrideable, ..
which opens up new ways to set up scenes and link + override data.
* Viewport/render visibility and selectability are now a part of the collection
and shared across all view layers and linkable.
* View layers define which subset of the scene collection hierarchy is excluded
for each. For many workflows one view layer can be used, these are more of an
advanced feature now.
OUTLINER
* The outliner now has a "View Layer" display mode instead of "Collections",
which can display the collections and/or objects in the view layer.
* In this display mode, collections can be excluded with the right click menu.
These will then be greyed out and their objects will be excluded.
* To view collections not linked to any scene, the "Blender File" display mode
can be used, with the new filtering option to just see Colleciton datablocks.
* The outliner right click menus for collections and objects were reorganized.
* Drag and drop still needs to be improved. Like before, dragging the icon or
text gives different results, we'll unify this later.
LINKING AND OVERRIDES
* Collections can now be linked into the scene without creating an instance,
with the link/append operator or from the collections view in the outliner.
* Collections can get static overrides with the right click menu in the outliner,
but this is rather unreliable and not clearly communicated at the moment.
* We still need to improve the make override operator to turn collection instances
into collections with overrides directly in the scene.
PERFORMANCE
* We tried to make performance not worse than before and improve it in some
cases. The main thing that's still a bit slower is multiple scenes, we have to
change the layer syncing to only updated affected scenes.
* Collections keep a list of their parent collections for faster incremental
updates in syncing and caching.
* View layer bases are now in a object -> base hash to avoid quadratic time
lookups internally and in API functions like visible_get().
VERSIONING
* Compatibility with 2.7 files should be improved due to the new visibility
controls. Of course users may not want to set up their scenes differently
now to avoid having separate layers and groups.
* Compatibility with 2.8 is mostly there, and was tested on Eevee demo and Hero
files. There's a few things which are know to be not quite compatible, like
nested layer collections inside groups.
* The versioning code for 2.8 files is quite complicated, and isolated behind
#ifdef so it can be removed at the end of the release cycle.
KNOWN ISSUES
* The G-key group operators in the 3D viewport were left mostly as is, they
need to be modified still to fit better.
* Same for the groups panel in the object properties. This needs to be updated
still, or perhaps replaced by something better.
* Collections must all have a unique name. Less restrictive namespacing is to
be done later, we'll have to see how important this is as all objects within
the collections must also have a unique name anyway.
* Full scene copy and delete scene are exactly doing the right thing yet.
Differential Revision: https://developer.blender.org/D3383
https://code.blender.org/2018/05/collections-and-groups/
2018-04-30 15:57:22 +02:00
|
|
|
single_object_users(bmain, scene, v3d, 0, copy_collections);
|
Render Layers and Collections (merge from render-layers)
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-07 10:18:38 +01:00
|
|
|
}
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2014-05-04 08:34:47 +10:00
|
|
|
/* needed since object relationships may have changed */
|
|
|
|
|
update_deps = true;
|
|
|
|
|
}
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2014-05-04 08:34:47 +10:00
|
|
|
if (RNA_boolean_get(op->ptr, "obdata")) {
|
2018-12-14 09:20:56 -02:00
|
|
|
single_obdata_users(bmain, scene, view_layer, v3d, flag);
|
2020-03-04 11:05:17 +01:00
|
|
|
|
|
|
|
|
/* Needed since some IDs were remapped? (incl. me->texcomesh, see T73797). */
|
|
|
|
|
update_deps = true;
|
2014-05-04 08:34:47 +10:00
|
|
|
}
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2014-05-04 08:34:47 +10:00
|
|
|
if (RNA_boolean_get(op->ptr, "material")) {
|
2018-12-14 09:20:56 -02:00
|
|
|
single_mat_users(bmain, scene, view_layer, v3d, flag);
|
2014-05-04 08:34:47 +10:00
|
|
|
}
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2014-05-04 08:34:47 +10:00
|
|
|
if (RNA_boolean_get(op->ptr, "animation")) {
|
2018-12-14 09:20:56 -02:00
|
|
|
single_object_action_users(bmain, scene, view_layer, v3d, flag);
|
2014-05-04 08:34:47 +10:00
|
|
|
}
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2021-06-23 13:25:40 +02:00
|
|
|
if (RNA_boolean_get(op->ptr, "obdata_animation")) {
|
|
|
|
|
single_objectdata_action_users(bmain, scene, view_layer, v3d, flag);
|
|
|
|
|
}
|
|
|
|
|
|
2021-05-27 22:44:02 +10:00
|
|
|
BKE_main_id_newptr_and_tag_clear(bmain);
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2009-11-01 00:06:53 +00:00
|
|
|
WM_event_add_notifier(C, NC_WINDOW, NULL);
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2014-05-04 08:34:47 +10:00
|
|
|
if (update_deps) {
|
2017-06-08 10:14:53 +02:00
|
|
|
DEG_relations_tag_update(bmain);
|
2014-05-04 08:34:47 +10:00
|
|
|
}
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2009-11-01 00:06:53 +00:00
|
|
|
return OPERATOR_FINISHED;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void OBJECT_OT_make_single_user(wmOperatorType *ot)
|
|
|
|
|
{
|
2017-10-18 15:07:26 +11:00
|
|
|
static const EnumPropertyItem type_items[] = {
|
2014-10-10 18:26:46 +02:00
|
|
|
{MAKE_SINGLE_USER_SELECTED, "SELECTED_OBJECTS", 0, "Selected Objects", ""},
|
|
|
|
|
{MAKE_SINGLE_USER_ALL, "ALL", 0, "All", ""},
|
2019-02-03 14:01:45 +11:00
|
|
|
{0, NULL, 0, NULL, NULL},
|
|
|
|
|
};
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2009-11-01 00:06:53 +00:00
|
|
|
/* identifiers */
|
2012-03-22 07:26:09 +00:00
|
|
|
ot->name = "Make Single User";
|
2010-02-10 21:15:44 +00:00
|
|
|
ot->description = "Make linked data local to each object";
|
2012-03-22 07:26:09 +00:00
|
|
|
ot->idname = "OBJECT_OT_make_single_user";
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2020-02-11 14:01:01 +11:00
|
|
|
/* Note that the invoke callback is only used from operator search,
|
|
|
|
|
* otherwise this does nothing by default. */
|
|
|
|
|
|
2009-11-01 00:06:53 +00:00
|
|
|
/* api callbacks */
|
2020-02-11 14:01:01 +11:00
|
|
|
ot->invoke = WM_operator_props_popup_confirm;
|
2012-03-22 07:26:09 +00:00
|
|
|
ot->exec = make_single_user_exec;
|
|
|
|
|
ot->poll = ED_operator_objectmode;
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2009-11-01 00:06:53 +00:00
|
|
|
/* flags */
|
2012-04-28 15:42:27 +00:00
|
|
|
ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2009-11-01 00:06:53 +00:00
|
|
|
/* properties */
|
2015-01-29 17:34:05 +01:00
|
|
|
ot->prop = RNA_def_enum(ot->srna, "type", type_items, MAKE_SINGLE_USER_SELECTED, "Type", "");
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2009-11-01 00:06:53 +00:00
|
|
|
RNA_def_boolean(ot->srna, "object", 0, "Object", "Make single user objects");
|
|
|
|
|
RNA_def_boolean(ot->srna, "obdata", 0, "Object Data", "Make single user object data");
|
2016-09-19 16:46:20 +02:00
|
|
|
RNA_def_boolean(ot->srna, "material", 0, "Materials", "Make materials local to each data-block");
|
2021-06-23 13:25:40 +02:00
|
|
|
RNA_def_boolean(ot->srna,
|
|
|
|
|
"animation",
|
|
|
|
|
0,
|
|
|
|
|
"Object Animation",
|
|
|
|
|
"Make object animation data local to each object");
|
|
|
|
|
RNA_def_boolean(ot->srna,
|
|
|
|
|
"obdata_animation",
|
|
|
|
|
0,
|
|
|
|
|
"Object Data Animation",
|
|
|
|
|
"Make object data (mesh, curve etc.) animation data local to each object");
|
2009-11-01 00:06:53 +00:00
|
|
|
}
|
Drag and drop 2.5 integration! Finally, slashdot regulars can use
Blender too now! :)
** Drag works as follows:
- drag-able items are defined by the standard interface ui toolkit
- each button can get this feature, via uiButSetDragXXX(but, ...).
There are calls to define drag-able images, ID blocks, RNA paths,
file paths, and so on. By default you drag an icon, exceptionally
an ImBuf
- Drag items are registered centrally in the WM, it allows more drag
items simultaneous too, but not implemented
** Drop works as follows:
- On mouse release, and if drag items exist in the WM, it converts
the mouse event to an EVT_DROP type. This event then gets the full
drag info as customdata
- drop regions are defined with WM_dropbox_add(), similar to keymaps
you can make a "drop map" this way, which become 'drop map handlers'
in the queues.
- next to that the UI kit handles some common button types (like
accepting ID or names) to be catching a drop event too.
- Every "drop box" has two callbacks:
- poll() = check if the event drag data is relevant for this box
- copy() = fill in custom properties in the dropbox to initialize
an operator
- The dropbox handler then calls its standard Operator with its
dropbox properties.
** Currently implemented
Drag items:
- ID icons in browse buttons
- ID icons in context menu of properties region
- ID icons in outliner and rna viewer
- FileBrowser icons
- FileBrowser preview images
Drag-able icons are subtly visualized by making them brighter a bit
on mouse-over. In case the icon is a button or UI element too (most
cases), the drag-able feature will make the item react to
mouse-release instead of mouse-press.
Drop options:
- UI buttons: ID and text buttons (paste name)
- View3d: Object ID drop copies object
- View3d: Material ID drop assigns to object under cursor
- View3d: Image ID drop assigns to object UV texture under cursor
- Sequencer: Path drop will add either Image or Movie strip
- Image window: Path drop will open image
** Drag and drop Notes:
- Dropping into another Blender window (from same application) works
too. I've added code that passes on mousemoves and clicks to other
windows, without activating them though. This does make using multi-window
Blender a bit friendler.
- Dropping a file path to an image, is not the same as dropping an
Image ID... keep this in mind. Sequencer for example wants paths to
be dropped, textures in 3d window wants an Image ID.
- Although drop boxes could be defined via Python, I suggest they're
part of the UI and editor design (= how we want an editor to work), and
not default offered configurable like keymaps.
- At the moment only one item can be dragged at a time. This is for
several reasons.... For one, Blender doesn't have a well defined
uniform way to define "what is selected" (files, outliner items, etc).
Secondly there's potential conflicts on what todo when you drop mixed
drag sets on spots. All undefined stuff... nice for later.
- Example to bypass the above: a collection of images that form a strip,
should be represented in filewindow as a single sequence anyway.
This then will fit well and gets handled neatly by design.
- Another option to check is to allow multiple options per drop... it
could show the operator as a sort of menu, allowing arrow or scrollwheel
to choose. For time being I'd prefer to try to design a singular drop
though, just offer only one drop action per data type on given spots.
- What does work already, but a tad slow, is to use a function that
detects an object (type) under cursor, so a drag item's option can be
further refined (like drop object on object = parent). (disabled)
** More notes
- Added saving for Region layouts (like split points for toolbar)
- Label buttons now handle mouse over
- File list: added full path entry for drop feature.
- Filesel bugfix: wm_operator_exec() got called there and fully handled,
while WM event code tried same. Added new OPERATOR_HANDLED flag for this.
Maybe python needs it too?
- Cocoa: added window move event, so multi-win setups work OK (didnt save).
- Interface_handlers.c: removed win->active
- Severe area copy bug: area handlers were not set to NULL
- Filesel bugfix: next/prev folder list was not copied on area copies
** Leftover todos
- Cocoa windows seem to hang on cases still... needs check
- Cocoa 'draw overlap' swap doesn't work
- Cocoa window loses focus permanently on using Spotlight
(for these reasons, makefile building has Carbon as default atm)
- ListView templates in UI cannot become dragged yet, needs review...
it consists of two overlapping UI elements, preventing handling icon clicks.
- There's already Ghost library code to handle dropping from OS
into Blender window. I've noticed this code is unfinished for Macs, but
seems to be complete for Windows. Needs test... currently, an external
drop event will print in console when succesfully delivered to Blender's WM.
2010-01-26 18:18:21 +00:00
|
|
|
|
2020-03-26 10:24:44 +11:00
|
|
|
/** \} */
|
|
|
|
|
|
|
|
|
|
/* ------------------------------------------------------------------- */
|
|
|
|
|
/** \name Drop Named Material on Object Operator
|
|
|
|
|
* \{ */
|
|
|
|
|
|
2022-05-24 15:13:20 +02:00
|
|
|
char *ED_object_ot_drop_named_material_tooltip(bContext *C, const char *name, const int mval[2])
|
2021-08-04 08:58:19 +02:00
|
|
|
{
|
2021-09-08 08:39:03 +02:00
|
|
|
int mat_slot = 0;
|
2021-10-25 10:07:00 -03:00
|
|
|
Object *ob = ED_view3d_give_material_slot_under_cursor(C, mval, &mat_slot);
|
2021-08-10 12:07:13 +02:00
|
|
|
if (ob == NULL) {
|
|
|
|
|
return BLI_strdup("");
|
|
|
|
|
}
|
2021-09-08 08:39:03 +02:00
|
|
|
mat_slot = max_ii(mat_slot, 1);
|
2021-08-04 08:58:19 +02:00
|
|
|
|
2021-09-08 08:39:03 +02:00
|
|
|
Material *prev_mat = BKE_object_material_get(ob, mat_slot);
|
2021-08-04 08:58:19 +02:00
|
|
|
|
|
|
|
|
char *result;
|
|
|
|
|
if (prev_mat) {
|
2021-08-09 14:41:30 +02:00
|
|
|
const char *tooltip = TIP_("Drop %s on %s (slot %d, replacing %s)");
|
2021-09-08 08:39:03 +02:00
|
|
|
result = BLI_sprintfN(tooltip, name, ob->id.name + 2, mat_slot, prev_mat->id.name + 2);
|
2021-08-04 08:58:19 +02:00
|
|
|
}
|
|
|
|
|
else {
|
2021-08-09 14:41:30 +02:00
|
|
|
const char *tooltip = TIP_("Drop %s on %s (slot %d)");
|
2021-09-08 08:39:03 +02:00
|
|
|
result = BLI_sprintfN(tooltip, name, ob->id.name + 2, mat_slot);
|
2021-08-04 08:58:19 +02:00
|
|
|
}
|
|
|
|
|
return result;
|
|
|
|
|
}
|
|
|
|
|
|
2013-03-13 09:03:46 +00:00
|
|
|
static int drop_named_material_invoke(bContext *C, wmOperator *op, const wmEvent *event)
|
Drag and drop 2.5 integration! Finally, slashdot regulars can use
Blender too now! :)
** Drag works as follows:
- drag-able items are defined by the standard interface ui toolkit
- each button can get this feature, via uiButSetDragXXX(but, ...).
There are calls to define drag-able images, ID blocks, RNA paths,
file paths, and so on. By default you drag an icon, exceptionally
an ImBuf
- Drag items are registered centrally in the WM, it allows more drag
items simultaneous too, but not implemented
** Drop works as follows:
- On mouse release, and if drag items exist in the WM, it converts
the mouse event to an EVT_DROP type. This event then gets the full
drag info as customdata
- drop regions are defined with WM_dropbox_add(), similar to keymaps
you can make a "drop map" this way, which become 'drop map handlers'
in the queues.
- next to that the UI kit handles some common button types (like
accepting ID or names) to be catching a drop event too.
- Every "drop box" has two callbacks:
- poll() = check if the event drag data is relevant for this box
- copy() = fill in custom properties in the dropbox to initialize
an operator
- The dropbox handler then calls its standard Operator with its
dropbox properties.
** Currently implemented
Drag items:
- ID icons in browse buttons
- ID icons in context menu of properties region
- ID icons in outliner and rna viewer
- FileBrowser icons
- FileBrowser preview images
Drag-able icons are subtly visualized by making them brighter a bit
on mouse-over. In case the icon is a button or UI element too (most
cases), the drag-able feature will make the item react to
mouse-release instead of mouse-press.
Drop options:
- UI buttons: ID and text buttons (paste name)
- View3d: Object ID drop copies object
- View3d: Material ID drop assigns to object under cursor
- View3d: Image ID drop assigns to object UV texture under cursor
- Sequencer: Path drop will add either Image or Movie strip
- Image window: Path drop will open image
** Drag and drop Notes:
- Dropping into another Blender window (from same application) works
too. I've added code that passes on mousemoves and clicks to other
windows, without activating them though. This does make using multi-window
Blender a bit friendler.
- Dropping a file path to an image, is not the same as dropping an
Image ID... keep this in mind. Sequencer for example wants paths to
be dropped, textures in 3d window wants an Image ID.
- Although drop boxes could be defined via Python, I suggest they're
part of the UI and editor design (= how we want an editor to work), and
not default offered configurable like keymaps.
- At the moment only one item can be dragged at a time. This is for
several reasons.... For one, Blender doesn't have a well defined
uniform way to define "what is selected" (files, outliner items, etc).
Secondly there's potential conflicts on what todo when you drop mixed
drag sets on spots. All undefined stuff... nice for later.
- Example to bypass the above: a collection of images that form a strip,
should be represented in filewindow as a single sequence anyway.
This then will fit well and gets handled neatly by design.
- Another option to check is to allow multiple options per drop... it
could show the operator as a sort of menu, allowing arrow or scrollwheel
to choose. For time being I'd prefer to try to design a singular drop
though, just offer only one drop action per data type on given spots.
- What does work already, but a tad slow, is to use a function that
detects an object (type) under cursor, so a drag item's option can be
further refined (like drop object on object = parent). (disabled)
** More notes
- Added saving for Region layouts (like split points for toolbar)
- Label buttons now handle mouse over
- File list: added full path entry for drop feature.
- Filesel bugfix: wm_operator_exec() got called there and fully handled,
while WM event code tried same. Added new OPERATOR_HANDLED flag for this.
Maybe python needs it too?
- Cocoa: added window move event, so multi-win setups work OK (didnt save).
- Interface_handlers.c: removed win->active
- Severe area copy bug: area handlers were not set to NULL
- Filesel bugfix: next/prev folder list was not copied on area copies
** Leftover todos
- Cocoa windows seem to hang on cases still... needs check
- Cocoa 'draw overlap' swap doesn't work
- Cocoa window loses focus permanently on using Spotlight
(for these reasons, makefile building has Carbon as default atm)
- ListView templates in UI cannot become dragged yet, needs review...
it consists of two overlapping UI elements, preventing handling icon clicks.
- There's already Ghost library code to handle dropping from OS
into Blender window. I've noticed this code is unfinished for Macs, but
seems to be complete for Windows. Needs test... currently, an external
drop event will print in console when succesfully delivered to Blender's WM.
2010-01-26 18:18:21 +00:00
|
|
|
{
|
2018-05-31 16:04:04 +02:00
|
|
|
Main *bmain = CTX_data_main(C);
|
2021-09-08 08:39:03 +02:00
|
|
|
int mat_slot = 0;
|
|
|
|
|
Object *ob = ED_view3d_give_material_slot_under_cursor(C, event->mval, &mat_slot);
|
|
|
|
|
mat_slot = max_ii(mat_slot, 1);
|
|
|
|
|
|
2022-05-23 20:54:15 +02:00
|
|
|
Material *ma = (Material *)WM_operator_properties_id_lookup_from_name_or_session_uuid(
|
2022-05-24 14:22:59 +02:00
|
|
|
bmain, op->ptr, ID_MA);
|
2014-10-10 18:44:37 +02:00
|
|
|
|
2021-08-10 12:07:13 +02:00
|
|
|
if (ob == NULL || ma == NULL) {
|
Drag and drop 2.5 integration! Finally, slashdot regulars can use
Blender too now! :)
** Drag works as follows:
- drag-able items are defined by the standard interface ui toolkit
- each button can get this feature, via uiButSetDragXXX(but, ...).
There are calls to define drag-able images, ID blocks, RNA paths,
file paths, and so on. By default you drag an icon, exceptionally
an ImBuf
- Drag items are registered centrally in the WM, it allows more drag
items simultaneous too, but not implemented
** Drop works as follows:
- On mouse release, and if drag items exist in the WM, it converts
the mouse event to an EVT_DROP type. This event then gets the full
drag info as customdata
- drop regions are defined with WM_dropbox_add(), similar to keymaps
you can make a "drop map" this way, which become 'drop map handlers'
in the queues.
- next to that the UI kit handles some common button types (like
accepting ID or names) to be catching a drop event too.
- Every "drop box" has two callbacks:
- poll() = check if the event drag data is relevant for this box
- copy() = fill in custom properties in the dropbox to initialize
an operator
- The dropbox handler then calls its standard Operator with its
dropbox properties.
** Currently implemented
Drag items:
- ID icons in browse buttons
- ID icons in context menu of properties region
- ID icons in outliner and rna viewer
- FileBrowser icons
- FileBrowser preview images
Drag-able icons are subtly visualized by making them brighter a bit
on mouse-over. In case the icon is a button or UI element too (most
cases), the drag-able feature will make the item react to
mouse-release instead of mouse-press.
Drop options:
- UI buttons: ID and text buttons (paste name)
- View3d: Object ID drop copies object
- View3d: Material ID drop assigns to object under cursor
- View3d: Image ID drop assigns to object UV texture under cursor
- Sequencer: Path drop will add either Image or Movie strip
- Image window: Path drop will open image
** Drag and drop Notes:
- Dropping into another Blender window (from same application) works
too. I've added code that passes on mousemoves and clicks to other
windows, without activating them though. This does make using multi-window
Blender a bit friendler.
- Dropping a file path to an image, is not the same as dropping an
Image ID... keep this in mind. Sequencer for example wants paths to
be dropped, textures in 3d window wants an Image ID.
- Although drop boxes could be defined via Python, I suggest they're
part of the UI and editor design (= how we want an editor to work), and
not default offered configurable like keymaps.
- At the moment only one item can be dragged at a time. This is for
several reasons.... For one, Blender doesn't have a well defined
uniform way to define "what is selected" (files, outliner items, etc).
Secondly there's potential conflicts on what todo when you drop mixed
drag sets on spots. All undefined stuff... nice for later.
- Example to bypass the above: a collection of images that form a strip,
should be represented in filewindow as a single sequence anyway.
This then will fit well and gets handled neatly by design.
- Another option to check is to allow multiple options per drop... it
could show the operator as a sort of menu, allowing arrow or scrollwheel
to choose. For time being I'd prefer to try to design a singular drop
though, just offer only one drop action per data type on given spots.
- What does work already, but a tad slow, is to use a function that
detects an object (type) under cursor, so a drag item's option can be
further refined (like drop object on object = parent). (disabled)
** More notes
- Added saving for Region layouts (like split points for toolbar)
- Label buttons now handle mouse over
- File list: added full path entry for drop feature.
- Filesel bugfix: wm_operator_exec() got called there and fully handled,
while WM event code tried same. Added new OPERATOR_HANDLED flag for this.
Maybe python needs it too?
- Cocoa: added window move event, so multi-win setups work OK (didnt save).
- Interface_handlers.c: removed win->active
- Severe area copy bug: area handlers were not set to NULL
- Filesel bugfix: next/prev folder list was not copied on area copies
** Leftover todos
- Cocoa windows seem to hang on cases still... needs check
- Cocoa 'draw overlap' swap doesn't work
- Cocoa window loses focus permanently on using Spotlight
(for these reasons, makefile building has Carbon as default atm)
- ListView templates in UI cannot become dragged yet, needs review...
it consists of two overlapping UI elements, preventing handling icon clicks.
- There's already Ghost library code to handle dropping from OS
into Blender window. I've noticed this code is unfinished for Macs, but
seems to be complete for Windows. Needs test... currently, an external
drop event will print in console when succesfully delivered to Blender's WM.
2010-01-26 18:18:21 +00:00
|
|
|
return OPERATOR_CANCELLED;
|
2019-04-22 09:19:45 +10:00
|
|
|
}
|
2014-10-10 18:44:37 +02:00
|
|
|
|
2021-09-08 08:39:03 +02:00
|
|
|
BKE_object_material_assign(CTX_data_main(C), ob, ma, mat_slot, BKE_MAT_ASSIGN_USERPREF);
|
2014-10-06 14:04:55 +02:00
|
|
|
|
2021-08-10 12:07:13 +02:00
|
|
|
DEG_id_tag_update(&ob->id, ID_RECALC_TRANSFORM);
|
2014-10-06 14:04:55 +02:00
|
|
|
|
2021-08-10 12:07:13 +02:00
|
|
|
WM_event_add_notifier(C, NC_OBJECT | ND_OB_SHADING, ob);
|
2021-03-11 17:30:39 +01:00
|
|
|
WM_event_add_notifier(C, NC_SPACE | ND_SPACE_VIEW3D, NULL);
|
2012-11-26 08:52:07 +00:00
|
|
|
WM_event_add_notifier(C, NC_MATERIAL | ND_SHADING_LINKS, ma);
|
2014-10-06 14:04:55 +02:00
|
|
|
|
Drag and drop 2.5 integration! Finally, slashdot regulars can use
Blender too now! :)
** Drag works as follows:
- drag-able items are defined by the standard interface ui toolkit
- each button can get this feature, via uiButSetDragXXX(but, ...).
There are calls to define drag-able images, ID blocks, RNA paths,
file paths, and so on. By default you drag an icon, exceptionally
an ImBuf
- Drag items are registered centrally in the WM, it allows more drag
items simultaneous too, but not implemented
** Drop works as follows:
- On mouse release, and if drag items exist in the WM, it converts
the mouse event to an EVT_DROP type. This event then gets the full
drag info as customdata
- drop regions are defined with WM_dropbox_add(), similar to keymaps
you can make a "drop map" this way, which become 'drop map handlers'
in the queues.
- next to that the UI kit handles some common button types (like
accepting ID or names) to be catching a drop event too.
- Every "drop box" has two callbacks:
- poll() = check if the event drag data is relevant for this box
- copy() = fill in custom properties in the dropbox to initialize
an operator
- The dropbox handler then calls its standard Operator with its
dropbox properties.
** Currently implemented
Drag items:
- ID icons in browse buttons
- ID icons in context menu of properties region
- ID icons in outliner and rna viewer
- FileBrowser icons
- FileBrowser preview images
Drag-able icons are subtly visualized by making them brighter a bit
on mouse-over. In case the icon is a button or UI element too (most
cases), the drag-able feature will make the item react to
mouse-release instead of mouse-press.
Drop options:
- UI buttons: ID and text buttons (paste name)
- View3d: Object ID drop copies object
- View3d: Material ID drop assigns to object under cursor
- View3d: Image ID drop assigns to object UV texture under cursor
- Sequencer: Path drop will add either Image or Movie strip
- Image window: Path drop will open image
** Drag and drop Notes:
- Dropping into another Blender window (from same application) works
too. I've added code that passes on mousemoves and clicks to other
windows, without activating them though. This does make using multi-window
Blender a bit friendler.
- Dropping a file path to an image, is not the same as dropping an
Image ID... keep this in mind. Sequencer for example wants paths to
be dropped, textures in 3d window wants an Image ID.
- Although drop boxes could be defined via Python, I suggest they're
part of the UI and editor design (= how we want an editor to work), and
not default offered configurable like keymaps.
- At the moment only one item can be dragged at a time. This is for
several reasons.... For one, Blender doesn't have a well defined
uniform way to define "what is selected" (files, outliner items, etc).
Secondly there's potential conflicts on what todo when you drop mixed
drag sets on spots. All undefined stuff... nice for later.
- Example to bypass the above: a collection of images that form a strip,
should be represented in filewindow as a single sequence anyway.
This then will fit well and gets handled neatly by design.
- Another option to check is to allow multiple options per drop... it
could show the operator as a sort of menu, allowing arrow or scrollwheel
to choose. For time being I'd prefer to try to design a singular drop
though, just offer only one drop action per data type on given spots.
- What does work already, but a tad slow, is to use a function that
detects an object (type) under cursor, so a drag item's option can be
further refined (like drop object on object = parent). (disabled)
** More notes
- Added saving for Region layouts (like split points for toolbar)
- Label buttons now handle mouse over
- File list: added full path entry for drop feature.
- Filesel bugfix: wm_operator_exec() got called there and fully handled,
while WM event code tried same. Added new OPERATOR_HANDLED flag for this.
Maybe python needs it too?
- Cocoa: added window move event, so multi-win setups work OK (didnt save).
- Interface_handlers.c: removed win->active
- Severe area copy bug: area handlers were not set to NULL
- Filesel bugfix: next/prev folder list was not copied on area copies
** Leftover todos
- Cocoa windows seem to hang on cases still... needs check
- Cocoa 'draw overlap' swap doesn't work
- Cocoa window loses focus permanently on using Spotlight
(for these reasons, makefile building has Carbon as default atm)
- ListView templates in UI cannot become dragged yet, needs review...
it consists of two overlapping UI elements, preventing handling icon clicks.
- There's already Ghost library code to handle dropping from OS
into Blender window. I've noticed this code is unfinished for Macs, but
seems to be complete for Windows. Needs test... currently, an external
drop event will print in console when succesfully delivered to Blender's WM.
2010-01-26 18:18:21 +00:00
|
|
|
return OPERATOR_FINISHED;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void OBJECT_OT_drop_named_material(wmOperatorType *ot)
|
|
|
|
|
{
|
|
|
|
|
/* identifiers */
|
2012-03-22 07:26:09 +00:00
|
|
|
ot->name = "Drop Named Material on Object";
|
|
|
|
|
ot->idname = "OBJECT_OT_drop_named_material";
|
2014-10-10 18:44:37 +02:00
|
|
|
|
Drag and drop 2.5 integration! Finally, slashdot regulars can use
Blender too now! :)
** Drag works as follows:
- drag-able items are defined by the standard interface ui toolkit
- each button can get this feature, via uiButSetDragXXX(but, ...).
There are calls to define drag-able images, ID blocks, RNA paths,
file paths, and so on. By default you drag an icon, exceptionally
an ImBuf
- Drag items are registered centrally in the WM, it allows more drag
items simultaneous too, but not implemented
** Drop works as follows:
- On mouse release, and if drag items exist in the WM, it converts
the mouse event to an EVT_DROP type. This event then gets the full
drag info as customdata
- drop regions are defined with WM_dropbox_add(), similar to keymaps
you can make a "drop map" this way, which become 'drop map handlers'
in the queues.
- next to that the UI kit handles some common button types (like
accepting ID or names) to be catching a drop event too.
- Every "drop box" has two callbacks:
- poll() = check if the event drag data is relevant for this box
- copy() = fill in custom properties in the dropbox to initialize
an operator
- The dropbox handler then calls its standard Operator with its
dropbox properties.
** Currently implemented
Drag items:
- ID icons in browse buttons
- ID icons in context menu of properties region
- ID icons in outliner and rna viewer
- FileBrowser icons
- FileBrowser preview images
Drag-able icons are subtly visualized by making them brighter a bit
on mouse-over. In case the icon is a button or UI element too (most
cases), the drag-able feature will make the item react to
mouse-release instead of mouse-press.
Drop options:
- UI buttons: ID and text buttons (paste name)
- View3d: Object ID drop copies object
- View3d: Material ID drop assigns to object under cursor
- View3d: Image ID drop assigns to object UV texture under cursor
- Sequencer: Path drop will add either Image or Movie strip
- Image window: Path drop will open image
** Drag and drop Notes:
- Dropping into another Blender window (from same application) works
too. I've added code that passes on mousemoves and clicks to other
windows, without activating them though. This does make using multi-window
Blender a bit friendler.
- Dropping a file path to an image, is not the same as dropping an
Image ID... keep this in mind. Sequencer for example wants paths to
be dropped, textures in 3d window wants an Image ID.
- Although drop boxes could be defined via Python, I suggest they're
part of the UI and editor design (= how we want an editor to work), and
not default offered configurable like keymaps.
- At the moment only one item can be dragged at a time. This is for
several reasons.... For one, Blender doesn't have a well defined
uniform way to define "what is selected" (files, outliner items, etc).
Secondly there's potential conflicts on what todo when you drop mixed
drag sets on spots. All undefined stuff... nice for later.
- Example to bypass the above: a collection of images that form a strip,
should be represented in filewindow as a single sequence anyway.
This then will fit well and gets handled neatly by design.
- Another option to check is to allow multiple options per drop... it
could show the operator as a sort of menu, allowing arrow or scrollwheel
to choose. For time being I'd prefer to try to design a singular drop
though, just offer only one drop action per data type on given spots.
- What does work already, but a tad slow, is to use a function that
detects an object (type) under cursor, so a drag item's option can be
further refined (like drop object on object = parent). (disabled)
** More notes
- Added saving for Region layouts (like split points for toolbar)
- Label buttons now handle mouse over
- File list: added full path entry for drop feature.
- Filesel bugfix: wm_operator_exec() got called there and fully handled,
while WM event code tried same. Added new OPERATOR_HANDLED flag for this.
Maybe python needs it too?
- Cocoa: added window move event, so multi-win setups work OK (didnt save).
- Interface_handlers.c: removed win->active
- Severe area copy bug: area handlers were not set to NULL
- Filesel bugfix: next/prev folder list was not copied on area copies
** Leftover todos
- Cocoa windows seem to hang on cases still... needs check
- Cocoa 'draw overlap' swap doesn't work
- Cocoa window loses focus permanently on using Spotlight
(for these reasons, makefile building has Carbon as default atm)
- ListView templates in UI cannot become dragged yet, needs review...
it consists of two overlapping UI elements, preventing handling icon clicks.
- There's already Ghost library code to handle dropping from OS
into Blender window. I've noticed this code is unfinished for Macs, but
seems to be complete for Windows. Needs test... currently, an external
drop event will print in console when succesfully delivered to Blender's WM.
2010-01-26 18:18:21 +00:00
|
|
|
/* api callbacks */
|
2012-03-22 07:26:09 +00:00
|
|
|
ot->invoke = drop_named_material_invoke;
|
2021-11-01 16:57:09 +01:00
|
|
|
ot->poll = ED_operator_objectmode_poll_msg;
|
2014-10-10 18:44:37 +02:00
|
|
|
|
Drag and drop 2.5 integration! Finally, slashdot regulars can use
Blender too now! :)
** Drag works as follows:
- drag-able items are defined by the standard interface ui toolkit
- each button can get this feature, via uiButSetDragXXX(but, ...).
There are calls to define drag-able images, ID blocks, RNA paths,
file paths, and so on. By default you drag an icon, exceptionally
an ImBuf
- Drag items are registered centrally in the WM, it allows more drag
items simultaneous too, but not implemented
** Drop works as follows:
- On mouse release, and if drag items exist in the WM, it converts
the mouse event to an EVT_DROP type. This event then gets the full
drag info as customdata
- drop regions are defined with WM_dropbox_add(), similar to keymaps
you can make a "drop map" this way, which become 'drop map handlers'
in the queues.
- next to that the UI kit handles some common button types (like
accepting ID or names) to be catching a drop event too.
- Every "drop box" has two callbacks:
- poll() = check if the event drag data is relevant for this box
- copy() = fill in custom properties in the dropbox to initialize
an operator
- The dropbox handler then calls its standard Operator with its
dropbox properties.
** Currently implemented
Drag items:
- ID icons in browse buttons
- ID icons in context menu of properties region
- ID icons in outliner and rna viewer
- FileBrowser icons
- FileBrowser preview images
Drag-able icons are subtly visualized by making them brighter a bit
on mouse-over. In case the icon is a button or UI element too (most
cases), the drag-able feature will make the item react to
mouse-release instead of mouse-press.
Drop options:
- UI buttons: ID and text buttons (paste name)
- View3d: Object ID drop copies object
- View3d: Material ID drop assigns to object under cursor
- View3d: Image ID drop assigns to object UV texture under cursor
- Sequencer: Path drop will add either Image or Movie strip
- Image window: Path drop will open image
** Drag and drop Notes:
- Dropping into another Blender window (from same application) works
too. I've added code that passes on mousemoves and clicks to other
windows, without activating them though. This does make using multi-window
Blender a bit friendler.
- Dropping a file path to an image, is not the same as dropping an
Image ID... keep this in mind. Sequencer for example wants paths to
be dropped, textures in 3d window wants an Image ID.
- Although drop boxes could be defined via Python, I suggest they're
part of the UI and editor design (= how we want an editor to work), and
not default offered configurable like keymaps.
- At the moment only one item can be dragged at a time. This is for
several reasons.... For one, Blender doesn't have a well defined
uniform way to define "what is selected" (files, outliner items, etc).
Secondly there's potential conflicts on what todo when you drop mixed
drag sets on spots. All undefined stuff... nice for later.
- Example to bypass the above: a collection of images that form a strip,
should be represented in filewindow as a single sequence anyway.
This then will fit well and gets handled neatly by design.
- Another option to check is to allow multiple options per drop... it
could show the operator as a sort of menu, allowing arrow or scrollwheel
to choose. For time being I'd prefer to try to design a singular drop
though, just offer only one drop action per data type on given spots.
- What does work already, but a tad slow, is to use a function that
detects an object (type) under cursor, so a drag item's option can be
further refined (like drop object on object = parent). (disabled)
** More notes
- Added saving for Region layouts (like split points for toolbar)
- Label buttons now handle mouse over
- File list: added full path entry for drop feature.
- Filesel bugfix: wm_operator_exec() got called there and fully handled,
while WM event code tried same. Added new OPERATOR_HANDLED flag for this.
Maybe python needs it too?
- Cocoa: added window move event, so multi-win setups work OK (didnt save).
- Interface_handlers.c: removed win->active
- Severe area copy bug: area handlers were not set to NULL
- Filesel bugfix: next/prev folder list was not copied on area copies
** Leftover todos
- Cocoa windows seem to hang on cases still... needs check
- Cocoa 'draw overlap' swap doesn't work
- Cocoa window loses focus permanently on using Spotlight
(for these reasons, makefile building has Carbon as default atm)
- ListView templates in UI cannot become dragged yet, needs review...
it consists of two overlapping UI elements, preventing handling icon clicks.
- There's already Ghost library code to handle dropping from OS
into Blender window. I've noticed this code is unfinished for Macs, but
seems to be complete for Windows. Needs test... currently, an external
drop event will print in console when succesfully delivered to Blender's WM.
2010-01-26 18:18:21 +00:00
|
|
|
/* flags */
|
2013-02-05 14:38:19 +00:00
|
|
|
ot->flag = OPTYPE_UNDO | OPTYPE_INTERNAL;
|
2014-10-10 18:44:37 +02:00
|
|
|
|
Drag and drop 2.5 integration! Finally, slashdot regulars can use
Blender too now! :)
** Drag works as follows:
- drag-able items are defined by the standard interface ui toolkit
- each button can get this feature, via uiButSetDragXXX(but, ...).
There are calls to define drag-able images, ID blocks, RNA paths,
file paths, and so on. By default you drag an icon, exceptionally
an ImBuf
- Drag items are registered centrally in the WM, it allows more drag
items simultaneous too, but not implemented
** Drop works as follows:
- On mouse release, and if drag items exist in the WM, it converts
the mouse event to an EVT_DROP type. This event then gets the full
drag info as customdata
- drop regions are defined with WM_dropbox_add(), similar to keymaps
you can make a "drop map" this way, which become 'drop map handlers'
in the queues.
- next to that the UI kit handles some common button types (like
accepting ID or names) to be catching a drop event too.
- Every "drop box" has two callbacks:
- poll() = check if the event drag data is relevant for this box
- copy() = fill in custom properties in the dropbox to initialize
an operator
- The dropbox handler then calls its standard Operator with its
dropbox properties.
** Currently implemented
Drag items:
- ID icons in browse buttons
- ID icons in context menu of properties region
- ID icons in outliner and rna viewer
- FileBrowser icons
- FileBrowser preview images
Drag-able icons are subtly visualized by making them brighter a bit
on mouse-over. In case the icon is a button or UI element too (most
cases), the drag-able feature will make the item react to
mouse-release instead of mouse-press.
Drop options:
- UI buttons: ID and text buttons (paste name)
- View3d: Object ID drop copies object
- View3d: Material ID drop assigns to object under cursor
- View3d: Image ID drop assigns to object UV texture under cursor
- Sequencer: Path drop will add either Image or Movie strip
- Image window: Path drop will open image
** Drag and drop Notes:
- Dropping into another Blender window (from same application) works
too. I've added code that passes on mousemoves and clicks to other
windows, without activating them though. This does make using multi-window
Blender a bit friendler.
- Dropping a file path to an image, is not the same as dropping an
Image ID... keep this in mind. Sequencer for example wants paths to
be dropped, textures in 3d window wants an Image ID.
- Although drop boxes could be defined via Python, I suggest they're
part of the UI and editor design (= how we want an editor to work), and
not default offered configurable like keymaps.
- At the moment only one item can be dragged at a time. This is for
several reasons.... For one, Blender doesn't have a well defined
uniform way to define "what is selected" (files, outliner items, etc).
Secondly there's potential conflicts on what todo when you drop mixed
drag sets on spots. All undefined stuff... nice for later.
- Example to bypass the above: a collection of images that form a strip,
should be represented in filewindow as a single sequence anyway.
This then will fit well and gets handled neatly by design.
- Another option to check is to allow multiple options per drop... it
could show the operator as a sort of menu, allowing arrow or scrollwheel
to choose. For time being I'd prefer to try to design a singular drop
though, just offer only one drop action per data type on given spots.
- What does work already, but a tad slow, is to use a function that
detects an object (type) under cursor, so a drag item's option can be
further refined (like drop object on object = parent). (disabled)
** More notes
- Added saving for Region layouts (like split points for toolbar)
- Label buttons now handle mouse over
- File list: added full path entry for drop feature.
- Filesel bugfix: wm_operator_exec() got called there and fully handled,
while WM event code tried same. Added new OPERATOR_HANDLED flag for this.
Maybe python needs it too?
- Cocoa: added window move event, so multi-win setups work OK (didnt save).
- Interface_handlers.c: removed win->active
- Severe area copy bug: area handlers were not set to NULL
- Filesel bugfix: next/prev folder list was not copied on area copies
** Leftover todos
- Cocoa windows seem to hang on cases still... needs check
- Cocoa 'draw overlap' swap doesn't work
- Cocoa window loses focus permanently on using Spotlight
(for these reasons, makefile building has Carbon as default atm)
- ListView templates in UI cannot become dragged yet, needs review...
it consists of two overlapping UI elements, preventing handling icon clicks.
- There's already Ghost library code to handle dropping from OS
into Blender window. I've noticed this code is unfinished for Macs, but
seems to be complete for Windows. Needs test... currently, an external
drop event will print in console when succesfully delivered to Blender's WM.
2010-01-26 18:18:21 +00:00
|
|
|
/* properties */
|
2022-05-23 20:54:15 +02:00
|
|
|
WM_operator_properties_id_lookup(ot, true);
|
Drag and drop 2.5 integration! Finally, slashdot regulars can use
Blender too now! :)
** Drag works as follows:
- drag-able items are defined by the standard interface ui toolkit
- each button can get this feature, via uiButSetDragXXX(but, ...).
There are calls to define drag-able images, ID blocks, RNA paths,
file paths, and so on. By default you drag an icon, exceptionally
an ImBuf
- Drag items are registered centrally in the WM, it allows more drag
items simultaneous too, but not implemented
** Drop works as follows:
- On mouse release, and if drag items exist in the WM, it converts
the mouse event to an EVT_DROP type. This event then gets the full
drag info as customdata
- drop regions are defined with WM_dropbox_add(), similar to keymaps
you can make a "drop map" this way, which become 'drop map handlers'
in the queues.
- next to that the UI kit handles some common button types (like
accepting ID or names) to be catching a drop event too.
- Every "drop box" has two callbacks:
- poll() = check if the event drag data is relevant for this box
- copy() = fill in custom properties in the dropbox to initialize
an operator
- The dropbox handler then calls its standard Operator with its
dropbox properties.
** Currently implemented
Drag items:
- ID icons in browse buttons
- ID icons in context menu of properties region
- ID icons in outliner and rna viewer
- FileBrowser icons
- FileBrowser preview images
Drag-able icons are subtly visualized by making them brighter a bit
on mouse-over. In case the icon is a button or UI element too (most
cases), the drag-able feature will make the item react to
mouse-release instead of mouse-press.
Drop options:
- UI buttons: ID and text buttons (paste name)
- View3d: Object ID drop copies object
- View3d: Material ID drop assigns to object under cursor
- View3d: Image ID drop assigns to object UV texture under cursor
- Sequencer: Path drop will add either Image or Movie strip
- Image window: Path drop will open image
** Drag and drop Notes:
- Dropping into another Blender window (from same application) works
too. I've added code that passes on mousemoves and clicks to other
windows, without activating them though. This does make using multi-window
Blender a bit friendler.
- Dropping a file path to an image, is not the same as dropping an
Image ID... keep this in mind. Sequencer for example wants paths to
be dropped, textures in 3d window wants an Image ID.
- Although drop boxes could be defined via Python, I suggest they're
part of the UI and editor design (= how we want an editor to work), and
not default offered configurable like keymaps.
- At the moment only one item can be dragged at a time. This is for
several reasons.... For one, Blender doesn't have a well defined
uniform way to define "what is selected" (files, outliner items, etc).
Secondly there's potential conflicts on what todo when you drop mixed
drag sets on spots. All undefined stuff... nice for later.
- Example to bypass the above: a collection of images that form a strip,
should be represented in filewindow as a single sequence anyway.
This then will fit well and gets handled neatly by design.
- Another option to check is to allow multiple options per drop... it
could show the operator as a sort of menu, allowing arrow or scrollwheel
to choose. For time being I'd prefer to try to design a singular drop
though, just offer only one drop action per data type on given spots.
- What does work already, but a tad slow, is to use a function that
detects an object (type) under cursor, so a drag item's option can be
further refined (like drop object on object = parent). (disabled)
** More notes
- Added saving for Region layouts (like split points for toolbar)
- Label buttons now handle mouse over
- File list: added full path entry for drop feature.
- Filesel bugfix: wm_operator_exec() got called there and fully handled,
while WM event code tried same. Added new OPERATOR_HANDLED flag for this.
Maybe python needs it too?
- Cocoa: added window move event, so multi-win setups work OK (didnt save).
- Interface_handlers.c: removed win->active
- Severe area copy bug: area handlers were not set to NULL
- Filesel bugfix: next/prev folder list was not copied on area copies
** Leftover todos
- Cocoa windows seem to hang on cases still... needs check
- Cocoa 'draw overlap' swap doesn't work
- Cocoa window loses focus permanently on using Spotlight
(for these reasons, makefile building has Carbon as default atm)
- ListView templates in UI cannot become dragged yet, needs review...
it consists of two overlapping UI elements, preventing handling icon clicks.
- There's already Ghost library code to handle dropping from OS
into Blender window. I've noticed this code is unfinished for Macs, but
seems to be complete for Windows. Needs test... currently, an external
drop event will print in console when succesfully delivered to Blender's WM.
2010-01-26 18:18:21 +00:00
|
|
|
}
|
2014-08-21 17:00:35 +10:00
|
|
|
|
2020-03-26 10:24:44 +11:00
|
|
|
/** \} */
|
|
|
|
|
|
|
|
|
|
/* ------------------------------------------------------------------- */
|
|
|
|
|
/** \name Unlink Object Operator
|
|
|
|
|
* \{ */
|
|
|
|
|
|
2014-08-21 17:00:35 +10:00
|
|
|
static int object_unlink_data_exec(bContext *C, wmOperator *op)
|
|
|
|
|
{
|
|
|
|
|
ID *id;
|
|
|
|
|
PropertyPointerRNA pprop;
|
|
|
|
|
|
2014-11-09 21:20:40 +01:00
|
|
|
UI_context_active_but_prop_get_templateID(C, &pprop.ptr, &pprop.prop);
|
2014-08-21 17:00:35 +10:00
|
|
|
|
|
|
|
|
if (pprop.prop == NULL) {
|
|
|
|
|
BKE_report(op->reports, RPT_ERROR, "Incorrect context for running object data unlink");
|
|
|
|
|
return OPERATOR_CANCELLED;
|
|
|
|
|
}
|
|
|
|
|
|
2019-08-23 09:52:12 +02:00
|
|
|
id = pprop.ptr.owner_id;
|
2014-08-21 17:00:35 +10:00
|
|
|
|
|
|
|
|
if (GS(id->name) == ID_OB) {
|
|
|
|
|
Object *ob = (Object *)id;
|
|
|
|
|
if (ob->data) {
|
|
|
|
|
ID *id_data = ob->data;
|
|
|
|
|
|
|
|
|
|
if (GS(id_data->name) == ID_IM) {
|
|
|
|
|
id_us_min(id_data);
|
|
|
|
|
ob->data = NULL;
|
|
|
|
|
}
|
|
|
|
|
else {
|
|
|
|
|
BKE_report(op->reports, RPT_ERROR, "Can't unlink this object data");
|
|
|
|
|
return OPERATOR_CANCELLED;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
RNA_property_update(C, &pprop.ptr, pprop.prop);
|
|
|
|
|
|
|
|
|
|
return OPERATOR_FINISHED;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void OBJECT_OT_unlink_data(wmOperatorType *ot)
|
|
|
|
|
{
|
|
|
|
|
/* identifiers */
|
|
|
|
|
ot->name = "Unlink";
|
|
|
|
|
ot->idname = "OBJECT_OT_unlink_data";
|
|
|
|
|
|
|
|
|
|
/* api callbacks */
|
|
|
|
|
ot->exec = object_unlink_data_exec;
|
|
|
|
|
|
|
|
|
|
/* flags */
|
|
|
|
|
ot->flag = OPTYPE_INTERNAL;
|
|
|
|
|
}
|
2020-03-26 10:24:44 +11:00
|
|
|
|
|
|
|
|
/** \} */
|