2011-02-23 10:52:22 +00:00
|
|
|
/*
|
2009-09-16 17:43:09 +00:00
|
|
|
* ***** BEGIN GPL LICENSE BLOCK *****
|
|
|
|
*
|
|
|
|
* This program is free software; you can redistribute it and/or
|
|
|
|
* modify it under the terms of the GNU General Public License
|
|
|
|
* as published by the Free Software Foundation; either version 2
|
|
|
|
* of the License, or (at your option) any later version.
|
|
|
|
*
|
|
|
|
* This program is distributed in the hope that it will be useful,
|
|
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
* GNU General Public License for more details.
|
|
|
|
*
|
|
|
|
* You should have received a copy of the GNU General Public License
|
|
|
|
* along with this program; if not, write to the Free Software Foundation,
|
2010-02-12 13:34:04 +00:00
|
|
|
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
2009-09-16 17:43:09 +00:00
|
|
|
*
|
|
|
|
* The Original Code is Copyright (C) 2001-2002 by NaN Holding BV.
|
|
|
|
* All rights reserved.
|
|
|
|
*
|
|
|
|
* Contributor(s): Blender Foundation, 2002-2008 full recode
|
|
|
|
*
|
|
|
|
* ***** END GPL LICENSE BLOCK *****
|
|
|
|
*/
|
|
|
|
|
2011-02-27 20:29:51 +00:00
|
|
|
/** \file blender/editors/object/object_relations.c
|
|
|
|
* \ingroup edobj
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
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"
|
2012-02-19 22:17:30 +00:00
|
|
|
#include "DNA_mesh_types.h"
|
2009-09-16 17:43:09 +00:00
|
|
|
#include "DNA_constraint_types.h"
|
|
|
|
#include "DNA_group_types.h"
|
|
|
|
#include "DNA_lamp_types.h"
|
|
|
|
#include "DNA_lattice_types.h"
|
|
|
|
#include "DNA_material_types.h"
|
|
|
|
#include "DNA_meta_types.h"
|
|
|
|
#include "DNA_particle_types.h"
|
|
|
|
#include "DNA_scene_types.h"
|
|
|
|
#include "DNA_world_types.h"
|
2010-08-04 04:01:27 +00:00
|
|
|
#include "DNA_object_types.h"
|
2012-08-03 13:27:58 +00:00
|
|
|
#include "DNA_vfont_types.h"
|
2016-08-03 23:31:48 +02:00
|
|
|
#include "DNA_gpencil_types.h"
|
2009-09-16 17:43:09 +00:00
|
|
|
|
2009-11-10 20:43:45 +00:00
|
|
|
#include "BLI_math.h"
|
2009-09-16 17:43:09 +00:00
|
|
|
#include "BLI_listbase.h"
|
2012-07-18 09:45:50 +00:00
|
|
|
#include "BLI_linklist.h"
|
2009-09-16 17:43:09 +00:00
|
|
|
#include "BLI_string.h"
|
2013-09-01 22:01:21 +00:00
|
|
|
#include "BLI_kdtree.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
|
|
|
|
2009-09-16 17:43:09 +00:00
|
|
|
#include "BKE_action.h"
|
|
|
|
#include "BKE_animsys.h"
|
|
|
|
#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_context.h"
|
|
|
|
#include "BKE_constraint.h"
|
|
|
|
#include "BKE_curve.h"
|
|
|
|
#include "BKE_depsgraph.h"
|
2011-11-23 15:44:20 +00:00
|
|
|
#include "BKE_DerivedMesh.h"
|
2009-09-16 17:43:09 +00:00
|
|
|
#include "BKE_displist.h"
|
|
|
|
#include "BKE_global.h"
|
2012-07-18 09:45:50 +00:00
|
|
|
#include "BKE_group.h"
|
2010-10-21 10:28:06 +00:00
|
|
|
#include "BKE_fcurve.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"
|
2011-11-05 13:11:49 +00:00
|
|
|
#include "BKE_lamp.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"
|
2009-09-16 17:43:09 +00:00
|
|
|
#include "BKE_library.h"
|
2014-03-26 16:55:20 +06:00
|
|
|
#include "BKE_library_query.h"
|
2016-12-12 14:58:10 +01:00
|
|
|
#include "BKE_library_remap.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"
|
|
|
|
#include "BKE_report.h"
|
|
|
|
#include "BKE_sca.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"
|
2013-04-13 20:31:52 +00:00
|
|
|
#include "BKE_editmesh.h"
|
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"
|
2010-10-21 10:28:06 +00:00
|
|
|
#include "ED_keyframing.h"
|
2009-09-16 17:43:09 +00:00
|
|
|
#include "ED_object.h"
|
2011-09-21 17:15:54 +00:00
|
|
|
#include "ED_mesh.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"
|
|
|
|
|
|
|
|
/*********************** Make Vertex Parent Operator ************************/
|
|
|
|
|
|
|
|
static int vertex_parent_set_poll(bContext *C)
|
|
|
|
{
|
|
|
|
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);
|
2017-04-19 11:31:33 +02:00
|
|
|
SceneLayer *sl = CTX_data_scene_layer(C);
|
2012-04-28 15:42:27 +00:00
|
|
|
Object *obedit = CTX_data_edit_object(C);
|
2010-01-28 00:45:30 +00:00
|
|
|
BMVert *eve;
|
|
|
|
BMIter iter;
|
2009-09-16 17:43:09 +00:00
|
|
|
Curve *cu;
|
|
|
|
Nurb *nu;
|
|
|
|
BezTriple *bezt;
|
|
|
|
BPoint *bp;
|
|
|
|
Object *par;
|
2012-04-28 15:42:27 +00:00
|
|
|
int a, v1 = 0, v2 = 0, v3 = 0, v4 = 0, nr = 1;
|
2014-10-10 18:44:37 +02:00
|
|
|
|
2009-09-16 17:43:09 +00:00
|
|
|
/* we need 1 to 3 selected vertices */
|
2014-10-10 18:44:37 +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;
|
2011-09-19 08:25:31 +00:00
|
|
|
|
2012-03-29 01:41:56 +00:00
|
|
|
EDBM_mesh_load(obedit);
|
2016-04-29 22:33:06 +10:00
|
|
|
EDBM_mesh_make(scene->toolsettings, obedit, true);
|
2011-09-19 08:25:31 +00:00
|
|
|
|
2015-12-03 10:44:27 +11:00
|
|
|
DAG_id_tag_update(obedit->data, 0);
|
|
|
|
|
2012-04-28 15:42:27 +00:00
|
|
|
em = me->edit_btmesh;
|
2009-09-16 17:43:09 +00:00
|
|
|
|
2012-07-26 08:41:55 +00:00
|
|
|
EDBM_mesh_normals_update(em);
|
2013-04-16 05:59:48 +00:00
|
|
|
BKE_editmesh_tessface_calc(em);
|
2012-07-26 08:41:55 +00:00
|
|
|
|
2011-11-23 15:44:20 +00:00
|
|
|
/* derivedMesh might be needed for solving parenting,
|
2012-03-03 16:31:46 +00:00
|
|
|
* so re-create it here */
|
2015-07-02 16:20:22 +10:00
|
|
|
makeDerivedMesh(scene, obedit, em, CD_MASK_BAREMESH | CD_MASK_ORIGINDEX, false);
|
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
|
|
|
|
2012-04-19 13:47:58 +00:00
|
|
|
BM_ITER_MESH (eve, &iter, em->bm, BM_VERTS_OF_MESH) {
|
2012-02-12 10:51:45 +00:00
|
|
|
if (BM_elem_flag_test(eve, BM_ELEM_SELECT)) {
|
2012-04-28 15:42:27 +00:00
|
|
|
if (v1 == 0) v1 = nr;
|
|
|
|
else if (v2 == 0) v2 = nr;
|
|
|
|
else if (v3 == 0) v3 = nr;
|
|
|
|
else if (v4 == 0) v4 = nr;
|
2009-09-16 17:43:09 +00:00
|
|
|
else break;
|
|
|
|
}
|
2011-09-06 05:04:26 +00:00
|
|
|
nr++;
|
2009-09-16 17:43:09 +00:00
|
|
|
}
|
|
|
|
}
|
2012-03-24 06:38:07 +00:00
|
|
|
else if (ELEM(obedit->type, OB_SURF, OB_CURVE)) {
|
2012-04-28 15:42:27 +00:00
|
|
|
ListBase *editnurb = object_editcurve_get(obedit);
|
2014-10-10 18:44:37 +02:00
|
|
|
|
2012-04-28 15:42:27 +00:00
|
|
|
cu = obedit->data;
|
2009-09-16 17:43:09 +00:00
|
|
|
|
2012-04-28 15:42:27 +00:00
|
|
|
nu = editnurb->first;
|
2012-03-24 06:38:07 +00:00
|
|
|
while (nu) {
|
|
|
|
if (nu->type == CU_BEZIER) {
|
2012-04-28 15:42:27 +00:00
|
|
|
bezt = nu->bezt;
|
|
|
|
a = nu->pntsu;
|
2012-03-24 06:38:07 +00:00
|
|
|
while (a--) {
|
2015-07-09 14:31:27 +10:00
|
|
|
if (BEZT_ISSEL_ANY_HIDDENHANDLES(cu, bezt)) {
|
2012-04-28 15:42:27 +00:00
|
|
|
if (v1 == 0) v1 = nr;
|
|
|
|
else if (v2 == 0) v2 = nr;
|
|
|
|
else if (v3 == 0) v3 = nr;
|
|
|
|
else if (v4 == 0) v4 = nr;
|
2009-09-16 17:43:09 +00:00
|
|
|
else break;
|
|
|
|
}
|
|
|
|
nr++;
|
|
|
|
bezt++;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else {
|
2012-04-28 15:42:27 +00:00
|
|
|
bp = nu->bp;
|
|
|
|
a = nu->pntsu * nu->pntsv;
|
2012-03-24 06:38:07 +00:00
|
|
|
while (a--) {
|
|
|
|
if (bp->f1 & SELECT) {
|
2012-04-28 15:42:27 +00:00
|
|
|
if (v1 == 0) v1 = nr;
|
|
|
|
else if (v2 == 0) v2 = nr;
|
|
|
|
else if (v3 == 0) v3 = nr;
|
|
|
|
else if (v4 == 0) v4 = nr;
|
2009-09-16 17:43:09 +00:00
|
|
|
else break;
|
|
|
|
}
|
|
|
|
nr++;
|
|
|
|
bp++;
|
|
|
|
}
|
|
|
|
}
|
2012-04-28 15:42:27 +00:00
|
|
|
nu = nu->next;
|
2009-09-16 17:43:09 +00:00
|
|
|
}
|
|
|
|
}
|
2012-04-28 15:42:27 +00:00
|
|
|
else if (obedit->type == OB_LATTICE) {
|
|
|
|
Lattice *lt = obedit->data;
|
2014-10-10 18:44:37 +02:00
|
|
|
|
2012-04-28 15:42:27 +00:00
|
|
|
a = lt->editlatt->latt->pntsu * lt->editlatt->latt->pntsv * lt->editlatt->latt->pntsw;
|
|
|
|
bp = lt->editlatt->latt->def;
|
2012-03-24 06:38:07 +00:00
|
|
|
while (a--) {
|
|
|
|
if (bp->f1 & SELECT) {
|
2012-04-28 15:42:27 +00:00
|
|
|
if (v1 == 0) v1 = nr;
|
|
|
|
else if (v2 == 0) v2 = nr;
|
|
|
|
else if (v3 == 0) v3 = nr;
|
|
|
|
else if (v4 == 0) v4 = nr;
|
2009-09-16 17:43:09 +00:00
|
|
|
else break;
|
|
|
|
}
|
|
|
|
nr++;
|
|
|
|
bp++;
|
|
|
|
}
|
|
|
|
}
|
2014-10-10 18:44:37 +02:00
|
|
|
|
2013-03-09 03:46:30 +00:00
|
|
|
if (v4 || !((v1 && v2 == 0 && v3 == 0) || (v1 && v2 && v3))) {
|
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;
|
|
|
|
}
|
2014-10-10 18:44:37 +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) {
|
2013-02-21 19:33:04 +00:00
|
|
|
DAG_id_tag_update(&ob->id, OB_RECALC_OB | OB_RECALC_DATA | OB_RECALC_TIME);
|
2012-04-28 15:42:27 +00:00
|
|
|
par = obedit->parent;
|
2014-10-10 18:44:37 +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;
|
2014-10-10 18:44:37 +02:00
|
|
|
|
2017-04-19 11:31:33 +02:00
|
|
|
ob->parent = BASACT_NEW->object;
|
2012-03-24 06:38:07 +00:00
|
|
|
if (v3) {
|
2012-04-28 15:42:27 +00:00
|
|
|
ob->partype = PARVERT3;
|
|
|
|
ob->par1 = v1 - 1;
|
|
|
|
ob->par2 = v2 - 1;
|
|
|
|
ob->par3 = v3 - 1;
|
2009-09-16 17:43:09 +00:00
|
|
|
|
|
|
|
/* inverse parent matrix */
|
2012-05-05 14:03:12 +00:00
|
|
|
BKE_object_workob_calc_parent(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;
|
|
|
|
ob->par1 = v1 - 1;
|
2009-09-16 17:43:09 +00:00
|
|
|
|
|
|
|
/* inverse parent matrix */
|
2012-05-05 14:03:12 +00:00
|
|
|
BKE_object_workob_calc_parent(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
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
CTX_DATA_END;
|
2014-10-10 18:44:37 +02:00
|
|
|
|
2013-02-21 19:33:04 +00:00
|
|
|
DAG_relations_tag_update(bmain);
|
2009-09-16 17:43:09 +00:00
|
|
|
|
|
|
|
WM_event_add_notifier(C, NC_OBJECT, NULL);
|
|
|
|
|
|
|
|
return OPERATOR_FINISHED;
|
|
|
|
}
|
|
|
|
|
|
|
|
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";
|
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_operator_confirm;
|
|
|
|
ot->poll = vertex_parent_set_poll;
|
|
|
|
ot->exec = vertex_parent_set_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;
|
2009-09-16 17:43:09 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/********************** Make Proxy Operator *************************/
|
|
|
|
|
|
|
|
/* set the object to proxify */
|
2013-03-13 09:03:46 +00:00
|
|
|
static int make_proxy_invoke(bContext *C, wmOperator *op, const wmEvent *event)
|
2009-09-16 17:43:09 +00:00
|
|
|
{
|
2012-04-28 15:42:27 +00:00
|
|
|
Scene *scene = CTX_data_scene(C);
|
|
|
|
Object *ob = ED_object_active_context(C);
|
2014-10-10 18:44:37 +02:00
|
|
|
|
2009-09-16 17:43:09 +00:00
|
|
|
/* sanity checks */
|
2016-07-06 14:11:01 +02:00
|
|
|
if (!scene || ID_IS_LINKED_DATABLOCK(scene) || !ob)
|
2009-09-16 17:43:09 +00:00
|
|
|
return OPERATOR_CANCELLED;
|
2014-10-10 18:44:37 +02:00
|
|
|
|
2009-09-16 17:43:09 +00:00
|
|
|
/* Get object to work on - use a menu if we need to... */
|
2016-07-06 14:11:01 +02:00
|
|
|
if (ob->dup_group && ID_IS_LINKED_DATABLOCK(ob->dup_group)) {
|
2009-09-16 17:43:09 +00:00
|
|
|
/* gives menu with list of objects in group */
|
2014-10-10 18:26:46 +02:00
|
|
|
/* proxy_group_objects_menu(C, op, ob, ob->dup_group); */
|
2013-03-13 09:03:46 +00:00
|
|
|
WM_enum_search_invoke(C, op, event);
|
2010-01-15 17:23:16 +00:00
|
|
|
return OPERATOR_CANCELLED;
|
2009-09-16 17:43:09 +00:00
|
|
|
}
|
2016-07-06 14:11:01 +02:00
|
|
|
else if (ID_IS_LINKED_DATABLOCK(ob)) {
|
2014-11-09 21:20:40 +01:00
|
|
|
uiPopupMenu *pup = UI_popup_menu_begin(C, IFACE_("OK?"), ICON_QUESTION);
|
|
|
|
uiLayout *layout = UI_popup_menu_layout(pup);
|
2014-10-10 18:44:37 +02:00
|
|
|
|
2009-09-16 17:43:09 +00:00
|
|
|
/* create operator menu item with relevant properties filled in */
|
2014-10-10 18:26:46 +02:00
|
|
|
uiItemFullO_ptr(layout, op->type, op->type->name, ICON_NONE, NULL,
|
|
|
|
WM_OP_EXEC_REGION_WIN, UI_ITEM_O_RETURN_PROPS);
|
2014-10-10 18:44:37 +02:00
|
|
|
|
2009-09-16 17:43:09 +00:00
|
|
|
/* present the menu and be done... */
|
2014-11-09 21:20:40 +01:00
|
|
|
UI_popup_menu_end(C, pup);
|
2014-10-28 17:51:06 +01:00
|
|
|
|
|
|
|
/* this invoke just calls another instance of this operator... */
|
|
|
|
return OPERATOR_INTERFACE;
|
2009-09-16 17:43:09 +00:00
|
|
|
}
|
|
|
|
else {
|
|
|
|
/* error.. cannot continue */
|
|
|
|
BKE_report(op->reports, RPT_ERROR, "Can only make proxy for a referenced object or group");
|
2014-10-28 17:51:06 +01:00
|
|
|
return OPERATOR_CANCELLED;
|
2009-09-16 17:43:09 +00:00
|
|
|
}
|
2014-10-10 18:44:37 +02:00
|
|
|
|
2009-09-16 17:43:09 +00:00
|
|
|
}
|
|
|
|
|
2012-04-28 15:42:27 +00:00
|
|
|
static int make_proxy_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);
|
|
|
|
Object *ob, *gob = ED_object_active_context(C);
|
2010-02-16 16:32:25 +00:00
|
|
|
GroupObject *go;
|
2012-04-28 15:42:27 +00:00
|
|
|
Scene *scene = CTX_data_scene(C);
|
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
|
|
|
SceneLayer *sl = CTX_data_scene_layer(C);
|
2010-02-16 19:41:44 +00:00
|
|
|
|
2012-03-06 18:40:15 +00:00
|
|
|
if (gob->dup_group != NULL) {
|
2012-04-28 15:42:27 +00:00
|
|
|
go = BLI_findlink(&gob->dup_group->gobject, RNA_enum_get(op->ptr, "object"));
|
|
|
|
ob = go->ob;
|
2009-09-16 17:43:09 +00:00
|
|
|
}
|
2012-03-06 18:40:15 +00:00
|
|
|
else {
|
2012-04-28 15:42:27 +00:00
|
|
|
ob = gob;
|
2010-02-16 19:41:44 +00:00
|
|
|
gob = NULL;
|
2009-09-16 17:43:09 +00:00
|
|
|
}
|
2014-10-10 18:44:37 +02:00
|
|
|
|
2009-09-16 17:43:09 +00:00
|
|
|
if (ob) {
|
|
|
|
Object *newob;
|
2017-04-19 11:31:33 +02:00
|
|
|
BaseLegacy *newbase, *oldbase = BASACT_NEW;
|
2012-04-28 15:42:27 +00:00
|
|
|
char name[MAX_ID_NAME + 4];
|
2014-10-10 18:44:37 +02:00
|
|
|
|
2012-04-28 15:42:27 +00:00
|
|
|
BLI_snprintf(name, sizeof(name), "%s_proxy", ((ID *)(gob ? gob : ob))->name + 2);
|
2011-10-19 23:10:54 +00:00
|
|
|
|
2015-05-04 12:25:33 +10:00
|
|
|
/* Add new object for the proxy */
|
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
|
|
|
newob = BKE_object_add(bmain, scene, sl, OB_EMPTY, name);
|
2014-10-10 18:44:37 +02:00
|
|
|
|
2009-09-16 17:43:09 +00:00
|
|
|
/* set layers OK */
|
2017-04-19 11:31:33 +02:00
|
|
|
newbase = BASACT_NEW; /* BKE_object_add sets active... */
|
2012-04-28 15:42:27 +00:00
|
|
|
newbase->lay = oldbase->lay;
|
|
|
|
newob->lay = newbase->lay;
|
2014-10-10 18:44:37 +02:00
|
|
|
|
2012-05-05 14:03:12 +00:00
|
|
|
/* remove base, leave user count of object, it gets linked in BKE_object_make_proxy */
|
2012-04-28 15:42:27 +00:00
|
|
|
if (gob == NULL) {
|
2013-01-26 17:38:45 +00:00
|
|
|
BKE_scene_base_unlink(scene, oldbase);
|
|
|
|
MEM_freeN(oldbase);
|
2009-09-16 17:43:09 +00:00
|
|
|
}
|
2014-10-10 18:44:37 +02:00
|
|
|
|
2012-05-05 14:03:12 +00:00
|
|
|
BKE_object_make_proxy(newob, ob, gob);
|
2014-10-10 18:44:37 +02:00
|
|
|
|
2009-09-16 17:43:09 +00:00
|
|
|
/* depsgraph flushes are needed for the new data */
|
2013-02-21 19:33:04 +00:00
|
|
|
DAG_relations_tag_update(bmain);
|
2012-04-28 15:42:27 +00:00
|
|
|
DAG_id_tag_update(&newob->id, OB_RECALC_OB | OB_RECALC_DATA | OB_RECALC_TIME);
|
|
|
|
WM_event_add_notifier(C, NC_OBJECT | ND_DRAW, newob);
|
2009-09-16 17:43:09 +00:00
|
|
|
}
|
|
|
|
else {
|
|
|
|
BKE_report(op->reports, RPT_ERROR, "No object to make proxy for");
|
|
|
|
return OPERATOR_CANCELLED;
|
|
|
|
}
|
2014-10-10 18:44:37 +02:00
|
|
|
|
2009-09-16 17:43:09 +00:00
|
|
|
return OPERATOR_FINISHED;
|
|
|
|
}
|
|
|
|
|
2010-01-15 17:23:16 +00:00
|
|
|
/* Generic itemf's for operators that take library args */
|
2014-10-10 18:26:46 +02:00
|
|
|
static EnumPropertyItem *proxy_group_object_itemf(bContext *C, PointerRNA *UNUSED(ptr),
|
|
|
|
PropertyRNA *UNUSED(prop), bool *r_free)
|
2010-01-15 17:23:16 +00:00
|
|
|
{
|
2012-04-28 15:42:27 +00:00
|
|
|
EnumPropertyItem item_tmp = {0}, *item = NULL;
|
|
|
|
int totitem = 0;
|
|
|
|
int i = 0;
|
|
|
|
Object *ob = ED_object_active_context(C);
|
2010-01-15 17:23:16 +00:00
|
|
|
GroupObject *go;
|
|
|
|
|
2012-03-24 06:38:07 +00:00
|
|
|
if (!ob || !ob->dup_group)
|
2010-01-27 21:19:39 +00:00
|
|
|
return DummyRNA_DEFAULT_items;
|
2010-01-15 17:23:16 +00:00
|
|
|
|
|
|
|
/* find the object to affect */
|
2012-04-28 15:42:27 +00:00
|
|
|
for (go = ob->dup_group->gobject.first; go; go = go->next) {
|
|
|
|
item_tmp.identifier = item_tmp.name = go->ob->id.name + 2;
|
|
|
|
item_tmp.value = i++;
|
2010-01-15 17:23:16 +00:00
|
|
|
RNA_enum_item_add(&item, &totitem, &item_tmp);
|
|
|
|
}
|
|
|
|
|
|
|
|
RNA_enum_item_end(&item, &totitem);
|
2014-01-04 18:08:43 +11:00
|
|
|
*r_free = true;
|
2010-01-15 17:23:16 +00:00
|
|
|
|
|
|
|
return item;
|
|
|
|
}
|
|
|
|
|
2012-04-28 15:42:27 +00:00
|
|
|
void OBJECT_OT_proxy_make(wmOperatorType *ot)
|
2009-09-16 17:43:09 +00:00
|
|
|
{
|
2010-01-15 17:23:16 +00:00
|
|
|
PropertyRNA *prop;
|
|
|
|
|
2009-09-16 17:43:09 +00:00
|
|
|
/* identifiers */
|
2012-03-22 07:26:09 +00:00
|
|
|
ot->name = "Make Proxy";
|
|
|
|
ot->idname = "OBJECT_OT_proxy_make";
|
|
|
|
ot->description = "Add empty object to become local replacement data of a library-linked object";
|
2014-10-10 18:44:37 +02:00
|
|
|
|
2009-09-16 17:43:09 +00:00
|
|
|
/* callbacks */
|
2012-03-22 07:26:09 +00:00
|
|
|
ot->invoke = make_proxy_invoke;
|
|
|
|
ot->exec = make_proxy_exec;
|
|
|
|
ot->poll = ED_operator_object_active;
|
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 */
|
2014-10-10 18:26:46 +02:00
|
|
|
/* XXX, relies on hard coded ID at the moment */
|
|
|
|
prop = RNA_def_enum(ot->srna, "object", DummyRNA_DEFAULT_items, 0, "Proxy Object",
|
|
|
|
"Name of lib-linked/grouped object to make a proxy for");
|
2010-01-15 17:23:16 +00:00
|
|
|
RNA_def_enum_funcs(prop, proxy_group_object_itemf);
|
2014-05-05 15:22:36 +10:00
|
|
|
RNA_def_property_flag(prop, PROP_ENUM_NO_TRANSLATE);
|
2012-03-22 07:26:09 +00:00
|
|
|
ot->prop = prop;
|
2009-09-16 17:43:09 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/********************** Clear Parent Operator ******************* */
|
|
|
|
|
2012-10-15 03:00:27 +00:00
|
|
|
typedef enum eObClearParentTypes {
|
|
|
|
CLEAR_PARENT_ALL = 0,
|
|
|
|
CLEAR_PARENT_KEEP_TRANSFORM,
|
|
|
|
CLEAR_PARENT_INVERSE
|
|
|
|
} eObClearParentTypes;
|
|
|
|
|
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"},
|
2009-09-16 17:43:09 +00:00
|
|
|
{0, NULL, 0, NULL, NULL}
|
|
|
|
};
|
|
|
|
|
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
|
|
|
{
|
2014-07-20 01:30:29 +10:00
|
|
|
if (ELEM(par->type, OB_ARMATURE, OB_LATTICE, OB_CURVE)) {
|
2012-10-15 03:00:27 +00:00
|
|
|
ModifierData *md, *mdn;
|
2014-10-10 18:44:37 +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;
|
2014-10-10 18:44:37 +02:00
|
|
|
|
2012-10-15 03:00:27 +00:00
|
|
|
mdn = md->next;
|
2014-10-10 18:44:37 +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
|
|
|
}
|
|
|
|
}
|
|
|
|
else if ((md->type == eModifierType_Curve) && (par->type == OB_CURVE)) {
|
|
|
|
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
|
|
|
}
|
|
|
|
}
|
2014-10-10 18:44:37 +02:00
|
|
|
|
2012-10-15 03:00:27 +00:00
|
|
|
/* free modifier if match */
|
|
|
|
if (free) {
|
|
|
|
BLI_remlink(&ob->modifiers, md);
|
|
|
|
modifier_free(md);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
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
|
|
|
{
|
2012-05-29 18:12:13 +00:00
|
|
|
if (ob->parent == NULL)
|
|
|
|
return;
|
2014-10-10 18:44:37 +02:00
|
|
|
|
2012-10-15 03:00:27 +00:00
|
|
|
switch (type) {
|
|
|
|
case CLEAR_PARENT_ALL:
|
|
|
|
{
|
|
|
|
/* for deformers, remove corresponding modifiers to prevent a large number of modifiers building up */
|
|
|
|
object_remove_parent_deform_modifiers(ob, ob->parent);
|
2014-10-10 18:44:37 +02:00
|
|
|
|
2012-10-15 03:00:27 +00:00
|
|
|
/* clear parenting relationship completely */
|
|
|
|
ob->parent = NULL;
|
2013-07-19 15:23:42 +00:00
|
|
|
break;
|
2012-10-15 03:00:27 +00:00
|
|
|
}
|
|
|
|
case CLEAR_PARENT_KEEP_TRANSFORM:
|
|
|
|
{
|
|
|
|
/* remove parent, and apply the parented transform result as object's local transforms */
|
|
|
|
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:
|
|
|
|
{
|
2014-10-10 16:57:29 +02:00
|
|
|
/* object stays parented, but the parent inverse (i.e. offset from parent to retain binding state)
|
|
|
|
* is cleared. In other words: nothing to do here! */
|
2013-07-19 15:23:42 +00:00
|
|
|
break;
|
2012-10-15 03:00:27 +00:00
|
|
|
}
|
|
|
|
}
|
2014-10-10 18:44:37 +02:00
|
|
|
|
2014-10-10 16:57:29 +02:00
|
|
|
/* Always clear parentinv matrix for sake of consistency, see T41950. */
|
|
|
|
unit_m4(ob->parentinv);
|
2014-10-10 18:44:37 +02:00
|
|
|
|
2013-02-21 19:33:04 +00:00
|
|
|
DAG_id_tag_update(&ob->id, OB_RECALC_OB | OB_RECALC_DATA | OB_RECALC_TIME);
|
2012-05-29 18:12:13 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* note, poll should check for editable scene */
|
|
|
|
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");
|
2009-09-16 17:43:09 +00: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;
|
2012-01-22 10:20:30 +00:00
|
|
|
|
2013-02-21 19:33:04 +00:00
|
|
|
DAG_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
|
|
|
|
2012-03-22 07:26:09 +00:00
|
|
|
ot->poll = ED_operator_object_active_editable;
|
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
|
|
|
}
|
|
|
|
|
|
|
|
/* ******************** Make Parent Operator *********************** */
|
|
|
|
|
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)", ""},
|
2012-01-22 10:20:30 +00:00
|
|
|
{0, NULL, 0, NULL, NULL}
|
|
|
|
};
|
|
|
|
|
2014-10-10 18:26:46 +02:00
|
|
|
bool ED_object_parent_set(ReportList *reports, Main *bmain, Scene *scene, Object *ob, Object *par,
|
|
|
|
int partype, const bool xmirror, const bool keep_transform, const int vert_par[3])
|
2009-09-16 17:43:09 +00:00
|
|
|
{
|
2012-04-28 15:42:27 +00:00
|
|
|
bPoseChannel *pchan = NULL;
|
2014-10-10 18:26:46 +02:00
|
|
|
const bool pararm = ELEM(partype, PAR_ARMATURE, PAR_ARMATURE_NAME, PAR_ARMATURE_ENVELOPE, PAR_ARMATURE_AUTO);
|
2014-10-10 18:44:37 +02:00
|
|
|
|
2013-02-21 19:33:04 +00:00
|
|
|
DAG_id_tag_update(&par->id, OB_RECALC_OB);
|
2014-10-10 18:44:37 +02:00
|
|
|
|
2009-09-16 17:43:09 +00:00
|
|
|
/* preconditions */
|
2012-04-28 15:42:27 +00:00
|
|
|
if (partype == PAR_FOLLOW || partype == PAR_PATH_CONST) {
|
|
|
|
if (par->type != OB_CURVE)
|
2012-01-22 10:20:30 +00:00
|
|
|
return 0;
|
2009-09-16 17:43:09 +00:00
|
|
|
else {
|
2012-04-28 15:42:27 +00:00
|
|
|
Curve *cu = par->data;
|
2014-10-10 18:44:37 +02:00
|
|
|
|
2012-04-28 15:42:27 +00:00
|
|
|
if ((cu->flag & CU_PATH) == 0) {
|
|
|
|
cu->flag |= CU_PATH | CU_FOLLOW;
|
2012-05-07 06:58:03 +00:00
|
|
|
BKE_displist_make_curveTypes(scene, par, 0); /* force creation of path data */
|
2009-09-16 17:43:09 +00:00
|
|
|
}
|
2013-03-09 03:46:30 +00:00
|
|
|
else {
|
|
|
|
cu->flag |= CU_FOLLOW;
|
|
|
|
}
|
|
|
|
|
2010-10-21 10:28:06 +00:00
|
|
|
/* if follow, add F-Curve for ctime (i.e. "eval_time") so that path-follow works */
|
2012-03-24 06:38:07 +00:00
|
|
|
if (partype == PAR_FOLLOW) {
|
2010-10-21 10:28:06 +00:00
|
|
|
/* get or create F-Curve */
|
|
|
|
bAction *act = verify_adt_action(&cu->id, 1);
|
2012-06-01 13:54:44 +00:00
|
|
|
FCurve *fcu = verify_fcurve(act, NULL, NULL, "eval_time", 0, 1);
|
2014-10-10 18:44:37 +02:00
|
|
|
|
2012-03-01 12:20:18 +00:00
|
|
|
/* setup dummy 'generator' modifier here to get 1-1 correspondence still working */
|
2010-10-21 10:28:06 +00:00
|
|
|
if (!fcu->bezt && !fcu->fpt && !fcu->modifiers.first)
|
|
|
|
add_fmodifier(&fcu->modifiers, FMODIFIER_TYPE_GENERATOR);
|
|
|
|
}
|
2014-10-10 18:44:37 +02:00
|
|
|
|
2009-10-22 23:22:05 +00:00
|
|
|
/* fall back on regular parenting now (for follow only) */
|
2012-03-24 06:38:07 +00:00
|
|
|
if (partype == PAR_FOLLOW)
|
2012-04-28 15:42:27 +00:00
|
|
|
partype = PAR_OBJECT;
|
2012-10-21 05:46:41 +00:00
|
|
|
}
|
2009-09-16 17:43:09 +00:00
|
|
|
}
|
2013-02-12 14:42:46 +00:00
|
|
|
else if (ELEM(partype, PAR_BONE, PAR_BONE_RELATIVE)) {
|
2012-05-05 16:03:57 +00:00
|
|
|
pchan = BKE_pose_channel_active(par);
|
2014-10-10 18:44:37 +02:00
|
|
|
|
2012-04-28 15:42:27 +00:00
|
|
|
if (pchan == NULL) {
|
2012-10-26 17:32:50 +00:00
|
|
|
BKE_report(reports, RPT_ERROR, "No active bone");
|
2014-10-10 18:26:46 +02:00
|
|
|
return false;
|
2009-09-16 17:43:09 +00:00
|
|
|
}
|
|
|
|
}
|
2014-10-10 18:44:37 +02:00
|
|
|
|
2012-04-28 15:42:27 +00:00
|
|
|
if (ob != par) {
|
2012-02-22 07:56:15 +00:00
|
|
|
if (BKE_object_parent_loop_check(par, ob)) {
|
|
|
|
BKE_report(reports, RPT_ERROR, "Loop in parents");
|
2014-10-10 18:26:46 +02:00
|
|
|
return false;
|
2012-02-22 07:56:15 +00:00
|
|
|
}
|
|
|
|
else {
|
|
|
|
Object workob;
|
2012-09-27 12:24:38 +00:00
|
|
|
|
2012-02-22 07:56:15 +00:00
|
|
|
/* apply transformation of previous parenting */
|
2012-09-27 12:24:38 +00:00
|
|
|
if (keep_transform) {
|
2012-12-04 14:43:42 +00:00
|
|
|
/* was removed because of bug [#23577],
|
|
|
|
* but this can be handy in some cases too [#32616], so make optional */
|
2014-04-01 11:34:00 +11:00
|
|
|
BKE_object_apply_mat4(ob, ob->obmat, false, false);
|
2012-09-27 12:24:38 +00:00
|
|
|
}
|
|
|
|
|
2012-02-22 07:56:15 +00:00
|
|
|
/* set the parent (except for follow-path constraint option) */
|
|
|
|
if (partype != PAR_PATH_CONST) {
|
2012-04-28 15:42:27 +00:00
|
|
|
ob->parent = par;
|
2014-10-10 16:57:29 +02:00
|
|
|
/* Always clear parentinv matrix for sake of consistency, see T41950. */
|
|
|
|
unit_m4(ob->parentinv);
|
2009-09-16 17:43:09 +00:00
|
|
|
}
|
2014-10-10 18:44:37 +02:00
|
|
|
|
2012-02-22 07:56:15 +00:00
|
|
|
/* handle types */
|
|
|
|
if (pchan)
|
|
|
|
BLI_strncpy(ob->parsubstr, pchan->name, sizeof(ob->parsubstr));
|
|
|
|
else
|
2012-04-28 15:42:27 +00:00
|
|
|
ob->parsubstr[0] = 0;
|
2014-10-10 18:44:37 +02:00
|
|
|
|
2012-02-22 07:56:15 +00:00
|
|
|
if (partype == PAR_PATH_CONST) {
|
|
|
|
/* don't do anything here, since this is not technically "parenting" */
|
|
|
|
}
|
2012-03-07 04:53:43 +00:00
|
|
|
else if (ELEM(partype, PAR_CURVE, PAR_LATTICE) || (pararm)) {
|
2012-02-22 07:56:15 +00: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
|
|
|
|
*/
|
2014-10-10 18:44:37 +02:00
|
|
|
ob->partype = PAROBJECT; /* note, dna define, not operator property */
|
|
|
|
/* ob->partype = PARSKEL; */ /* note, dna define, not operator property */
|
|
|
|
|
|
|
|
/* BUT, to keep the deforms, we need a modifier, and then we need to set the object that it uses
|
2012-10-15 03:16:38 +00:00
|
|
|
* - 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...
|
|
|
|
*/
|
2014-10-10 18:44:37 +02:00
|
|
|
/* XXX currently this should only happen for meshes, curves, surfaces,
|
|
|
|
* and lattices - this stuff isn't available for metas yet */
|
2014-07-20 01:30:29 +10:00
|
|
|
if (ELEM(ob->type, OB_MESH, OB_CURVE, OB_SURF, OB_FONT, OB_LATTICE)) {
|
2012-02-22 07:56:15 +00:00
|
|
|
ModifierData *md;
|
2014-10-10 18:44:37 +02:00
|
|
|
|
2012-02-22 07:56:15 +00:00
|
|
|
switch (partype) {
|
2012-04-28 15:42:27 +00:00
|
|
|
case PAR_CURVE: /* curve deform */
|
2014-01-10 01:15:13 +13:00
|
|
|
if (modifiers_isDeformedByCurve(ob) != par) {
|
2012-10-15 03:16:38 +00:00
|
|
|
md = ED_object_modifier_add(reports, bmain, scene, ob, NULL, eModifierType_Curve);
|
2012-10-15 03:56:01 +00:00
|
|
|
if (md) {
|
|
|
|
((CurveModifierData *)md)->object = par;
|
|
|
|
}
|
2014-10-21 19:16:29 +06:00
|
|
|
if (par->curve_cache && par->curve_cache->path == NULL) {
|
|
|
|
DAG_id_tag_update(&par->id, OB_RECALC_DATA);
|
|
|
|
}
|
2012-10-15 03:16:38 +00:00
|
|
|
}
|
2012-04-28 15:42:27 +00:00
|
|
|
break;
|
|
|
|
case PAR_LATTICE: /* lattice deform */
|
2012-10-15 03:16:38 +00:00
|
|
|
if (modifiers_isDeformedByLattice(ob) != par) {
|
|
|
|
md = ED_object_modifier_add(reports, bmain, scene, ob, NULL, eModifierType_Lattice);
|
2012-10-15 03:56:01 +00:00
|
|
|
if (md) {
|
|
|
|
((LatticeModifierData *)md)->object = par;
|
|
|
|
}
|
2012-10-15 03:16:38 +00:00
|
|
|
}
|
2012-04-28 15:42:27 +00:00
|
|
|
break;
|
|
|
|
default: /* armature deform */
|
2012-10-15 03:16:38 +00:00
|
|
|
if (modifiers_isDeformedByArmature(ob) != par) {
|
|
|
|
md = ED_object_modifier_add(reports, bmain, scene, ob, NULL, eModifierType_Armature);
|
2012-10-15 03:56:01 +00:00
|
|
|
if (md) {
|
|
|
|
((ArmatureModifierData *)md)->object = par;
|
|
|
|
}
|
2012-10-15 03:16:38 +00:00
|
|
|
}
|
2012-04-28 15:42:27 +00:00
|
|
|
break;
|
2009-11-22 12:28:38 +00:00
|
|
|
}
|
|
|
|
}
|
2012-02-22 07:56:15 +00:00
|
|
|
}
|
2013-02-12 14:42:46 +00:00
|
|
|
else if (partype == PAR_BONE) {
|
2012-04-28 15:42:27 +00:00
|
|
|
ob->partype = PARBONE; /* note, dna define, not operator property */
|
2013-02-12 14:42:46 +00:00
|
|
|
if (pchan->bone)
|
|
|
|
pchan->bone->flag &= ~BONE_RELATIVE_PARENTING;
|
|
|
|
}
|
|
|
|
else if (partype == PAR_BONE_RELATIVE) {
|
|
|
|
ob->partype = PARBONE; /* note, dna define, not operator property */
|
|
|
|
if (pchan->bone)
|
|
|
|
pchan->bone->flag |= BONE_RELATIVE_PARENTING;
|
|
|
|
}
|
2013-09-01 22:01:21 +00:00
|
|
|
else if (partype == PAR_VERTEX) {
|
|
|
|
ob->partype = PARVERT1;
|
|
|
|
ob->par1 = vert_par[0];
|
|
|
|
}
|
|
|
|
else if (partype == PAR_VERTEX_TRI) {
|
|
|
|
ob->partype = PARVERT3;
|
|
|
|
copy_v3_v3_int(&ob->par1, vert_par);
|
|
|
|
}
|
|
|
|
else {
|
2012-04-28 15:42:27 +00:00
|
|
|
ob->partype = PAROBJECT; /* note, dna define, not operator property */
|
2013-09-01 22:01:21 +00:00
|
|
|
}
|
2014-10-10 18:44:37 +02:00
|
|
|
|
2012-02-22 07:56:15 +00:00
|
|
|
/* constraint */
|
2012-03-24 06:38:07 +00:00
|
|
|
if (partype == PAR_PATH_CONST) {
|
2012-02-22 07:56:15 +00:00
|
|
|
bConstraint *con;
|
|
|
|
bFollowPathConstraint *data;
|
|
|
|
float cmat[4][4], vec[3];
|
2014-10-10 18:44:37 +02:00
|
|
|
|
2014-04-11 11:47:07 +10:00
|
|
|
con = BKE_constraint_add_for_object(ob, "AutoPath", CONSTRAINT_TYPE_FOLLOWPATH);
|
2014-10-10 18:44:37 +02:00
|
|
|
|
2012-02-22 07:56:15 +00:00
|
|
|
data = con->data;
|
|
|
|
data->tar = par;
|
2014-10-10 18:44:37 +02:00
|
|
|
|
2014-04-11 11:47:07 +10:00
|
|
|
BKE_constraint_target_matrix_get(scene, con, 0, CONSTRAINT_OBTYPE_OBJECT, NULL, cmat, scene->r.cfra);
|
2012-02-22 07:56:15 +00:00
|
|
|
sub_v3_v3v3(vec, ob->obmat[3], cmat[3]);
|
2014-10-10 18:44:37 +02:00
|
|
|
|
2013-04-14 12:01:12 +00:00
|
|
|
copy_v3_v3(ob->loc, vec);
|
2012-02-22 07:56:15 +00:00
|
|
|
}
|
2014-01-10 01:15:13 +13:00
|
|
|
else if (pararm && (ob->type == OB_MESH) && (par->type == OB_ARMATURE)) {
|
2012-03-24 06:38:07 +00:00
|
|
|
if (partype == PAR_ARMATURE_NAME)
|
2014-04-01 11:34:00 +11:00
|
|
|
create_vgroups_from_armature(reports, scene, ob, par, ARM_GROUPS_NAME, false);
|
2012-03-24 06:38:07 +00:00
|
|
|
else if (partype == PAR_ARMATURE_ENVELOPE)
|
2012-07-15 12:53:16 +00:00
|
|
|
create_vgroups_from_armature(reports, scene, ob, par, ARM_GROUPS_ENVELOPE, xmirror);
|
2012-03-24 06:38:07 +00:00
|
|
|
else if (partype == PAR_ARMATURE_AUTO) {
|
2012-02-22 07:56:15 +00:00
|
|
|
WM_cursor_wait(1);
|
2012-07-15 12:53:16 +00:00
|
|
|
create_vgroups_from_armature(reports, scene, ob, par, ARM_GROUPS_AUTO, xmirror);
|
2012-02-22 07:56:15 +00:00
|
|
|
WM_cursor_wait(0);
|
2009-09-16 17:43:09 +00:00
|
|
|
}
|
2012-02-22 07:56:15 +00:00
|
|
|
/* get corrected inverse */
|
2012-04-28 15:42:27 +00:00
|
|
|
ob->partype = PAROBJECT;
|
2012-05-05 14:03:12 +00:00
|
|
|
BKE_object_workob_calc_parent(scene, ob, &workob);
|
2014-10-10 18:44:37 +02:00
|
|
|
|
2012-02-22 07:56:15 +00:00
|
|
|
invert_m4_m4(ob->parentinv, workob.obmat);
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
/* calculate inverse parent matrix */
|
2012-05-05 14:03:12 +00:00
|
|
|
BKE_object_workob_calc_parent(scene, ob, &workob);
|
2012-02-22 07:56:15 +00:00
|
|
|
invert_m4_m4(ob->parentinv, workob.obmat);
|
2009-09-16 17:43:09 +00:00
|
|
|
}
|
2014-10-10 18:44:37 +02:00
|
|
|
|
2013-02-21 19:33:04 +00:00
|
|
|
DAG_id_tag_update(&ob->id, OB_RECALC_OB | OB_RECALC_DATA);
|
2009-09-16 17:43:09 +00:00
|
|
|
}
|
|
|
|
}
|
2012-01-22 10:20:30 +00:00
|
|
|
|
2014-10-10 18:26:46 +02:00
|
|
|
return true;
|
2012-01-22 10:20:30 +00:00
|
|
|
}
|
|
|
|
|
2013-09-01 22:01:21 +00:00
|
|
|
|
|
|
|
|
|
|
|
static void parent_set_vert_find(KDTree *tree, Object *child, int vert_par[3], bool is_tri)
|
|
|
|
{
|
|
|
|
const float *co_find = child->obmat[3];
|
|
|
|
if (is_tri) {
|
|
|
|
KDTreeNearest nearest[3];
|
|
|
|
int tot;
|
|
|
|
|
2014-03-18 09:05:07 +11:00
|
|
|
tot = BLI_kdtree_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);
|
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;
|
|
|
|
|
|
|
|
BLI_assert(min_iii(UNPACK3(vert_par)) >= 0);
|
|
|
|
}
|
|
|
|
else {
|
2014-03-18 09:05:07 +11:00
|
|
|
vert_par[0] = BLI_kdtree_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;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2012-01-22 10:20:30 +00:00
|
|
|
static int 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);
|
|
|
|
Object *par = ED_object_active_context(C);
|
|
|
|
int partype = RNA_enum_get(op->ptr, "type");
|
2014-10-10 18:26:46 +02:00
|
|
|
const bool xmirror = RNA_boolean_get(op->ptr, "xmirror");
|
|
|
|
const bool keep_transform = RNA_boolean_get(op->ptr, "keep_transform");
|
2013-09-01 22:01:21 +00:00
|
|
|
bool ok = true;
|
|
|
|
|
|
|
|
/* vertex parent (kdtree) */
|
|
|
|
const bool is_vert_par = ELEM(partype, PAR_VERTEX, PAR_VERTEX_TRI);
|
|
|
|
const bool is_tri = partype == PAR_VERTEX_TRI;
|
|
|
|
int tree_tot;
|
|
|
|
struct KDTree *tree = NULL;
|
|
|
|
int vert_par[3] = {0, 0, 0};
|
2014-04-27 00:22:49 +10:00
|
|
|
const int *vert_par_p = is_vert_par ? vert_par : NULL;
|
2013-09-01 22:01:21 +00:00
|
|
|
|
|
|
|
|
|
|
|
if (is_vert_par) {
|
|
|
|
tree = BKE_object_as_kdtree(par, &tree_tot);
|
|
|
|
BLI_assert(tree != NULL);
|
|
|
|
|
|
|
|
if (tree_tot < (is_tri ? 3 : 1)) {
|
|
|
|
BKE_report(op->reports, RPT_ERROR, "Not enough vertices for vertex-parent");
|
|
|
|
ok = false;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-10-10 18:26:46 +02:00
|
|
|
if (ok) {
|
|
|
|
/* Non vertex-parent */
|
|
|
|
CTX_DATA_BEGIN (C, Object *, ob, selected_editable_objects)
|
|
|
|
{
|
|
|
|
if (is_vert_par) {
|
|
|
|
parent_set_vert_find(tree, ob, vert_par, is_tri);
|
|
|
|
}
|
2012-01-22 10:20:30 +00:00
|
|
|
|
2014-10-10 18:26:46 +02:00
|
|
|
if (!ED_object_parent_set(op->reports, bmain, scene, ob, par, partype, xmirror, keep_transform, vert_par_p)) {
|
|
|
|
ok = false;
|
|
|
|
break;
|
|
|
|
}
|
2012-02-22 07:56:15 +00:00
|
|
|
}
|
2014-10-10 18:26:46 +02:00
|
|
|
CTX_DATA_END;
|
2012-02-22 07:56:15 +00:00
|
|
|
}
|
2013-09-01 22:01:21 +00:00
|
|
|
|
|
|
|
if (is_vert_par) {
|
|
|
|
BLI_kdtree_free(tree);
|
|
|
|
}
|
|
|
|
|
2012-02-22 07:56:15 +00:00
|
|
|
if (!ok)
|
2012-01-22 10:20:30 +00:00
|
|
|
return OPERATOR_CANCELLED;
|
2012-02-22 07:56:15 +00:00
|
|
|
|
2013-02-21 19:33:04 +00:00
|
|
|
DAG_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);
|
2012-02-22 07:56:15 +00:00
|
|
|
|
|
|
|
return OPERATOR_FINISHED;
|
2009-09-16 17:43:09 +00:00
|
|
|
}
|
|
|
|
|
2012-01-22 10:20:30 +00:00
|
|
|
|
2013-03-13 09:03:46 +00:00
|
|
|
static int parent_set_invoke(bContext *C, wmOperator *UNUSED(op), const wmEvent *UNUSED(event))
|
2009-09-16 17:43:09 +00:00
|
|
|
{
|
2012-04-28 15:42:27 +00:00
|
|
|
Object *ob = 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
|
|
|
|
2014-04-01 11:34:00 +11:00
|
|
|
wmOperatorType *ot = WM_operatortype_find("OBJECT_OT_parent_set", true);
|
2012-09-27 12:24:38 +00:00
|
|
|
PointerRNA opptr;
|
|
|
|
|
|
|
|
#if 0
|
|
|
|
uiItemEnumO_ptr(layout, ot, NULL, 0, "type", PAR_OBJECT);
|
|
|
|
#else
|
2013-02-15 08:31:00 +00:00
|
|
|
opptr = uiItemFullO_ptr(layout, ot, IFACE_("Object"), ICON_NONE, NULL, WM_OP_EXEC_DEFAULT, UI_ITEM_O_RETURN_PROPS);
|
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);
|
2012-09-27 12:24:38 +00:00
|
|
|
|
2013-02-15 08:31:00 +00:00
|
|
|
opptr = uiItemFullO_ptr(layout, ot, IFACE_("Object (Keep Transform)"), ICON_NONE, NULL, WM_OP_EXEC_DEFAULT,
|
|
|
|
UI_ITEM_O_RETURN_PROPS);
|
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
|
2009-09-16 17:43:09 +00:00
|
|
|
/* ob becomes parent, make the associated menus */
|
2012-04-28 15:42:27 +00:00
|
|
|
if (ob->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);
|
|
|
|
uiItemEnumO_ptr(layout, ot, NULL, 0, "type", PAR_ARMATURE_ENVELOPE);
|
|
|
|
uiItemEnumO_ptr(layout, ot, NULL, 0, "type", PAR_ARMATURE_AUTO);
|
|
|
|
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
|
|
|
}
|
2012-04-28 15:42:27 +00:00
|
|
|
else if (ob->type == OB_CURVE) {
|
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
|
|
|
}
|
2012-03-24 06:38:07 +00:00
|
|
|
else if (ob->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
|
|
|
}
|
2014-10-10 18:44:37 +02:00
|
|
|
|
2013-09-01 22:01:21 +00:00
|
|
|
/* vertex parenting */
|
2013-09-01 22:38:41 +00:00
|
|
|
if (OB_TYPE_SUPPORT_PARVERT(ob->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);
|
|
|
|
}
|
|
|
|
|
2014-11-09 21:20:40 +01:00
|
|
|
UI_popup_menu_end(C, pup);
|
2014-10-10 18:44:37 +02:00
|
|
|
|
2014-10-28 17:51:06 +01:00
|
|
|
return OPERATOR_INTERFACE;
|
2009-09-16 17:43:09 +00:00
|
|
|
}
|
|
|
|
|
2013-03-19 23:17:44 +00:00
|
|
|
static bool parent_set_draw_check_prop(PointerRNA *ptr, PropertyRNA *prop)
|
2012-07-15 12:53:16 +00:00
|
|
|
{
|
|
|
|
const char *prop_id = RNA_property_identifier(prop);
|
2014-10-10 18:26:46 +02:00
|
|
|
const int type = RNA_enum_get(ptr, "type");
|
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")) {
|
2012-07-15 12:53:16 +00:00
|
|
|
if (ELEM(type, PAR_ARMATURE_ENVELOPE, PAR_ARMATURE_AUTO))
|
2013-03-19 23:17:44 +00:00
|
|
|
return true;
|
2012-07-15 12:53:16 +00:00
|
|
|
else
|
2013-03-19 23:17:44 +00:00
|
|
|
return false;
|
2012-07-15 12:53:16 +00:00
|
|
|
}
|
|
|
|
|
2013-03-19 23:17:44 +00:00
|
|
|
return true;
|
2012-07-15 12:53:16 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static void parent_set_ui(bContext *C, wmOperator *op)
|
|
|
|
{
|
|
|
|
uiLayout *layout = op->layout;
|
|
|
|
wmWindowManager *wm = CTX_wm_manager(C);
|
|
|
|
PointerRNA ptr;
|
|
|
|
|
|
|
|
RNA_pointer_create(&wm->id, op->type->srna, op->properties, &ptr);
|
|
|
|
|
|
|
|
/* Main auto-draw call. */
|
|
|
|
uiDefAutoButsRNA(layout, &ptr, parent_set_draw_check_prop, '\0');
|
|
|
|
}
|
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";
|
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 = parent_set_invoke;
|
|
|
|
ot->exec = parent_set_exec;
|
|
|
|
ot->poll = ED_operator_object_active;
|
2012-07-15 12:53:16 +00:00
|
|
|
ot->ui = parent_set_ui;
|
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
|
|
|
|
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
|
|
|
}
|
|
|
|
|
2009-10-26 11:20:16 +00:00
|
|
|
/* ************ Make Parent Without Inverse Operator ******************* */
|
|
|
|
|
|
|
|
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);
|
2014-10-10 18:44:37 +02:00
|
|
|
|
2013-02-21 19:33:04 +00:00
|
|
|
DAG_id_tag_update(&par->id, OB_RECALC_OB);
|
2014-10-10 18:44:37 +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 {
|
|
|
|
/* clear inverse matrix and also the object location */
|
2009-11-10 20:43:45 +00:00
|
|
|
unit_m4(ob->parentinv);
|
2012-04-28 15:42:27 +00:00
|
|
|
memset(ob->loc, 0, 3 * sizeof(float));
|
2014-10-10 18:44:37 +02:00
|
|
|
|
2009-10-26 11:20:16 +00:00
|
|
|
/* set recalc flags */
|
2013-02-21 19:33:04 +00:00
|
|
|
DAG_id_tag_update(&ob->id, OB_RECALC_OB | OB_RECALC_DATA);
|
2014-10-10 18:44:37 +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;
|
|
|
|
ob->partype = PAROBJECT; /* note, dna define, not operator property */
|
2009-10-26 11:20:16 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
CTX_DATA_END;
|
2014-10-10 18:44:37 +02:00
|
|
|
|
2013-02-21 19:33:04 +00:00
|
|
|
DAG_relations_tag_update(bmain);
|
2012-04-28 15:42:27 +00:00
|
|
|
WM_event_add_notifier(C, NC_OBJECT | ND_TRANSFORM, NULL);
|
2014-10-10 18:44:37 +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";
|
2014-10-10 18:44:37 +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;
|
2014-10-10 18:44:37 +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;
|
2009-10-26 11:20:16 +00:00
|
|
|
}
|
|
|
|
|
2009-09-16 17:43:09 +00:00
|
|
|
/************************ Clear Slow Parent Operator *********************/
|
|
|
|
|
2010-10-15 01:36:14 +00:00
|
|
|
static int object_slow_parent_clear_exec(bContext *C, wmOperator *UNUSED(op))
|
2009-09-16 17:43:09 +00:00
|
|
|
{
|
2012-04-28 15:42:27 +00:00
|
|
|
Scene *scene = CTX_data_scene(C);
|
2009-09-16 17:43:09 +00: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->parent) {
|
|
|
|
if (ob->partype & PARSLOW) {
|
2009-09-16 17:43:09 +00:00
|
|
|
ob->partype -= PARSLOW;
|
2012-05-05 14:03:12 +00:00
|
|
|
BKE_object_where_is_calc(scene, ob);
|
2009-09-16 17:43:09 +00:00
|
|
|
ob->partype |= PARSLOW;
|
2013-02-21 19:33:04 +00:00
|
|
|
DAG_id_tag_update(&ob->id, OB_RECALC_OB);
|
2009-09-16 17:43:09 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
CTX_DATA_END;
|
|
|
|
|
|
|
|
WM_event_add_notifier(C, NC_SCENE, scene);
|
2014-10-10 18:44:37 +02:00
|
|
|
|
2009-09-16 17:43:09 +00:00
|
|
|
return OPERATOR_FINISHED;
|
|
|
|
}
|
|
|
|
|
|
|
|
void OBJECT_OT_slow_parent_clear(wmOperatorType *ot)
|
|
|
|
{
|
|
|
|
/* identifiers */
|
2012-03-22 07:26:09 +00:00
|
|
|
ot->name = "Clear Slow Parent";
|
2010-02-10 21:15:44 +00:00
|
|
|
ot->description = "Clear the object's slow parent";
|
2012-03-22 07:26:09 +00:00
|
|
|
ot->idname = "OBJECT_OT_slow_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_operator_confirm;
|
|
|
|
ot->exec = object_slow_parent_clear_exec;
|
|
|
|
ot->poll = ED_operator_view3d_active;
|
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;
|
2009-09-16 17:43:09 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/********************** Make Slow Parent Operator *********************/
|
|
|
|
|
2010-10-15 01:36:14 +00:00
|
|
|
static int object_slow_parent_set_exec(bContext *C, wmOperator *UNUSED(op))
|
2009-09-16 17:43:09 +00:00
|
|
|
{
|
2012-04-28 15:42:27 +00:00
|
|
|
Scene *scene = CTX_data_scene(C);
|
2009-09-16 17:43:09 +00: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->parent)
|
2009-09-16 17:43:09 +00:00
|
|
|
ob->partype |= PARSLOW;
|
|
|
|
|
2013-02-21 19:33:04 +00:00
|
|
|
DAG_id_tag_update(&ob->id, OB_RECALC_OB);
|
2009-09-16 17:43:09 +00:00
|
|
|
}
|
|
|
|
CTX_DATA_END;
|
|
|
|
|
|
|
|
WM_event_add_notifier(C, NC_SCENE, scene);
|
2014-10-10 18:44:37 +02:00
|
|
|
|
2009-09-16 17:43:09 +00:00
|
|
|
return OPERATOR_FINISHED;
|
|
|
|
}
|
|
|
|
|
|
|
|
void OBJECT_OT_slow_parent_set(wmOperatorType *ot)
|
|
|
|
{
|
|
|
|
/* identifiers */
|
2012-03-22 07:26:09 +00:00
|
|
|
ot->name = "Set Slow Parent";
|
2010-02-10 21:15:44 +00:00
|
|
|
ot->description = "Set the object's slow parent";
|
2012-03-22 07:26:09 +00:00
|
|
|
ot->idname = "OBJECT_OT_slow_parent_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_operator_confirm;
|
|
|
|
ot->exec = object_slow_parent_set_exec;
|
|
|
|
ot->poll = ED_operator_view3d_active;
|
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;
|
2009-09-16 17:43:09 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* ******************** Clear Track Operator ******************* */
|
|
|
|
|
2014-10-10 18:26:46 +02:00
|
|
|
enum {
|
|
|
|
CLEAR_TRACK = 1,
|
|
|
|
CLEAR_TRACK_KEEP_TRANSFORM = 2,
|
|
|
|
};
|
|
|
|
|
2009-09-16 17:43:09 +00:00
|
|
|
static 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)", ""},
|
2009-09-16 17:43:09 +00:00
|
|
|
{0, NULL, 0, NULL, NULL}
|
|
|
|
};
|
|
|
|
|
|
|
|
/* note, poll should check for editable scene */
|
|
|
|
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");
|
2009-09-16 17:43:09 +00: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;
|
2014-10-10 18:44:37 +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;
|
2013-02-21 19:33:04 +00:00
|
|
|
DAG_id_tag_update(&ob->id, OB_RECALC_OB | OB_RECALC_DATA | OB_RECALC_TIME);
|
2014-10-10 18:44:37 +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, CONSTRAINT_TYPE_DAMPTRACK))
|
2014-04-11 11:47:07 +10:00
|
|
|
BKE_constraint_remove(&ob->constraints, con);
|
2010-02-21 11:42:32 +00:00
|
|
|
}
|
2014-10-10 18:44:37 +02:00
|
|
|
|
2014-10-10 18:26:46 +02:00
|
|
|
if (type == CLEAR_TRACK_KEEP_TRANSFORM)
|
2014-04-01 11:34:00 +11:00
|
|
|
BKE_object_apply_mat4(ob, ob->obmat, true, true);
|
2009-09-16 17:43:09 +00:00
|
|
|
}
|
|
|
|
CTX_DATA_END;
|
|
|
|
|
2013-02-21 19:33:04 +00:00
|
|
|
DAG_relations_tag_update(bmain);
|
2012-04-28 15:42:27 +00:00
|
|
|
WM_event_add_notifier(C, NC_OBJECT | ND_TRANSFORM, NULL);
|
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
|
|
|
}
|
|
|
|
|
|
|
|
/************************** Make Track Operator *****************************/
|
|
|
|
|
2014-10-10 18:26:46 +02:00
|
|
|
enum {
|
|
|
|
CREATE_TRACK_DAMPTRACK = 1,
|
|
|
|
CREATE_TRACK_TRACKTO = 2,
|
|
|
|
CREATE_TRACK_LOCKTRACK = 3,
|
|
|
|
};
|
|
|
|
|
2009-09-16 17:43:09 +00:00
|
|
|
static EnumPropertyItem prop_make_track_types[] = {
|
2014-10-10 18:26:46 +02:00
|
|
|
{CREATE_TRACK_DAMPTRACK, "DAMPTRACK", 0, "Damped Track Constraint", ""},
|
|
|
|
{CREATE_TRACK_TRACKTO, "TRACKTO", 0, "Track To Constraint", ""},
|
|
|
|
{CREATE_TRACK_LOCKTRACK, "LOCKTRACK", 0, "Lock Track Constraint", ""},
|
2009-09-16 17:43:09 +00:00
|
|
|
{0, NULL, 0, NULL, NULL}
|
|
|
|
};
|
|
|
|
|
|
|
|
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);
|
2014-10-10 18:44:37 +02:00
|
|
|
|
2014-10-10 18:26:46 +02:00
|
|
|
const int type = RNA_enum_get(op->ptr, "type");
|
2010-02-21 11:42:32 +00:00
|
|
|
|
2014-10-10 18:26:46 +02:00
|
|
|
switch (type) {
|
|
|
|
case CREATE_TRACK_DAMPTRACK:
|
2012-04-30 16:22:40 +00:00
|
|
|
{
|
2014-10-10 18:26:46 +02:00
|
|
|
bConstraint *con;
|
|
|
|
bDampTrackConstraint *data;
|
2010-02-21 11:42:32 +00: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);
|
|
|
|
|
|
|
|
data = con->data;
|
|
|
|
data->tar = obact;
|
|
|
|
DAG_id_tag_update(&ob->id, OB_RECALC_OB | OB_RECALC_DATA | OB_RECALC_TIME);
|
2014-10-10 18:44:37 +02:00
|
|
|
|
2014-10-10 18:26:46 +02:00
|
|
|
/* Lamp, Camera and Speaker track differently by default */
|
|
|
|
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:
|
2012-04-30 16:22:40 +00:00
|
|
|
{
|
2014-10-10 18:26:46 +02:00
|
|
|
bConstraint *con;
|
|
|
|
bTrackToConstraint *data;
|
2009-09-16 17:43:09 +00: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);
|
|
|
|
|
|
|
|
data = con->data;
|
|
|
|
data->tar = obact;
|
|
|
|
DAG_id_tag_update(&ob->id, OB_RECALC_OB | OB_RECALC_DATA | OB_RECALC_TIME);
|
2014-10-10 18:44:37 +02:00
|
|
|
|
2014-10-10 18:26:46 +02:00
|
|
|
/* Lamp, Camera and Speaker track differently by default */
|
|
|
|
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:
|
2012-04-30 16:22:40 +00:00
|
|
|
{
|
2014-10-10 18:26:46 +02:00
|
|
|
bConstraint *con;
|
|
|
|
bLockTrackConstraint *data;
|
2009-09-16 17:43:09 +00: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);
|
|
|
|
|
|
|
|
data = con->data;
|
|
|
|
data->tar = obact;
|
|
|
|
DAG_id_tag_update(&ob->id, OB_RECALC_OB | OB_RECALC_DATA | OB_RECALC_TIME);
|
2014-10-10 18:44:37 +02:00
|
|
|
|
2014-10-10 18:26:46 +02:00
|
|
|
/* Lamp, Camera and Speaker track differently by default */
|
|
|
|
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
|
|
|
}
|
|
|
|
}
|
2014-10-10 18:44:37 +02:00
|
|
|
|
2013-02-21 19:33:04 +00:00
|
|
|
DAG_relations_tag_update(bmain);
|
2012-04-28 15:42:27 +00:00
|
|
|
WM_event_add_notifier(C, NC_OBJECT | ND_TRANSFORM, NULL);
|
2014-10-10 18:44:37 +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
|
|
|
}
|
|
|
|
|
|
|
|
/************************** Link to Scene Operator *****************************/
|
|
|
|
|
|
|
|
#if 0
|
2011-02-14 17:55:27 +00:00
|
|
|
static void link_to_scene(Main *UNUSED(bmain), unsigned short 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
|
|
|
{
|
2012-04-28 15:42:27 +00:00
|
|
|
Scene *sce = (Scene *) BLI_findlink(&bmain->scene, G.curscreen->scenenr - 1);
|
2009-09-16 17:43:09 +00:00
|
|
|
Base *base, *nbase;
|
2014-10-10 18:44:37 +02:00
|
|
|
|
2014-10-10 18:26:46 +02:00
|
|
|
if (sce == NULL) return;
|
2012-03-24 06:38:07 +00:00
|
|
|
if (sce->id.lib) return;
|
2014-10-10 18:44:37 +02:00
|
|
|
|
2012-04-28 15:42:27 +00:00
|
|
|
for (base = FIRSTBASE; base; base = base->next) {
|
2012-03-24 06:38:07 +00:00
|
|
|
if (TESTBASE(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
|
|
|
{
|
2012-04-28 15:42:27 +00:00
|
|
|
Scene *scene_to = BLI_findlink(&CTX_data_main(C)->scene, RNA_enum_get(op->ptr, "scene"));
|
2009-09-16 17:43:09 +00: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;
|
|
|
|
}
|
|
|
|
|
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
|
|
|
}
|
2009-09-16 17:43:09 +00:00
|
|
|
|
2016-07-06 14:11:01 +02:00
|
|
|
if (ID_IS_LINKED_DATABLOCK(scene_to)) {
|
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;
|
|
|
|
}
|
|
|
|
|
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
|
|
|
SceneCollection *sc_to = BKE_collection_master(scene_to);
|
2012-04-30 16:22:40 +00:00
|
|
|
CTX_DATA_BEGIN (C, Base *, base, selected_bases)
|
|
|
|
{
|
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
|
|
|
BKE_collection_object_add(scene_to, sc_to, base->object);
|
2011-05-09 02:45:52 +00:00
|
|
|
}
|
2009-11-04 10:25:57 +00:00
|
|
|
CTX_DATA_END;
|
|
|
|
|
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);
|
|
|
|
|
2009-11-04 10:25:57 +00:00
|
|
|
/* one day multiple scenes will be visible, then we should have some update function for them */
|
|
|
|
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,
|
|
|
|
MAKE_LINKS_DUPLIGROUP = 5,
|
|
|
|
MAKE_LINKS_MODIFIERS = 6,
|
|
|
|
MAKE_LINKS_FONTS = 7,
|
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:
|
2014-10-10 18:26:46 +02:00
|
|
|
if (OB_TYPE_SUPPORT_MATERIAL(ob_src->type) && OB_TYPE_SUPPORT_MATERIAL(ob_dst->type)) {
|
|
|
|
return true;
|
2011-10-03 17:29:43 +00:00
|
|
|
}
|
2010-06-27 23:18:04 +00:00
|
|
|
break;
|
|
|
|
case MAKE_LINKS_ANIMDATA:
|
2012-07-18 09:45:50 +00:00
|
|
|
case MAKE_LINKS_GROUP:
|
2010-06-27 23:18:04 +00:00
|
|
|
case MAKE_LINKS_DUPLIGROUP:
|
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;
|
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
|
|
|
{
|
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;
|
|
|
|
|
2012-07-18 09:45:50 +00:00
|
|
|
/* group */
|
|
|
|
LinkNode *ob_groups = NULL;
|
2013-06-28 18:39:39 +00:00
|
|
|
bool is_cycle = false;
|
|
|
|
bool is_lib = false;
|
2012-07-18 09:45:50 +00:00
|
|
|
|
|
|
|
ob_src = ED_object_active_context(C);
|
|
|
|
|
|
|
|
/* avoid searching all groups in source object each time */
|
|
|
|
if (type == MAKE_LINKS_GROUP) {
|
|
|
|
ob_groups = BKE_object_groups(ob_src);
|
|
|
|
}
|
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
|
|
|
|
2012-07-18 09:45:50 +00:00
|
|
|
CTX_DATA_BEGIN (C, Base *, base_dst, selected_editable_bases)
|
2012-04-30 16:22:40 +00:00
|
|
|
{
|
2012-07-18 09:45:50 +00:00
|
|
|
Object *ob_dst = base_dst->object;
|
|
|
|
|
|
|
|
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;
|
|
|
|
|
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);
|
2012-04-28 15:42:27 +00:00
|
|
|
|
2013-06-28 18:39:39 +00:00
|
|
|
obdata_id = ob_src->data;
|
|
|
|
id_us_plus(obdata_id);
|
|
|
|
ob_dst->data = obdata_id;
|
2012-04-28 15:42:27 +00:00
|
|
|
|
|
|
|
/* if amount of material indices changed: */
|
2016-07-08 14:36:25 +02:00
|
|
|
test_object_materials(ob_dst, ob_dst->data);
|
2012-04-28 15:42:27 +00:00
|
|
|
|
2013-02-21 19:33:04 +00:00
|
|
|
DAG_id_tag_update(&ob_dst->id, OB_RECALC_DATA);
|
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++) {
|
|
|
|
Material *ma = give_current_material(ob_src, a + 1);
|
2012-08-12 17:12:07 +00:00
|
|
|
assign_material(ob_dst, ma, a + 1, BKE_MAT_ASSIGN_USERPREF); /* also works with ma==NULL */
|
2012-04-28 15:42:27 +00:00
|
|
|
}
|
2016-10-24 10:09:13 +02:00
|
|
|
DAG_id_tag_update(&ob_dst->id, OB_RECALC_DATA);
|
2012-04-28 15:42:27 +00:00
|
|
|
break;
|
|
|
|
case MAKE_LINKS_ANIMDATA:
|
2015-04-04 15:13:56 +11:00
|
|
|
BKE_animdata_copy_id((ID *)ob_dst, (ID *)ob_src, false);
|
2013-07-03 20:37:09 +00:00
|
|
|
if (ob_dst->data && ob_src->data) {
|
2016-07-06 14:11:01 +02:00
|
|
|
if (ID_IS_LINKED_DATABLOCK(obdata_id)) {
|
2013-07-03 20:37:09 +00:00
|
|
|
is_lib = true;
|
|
|
|
break;
|
|
|
|
}
|
2015-04-04 15:13:56 +11:00
|
|
|
BKE_animdata_copy_id((ID *)ob_dst->data, (ID *)ob_src->data, false);
|
2013-06-28 18:39:39 +00:00
|
|
|
}
|
2013-07-02 17:21:40 +00:00
|
|
|
DAG_id_tag_update(&ob_dst->id, OB_RECALC_OB | OB_RECALC_DATA | OB_RECALC_TIME);
|
2012-04-28 15:42:27 +00:00
|
|
|
break;
|
2012-07-18 09:45:50 +00:00
|
|
|
case MAKE_LINKS_GROUP:
|
|
|
|
{
|
|
|
|
LinkNode *group_node;
|
|
|
|
|
|
|
|
/* first clear groups */
|
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
|
|
|
BKE_object_groups_clear(ob_dst);
|
2012-07-18 09:45:50 +00:00
|
|
|
|
|
|
|
/* now add in the groups from the link nodes */
|
|
|
|
for (group_node = ob_groups; group_node; group_node = group_node->next) {
|
|
|
|
if (ob_dst->dup_group != group_node->link) {
|
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
|
|
|
BKE_group_object_add(group_node->link, ob_dst);
|
2012-07-18 09:45:50 +00:00
|
|
|
}
|
|
|
|
else {
|
2014-04-01 11:34:00 +11:00
|
|
|
is_cycle = true;
|
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
|
|
|
}
|
2012-04-28 15:42:27 +00:00
|
|
|
case MAKE_LINKS_DUPLIGROUP:
|
2012-07-18 09:45:50 +00:00
|
|
|
ob_dst->dup_group = ob_src->dup_group;
|
|
|
|
if (ob_dst->dup_group) {
|
2016-09-03 11:47:17 +02:00
|
|
|
id_us_plus(&ob_dst->dup_group->id);
|
2012-07-18 09:45:50 +00:00
|
|
|
ob_dst->transflag |= OB_DUPLIGROUP;
|
2012-04-28 15:42:27 +00:00
|
|
|
}
|
|
|
|
break;
|
|
|
|
case MAKE_LINKS_MODIFIERS:
|
2012-07-18 09:45:50 +00:00
|
|
|
BKE_object_link_modifiers(ob_dst, ob_src);
|
2013-02-21 19:33:04 +00:00
|
|
|
DAG_id_tag_update(&ob_dst->id, OB_RECALC_OB | OB_RECALC_DATA | OB_RECALC_TIME);
|
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;
|
|
|
|
|
2016-07-06 14:11:01 +02:00
|
|
|
if (ID_IS_LINKED_DATABLOCK(obdata_id)) {
|
2013-06-28 18:39:39 +00:00
|
|
|
is_lib = true;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
2015-11-09 19:47:10 +01:00
|
|
|
if (cu_dst->vfont)
|
|
|
|
id_us_min(&cu_dst->vfont->id);
|
2012-08-03 13:27:58 +00:00
|
|
|
cu_dst->vfont = cu_src->vfont;
|
|
|
|
id_us_plus((ID *)cu_dst->vfont);
|
2015-11-09 19:47:10 +01:00
|
|
|
if (cu_dst->vfontb)
|
|
|
|
id_us_min(&cu_dst->vfontb->id);
|
2012-08-03 13:27:58 +00:00
|
|
|
cu_dst->vfontb = cu_src->vfontb;
|
|
|
|
id_us_plus((ID *)cu_dst->vfontb);
|
2015-11-09 19:47:10 +01:00
|
|
|
if (cu_dst->vfonti)
|
|
|
|
id_us_min(&cu_dst->vfonti->id);
|
2012-08-03 13:27:58 +00:00
|
|
|
cu_dst->vfonti = cu_src->vfonti;
|
|
|
|
id_us_plus((ID *)cu_dst->vfonti);
|
2015-11-09 19:47:10 +01:00
|
|
|
if (cu_dst->vfontbi)
|
|
|
|
id_us_min(&cu_dst->vfontbi->id);
|
2012-08-03 13:27:58 +00:00
|
|
|
cu_dst->vfontbi = cu_src->vfontbi;
|
|
|
|
id_us_plus((ID *)cu_dst->vfontbi);
|
|
|
|
|
2013-02-21 19:33:04 +00:00
|
|
|
DAG_id_tag_update(&ob_dst->id, OB_RECALC_OB | OB_RECALC_DATA | OB_RECALC_TIME);
|
2012-08-03 13:27:58 +00:00
|
|
|
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;
|
2009-09-16 17:43:09 +00:00
|
|
|
|
2012-07-18 09:45:50 +00:00
|
|
|
if (type == MAKE_LINKS_GROUP) {
|
|
|
|
if (ob_groups) {
|
|
|
|
BLI_linklist_free(ob_groups, NULL);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (is_cycle) {
|
|
|
|
BKE_report(op->reports, RPT_WARNING, "Skipped some groups because of cycle detected");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2013-06-28 18:39:39 +00:00
|
|
|
if (is_lib) {
|
|
|
|
BKE_report(op->reports, RPT_WARNING, "Skipped editing library object data");
|
|
|
|
}
|
|
|
|
|
2013-02-21 19:33:04 +00:00
|
|
|
DAG_relations_tag_update(bmain);
|
2012-04-28 15:42:27 +00:00
|
|
|
WM_event_add_notifier(C, NC_SPACE | ND_SPACE_VIEW3D, CTX_wm_view3d(C));
|
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);
|
2013-02-21 19:33:04 +00: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;
|
|
|
|
|
|
|
|
/* 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";
|
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 */
|
|
|
|
|
|
|
|
/* flags */
|
2012-04-28 15:42:27 +00:00
|
|
|
ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
|
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)
|
|
|
|
{
|
2012-04-28 15:42:27 +00:00
|
|
|
static EnumPropertyItem make_links_items[] = {
|
|
|
|
{MAKE_LINKS_OBDATA, "OBDATA", 0, "Object Data", ""},
|
|
|
|
{MAKE_LINKS_MATERIALS, "MATERIAL", 0, "Materials", ""},
|
|
|
|
{MAKE_LINKS_ANIMDATA, "ANIMATION", 0, "Animation Data", ""},
|
2012-07-18 09:45:50 +00:00
|
|
|
{MAKE_LINKS_GROUP, "GROUPS", 0, "Group", ""},
|
2012-04-28 15:42:27 +00:00
|
|
|
{MAKE_LINKS_DUPLIGROUP, "DUPLIGROUP", 0, "DupliGroup", ""},
|
|
|
|
{MAKE_LINKS_MODIFIERS, "MODIFIERS", 0, "Modifiers", ""},
|
2012-08-03 13:27:58 +00:00
|
|
|
{MAKE_LINKS_FONTS, "FONTS", 0, "Fonts", ""},
|
2009-11-04 10:25:57 +00:00
|
|
|
{0, NULL, 0, NULL, NULL}};
|
|
|
|
|
|
|
|
/* identifiers */
|
2012-03-22 07:26:09 +00:00
|
|
|
ot->name = "Link Data";
|
2014-06-26 10:38:53 +02:00
|
|
|
ot->description = "Apply active object links to other selected objects";
|
2012-03-22 07:26:09 +00:00
|
|
|
ot->idname = "OBJECT_OT_make_links_data";
|
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;
|
2009-11-04 10:25:57 +00:00
|
|
|
|
|
|
|
/* flags */
|
2012-04-28 15:42:27 +00:00
|
|
|
ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
|
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
|
|
|
}
|
|
|
|
|
2009-11-04 10:25:57 +00:00
|
|
|
|
2009-09-16 17:43:09 +00:00
|
|
|
/**************************** Make Single User ********************************/
|
|
|
|
|
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
|
|
|
static Object *single_object_users_object(Main *bmain, Scene *scene, Object *ob, const bool copy_groups)
|
|
|
|
{
|
|
|
|
if (!ID_IS_LINKED_DATABLOCK(ob) && ob->id.us > 1) {
|
|
|
|
/* base gets copy of object */
|
|
|
|
Object *obn = ID_NEW_SET(ob, BKE_object_copy(bmain, ob));
|
|
|
|
|
|
|
|
if (copy_groups) {
|
|
|
|
if (ob->flag & OB_FROMGROUP) {
|
|
|
|
obn->flag |= OB_FROMGROUP;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
/* copy already clears */
|
|
|
|
}
|
|
|
|
/* remap gpencil parenting */
|
|
|
|
|
|
|
|
if (scene->gpd) {
|
|
|
|
bGPdata *gpd = scene->gpd;
|
|
|
|
for (bGPDlayer *gpl = gpd->layers.first; gpl; gpl = gpl->next) {
|
|
|
|
if (gpl->parent == ob) {
|
|
|
|
gpl->parent = obn;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
id_us_min(&ob->id);
|
|
|
|
return obn;
|
|
|
|
}
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void libblock_relink_scene_collection(SceneCollection *sc)
|
|
|
|
{
|
|
|
|
for (LinkData *link = sc->objects.first; link; link = link->next) {
|
|
|
|
BKE_libblock_relink_to_newid(link->data);
|
|
|
|
}
|
|
|
|
|
|
|
|
for (SceneCollection *nsc = sc->scene_collections.first; nsc; nsc = nsc->next) {
|
|
|
|
libblock_relink_scene_collection(nsc);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void single_object_users_scene_collection(Main *bmain, Scene *scene, SceneCollection *sc, const int flag, const bool copy_groups)
|
|
|
|
{
|
|
|
|
for (LinkData *link = sc->objects.first; link; link = link->next) {
|
|
|
|
Object *ob = link->data;
|
|
|
|
/* an object may be in more than one collection */
|
|
|
|
if ((ob->id.newid == NULL) && ((ob->flag & flag) == flag)) {
|
|
|
|
link->data = single_object_users_object(bmain, scene, link->data, copy_groups);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* we reset filter objects because they should be regenerated after this */
|
|
|
|
BLI_freelistN(&sc->filter_objects);
|
|
|
|
|
|
|
|
for (SceneCollection *nsc = sc->scene_collections.first; nsc; nsc = nsc->next) {
|
|
|
|
single_object_users_scene_collection(bmain, scene, nsc, flag, copy_groups);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2016-11-30 15:25:54 +01:00
|
|
|
/* Warning, sets ID->newid pointers of objects and groups, but does not clear them. */
|
2014-10-10 18:26:46 +02:00
|
|
|
static void single_object_users(Main *bmain, Scene *scene, View3D *v3d, const int flag, const bool copy_groups)
|
2009-09-16 17:43:09 +00:00
|
|
|
{
|
2013-04-24 23:09:25 +00:00
|
|
|
Group *group, *groupn;
|
|
|
|
GroupObject *go;
|
2014-10-10 18:44:37 +02:00
|
|
|
|
2016-11-30 15:25:54 +01:00
|
|
|
clear_sca_new_poins(); /* BGE logic */
|
2013-04-24 23:09:25 +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
|
|
|
/* duplicate all the objects of the scene */
|
|
|
|
SceneCollection *msc = BKE_collection_master(scene);
|
|
|
|
single_object_users_scene_collection(bmain, scene, msc, flag, copy_groups);
|
2014-05-01 06:49:38 +10: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
|
|
|
/* loop over SceneLayers and assign the pointers accordingly */
|
|
|
|
for (SceneLayer *sl = scene->render_layers.first; sl; sl = sl->next) {
|
|
|
|
for (Base *base = sl->object_bases.first; base; base = base->next) {
|
|
|
|
ID_NEW_REMAP(base->object);
|
2009-09-16 17:43:09 +00:00
|
|
|
}
|
|
|
|
}
|
2013-04-24 23:09:25 +00:00
|
|
|
|
|
|
|
/* duplicate groups that consist entirely of duplicated objects */
|
|
|
|
for (group = bmain->group.first; group; group = group->id.next) {
|
|
|
|
if (copy_groups && group->gobject.first) {
|
|
|
|
bool all_duplicated = true;
|
|
|
|
|
|
|
|
for (go = group->gobject.first; go; go = go->next) {
|
|
|
|
if (!(go->ob && (go->ob->id.newid))) {
|
|
|
|
all_duplicated = false;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (all_duplicated) {
|
2016-11-30 15:25:54 +01:00
|
|
|
groupn = ID_NEW_SET(group, BKE_group_copy(bmain, group));
|
2013-04-24 23:09:25 +00:00
|
|
|
|
2016-11-30 15:25:54 +01:00
|
|
|
for (go = groupn->gobject.first; go; go = go->next) {
|
2013-04-25 16:35:57 +00:00
|
|
|
go->ob = (Object *)go->ob->id.newid;
|
2016-11-30 15:25:54 +01:00
|
|
|
}
|
2013-04-24 23:09:25 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* group pointers in scene */
|
|
|
|
BKE_scene_groups_relink(scene);
|
2014-10-10 18:44:37 +02:00
|
|
|
|
2016-11-30 15:25:54 +01:00
|
|
|
ID_NEW_REMAP(scene->camera);
|
|
|
|
if (v3d) ID_NEW_REMAP(v3d->camera);
|
2014-10-10 18:44:37 +02:00
|
|
|
|
2013-04-24 23:09:25 +00:00
|
|
|
/* object and group pointers */
|
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
|
|
|
libblock_relink_scene_collection(msc);
|
2009-09-16 17:43:09 +00:00
|
|
|
|
|
|
|
set_sca_new_poins();
|
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
|
|
|
|
|
|
|
/* TODO redo filter */
|
|
|
|
TODO_LAYER_SYNC_FILTER
|
2009-09-16 17:43:09 +00:00
|
|
|
}
|
|
|
|
|
2011-08-08 08:22:01 +00:00
|
|
|
/* not an especially efficient function, only added so the single user
|
|
|
|
* button can be functional.*/
|
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
|
|
|
{
|
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
|
|
|
FOREACH_SCENE_OBJECT(scene, ob_iter)
|
|
|
|
{
|
|
|
|
ob_iter->flag &= ~OB_DONE;
|
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
|
|
|
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);
|
2016-11-30 15:25:54 +01:00
|
|
|
BKE_main_id_clear_newpoins(bmain);
|
2011-08-08 08:22:01 +00:00
|
|
|
}
|
|
|
|
|
2016-07-10 14:52:00 +02:00
|
|
|
static void new_id_matar(Main *bmain, Material **matar, const int totcol)
|
2009-09-16 17:43:09 +00:00
|
|
|
{
|
|
|
|
ID *id;
|
|
|
|
int a;
|
2014-10-10 18:44:37 +02:00
|
|
|
|
2012-04-28 15:42:27 +00:00
|
|
|
for (a = 0; a < totcol; a++) {
|
|
|
|
id = (ID *)matar[a];
|
2016-07-06 14:11:01 +02:00
|
|
|
if (id && !ID_IS_LINKED_DATABLOCK(id)) {
|
2012-03-24 06:38:07 +00:00
|
|
|
if (id->newid) {
|
2012-04-28 15:42:27 +00:00
|
|
|
matar[a] = (Material *)id->newid;
|
2009-09-16 17:43:09 +00:00
|
|
|
id_us_plus(id->newid);
|
2015-11-09 19:47:10 +01:00
|
|
|
id_us_min(id);
|
2009-09-16 17:43:09 +00:00
|
|
|
}
|
2012-04-28 15:42:27 +00:00
|
|
|
else if (id->us > 1) {
|
2016-11-30 15:25:54 +01:00
|
|
|
matar[a] = ID_NEW_SET(id, BKE_material_copy(bmain, matar[a]));
|
2015-11-09 19:47:10 +01:00
|
|
|
id_us_min(id);
|
2009-09-16 17:43:09 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-04-19 11:31:33 +02:00
|
|
|
static void single_obdata_users(Main *bmain, Scene *scene, SceneLayer *sl, const int flag)
|
2009-09-16 17:43:09 +00:00
|
|
|
{
|
|
|
|
Lamp *la;
|
|
|
|
Curve *cu;
|
2014-10-10 18:44:37 +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;
|
|
|
|
int a;
|
|
|
|
|
2017-04-19 11:31:33 +02:00
|
|
|
FOREACH_OBJECT_FLAG(scene, sl, flag, ob)
|
|
|
|
{
|
|
|
|
if (!ID_IS_LINKED_DATABLOCK(ob)) {
|
2012-04-28 15:42:27 +00:00
|
|
|
id = ob->data;
|
2014-10-10 18:44:37 +02:00
|
|
|
|
2016-07-06 14:11:01 +02:00
|
|
|
if (id && id->us > 1 && !ID_IS_LINKED_DATABLOCK(id)) {
|
2013-02-21 19:33:04 +00:00
|
|
|
DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
|
2013-06-03 12:28:46 +00:00
|
|
|
|
2012-04-28 06:31:57 +00:00
|
|
|
switch (ob->type) {
|
2012-04-28 15:42:27 +00:00
|
|
|
case OB_LAMP:
|
2016-11-30 15:25:54 +01:00
|
|
|
ob->data = la = ID_NEW_SET(ob->data, BKE_lamp_copy(bmain, ob->data));
|
2012-04-28 15:42:27 +00:00
|
|
|
for (a = 0; a < MAX_MTEX; a++) {
|
|
|
|
if (la->mtex[a]) {
|
2016-11-30 15:25:54 +01:00
|
|
|
ID_NEW_REMAP(la->mtex[a]->object);
|
2012-04-28 15:42:27 +00:00
|
|
|
}
|
2009-09-16 17:43:09 +00:00
|
|
|
}
|
2012-04-28 15:42:27 +00:00
|
|
|
break;
|
|
|
|
case OB_CAMERA:
|
2016-11-30 15:25:54 +01:00
|
|
|
ob->data = ID_NEW_SET(ob->data, BKE_camera_copy(bmain, ob->data));
|
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. */
|
|
|
|
me = ob->data = ID_NEW_SET(ob->data, BKE_mesh_copy(bmain, ob->data));
|
|
|
|
if (me->key) /* We do not need to set me->key->id.newid here... */
|
|
|
|
BKE_animdata_copy_id_action((ID *)me->key, false);
|
2012-04-28 15:42:27 +00:00
|
|
|
break;
|
|
|
|
case OB_MBALL:
|
2016-11-30 15:25:54 +01:00
|
|
|
ob->data = ID_NEW_SET(ob->data, BKE_mball_copy(bmain, ob->data));
|
2012-04-28 15:42:27 +00:00
|
|
|
break;
|
|
|
|
case OB_CURVE:
|
|
|
|
case OB_SURF:
|
|
|
|
case OB_FONT:
|
2016-11-30 15:25:54 +01:00
|
|
|
ob->data = cu = ID_NEW_SET(ob->data, BKE_curve_copy(bmain, ob->data));
|
|
|
|
ID_NEW_REMAP(cu->bevobj);
|
|
|
|
ID_NEW_REMAP(cu->taperobj);
|
|
|
|
if (cu->key) /* We do not need to set cu->key->id.newid here... */
|
|
|
|
BKE_animdata_copy_id_action((ID *)cu->key, false);
|
2012-04-28 15:42:27 +00:00
|
|
|
break;
|
|
|
|
case OB_LATTICE:
|
2016-11-30 15:25:54 +01:00
|
|
|
ob->data = lat = ID_NEW_SET(ob->data, BKE_lattice_copy(bmain, ob->data));
|
|
|
|
if (lat->key) /* We do not need to set lat->key->id.newid here... */
|
|
|
|
BKE_animdata_copy_id_action((ID *)lat->key, false);
|
2012-04-28 15:42:27 +00:00
|
|
|
break;
|
|
|
|
case OB_ARMATURE:
|
2013-02-21 19:33:04 +00:00
|
|
|
DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
|
2016-11-30 15:25:54 +01:00
|
|
|
ob->data = ID_NEW_SET(ob->data, BKE_armature_copy(bmain, ob->data));
|
2012-05-05 16:03:57 +00:00
|
|
|
BKE_pose_rebuild(ob, ob->data);
|
2012-04-28 15:42:27 +00:00
|
|
|
break;
|
|
|
|
case OB_SPEAKER:
|
2016-11-30 15:25:54 +01:00
|
|
|
ob->data = ID_NEW_SET(ob->data, BKE_speaker_copy(bmain, ob->data));
|
2012-04-28 15:42:27 +00:00
|
|
|
break;
|
|
|
|
default:
|
|
|
|
if (G.debug & G_DEBUG)
|
|
|
|
printf("ERROR %s: can't copy %s\n", __func__, id->name);
|
|
|
|
return;
|
2009-09-16 17:43:09 +00:00
|
|
|
}
|
2013-06-03 12:28:46 +00:00
|
|
|
|
|
|
|
/* Copy animation data after object data became local,
|
|
|
|
* otherwise old and new object data will share the same
|
|
|
|
* AnimData structure, which is not what we want.
|
|
|
|
* (sergey)
|
|
|
|
*/
|
2016-11-30 15:25:54 +01:00
|
|
|
BKE_animdata_copy_id_action((ID *)ob->data, false);
|
2013-06-03 12:28:46 +00:00
|
|
|
|
2015-11-09 19:47:10 +01:00
|
|
|
id_us_min(id);
|
2009-09-16 17:43:09 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2017-04-19 11:31:33 +02:00
|
|
|
FOREACH_OBJECT_FLAG_END
|
2014-10-10 18:44:37 +02:00
|
|
|
|
2012-04-28 15:42:27 +00:00
|
|
|
me = bmain->mesh.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
|
|
|
}
|
|
|
|
}
|
|
|
|
|
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
|
|
|
static void single_object_action_users(Scene *scene, SceneLayer *sl, const int flag)
|
2009-09-16 17:43:09 +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
|
|
|
FOREACH_OBJECT_FLAG(scene, sl, flag, ob)
|
2017-04-19 11:17:06 +02:00
|
|
|
if (!ID_IS_LINKED_DATABLOCK(ob)) {
|
2013-02-21 19:33:04 +00:00
|
|
|
DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
|
2016-11-30 15:25:54 +01:00
|
|
|
BKE_animdata_copy_id_action(&ob->id, false);
|
2009-09-16 17:43:09 +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
|
|
|
FOREACH_OBJECT_FLAG_END
|
2009-09-16 17:43:09 +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
|
|
|
static void single_mat_users(Main *bmain, Scene *scene, SceneLayer *sl, const int flag, const bool do_textures)
|
2009-09-16 17:43:09 +00:00
|
|
|
{
|
|
|
|
Material *ma, *man;
|
|
|
|
Tex *tex;
|
|
|
|
int a, b;
|
2014-10-10 18:44:37 +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
|
|
|
FOREACH_OBJECT_FLAG(scene, sl, flag, ob)
|
2017-04-19 11:17:06 +02:00
|
|
|
if (!ID_IS_LINKED_DATABLOCK(ob)) {
|
2012-04-28 15:42:27 +00:00
|
|
|
for (a = 1; a <= ob->totcol; a++) {
|
|
|
|
ma = give_current_material(ob, a);
|
2012-03-24 06:38:07 +00:00
|
|
|
if (ma) {
|
2016-11-30 15:25:54 +01:00
|
|
|
/* do not test for LIB_TAG_NEW or use newid: this functions guaranteed delivers single_users! */
|
2014-10-10 18:44:37 +02:00
|
|
|
|
2012-04-28 15:42:27 +00:00
|
|
|
if (ma->id.us > 1) {
|
2016-07-10 14:52:00 +02:00
|
|
|
man = BKE_material_copy(bmain, ma);
|
2016-11-30 15:25:54 +01:00
|
|
|
BKE_animdata_copy_id_action(&man->id, false);
|
2014-10-10 18:44:37 +02:00
|
|
|
|
2012-04-28 15:42:27 +00:00
|
|
|
man->id.us = 0;
|
2012-08-12 17:12:07 +00:00
|
|
|
assign_material(ob, man, a, BKE_MAT_ASSIGN_USERPREF);
|
2010-12-19 13:50:31 +00:00
|
|
|
|
2012-03-24 06:38:07 +00:00
|
|
|
if (do_textures) {
|
2012-04-28 15:42:27 +00:00
|
|
|
for (b = 0; b < MAX_MTEX; b++) {
|
|
|
|
if (ma->mtex[b] && (tex = ma->mtex[b]->tex)) {
|
|
|
|
if (tex->id.us > 1) {
|
2015-11-09 19:47:10 +01:00
|
|
|
id_us_min(&tex->id);
|
2016-07-10 14:52:00 +02:00
|
|
|
tex = BKE_texture_copy(bmain, tex);
|
2016-11-30 15:25:54 +01:00
|
|
|
BKE_animdata_copy_id_action(&tex->id, false);
|
2012-04-28 15:42:27 +00:00
|
|
|
man->mtex[b]->tex = tex;
|
2009-11-01 00:06:53 +00:00
|
|
|
}
|
2009-09-16 17:43:09 +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
|
|
|
FOREACH_OBJECT_FLAG_END
|
2009-09-16 17:43:09 +00:00
|
|
|
}
|
|
|
|
|
2016-07-10 14:52:00 +02:00
|
|
|
static void do_single_tex_user(Main *bmain, Tex **from)
|
2009-09-16 17:43:09 +00:00
|
|
|
{
|
|
|
|
Tex *tex, *texn;
|
2014-10-10 18:44:37 +02:00
|
|
|
|
2012-04-28 15:42:27 +00:00
|
|
|
tex = *from;
|
|
|
|
if (tex == NULL) return;
|
2014-10-10 18:44:37 +02:00
|
|
|
|
2012-03-24 06:38:07 +00:00
|
|
|
if (tex->id.newid) {
|
2012-04-28 15:42:27 +00:00
|
|
|
*from = (Tex *)tex->id.newid;
|
2009-09-16 17:43:09 +00:00
|
|
|
id_us_plus(tex->id.newid);
|
2015-11-09 19:47:10 +01:00
|
|
|
id_us_min(&tex->id);
|
2009-09-16 17:43:09 +00:00
|
|
|
}
|
2012-04-28 15:42:27 +00:00
|
|
|
else if (tex->id.us > 1) {
|
2016-11-30 15:25:54 +01:00
|
|
|
texn = ID_NEW_SET(tex, BKE_texture_copy(bmain, tex));
|
|
|
|
BKE_animdata_copy_id_action(&texn->id, false);
|
2012-04-28 15:42:27 +00:00
|
|
|
tex->id.newid = (ID *)texn;
|
2015-11-09 19:47:10 +01:00
|
|
|
id_us_min(&tex->id);
|
2012-04-28 15:42:27 +00:00
|
|
|
*from = texn;
|
2009-09-16 17:43:09 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2011-02-14 17:55:27 +00:00
|
|
|
static void single_tex_users_expand(Main *bmain)
|
2009-09-16 17:43:09 +00: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
|
|
|
/* only when 'parent' blocks are LIB_TAG_NEW */
|
2009-09-16 17:43:09 +00:00
|
|
|
Material *ma;
|
|
|
|
Lamp *la;
|
|
|
|
World *wo;
|
|
|
|
int b;
|
2014-10-10 18:44:37 +02:00
|
|
|
|
2012-04-28 15:42:27 +00:00
|
|
|
for (ma = bmain->mat.first; ma; ma = ma->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 (ma->id.tag & LIB_TAG_NEW) {
|
2012-04-28 15:42:27 +00:00
|
|
|
for (b = 0; b < MAX_MTEX; b++) {
|
2012-03-24 06:38:07 +00:00
|
|
|
if (ma->mtex[b] && ma->mtex[b]->tex) {
|
2016-07-10 14:52:00 +02:00
|
|
|
do_single_tex_user(bmain, &(ma->mtex[b]->tex));
|
2009-09-16 17:43:09 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2012-04-28 15:42:27 +00:00
|
|
|
for (la = bmain->lamp.first; la; la = la->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 (la->id.tag & LIB_TAG_NEW) {
|
2012-04-28 15:42:27 +00:00
|
|
|
for (b = 0; b < MAX_MTEX; b++) {
|
2012-03-24 06:38:07 +00:00
|
|
|
if (la->mtex[b] && la->mtex[b]->tex) {
|
2016-07-10 14:52:00 +02:00
|
|
|
do_single_tex_user(bmain, &(la->mtex[b]->tex));
|
2009-09-16 17:43:09 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2012-04-28 15:42:27 +00:00
|
|
|
for (wo = bmain->world.first; wo; wo = wo->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 (wo->id.tag & LIB_TAG_NEW) {
|
2012-04-28 15:42:27 +00:00
|
|
|
for (b = 0; b < MAX_MTEX; b++) {
|
2012-03-24 06:38:07 +00:00
|
|
|
if (wo->mtex[b] && wo->mtex[b]->tex) {
|
2016-07-10 14:52:00 +02:00
|
|
|
do_single_tex_user(bmain, &(wo->mtex[b]->tex));
|
2009-09-16 17:43:09 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2010-08-01 12:47:49 +00:00
|
|
|
static void single_mat_users_expand(Main *bmain)
|
2009-09-16 17:43:09 +00: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
|
|
|
/* only when 'parent' blocks are LIB_TAG_NEW */
|
2009-09-16 17:43:09 +00:00
|
|
|
Object *ob;
|
|
|
|
Mesh *me;
|
|
|
|
Curve *cu;
|
|
|
|
MetaBall *mb;
|
|
|
|
Material *ma;
|
|
|
|
int a;
|
2014-10-10 18:44:37 +02:00
|
|
|
|
2012-04-28 15:42:27 +00:00
|
|
|
for (ob = bmain->object.first; ob; ob = ob->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 (ob->id.tag & LIB_TAG_NEW)
|
2016-07-10 14:52:00 +02:00
|
|
|
new_id_matar(bmain, ob->mat, ob->totcol);
|
2009-09-16 17:43:09 +00:00
|
|
|
|
2012-04-28 15:42:27 +00:00
|
|
|
for (me = bmain->mesh.first; me; me = me->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 (me->id.tag & LIB_TAG_NEW)
|
2016-07-10 14:52:00 +02:00
|
|
|
new_id_matar(bmain, me->mat, me->totcol);
|
2009-09-16 17:43:09 +00:00
|
|
|
|
2012-04-28 15:42:27 +00:00
|
|
|
for (cu = bmain->curve.first; cu; cu = cu->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 (cu->id.tag & LIB_TAG_NEW)
|
2016-07-10 14:52:00 +02:00
|
|
|
new_id_matar(bmain, cu->mat, cu->totcol);
|
2009-09-16 17:43:09 +00:00
|
|
|
|
2012-04-28 15:42:27 +00:00
|
|
|
for (mb = bmain->mball.first; mb; mb = mb->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 (mb->id.tag & LIB_TAG_NEW)
|
2016-07-10 14:52:00 +02:00
|
|
|
new_id_matar(bmain, mb->mat, mb->totcol);
|
2009-09-16 17:43:09 +00:00
|
|
|
|
|
|
|
/* material imats */
|
2012-04-28 15:42:27 +00:00
|
|
|
for (ma = bmain->mat.first; ma; ma = ma->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 (ma->id.tag & LIB_TAG_NEW)
|
2012-04-28 15:42:27 +00:00
|
|
|
for (a = 0; a < MAX_MTEX; a++)
|
2012-03-24 06:38:07 +00:00
|
|
|
if (ma->mtex[a])
|
2016-11-30 15:25:54 +01:00
|
|
|
ID_NEW_REMAP(ma->mtex[a]->object);
|
2009-09-16 17:43:09 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* used for copying scenes */
|
2014-10-10 18:26:46 +02:00
|
|
|
void ED_object_single_users(Main *bmain, Scene *scene, const bool full, const bool copy_groups)
|
2009-09-16 17:43:09 +00:00
|
|
|
{
|
2013-04-24 23:09:25 +00:00
|
|
|
single_object_users(bmain, scene, NULL, 0, copy_groups);
|
2009-09-16 17:43:09 +00:00
|
|
|
|
2012-03-24 06:38:07 +00:00
|
|
|
if (full) {
|
2017-04-19 11:31:33 +02:00
|
|
|
single_obdata_users(bmain, scene, NULL, 0);
|
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_action_users(scene, NULL, 0);
|
2010-08-01 12:47:49 +00:00
|
|
|
single_mat_users_expand(bmain);
|
|
|
|
single_tex_users_expand(bmain);
|
2010-03-22 09:30:00 +00:00
|
|
|
}
|
2009-09-16 17:43:09 +00:00
|
|
|
|
2017-05-29 11:00:01 +02:00
|
|
|
/* Relink nodetrees' pointers that have been duplicated. */
|
|
|
|
FOREACH_NODETREE(bmain, ntree, id)
|
|
|
|
{
|
|
|
|
/* This is a bit convoluted, we want to root ntree of copied IDs and only those,
|
|
|
|
* so we first check that old ID has been copied and that ntree is root tree of old ID,
|
|
|
|
* then get root tree of new ID and remap its pointers to new ID... */
|
|
|
|
if (id->newid && (&ntree->id != id)) {
|
|
|
|
ntree = ntreeFromID(id->newid);
|
|
|
|
BKE_libblock_relink_to_newid(&ntree->id);
|
|
|
|
}
|
|
|
|
} FOREACH_NODETREE_END
|
|
|
|
|
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
|
|
|
/* Relink datablock pointer properties */
|
|
|
|
{
|
|
|
|
IDP_RelinkProperty(scene->id.properties);
|
|
|
|
|
|
|
|
for (Base *base = scene->base.first; base; base = base->next) {
|
|
|
|
Object *ob = base->object;
|
|
|
|
if (!ID_IS_LINKED_DATABLOCK(ob)) {
|
2017-04-24 21:58:28 +10:00
|
|
|
IDP_RelinkProperty(ob->id.properties);
|
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
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (scene->nodetree) {
|
|
|
|
IDP_RelinkProperty(scene->nodetree->id.properties);
|
|
|
|
for (bNode *node = scene->nodetree->nodes.first; node; node = node->next) {
|
|
|
|
IDP_RelinkProperty(node->prop);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (scene->gpd) {
|
|
|
|
IDP_RelinkProperty(scene->gpd->id.properties);
|
|
|
|
}
|
|
|
|
|
|
|
|
IDP_RelinkProperty(scene->world->id.properties);
|
|
|
|
|
|
|
|
if (scene->clip) {
|
|
|
|
IDP_RelinkProperty(scene->clip->id.properties);
|
|
|
|
}
|
|
|
|
}
|
2013-12-30 13:25:27 +11:00
|
|
|
BKE_main_id_clear_newpoins(bmain);
|
2016-08-12 13:58:48 +02:00
|
|
|
DAG_relations_tag_update(bmain);
|
2009-09-16 17:43:09 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/******************************* Make Local ***********************************/
|
|
|
|
|
|
|
|
/* helper for below, ma was checked to be not NULL */
|
|
|
|
static void make_local_makelocalmaterial(Material *ma)
|
|
|
|
{
|
|
|
|
AnimData *adt;
|
|
|
|
int b;
|
2014-10-10 18:44:37 +02:00
|
|
|
|
2016-07-14 13:03:22 +02:00
|
|
|
id_make_local(G.main, &ma->id, false, false);
|
2014-10-10 18:44:37 +02:00
|
|
|
|
2012-04-28 15:42:27 +00:00
|
|
|
for (b = 0; b < MAX_MTEX; b++)
|
2012-03-24 06:38:07 +00:00
|
|
|
if (ma->mtex[b] && ma->mtex[b]->tex)
|
2016-07-14 13:03:22 +02:00
|
|
|
id_make_local(G.main, &ma->mtex[b]->tex->id, false, false);
|
2014-10-10 18:44:37 +02:00
|
|
|
|
2012-04-28 15:42:27 +00:00
|
|
|
adt = BKE_animdata_from_id(&ma->id);
|
2012-03-24 06:38:07 +00:00
|
|
|
if (adt) BKE_animdata_make_local(adt);
|
2009-09-16 17:43:09 +00:00
|
|
|
|
|
|
|
/* nodetree? XXX */
|
|
|
|
}
|
|
|
|
|
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
|
|
|
};
|
|
|
|
|
2016-03-24 12:28:41 +01:00
|
|
|
static int tag_localizable_looper(
|
2017-01-31 10:41:25 +01:00
|
|
|
void *UNUSED(user_data), ID *UNUSED(self_id), ID **id_pointer, const int UNUSED(cb_flag))
|
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);
|
|
|
|
|
2016-02-15 19:35:35 +01:00
|
|
|
BKE_main_id_tag_all(bmain, LIB_TAG_DOIT, false);
|
2014-03-26 16:55:20 +06: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;
|
2014-03-26 16:55:20 +06:00
|
|
|
|
|
|
|
/* If data is also gonna to become local, mark data we're interested in
|
|
|
|
* as gonna-to-be-local.
|
|
|
|
*/
|
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;
|
2014-03-26 16:55:20 +06:00
|
|
|
}
|
|
|
|
}
|
|
|
|
CTX_DATA_END;
|
|
|
|
|
|
|
|
/* Also forbid making objects local if other library objects are using
|
|
|
|
* them for modifiers or constraints.
|
|
|
|
*/
|
2015-11-23 15:44:15 +11:00
|
|
|
for (Object *object = bmain->object.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
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* 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.
|
|
|
|
*/
|
2017-04-21 14:28:23 +02:00
|
|
|
static bool make_local_all__instance_indirect_unused(Main *bmain, Scene *scene, SceneLayer *sl, SceneCollection *sc)
|
2014-09-04 14:14:42 +10:00
|
|
|
{
|
|
|
|
Object *ob;
|
|
|
|
bool changed = false;
|
|
|
|
|
|
|
|
for (ob = bmain->object.first; ob; ob = ob->id.next) {
|
2016-07-06 14:11:01 +02:00
|
|
|
if (ID_IS_LINKED_DATABLOCK(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
|
|
|
|
2017-04-21 14:28:23 +02:00
|
|
|
BKE_collection_object_add(scene, sc, ob);
|
|
|
|
base = BKE_scene_layer_base_find(sl, ob);
|
|
|
|
base->flag |= BASE_SELECTED;
|
|
|
|
BKE_scene_object_base_flag_sync_from_base(base);
|
2014-09-04 14:14:42 +10:00
|
|
|
DAG_id_tag_update(&ob->id, OB_RECALC_OB | OB_RECALC_DATA | OB_RECALC_TIME);
|
|
|
|
|
|
|
|
changed = true;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return changed;
|
|
|
|
}
|
|
|
|
|
2009-09-16 17:43:09 +00:00
|
|
|
static int make_local_exec(bContext *C, wmOperator *op)
|
|
|
|
{
|
2012-04-28 15:42:27 +00:00
|
|
|
Main *bmain = CTX_data_main(C);
|
2014-09-04 14:14:42 +10:00
|
|
|
Scene *scene = CTX_data_scene(C);
|
2017-04-21 14:28:23 +02:00
|
|
|
SceneLayer *sl = CTX_data_scene_layer(C);
|
|
|
|
SceneCollection *sc = CTX_data_scene_collection(C);
|
2009-09-16 17:43:09 +00:00
|
|
|
AnimData *adt;
|
|
|
|
ParticleSystem *psys;
|
|
|
|
Material *ma, ***matarar;
|
|
|
|
Lamp *la;
|
|
|
|
ID *id;
|
2014-10-10 18:26:46 +02:00
|
|
|
const int mode = RNA_enum_get(op->ptr, "type");
|
|
|
|
int a, b;
|
2014-10-10 18:44:37 +02:00
|
|
|
|
2012-07-05 12:09:43 +00:00
|
|
|
if (mode == MAKE_LOCAL_ALL) {
|
2014-09-04 14:14:42 +10:00
|
|
|
/* de-select so the user can differentiate newly instanced from existing objects */
|
|
|
|
BKE_scene_base_deselect_all(scene);
|
|
|
|
|
2017-04-21 14:28:23 +02:00
|
|
|
if (make_local_all__instance_indirect_unused(bmain, scene, sl, sc)) {
|
2014-09-04 14:14:42 +10:00
|
|
|
BKE_report(op->reports, RPT_INFO,
|
|
|
|
"Orphan library objects added to the current scene to avoid loss");
|
|
|
|
}
|
|
|
|
|
2016-11-01 13:39:31 +01:00
|
|
|
BKE_library_make_local(bmain, NULL, NULL, false, false); /* NULL is all libs */
|
2009-09-16 17:43:09 +00:00
|
|
|
WM_event_add_notifier(C, NC_WINDOW, NULL);
|
|
|
|
return OPERATOR_FINISHED;
|
|
|
|
}
|
|
|
|
|
2014-03-26 16:55:20 +06:00
|
|
|
tag_localizable_objects(C, mode);
|
2014-10-10 18:44:37 +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;
|
|
|
|
}
|
|
|
|
|
2012-03-24 06:38:07 +00:00
|
|
|
if (ob->id.lib)
|
2016-07-14 13:03:22 +02:00
|
|
|
id_make_local(bmain, &ob->id, false, false);
|
2009-09-16 17:43:09 +00:00
|
|
|
}
|
|
|
|
CTX_DATA_END;
|
2014-10-10 18:44:37 +02:00
|
|
|
|
2009-09-16 17:43:09 +00:00
|
|
|
/* maybe object pointers */
|
2012-04-30 16:22:40 +00:00
|
|
|
CTX_DATA_BEGIN (C, Object *, ob, selected_objects)
|
|
|
|
{
|
2012-04-28 15:42:27 +00:00
|
|
|
if (ob->id.lib == NULL) {
|
2016-11-30 15:25:54 +01:00
|
|
|
ID_NEW_REMAP(ob->parent);
|
2009-09-16 17:43:09 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
CTX_DATA_END;
|
|
|
|
|
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;
|
|
|
|
}
|
|
|
|
|
2012-04-28 15:42:27 +00:00
|
|
|
id = ob->data;
|
2014-10-10 18:44:37 +02:00
|
|
|
|
2012-07-05 12:09:43 +00:00
|
|
|
if (id && (ELEM(mode, MAKE_LOCAL_SELECT_OBDATA, MAKE_LOCAL_SELECT_OBDATA_MATERIAL))) {
|
2016-07-14 13:03:22 +02:00
|
|
|
id_make_local(bmain, id, false, false);
|
2012-04-28 15:42:27 +00:00
|
|
|
adt = BKE_animdata_from_id(id);
|
2012-03-24 06:38:07 +00:00
|
|
|
if (adt) BKE_animdata_make_local(adt);
|
2014-10-10 18:44:37 +02:00
|
|
|
|
2010-12-20 18:54:32 +00:00
|
|
|
/* tag indirect data direct */
|
2013-07-28 06:37:58 +00:00
|
|
|
matarar = give_matarar(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];
|
2012-03-24 06:38:07 +00:00
|
|
|
if (ma)
|
2010-12-20 18:54:32 +00:00
|
|
|
id_lib_extern(&ma->id);
|
|
|
|
}
|
|
|
|
}
|
2009-09-16 17:43:09 +00:00
|
|
|
}
|
|
|
|
|
2012-04-28 15:42:27 +00:00
|
|
|
for (psys = ob->particlesystem.first; psys; psys = psys->next)
|
2016-07-14 13:03:22 +02:00
|
|
|
id_make_local(bmain, &psys->part->id, false, false);
|
2009-09-16 17:43:09 +00:00
|
|
|
|
2012-04-28 15:42:27 +00:00
|
|
|
adt = BKE_animdata_from_id(&ob->id);
|
2012-03-24 06:38:07 +00:00
|
|
|
if (adt) BKE_animdata_make_local(adt);
|
2009-09-16 17:43:09 +00:00
|
|
|
}
|
|
|
|
CTX_DATA_END;
|
|
|
|
|
2012-07-05 12:09:43 +00:00
|
|
|
if (mode == MAKE_LOCAL_SELECT_OBDATA_MATERIAL) {
|
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;
|
|
|
|
}
|
|
|
|
|
2012-04-28 15:42:27 +00:00
|
|
|
if (ob->type == OB_LAMP) {
|
|
|
|
la = ob->data;
|
2009-09-16 17:43:09 +00:00
|
|
|
|
2012-04-28 15:42:27 +00:00
|
|
|
for (b = 0; b < MAX_MTEX; b++)
|
2012-03-24 06:38:07 +00:00
|
|
|
if (la->mtex[b] && la->mtex[b]->tex)
|
2016-07-14 13:03:22 +02:00
|
|
|
id_make_local(bmain, &la->mtex[b]->tex->id, false, false);
|
2009-09-16 17:43:09 +00:00
|
|
|
}
|
|
|
|
else {
|
2012-04-28 15:42:27 +00:00
|
|
|
for (a = 0; a < ob->totcol; a++) {
|
|
|
|
ma = ob->mat[a];
|
2012-03-24 06:38:07 +00:00
|
|
|
if (ma)
|
2009-09-16 17:43:09 +00:00
|
|
|
make_local_makelocalmaterial(ma);
|
|
|
|
}
|
2014-10-10 18:44:37 +02:00
|
|
|
|
2012-04-28 15:42:27 +00:00
|
|
|
matarar = (Material ***)give_matarar(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];
|
2012-03-24 06:38:07 +00:00
|
|
|
if (ma)
|
2009-09-16 17:43:09 +00:00
|
|
|
make_local_makelocalmaterial(ma);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
CTX_DATA_END;
|
|
|
|
}
|
|
|
|
|
2016-11-30 15:25:54 +01:00
|
|
|
BKE_main_id_clear_newpoins(bmain);
|
2009-09-16 17:43:09 +00:00
|
|
|
WM_event_add_notifier(C, NC_WINDOW, NULL);
|
|
|
|
|
|
|
|
return OPERATOR_FINISHED;
|
|
|
|
}
|
|
|
|
|
|
|
|
void OBJECT_OT_make_local(wmOperatorType *ot)
|
|
|
|
{
|
2012-04-28 15:42:27 +00:00
|
|
|
static 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", ""},
|
|
|
|
{0, NULL, 0, NULL, NULL}
|
|
|
|
};
|
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";
|
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 = make_local_exec;
|
|
|
|
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", type_items, 0, "Type", "");
|
2009-09-16 17:43:09 +00:00
|
|
|
}
|
|
|
|
|
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);
|
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
|
|
|
SceneLayer *sl = CTX_data_scene_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;
|
2014-10-10 18:26:46 +02:00
|
|
|
const bool copy_groups = false;
|
2014-05-04 08:34:47 +10:00
|
|
|
bool update_deps = false;
|
2009-11-01 00:06:53 +00: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) {
|
|
|
|
BKE_scene_layer_selected_objects_tag(sl, OB_DONE);
|
|
|
|
single_object_users(bmain, scene, v3d, OB_DONE, copy_groups);
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
single_object_users(bmain, scene, v3d, 0, copy_groups);
|
|
|
|
}
|
2009-11-01 00:06:53 +00:00
|
|
|
|
2014-05-04 08:34:47 +10:00
|
|
|
/* needed since object relationships may have changed */
|
|
|
|
update_deps = true;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (RNA_boolean_get(op->ptr, "obdata")) {
|
2017-04-19 11:31:33 +02:00
|
|
|
single_obdata_users(bmain, scene, sl, flag);
|
2014-05-04 08:34:47 +10:00
|
|
|
}
|
2009-11-01 00:06:53 +00:00
|
|
|
|
2014-05-04 08:34:47 +10:00
|
|
|
if (RNA_boolean_get(op->ptr, "material")) {
|
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_mat_users(bmain, scene, sl, flag, RNA_boolean_get(op->ptr, "texture"));
|
2014-05-04 08:34:47 +10:00
|
|
|
}
|
2009-11-01 00:06:53 +00:00
|
|
|
|
2011-05-22 17:10:24 +00:00
|
|
|
#if 0 /* can't do this separate from materials */
|
2012-03-24 06:38:07 +00:00
|
|
|
if (RNA_boolean_get(op->ptr, "texture"))
|
2014-04-01 11:34:00 +11:00
|
|
|
single_mat_users(scene, flag, true);
|
2011-05-22 17:10:24 +00:00
|
|
|
#endif
|
2014-05-04 08:34:47 +10:00
|
|
|
if (RNA_boolean_get(op->ptr, "animation")) {
|
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_action_users(scene, sl, flag);
|
2014-05-04 08:34:47 +10:00
|
|
|
}
|
2009-11-01 00:06:53 +00:00
|
|
|
|
2013-12-30 13:25:27 +11:00
|
|
|
BKE_main_id_clear_newpoins(bmain);
|
2009-11-01 00:06:53 +00:00
|
|
|
|
|
|
|
WM_event_add_notifier(C, NC_WINDOW, NULL);
|
2014-05-04 08:34:47 +10:00
|
|
|
|
|
|
|
if (update_deps) {
|
|
|
|
DAG_relations_tag_update(bmain);
|
|
|
|
}
|
|
|
|
|
2009-11-01 00:06:53 +00:00
|
|
|
return OPERATOR_FINISHED;
|
|
|
|
}
|
|
|
|
|
|
|
|
void OBJECT_OT_make_single_user(wmOperatorType *ot)
|
|
|
|
{
|
2012-04-28 15:42:27 +00:00
|
|
|
static 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", ""},
|
2009-11-01 00:06:53 +00:00
|
|
|
{0, NULL, 0, NULL, NULL}};
|
|
|
|
|
|
|
|
/* 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";
|
2009-11-01 00:06:53 +00:00
|
|
|
|
|
|
|
/* api callbacks */
|
2012-03-22 07:26:09 +00:00
|
|
|
ot->invoke = WM_menu_invoke;
|
|
|
|
ot->exec = make_single_user_exec;
|
|
|
|
ot->poll = ED_operator_objectmode;
|
2009-11-01 00:06:53 +00:00
|
|
|
|
|
|
|
/* flags */
|
2012-04-28 15:42:27 +00:00
|
|
|
ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
|
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", "");
|
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");
|
2014-10-10 18:26:46 +02:00
|
|
|
RNA_def_boolean(ot->srna, "texture", 0, "Textures",
|
|
|
|
"Make textures local to each material (needs 'Materials' to be set too)");
|
2010-12-19 13:50:31 +00:00
|
|
|
RNA_def_boolean(ot->srna, "animation", 0, "Object Animation", "Make 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
|
|
|
|
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
|
|
|
{
|
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
|
|
|
BaseLegacy *base = ED_view3d_give_base_under_cursor(C, event->mval);
|
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
|
|
|
Material *ma;
|
2012-04-28 15:42:27 +00:00
|
|
|
char name[MAX_ID_NAME - 2];
|
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
|
|
|
RNA_string_get(op->ptr, "name", name);
|
2012-05-05 17:00:11 +00:00
|
|
|
ma = (Material *)BKE_libblock_find_name(ID_MA, name);
|
2012-04-28 15:42:27 +00:00
|
|
|
if (base == 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;
|
2014-10-10 18:44:37 +02:00
|
|
|
|
2012-08-12 17:12:07 +00:00
|
|
|
assign_material(base->object, ma, 1, BKE_MAT_ASSIGN_USERPREF);
|
2014-10-06 14:04:55 +02:00
|
|
|
|
|
|
|
DAG_id_tag_update(&base->object->id, OB_RECALC_OB);
|
|
|
|
|
|
|
|
WM_event_add_notifier(C, NC_OBJECT | ND_OB_SHADING, base->object);
|
2012-04-28 15:42:27 +00:00
|
|
|
WM_event_add_notifier(C, NC_SPACE | ND_SPACE_VIEW3D, CTX_wm_view3d(C));
|
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;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* used for dropbox */
|
|
|
|
/* assigns to object under cursor, only first material slot */
|
|
|
|
void OBJECT_OT_drop_named_material(wmOperatorType *ot)
|
|
|
|
{
|
|
|
|
/* identifiers */
|
2012-03-22 07:26:09 +00:00
|
|
|
ot->name = "Drop Named Material on Object";
|
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
|
|
|
ot->description = "";
|
2012-03-22 07:26:09 +00:00
|
|
|
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;
|
|
|
|
ot->poll = ED_operator_objectmode;
|
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 */
|
2012-04-28 15:42:27 +00:00
|
|
|
RNA_def_string(ot->srna, "name", "Material", MAX_ID_NAME - 2, "Name", "Material name to assign");
|
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
|
|
|
|
|
|
|
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;
|
|
|
|
}
|
|
|
|
|
|
|
|
id = pprop.ptr.id.data;
|
|
|
|
|
|
|
|
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;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* \note Only for empty-image objects, this operator is needed
|
|
|
|
*/
|
|
|
|
void OBJECT_OT_unlink_data(wmOperatorType *ot)
|
|
|
|
{
|
|
|
|
/* identifiers */
|
|
|
|
ot->name = "Unlink";
|
|
|
|
ot->idname = "OBJECT_OT_unlink_data";
|
|
|
|
ot->description = "";
|
|
|
|
|
|
|
|
/* api callbacks */
|
|
|
|
ot->exec = object_unlink_data_exec;
|
|
|
|
|
|
|
|
/* flags */
|
|
|
|
ot->flag = OPTYPE_INTERNAL;
|
|
|
|
}
|