griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
Files
54d69a2fd1be60aaba62f92cd0db5b5ba71495aa
test/source/blender/editors/object/object_add.c

Ignoring revisions in .git-blame-ignore-revs. Click here to bypass and see the normal blame view.

3866 lines
118 KiB
C
Raw Normal View History

doxygen: prevent GPL license block from being parsed as doxygen comment.
2011-02-23 10:52:22 +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
* 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,
correct fsf address
2010-02-12 13:34:04 +00:00
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
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
*
* The Original Code is Copyright (C) 2001-2002 by NaN Holding BV.
* All rights reserved.
*/
doxygen: add newline after \file While \file doesn't need an argument, it can't have another doxy command after it.
2019-02-18 08:08:12 +11:00
/** \file
* \ingroup edobj
doxygen: blender/editors tagged.
2011-02-27 20:29:51 +00:00
*/
Cleanup: `make format` after SortedIncludes change
2020-03-19 09:33:03 +01:00
#include <ctype.h>
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
#include <stdlib.h>
'Add Group' back in the add object menu
2009-10-07 14:40:27 +00:00
#include <string.h>
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
#include "MEM_guardedalloc.h"
Nla Sound Strips + Add Speaker Second part of previous commit. Now, when speaker objects are created, they are created by default with an NLA sound strip so that it is easy to just start immediately using this to do cool stuff (i.e. timing when you want the sound to start).
2011-08-07 12:43:44 +00:00
#include "DNA_anim_types.h"
Fix T41602: Camera draw size ignores scene scale
2014-08-28 20:24:43 +10:00
#include "DNA_camera_types.h"
Cleanup: rename files from group to collection to match contents.
2018-08-29 15:32:50 +02:00
#include "DNA_collection_types.h"
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
#include "DNA_curve_types.h"
Grease Pencil: Add LineArt modifier This adds the LineArt grease pencil modifier. It takes objects or collections as input and generates various grease pencil lines from these objects with the help of the active scene camera. For example it can generate contour lines, intersection lines and crease lines to name a few. This is really useful as artists can then use 3D meshes to automatically generate grease pencil lines for characters, enviroments or other visualization purposes. These lines can then be baked and edited as regular grease pencil lines. Reviewed By: Sebastian Parborg, Antonio Vazquez, Matias Mendiola Differential Revision: http://developer.blender.org/D8758
2021-03-16 19:35:53 +01:00
#include "DNA_gpencil_modifier_types.h"
Cleanup: `make format` after SortedIncludes change
2020-03-19 09:33:03 +01:00
#include "DNA_gpencil_types.h"
Bugfix [#28267] keyframed values for shapekeys of copied objects are linked Shapekey actions weren't getting copied when their owner data was. This was due to the IMO totally convoluted way in which the duplicate action flags have been set up: - the function to copy animdata takes a param to specify whether actions are copied or not, but this is never touched (i.e. this always just gets FALSE passed in) - instead, we jump around in hoops later figuring out whether the userpref wants copying to occur, then fixing up the links IIRC, part of this may be due to a desire/need to not duplicate actions when dealing with NodeTree copies for multi-threaded rendering, but at the expense of complicating everything else.
2011-08-16 01:02:26 +00:00
#include "DNA_key_types.h"
Cleanup: `make format` after SortedIncludes change
2020-03-19 09:33:03 +01:00
#include "DNA_light_types.h"
#include "DNA_lightprobe_types.h"
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
#include "DNA_material_types.h"
#include "DNA_mesh_types.h"
#include "DNA_meta_types.h"
Cleanup: add _types.h suffix to DNA headers
2018-02-07 11:14:08 +11:00
#include "DNA_object_fluidsim_types.h"
#include "DNA_object_force_types.h"
Clean up in "add object" code: * Get rid of ED_object_add_generic_invoke() and all invoke callbacks using it, it was doing nothing exec() callbacks would not do. In fact, its only action (setting part of common add ops properties, like loc, layers, etc.) was needed too by direct exec call, so it was done twice in case of using invoke()! * Replace custom invoke code for metaballs by WM_menu_invoke helper (as already used by lamps). * Add a new OBJECT_OT_empty_add op, to allow direct addition of empties of a given drawtype. * And some general code cleanup (like trailing spaces, empty lines, ...). Did quite a bunch of tests/verifications, but obviously could not tackle all possible scenarios... Anyway, if any, bugs should arize quite quickly (but I don’t expect any! :p ).
2012-10-05 12:59:09 +00:00
#include "DNA_object_types.h"
Pointclouds: support mesh <-> pointcloud in convert operator Just converts verts to points and vice versa. Materials and Attribute layers are preserved (so for example if you set custom radii on the pointcloud, convert to mesh, then convert back to pointcloud, this will be preserved). Also not add a Radius layer by default (it is still added and filled when adding a pointcloud object from the menu), a global Radius property that will be used if there is no radius attribute can be added later. A Radius attribute can also be added in the pointcloud data properties (and filled via python). This will also add a new utility function that copies materials between datablocks: BKE_id_materials_copy ref T75717 Differential Revision: https://developer.blender.org/D7391
2020-04-09 18:49:40 +02:00
#include "DNA_pointcloud_types.h"
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
#include "DNA_scene_types.h"
#include "DNA_vfont_types.h"
Fix #29640: make duplicates release keep hierarchy and parent properties not working for multiple objects. ID.newid only worked for one object, now it uses a hash instead.
2011-12-16 23:56:18 +00:00
#include "BLI_ghash.h"
#include "BLI_listbase.h"
Math Lib * Convert all code to use new functions. * Branch maintainers may want to skip this commit, and run this conversion script instead, if they use a lot of math functions in new code: http://www.pasteall.org/9052/python
2009-11-10 20:43:45 +00:00
#include "BLI_math.h"
fix [#29183] Make duplicates real: parent informations of the group is not copied infact this is a feature request but we had reports about it before and its useful to have. 2 new options for OBJECT_OT_duplicates_make_real - parent to original duplicator - keep internal hierarchy
2011-11-07 05:28:26 +00:00
#include "BLI_string.h"
Cleanup: `make format` after SortedIncludes change
2020-03-19 09:33:03 +01:00
#include "BLI_utildefines.h"
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
Refactor translation code out of blenfont - Add blentranslation `BLT_*` module. - moved & split `BLF_translation.h` into (`BLT_translation.h`, `BLT_lang.h`). - moved `BLF_*_unifont` functions from `blf_translation.c` to new source file `blf_font_i18n.c`.
2015-08-16 17:32:01 +10:00
#include "BLT_translation.h"
More UI message i18n fixes and improvements...
2013-03-10 14:57:19 +00:00
Depsgraph: Add utility function to tag pose for recalc Currently this function only tags pose itself, totally matching previous behavior. But this will be needed in the future once new dependency graph is landed, because of it's granular nature which relies on the fact that pose channels are all up to date when building the graph. Should be no functional changes so far.
2015-05-12 13:13:36 +05:00
#include "BKE_action.h"
Cleanup: Animation, move AnimData API to `anim_data.c`/`BKE_anim_data.h` The `BKE_animsys.h` and `anim_sys.c` files already had a an "AnimData API" section. The code in that section has now been split off, and placed into `BKE_anim_data.h` and `anim_data.c`. All files that used to include `BKE_animsys.h` have been adjusted to only include the animation headers they need (sometimes none). No functional changes.
2020-04-03 13:07:36 +02:00
#include "BKE_anim_data.h"
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
#include "BKE_armature.h"
Code refactoring: split camera functions from object.c into new camera.c.
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"
Fix memory leak when making duplicates real and parent had constraints Thanks Bastien for help!
2017-02-27 17:46:21 +01:00
#include "BKE_constraint.h"
Cleanup: `make format` after SortedIncludes change
2020-03-19 09:33:03 +01:00
#include "BKE_context.h"
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
#include "BKE_curve.h"
#include "BKE_displist.h"
Cleanup: split `BKE_anim.h` and `anim.c` into smaller pieces The files are now split up into the following sections: - `BKE_anim_path.h` and `anim_path.c` for path/curve functions. - `BKE_anim_visualization.h` and `anim_visualizationanim_path.c` for animation visualization (mostly motion paths). - `BKE_duplilist.h` for DupliList function declarations. These were already implemented in `object_dupli.c`, so they were rather out of place being declared in `BKE_anim.h` in the first place. No functional changes.
2020-04-03 11:35:04 +02:00
#include "BKE_duplilist.h"
Unified effector functionality for particles, cloth and softbody * Unified scene wide gravity (currently in scene buttons) instead of each simulation having it's own gravity. * Weight parameters for all effectors and an effector group setting. * Every effector can use noise. * Most effectors have "shapes" point, plane, surface, every point. - "Point" is most like the old effectors and uses the effector location as the effector point. - "Plane" uses the closest point on effectors local xy-plane as the effector point. - "Surface" uses the closest point on an effector object's surface as the effector point. - "Every Point" uses every point in a mesh effector object as an effector point. - The falloff is calculated from this point, so for example with "surface" shape and "use only negative z axis" it's possible to apply force only "inside" the effector object. * Spherical effector is now renamed as "force" as it's no longer just spherical. * New effector parameter "flow", which makes the effector act as surrounding air velocity, so the resulting force is proportional to the velocity difference of the point and "air velocity". For example a wind field with flow=1.0 results in proper non-accelerating wind. * New effector fields "turbulence", which creates nice random flow paths, and "drag", which slows the points down. * Much improved vortex field. * Effectors can now effect particle rotation as well as location. * Use full, or only positive/negative z-axis to apply force (note. the z-axis is the surface normal in the case of effector shape "surface") * New "force field" submenu in add menu, which adds an empty with the chosen effector (curve object for corve guides). * Other dynamics should be quite easy to add to the effector system too if wanted. * "Unified" doesn't mean that force fields give the exact same results for particles, softbody & cloth, since their final effect depends on many external factors, like for example the surface area of the effected faces. Code changes * Subversion bump for correct handling of global gravity. * Separate ui py file for common dynamics stuff. * Particle settings updating is flushed with it's id through DAG_id_flush_update(..). Known issues * Curve guides don't yet have all ui buttons in place, but they should work none the less. * Hair dynamics don't yet respect force fields. Other changes * Particle emission defaults now to frames 1-200 with life of 50 frames to fill the whole default timeline. * Many particles drawing related crashes fixed. * Sometimes particles didn't update on first frame properly. * Hair with object/group visualization didn't work properly. * Memory leaks with PointCacheID lists (Genscher, remember to free pidlists after use :).
2009-09-30 22:10:14 +00:00
#include "BKE_effect.h"
Fix "Make Instances Real" to work with nodes modifier instances This commit changes the check at the beginning of the "Make Instances Real" operator to account for the instances created by nodes modifiers in the modifier stack. Differential Revision: https://developer.blender.org/D10059
2021-01-15 08:18:52 -06:00
#include "BKE_geometry_set.h"
GPencil: Split Curve geometry functions to new file This prepare the code for future curve editors
2020-05-06 18:13:59 +02:00
#include "BKE_gpencil_curve.h"
GPencil: Convert and Bake mesh animation to grease pencil strokes This patch adds two options: - Convert a mesh to grease pencil strokes. - Bake the mesh animation into grease pencil strokes. Both are related and must be included in the same patch. Related to tasks: T77629 and T77630 Notice: The conversion is done for mesh edges and it's not considering any visibility clipping. All edges are exported, no matters if it's visible or not. Example of Convert a Mesh to Grease Pencil strokes: {F8606028} This conversion was inspired by the technique used by @luamono in this tweet: https://twitter.com/luamono/status/1239983662176841730 Example of Bake Animation (the video is a little outdate, but the basic functionality is the same, only small changes in UI): {F8606032} Reviewed By: mendio, pepeland Maniphest Tasks: T77629, T77630 Differential Revision: https://developer.blender.org/D7983
2020-06-16 15:28:46 +02:00
#include "BKE_gpencil_geom.h"
Grease Pencil: Add LineArt modifier This adds the LineArt grease pencil modifier. It takes objects or collections as input and generates various grease pencil lines from these objects with the help of the active scene camera. For example it can generate contour lines, intersection lines and crease lines to name a few. This is really useful as artists can then use 3D meshes to automatically generate grease pencil lines for characters, enviroments or other visualization purposes. These lines can then be baked and edited as regular grease pencil lines. Reviewed By: Sebastian Parborg, Antonio Vazquez, Matias Mendiola Differential Revision: http://developer.blender.org/D8758
2021-03-16 19:35:53 +01:00
#include "BKE_gpencil_modifier.h"
Objects: add Volume object type, and prototypes for Hair and PointCloud Only the volume object is exposed in the user interface. It is based on OpenVDB internally. Drawing and rendering code will follow in another commit. https://wiki.blender.org/wiki/Source/Objects/Volume https://wiki.blender.org/wiki/Reference/Release_Notes/2.83/Volumes Hair and PointCloud object types are hidden behind a WITH_NEW_OBJECT_TYPES build option. These are unfinished, and included only to make it easier to cooperate on development in the future and avoid tricky merges. https://wiki.blender.org/wiki/Source/Objects/New_Object_Types Ref T73201, T68981 Differential Revision: https://developer.blender.org/D6945
2020-03-17 14:41:48 +01:00
#include "BKE_hair.h"
Cleanup: remove some useless BKE_library and BKE_main includes. Makes it simpler to make some changes... Also fix order of some includes (use alphabetical please).
2018-11-07 18:00:24 +01:00
#include "BKE_key.h"
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
#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"
Cleanup/refactor: Rename `BKE_library` files to `BKE_lib`. Note that `BKE_library.h`/`library.c` were renamed to `BKE_lib_id.h`/`lib_id.c` to avoid having a too generic name here. Part of T72604.
2020-02-10 12:58:59 +01:00
#include "BKE_lib_id.h"
Fix T89400: Possible to delete objects used by overrides of collections. This should not be allowed in general, added some initial call to check when user is allowed to delete a data to search for mandatory override usages...
2021-09-28 18:29:02 +02:00
#include "BKE_lib_override.h"
Cleanup/refactor: Rename `BKE_library` files to `BKE_lib`. Note that `BKE_library.h`/`library.c` were renamed to `BKE_lib_id.h`/`lib_id.c` to avoid having a too generic name here. Part of T72604.
2020-02-10 12:58:59 +01:00
#include "BKE_lib_query.h"
#include "BKE_lib_remap.h"
Cleanup: `make format` after SortedIncludes change
2020-03-19 09:33:03 +01:00
#include "BKE_light.h"
BKE: Fix probe duplication not duplicating data block
2018-11-16 01:03:04 +01:00
#include "BKE_lightprobe.h"
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
#include "BKE_main.h"
#include "BKE_material.h"
#include "BKE_mball.h"
#include "BKE_mesh.h"
Moved function declarations from BKE_DerivedMesh.h to BKE_mesh_runtime.h The function definitions still reside in DerivedMesh.c. Once we're done porting all the DerivedMesh use to Mesh, we'll move the still-relevant functions to mesh_runtime.c. This move is now cumbersome due to shared statically-declared utility functions in DerivedMesh.c
2018-06-05 16:58:08 +02:00
#include "BKE_mesh_runtime.h"
Nla Sound Strips + Add Speaker Second part of previous commit. Now, when speaker objects are created, they are created by default with an NLA sound strip so that it is easy to just start immediately using this to do cool stuff (i.e. timing when you want the sound to start).
2011-08-07 12:43:44 +00:00
#include "BKE_nla.h"
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
#include "BKE_object.h"
#include "BKE_particle.h"
Objects: add Volume object type, and prototypes for Hair and PointCloud Only the volume object is exposed in the user interface. It is based on OpenVDB internally. Drawing and rendering code will follow in another commit. https://wiki.blender.org/wiki/Source/Objects/Volume https://wiki.blender.org/wiki/Reference/Release_Notes/2.83/Volumes Hair and PointCloud object types are hidden behind a WITH_NEW_OBJECT_TYPES build option. These are unfinished, and included only to make it easier to cooperate on development in the future and avoid tricky merges. https://wiki.blender.org/wiki/Source/Objects/New_Object_Types Ref T73201, T68981 Differential Revision: https://developer.blender.org/D6945
2020-03-17 14:41:48 +01:00
#include "BKE_pointcloud.h"
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
#include "BKE_report.h"
Nodes: add cycles shader nodes, these will only be available to render engines that use the new shading nodes system. Documentation: http://wiki.blender.org/index.php/Doc:2.6/Manual/Render/Cycles/Nodes
2011-11-08 11:38:16 +00:00
#include "BKE_scene.h"
3D Audio GSoC: * versioning stuff for btheme->tv3d.speaker * separating object.c speaker functions in own source file Thanks Brecht for the suggestions.
2011-08-04 07:12:03 +00:00
#include "BKE_speaker.h"
Cleanup: rename BKE_font.h -> BKE_vfont.h Match API naming prefix (BKE_vfont_*) and DNA_vfont_types.h.
2021-10-06 11:15:53 +11:00
#include "BKE_vfont.h"
Objects: add Volume object type, and prototypes for Hair and PointCloud Only the volume object is exposed in the user interface. It is based on OpenVDB internally. Drawing and rendering code will follow in another commit. https://wiki.blender.org/wiki/Source/Objects/Volume https://wiki.blender.org/wiki/Reference/Release_Notes/2.83/Volumes Hair and PointCloud object types are hidden behind a WITH_NEW_OBJECT_TYPES build option. These are unfinished, and included only to make it easier to cooperate on development in the future and avoid tricky merges. https://wiki.blender.org/wiki/Source/Objects/New_Object_Types Ref T73201, T68981 Differential Revision: https://developer.blender.org/D6945
2020-03-17 14:41:48 +01:00
#include "BKE_volume.h"
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
Replace all old DAG calls with direct calls to new DEG and remove BKE_depsgraph.h This removes BKE_depsgraph.h and depsgraph.c
2017-06-08 10:14:53 +02:00
#include "DEG_depsgraph.h"
#include "DEG_depsgraph_build.h"
Fix T58481: "Make duplicates real" operator settings crashes
2018-12-04 10:18:21 +01:00
#include "DEG_depsgraph_query.h"
Replace all old DAG calls with direct calls to new DEG and remove BKE_depsgraph.h This removes BKE_depsgraph.h and depsgraph.c
2017-06-08 10:14:53 +02: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
#include "RNA_access.h"
#include "RNA_define.h"
#include "RNA_enum_types.h"
GPencil: Convert and Bake mesh animation to grease pencil strokes This patch adds two options: - Convert a mesh to grease pencil strokes. - Bake the mesh animation into grease pencil strokes. Both are related and must be included in the same patch. Related to tasks: T77629 and T77630 Notice: The conversion is done for mesh edges and it's not considering any visibility clipping. All edges are exported, no matters if it's visible or not. Example of Convert a Mesh to Grease Pencil strokes: {F8606028} This conversion was inspired by the technique used by @luamono in this tweet: https://twitter.com/luamono/status/1239983662176841730 Example of Bake Animation (the video is a little outdate, but the basic functionality is the same, only small changes in UI): {F8606032} Reviewed By: mendio, pepeland Maniphest Tasks: T77629, T77630 Differential Revision: https://developer.blender.org/D7983
2020-06-16 15:28:46 +02:00
#include "UI_interface.h"
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
#include "WM_api.h"
#include "WM_types.h"
#include "ED_armature.h"
#include "ED_curve.h"
New Grease Pencil object for 2D animation This commit merge the full development done in greasepencil-object branch and include mainly the following features. - New grease pencil object. - New drawing engine. - New grease pencil modes Draw/Sculpt/Edit and Weight Paint. - New brushes for grease pencil. - New modifiers for grease pencil. - New shaders FX. - New material system (replace old palettes and colors). - Split of annotations (old grease pencil) and new grease pencil object. - UI adapted to blender 2.8. You can get more info here: https://code.blender.org/2017/12/drawing-2d-animation-in-blender-2-8/ https://code.blender.org/2018/07/grease-pencil-status-update/ This is the result of nearly two years of development and I want thanks firstly the other members of the grease pencil team: Daniel M. Lara, Matias Mendiola and Joshua Leung for their support, ideas and to keep working in the project all the time, without them this project had been impossible. Also, I want thanks other Blender developers for their help, advices and to be there always to help me, and specially to Clément Foucault, Dalai Felinto, Pablo Vázquez and Campbell Barton.
2018-07-31 10:22:19 +02:00
#include "ED_gpencil.h"
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
#include "ED_mball.h"
#include "ED_mesh.h"
Nodes: add cycles shader nodes, these will only be available to render engines that use the new shading nodes system. Documentation: http://wiki.blender.org/index.php/Doc:2.6/Manual/Render/Cycles/Nodes
2011-11-08 11:38:16 +00:00
#include "ED_node.h"
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
#include "ED_object.h"
Outliner: Synced selection and active element highlighting Adds a toggle to the filter menu for outliner synced selection. Enabled by default, this ensures selection is synced between objects, bones, and sequences. An active outliner element theme color is added to indicate which element is active. Synced selection is controlled on the operator level. Each operator that modifies selection for objects, bones, sequences, or outliner elements needs to call the respective ED_outliner_select_sync_from.. function to tag outliners to be synced. Syncing is done lazily on outliner draw.
2019-08-07 22:27:07 -06:00
#include "ED_outliner.h"
rigidbody operators poll functions were mixing up CTX_data_active_object/ED_object_active_context. - replace ED_operator_rigidbody_add_poll with ED_operator_object_active_editable_mesh - replace ED_operator_rigidbody_active_poll with ED_operator_scene_editable for operators that use the entire selection. - remove rigid-body from objects that are converted from meshes to curves, while this isnt crashing it is confusing to see in the UI.
2013-04-09 01:43:39 +00:00
#include "ED_physics.h"
Fix #19736: GLSL viewport materials are not updated on all changes.
2010-02-13 13:49:27 +00:00
#include "ED_render.h"
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
#include "ED_screen.h"
Fix all objects getting selected sometimes when droppping object If no other object was selected while dragging one in (e.g. from the Outliner or an object asset from the Asset Browser), all visible objects in the active view layer would get selected. Issue was caused by a wrong enum type use. Mistake in bcdba7c34da0.
2021-04-30 12:37:26 +02:00
#include "ED_select_utils.h"
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
#include "ED_transform.h"
Fix [#21114] Graphical cursor displayed in wrong position when switching to local ortho.
2010-03-17 00:05:40 +00:00
#include "ED_view3d.h"
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
#include "UI_resources.h"
#include "object_intern.h"
Cleanup: use doxy sections for object_add.c
2019-05-16 14:03:31 +10:00
/* -------------------------------------------------------------------- */
/** \name Local Enum Declarations
* \{ */
Cleanup: move public doc-strings into headers for 'editors' Ref T92709
2021-12-09 00:55:11 +11:00
/* This is an exact copy of the define in `rna_light.c`
Some effect-less code cleanup...
2012-10-05 07:05:52 +00:00
* kept here because of linking order.
Bugfix for [#31829] Add lamp icons missing. Patch by Philipp Oeser. Note: If you do code cleanups, and revert make sure you revert it correct and not halfway. ;-) r47034
2012-06-14 13:54:55 +00:00
* Icons are only defined here */
UI/Python: rename Lamps to Lights, to follow more standard terminology. Internally it's still mostly named lamps, though some modules like Cycles were already calling them lights.
2018-06-27 14:41:53 +02:00
const EnumPropertyItem rna_enum_light_type_items[] = {
{LA_LOCAL, "POINT", ICON_LIGHT_POINT, "Point", "Omnidirectional point light source"},
{LA_SUN, "SUN", ICON_LIGHT_SUN, "Sun", "Constant direction parallel ray light source"},
{LA_SPOT, "SPOT", ICON_LIGHT_SPOT, "Spot", "Directional cone light source"},
{LA_AREA, "AREA", ICON_LIGHT_AREA, "Area", "Directional area light source"},
Cleanup: trailing commas Needed for clan-format not to wrap onto one line.
2019-02-03 14:01:45 +11:00
{0, NULL, 0, NULL, NULL},
previous commit didnt build - add back enum and note that its a copy because of linking error
2012-05-26 00:41:11 +00:00
};
Some effect-less code cleanup...
2012-10-05 07:05:52 +00:00
/* copy from rna_object_force.c */
Cleanup: Use const for RNA EnumPropertyItem args Practically all access to enum data is read-only.
2017-10-18 15:07:26 +11:00
static const EnumPropertyItem field_type_items[] = {
Some effect-less code cleanup...
2012-10-05 07:05:52 +00:00
{PFIELD_FORCE, "FORCE", ICON_FORCE_FORCE, "Force", ""},
{PFIELD_WIND, "WIND", ICON_FORCE_WIND, "Wind", ""},
{PFIELD_VORTEX, "VORTEX", ICON_FORCE_VORTEX, "Vortex", ""},
{PFIELD_MAGNET, "MAGNET", ICON_FORCE_MAGNETIC, "Magnetic", ""},
{PFIELD_HARMONIC, "HARMONIC", ICON_FORCE_HARMONIC, "Harmonic", ""},
{PFIELD_CHARGE, "CHARGE", ICON_FORCE_CHARGE, "Charge", ""},
{PFIELD_LENNARDJ, "LENNARDJ", ICON_FORCE_LENNARDJONES, "Lennard-Jones", ""},
{PFIELD_TEXTURE, "TEXTURE", ICON_FORCE_TEXTURE, "Texture", ""},
{PFIELD_GUIDE, "GUIDE", ICON_FORCE_CURVE, "Curve Guide", ""},
{PFIELD_BOID, "BOID", ICON_FORCE_BOID, "Boid", ""},
{PFIELD_TURBULENCE, "TURBULENCE", ICON_FORCE_TURBULENCE, "Turbulence", ""},
{PFIELD_DRAG, "DRAG", ICON_FORCE_DRAG, "Drag", ""},
Fluid: Rename smoke flow forces to fluid flow forces Better to use more general term since in theory these forces can be used for smoke and liquid.
2020-05-14 10:30:11 +02:00
{PFIELD_FLUIDFLOW, "FLUID", ICON_FORCE_FLUIDFLOW, "Fluid Flow", ""},
Cleanup: trailing commas Needed for clan-format not to wrap onto one line.
2019-02-03 14:01:45 +11:00
{0, NULL, 0, NULL, NULL},
Some effect-less code cleanup...
2012-10-05 07:05:52 +00:00
};
Rename probe to light-probe Probe is a real general term, the new name is used often in docs online.
2017-06-12 20:59:54 +10:00
static EnumPropertyItem lightprobe_type_items[] = {
Use Light Probe icons
2018-05-11 16:02:09 +02:00
{LIGHTPROBE_TYPE_CUBE,
"CUBEMAP",
ICON_LIGHTPROBE_CUBEMAP,
"Reflection Cubemap",
Light Probes: interface changes, and renames Although we are calling all of them light probes, there are a lot of differences between them. This commit does the following: * Prevent user from changing the probe type once added * Unify "sphere" and "cube" probes into reflection cubemap (as before you can switch between them from the probe UI) To be done ========== * Don't show add probe menus unless we are on Eevee * Light probes panels should not be visible in Clay. Light probe objects should not be visible in Clay viewport (nor on Cycles). Notes ===== * We need icons for the different light probes, and for lightprobes as a whole (we are using RADIO for now).
2017-06-22 17:20:39 +02:00
"Reflection probe with spherical or cubic attenuation"},
Use Light Probe icons
2018-05-11 16:02:09 +02:00
{LIGHTPROBE_TYPE_PLANAR,
"PLANAR",
ICON_LIGHTPROBE_PLANAR,
"Reflection Plane",
Light Probes: interface changes, and renames Although we are calling all of them light probes, there are a lot of differences between them. This commit does the following: * Prevent user from changing the probe type once added * Unify "sphere" and "cube" probes into reflection cubemap (as before you can switch between them from the probe UI) To be done ========== * Don't show add probe menus unless we are on Eevee * Light probes panels should not be visible in Clay. Light probe objects should not be visible in Clay viewport (nor on Cycles). Notes ===== * We need icons for the different light probes, and for lightprobes as a whole (we are using RADIO for now).
2017-06-22 17:20:39 +02:00
"Planar reflection probe"},
Use Light Probe icons
2018-05-11 16:02:09 +02:00
{LIGHTPROBE_TYPE_GRID,
"GRID",
ICON_LIGHTPROBE_GRID,
"Irradiance Volume",
Light Probes: interface changes, and renames Although we are calling all of them light probes, there are a lot of differences between them. This commit does the following: * Prevent user from changing the probe type once added * Unify "sphere" and "cube" probes into reflection cubemap (as before you can switch between them from the probe UI) To be done ========== * Don't show add probe menus unless we are on Eevee * Light probes panels should not be visible in Clay. Light probe objects should not be visible in Clay viewport (nor on Cycles). Notes ===== * We need icons for the different light probes, and for lightprobes as a whole (we are using RADIO for now).
2017-06-22 17:20:39 +02:00
"Irradiance probe to capture diffuse indirect lighting"},
Cleanup: trailing commas Needed for clan-format not to wrap onto one line.
2019-02-03 14:01:45 +11:00
{0, NULL, 0, NULL, NULL},
Probe: Add panel and "Add-menu" items. Also revisits defaults.
2017-06-07 18:32:27 +02:00
};
Cleanup: remove unused identifiers
2019-05-16 13:54:32 +10:00
enum {
ALIGN_WORLD = 0,
Objects: new 3D cursor alignment option when adding objects The choices are now World, View and 3D Cursor. This breaks Python API compatibility, add-ons that add objects with this parameter will need to be updated. Differential Revision: https://developer.blender.org/D4706
2019-05-15 16:56:22 +02:00
ALIGN_VIEW,
ALIGN_CURSOR,
Cleanup: remove unused identifiers
2019-05-16 13:54:32 +10:00
};
Objects: new 3D cursor alignment option when adding objects The choices are now World, View and 3D Cursor. This breaks Python API compatibility, add-ons that add objects with this parameter will need to be updated. Differential Revision: https://developer.blender.org/D4706
2019-05-15 16:56:22 +02:00
static const EnumPropertyItem align_options[] = {
{ALIGN_WORLD, "WORLD", 0, "World", "Align the new object to the world"},
{ALIGN_VIEW, "VIEW", 0, "View", "Align the new object to the view"},
{ALIGN_CURSOR, "CURSOR", 0, "3D Cursor", "Use the 3D cursor orientation for the new object"},
Cleanup: use doxy sections for object_add.c
2019-05-16 14:03:31 +10:00
{0, NULL, 0, NULL, NULL},
};
/** \} */
Objects: new 3D cursor alignment option when adding objects The choices are now World, View and 3D Cursor. This breaks Python API compatibility, add-ons that add objects with this parameter will need to be updated. Differential Revision: https://developer.blender.org/D4706
2019-05-15 16:56:22 +02:00
Fix object moved to cursor when editing last operation after dropping object Steps to reproduce were: * Drag object icon from the Outliner into the 3D view (or an object asset from the Asset Browser) * Open the "Adjust Last Operation" panel * Edit options in there - the object would move to the mouse location The same issue happens with collection instance and object data adding (e.g. via drag & drop). This patch addresses them too. The operator used the event state stored in the window. This shouldn't be accessed from the operator execute callback generally which happened here. Especially not if the operator supports editing properties.
2021-01-05 00:57:24 +01:00
/* -------------------------------------------------------------------- */
/** \name Local Helpers
* \{ */
/**
* Operator properties for creating an object under a screen space (2D) coordinate.
* Used for object dropping like behavior (drag object and drop into 3D View).
*/
static void object_add_drop_xy_props(wmOperatorType *ot)
{
PropertyRNA *prop;
prop = RNA_def_int(ot->srna,
"drop_x",
0,
INT_MIN,
INT_MAX,
"Drop X",
"X-coordinate (screen space) to place the new object under",
INT_MIN,
INT_MAX);
RNA_def_property_flag(prop, PROP_HIDDEN | PROP_SKIP_SAVE);
prop = RNA_def_int(ot->srna,
"drop_y",
0,
INT_MIN,
INT_MAX,
"Drop Y",
"Y-coordinate (screen space) to place the new object under",
INT_MIN,
INT_MAX);
RNA_def_property_flag(prop, PROP_HIDDEN | PROP_SKIP_SAVE);
}
static bool object_add_drop_xy_is_set(const wmOperator *op)
{
return RNA_struct_property_is_set(op->ptr, "drop_x") &&
RNA_struct_property_is_set(op->ptr, "drop_y");
}
/**
* Query the currently set X- and Y-coordinate to position the new object under.
* \param r_mval: Returned pointer to the coordinate in region-space.
*/
static bool object_add_drop_xy_get(bContext *C, wmOperator *op, int (*r_mval)[2])
{
if (!object_add_drop_xy_is_set(op)) {
(*r_mval)[0] = 0.0f;
(*r_mval)[1] = 0.0f;
return false;
}
const ARegion *region = CTX_wm_region(C);
(*r_mval)[0] = RNA_int_get(op->ptr, "drop_x") - region->winrct.xmin;
(*r_mval)[1] = RNA_int_get(op->ptr, "drop_y") - region->winrct.ymin;
return true;
}
/**
* Set the drop coordinate to the mouse position (if not already set) and call the operator's
* `exec()` callback.
*/
static int object_add_drop_xy_generic_invoke(bContext *C, wmOperator *op, const wmEvent *event)
{
if (!object_add_drop_xy_is_set(op)) {
Cleanup: use an array for wmEvent cursor position variables Use arrays for wmEvent coordinates, this quiets warnings with GCC11. - `x, y` -> `xy`. - `prevx, prevy` -> `prev_xy`. - `prevclickx, prevclicky` -> `prev_click_xy`. There is still some cleanup such as using `copy_v2_v2_int()`, this can be done separately. Reviewed By: campbellbarton, Severin Ref D12901
2021-10-20 23:45:30 +11:00
RNA_int_set(op->ptr, "drop_x", event->xy[0]);
RNA_int_set(op->ptr, "drop_y", event->xy[1]);
Fix object moved to cursor when editing last operation after dropping object Steps to reproduce were: * Drag object icon from the Outliner into the 3D view (or an object asset from the Asset Browser) * Open the "Adjust Last Operation" panel * Edit options in there - the object would move to the mouse location The same issue happens with collection instance and object data adding (e.g. via drag & drop). This patch addresses them too. The operator used the event state stored in the window. This shouldn't be accessed from the operator execute callback generally which happened here. Especially not if the operator supports editing properties.
2021-01-05 00:57:24 +01:00
}
return op->type->exec(C, op);
}
/** \} */
Cleanup: use doxy sections for object_add.c
2019-05-16 14:03:31 +10:00
/* -------------------------------------------------------------------- */
/** \name Public Add Object API
* \{ */
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
code cleanup: use const float and define array size
2012-05-26 22:21:56 +00:00
void ED_object_location_from_view(bContext *C, float loc[3])
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
{
3D View: remove 3D cursor Use 3D cursor from the scene (was previously used for local-view).
2018-11-26 13:49:17 +11:00
const Scene *scene = CTX_data_scene(C);
copy_v3_v3(loc, scene->cursor.location);
Added location and rotation operator properties for adding objects. The Align to View boolean is now just used to set the rotation property value during invoke. This removes some reliance on 3d view info for non-interactive use, and also lets you specify new object's locations/rotations explicitly when calling from Python.
2009-12-28 04:09:46 +00:00
}
Cleanup: split rotation_from_view Add a function that takes only a quat, instead of the 3D view. Allows for using non-view orientations.
2018-05-06 18:32:18 +02:00
void ED_object_rotation_from_quat(float rot[3], const float viewquat[4], const char align_axis)
Added location and rotation operator properties for adding objects. The Align to View boolean is now just used to set the rotation property value during invoke. This removes some reliance on 3d view info for non-interactive use, and also lets you specify new object's locations/rotations explicitly when calling from Python.
2009-12-28 04:09:46 +00:00
{
Fix T38217: Fix glitch adding Monkey with view align added an option so view-align can default to a different axis.
2014-01-16 23:50:35 +11:00
BLI_assert(align_axis >= 'X' && align_axis <= 'Z');
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Cleanup: split rotation_from_view Add a function that takes only a quat, instead of the 3D view. Allows for using non-view orientations.
2018-05-06 18:32:18 +02:00
switch (align_axis) {
case 'X': {
/* Same as 'rv3d->viewinv[1]' */
Cleanup: declare arrays arrays where possible
2020-08-07 22:36:11 +10:00
const float axis_y[4] = {0.0f, 1.0f, 0.0f};
Cleanup: split rotation_from_view Add a function that takes only a quat, instead of the 3D view. Allows for using non-view orientations.
2018-05-06 18:32:18 +02:00
float quat_y[4], quat[4];
axis_angle_to_quat(quat_y, axis_y, M_PI_2);
mul_qt_qtqt(quat, viewquat, quat_y);
quat_to_eul(rot, quat);
break;
Fix T38217: Fix glitch adding Monkey with view align added an option so view-align can default to a different axis.
2014-01-16 23:50:35 +11:00
}
Cleanup: split rotation_from_view Add a function that takes only a quat, instead of the 3D view. Allows for using non-view orientations.
2018-05-06 18:32:18 +02:00
case 'Y': {
quat_to_eul(rot, viewquat);
rot[0] -= (float)M_PI_2;
break;
}
case 'Z': {
quat_to_eul(rot, viewquat);
break;
}
}
}
Fix T38217: Fix glitch adding Monkey with view align added an option so view-align can default to a different axis.
2014-01-16 23:50:35 +11:00
Cleanup: split rotation_from_view Add a function that takes only a quat, instead of the 3D view. Allows for using non-view orientations.
2018-05-06 18:32:18 +02:00
void ED_object_rotation_from_view(bContext *C, float rot[3], const char align_axis)
{
RegionView3D *rv3d = CTX_wm_region_view3d(C);
BLI_assert(align_axis >= 'X' && align_axis <= 'Z');
if (rv3d) {
float viewquat[4];
copy_qt_qt(viewquat, rv3d->viewquat);
viewquat[0] *= -1.0f;
ED_object_rotation_from_quat(rot, viewquat, align_axis);
store the view align setting even if its disabled & don't edit the view quat when getting a euler from it.
2010-11-18 00:26:00 +00:00
}
else {
zero_v3(rot);
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
}
Added location and rotation operator properties for adding objects. The Align to View boolean is now just used to set the rotation property value during invoke. This removes some reliance on 3d view info for non-interactive use, and also lets you specify new object's locations/rotations explicitly when calling from Python.
2009-12-28 04:09:46 +00:00
}
Fix T68112: Align View on object add is broken No need to use BKE_object_where_is_calc() in this case: there is no parenting or constraint system involved on object add. So simply use direct object matrix calculation from it's local transform. No need in dependency graph either in this case.
2019-08-02 15:13:59 +02:00
void ED_object_base_init_transform_on_add(Object *object, const float loc[3], const float rot[3])
Added location and rotation operator properties for adding objects. The Align to View boolean is now just used to set the rotation property value during invoke. This removes some reliance on 3d view info for non-interactive use, and also lets you specify new object's locations/rotations explicitly when calling from Python.
2009-12-28 04:09:46 +00:00
{
Cleanup: style, use braces for editors
2019-04-22 09:19:45 +10:00
if (loc) {
Fix T68112: Align View on object add is broken No need to use BKE_object_where_is_calc() in this case: there is no parenting or constraint system involved on object add. So simply use direct object matrix calculation from it's local transform. No need in dependency graph either in this case.
2019-08-02 15:13:59 +02:00
copy_v3_v3(object->loc, loc);
Cleanup: style, use braces for editors
2019-04-22 09:19:45 +10:00
}
Some effect-less code cleanup...
2012-10-05 07:05:52 +00:00
Cleanup: style, use braces for editors
2019-04-22 09:19:45 +10:00
if (rot) {
Fix T68112: Align View on object add is broken No need to use BKE_object_where_is_calc() in this case: there is no parenting or constraint system involved on object add. So simply use direct object matrix calculation from it's local transform. No need in dependency graph either in this case.
2019-08-02 15:13:59 +02:00
copy_v3_v3(object->rot, rot);
Cleanup: style, use braces for editors
2019-04-22 09:19:45 +10:00
}
Some effect-less code cleanup...
2012-10-05 07:05:52 +00:00
Fix T68112: Align View on object add is broken No need to use BKE_object_where_is_calc() in this case: there is no parenting or constraint system involved on object add. So simply use direct object matrix calculation from it's local transform. No need in dependency graph either in this case.
2019-08-02 15:13:59 +02:00
BKE_object_to_mat4(object, object->obmat);
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
}
Fix T84638: Wrong scale for primitives with radius Creating some primitives allows for a scale value (via python) that will scale the object accordingly. For objects with a radius parameter (like cylinders, spheres, etc.) passing a scale different to (1,1,1) would result in unexpected behavior. For example: `>>> bpy.ops.mesh.primitive_uv_sphere_add(radius=2, scale=(1,1,2))` We would expect this to create a sphere with a radius of 2 (dimensions 4,4,4) and then be scaled *2 along the z-axis (dimensions 4,4,8). But this would previously create a scaled sphere with dimensions (2,2,4). The scale was simply divided by two. Maybe because the "radius" parameter for creating the primitives was confusingly named "diameter" (but used as the radius). The fix adds a scale parameter to `ED_object_new_primitive_matrix` and also renames the wrongly named "diameter" parameters to "radius". Reviewed By: campbellbarton Maniphest Tasks: T84638 Ref D10093
2021-09-13 17:50:41 +10:00
float ED_object_new_primitive_matrix(bContext *C,
Object *obedit,
const float loc[3],
const float rot[3],
const float scale[3],
float r_primmat[4][4])
Fix [#20644] new curve sets itself to the origin, but the pivot to the cursor + Cleaned up the nurbs spin operator and gave it properties rather than relying on context
2010-01-12 01:50:34 +00:00
{
Fix #31657: adding mesh objects did not take units into account for the grid scale that sets the default size.
2012-05-31 16:04:03 +00:00
Scene *scene = CTX_data_scene(C);
code style cleanup, no functional changes.
2012-02-23 02:23:42 +00:00
View3D *v3d = CTX_wm_view3d(C);
Fix [#20644] new curve sets itself to the origin, but the pivot to the cursor + Cleaned up the nurbs spin operator and gave it properties rather than relying on context
2010-01-12 01:50:34 +00:00
float mat[3][3], rmat[3][3], cmat[3][3], imat[3][3];
Some effect-less code cleanup...
2012-10-05 07:05:52 +00:00
Cleanup: pass const matrices Also order return matrices last.
2020-08-02 17:17:31 +10:00
unit_m4(r_primmat);
Some effect-less code cleanup...
2012-10-05 07:05:52 +00:00
Fix [#20644] new curve sets itself to the origin, but the pivot to the cursor + Cleaned up the nurbs spin operator and gave it properties rather than relying on context
2010-01-12 01:50:34 +00:00
eul_to_mat3(rmat, rot);
invert_m3(rmat);
Some effect-less code cleanup...
2012-10-05 07:05:52 +00:00
Fix [#20644] new curve sets itself to the origin, but the pivot to the cursor + Cleaned up the nurbs spin operator and gave it properties rather than relying on context
2010-01-12 01:50:34 +00:00
/* inverse transform for initial rotation and object */
copy_m3_m4(mat, obedit->obmat);
mul_m3_m3m3(cmat, rmat, mat);
invert_m3_m3(imat, cmat);
Cleanup: pass const matrices Also order return matrices last.
2020-08-02 17:17:31 +10:00
copy_m4_m3(r_primmat, imat);
Some effect-less code cleanup...
2012-10-05 07:05:52 +00:00
Fix [#20644] new curve sets itself to the origin, but the pivot to the cursor + Cleaned up the nurbs spin operator and gave it properties rather than relying on context
2010-01-12 01:50:34 +00:00
/* center */
Cleanup: pass const matrices Also order return matrices last.
2020-08-02 17:17:31 +10:00
copy_v3_v3(r_primmat[3], loc);
sub_v3_v3v3(r_primmat[3], r_primmat[3], obedit->obmat[3]);
Fix [#20644] new curve sets itself to the origin, but the pivot to the cursor + Cleaned up the nurbs spin operator and gave it properties rather than relying on context
2010-01-12 01:50:34 +00:00
invert_m3_m3(imat, mat);
Cleanup: pass const matrices Also order return matrices last.
2020-08-02 17:17:31 +10:00
mul_m3_v3(imat, r_primmat[3]);
Some effect-less code cleanup...
2012-10-05 07:05:52 +00:00
Fix T84638: Wrong scale for primitives with radius Creating some primitives allows for a scale value (via python) that will scale the object accordingly. For objects with a radius parameter (like cylinders, spheres, etc.) passing a scale different to (1,1,1) would result in unexpected behavior. For example: `>>> bpy.ops.mesh.primitive_uv_sphere_add(radius=2, scale=(1,1,2))` We would expect this to create a sphere with a radius of 2 (dimensions 4,4,4) and then be scaled *2 along the z-axis (dimensions 4,4,8). But this would previously create a scaled sphere with dimensions (2,2,4). The scale was simply divided by two. Maybe because the "radius" parameter for creating the primitives was confusingly named "diameter" (but used as the radius). The fix adds a scale parameter to `ED_object_new_primitive_matrix` and also renames the wrongly named "diameter" parameters to "radius". Reviewed By: campbellbarton Maniphest Tasks: T84638 Ref D10093
2021-09-13 17:50:41 +10:00
if (scale != NULL) {
rescale_m4(r_primmat, scale);
}
fix [#33442] Units adding meshes were scaling the user input values so the distance on the button didnt relate to the scale of the object added. Now use an invoke function that scales unset default values.
2012-12-09 10:48:18 +00:00
{
const float dia = v3d ? ED_view3d_grid_scale(scene, v3d, NULL) :
ED_scene_grid_scale(scene, NULL);
Fix #32219: Inconsistent influence of Units Scale on new objects Made it so meshes, curves, surfaces and metaballs are scaling to a grid cell size, which makes them behave consistently now. There're still issues to be resolved still: - Lattice is not scaled to grid cell size yet, it uses slightly different add function which makes scaling a bit tricky and hacky. Would prefer to do a bit bigger refactor here, so it's a TODO for now. - Cameras, speakers and other helpers are not scaling. They don't have data on which scale could be applied and perhaps it should be some kind of draw scale. Also would consider it's a TODO for now.
2012-10-19 12:53:03 +00:00
return dia;
}
Fix #31657: adding mesh objects did not take units into account for the grid scale that sets the default size.
2012-05-31 16:04:03 +00:00
fix for checking char arrays against NULL, instead check their first character. also remove some dead code (return directly after return).
2013-07-16 11:42:07 +00:00
/* return 1.0f; */
Fix [#20644] new curve sets itself to the origin, but the pivot to the cursor + Cleaned up the nurbs spin operator and gave it properties rather than relying on context
2010-01-12 01:50:34 +00:00
}
Cleanup: use doxy sections for object_add.c
2019-05-16 14:03:31 +10:00
/** \} */
/* -------------------------------------------------------------------- */
/** \name Add Object Operator
* \{ */
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
quiet -Wmissing-prototypes warnings, and enable this warning by default for C with gcc. helps for finding unused functions and making functions static, also did some minor code cleanup.
2012-09-15 01:52:28 +00:00
static void view_align_update(struct Main *UNUSED(main),
struct Scene *UNUSED(scene),
struct PointerRNA *ptr)
Fix #28805: Add mesh, align to view, un check align to view. not updating. Re-set rotation property when "Lock to View" property changes. This makes proper updates without breaking behavior.
2011-10-06 12:51:33 +00:00
{
RNA_struct_idprops_unset(ptr, "rotation");
}
UI: 'Add Object' rename dimensions D3943 by @Zachman w/ edits
2018-11-15 17:44:50 +11:00
void ED_object_add_unit_props_size(wmOperatorType *ot)
{
RNA_def_float_distance(
ot->srna, "size", 2.0f, 0.0, OBJECT_ADD_SIZE_MAXF, "Size", "", 0.001, 100.00);
}
Fix T76922: Meta-balls created twice the specified size
2020-05-21 18:18:00 +10:00
void ED_object_add_unit_props_radius_ex(wmOperatorType *ot, float default_value)
move make_prim_radius_prop into a generic function.
2013-09-16 00:18:09 +00:00
{
Fix T46900: Inset Faces Thickness & Depth Do Not Use Scene Units (i.e. Imperial). Was the case of several Mesh operators actually (and probably others, but cannot check everything). Added `RNA_def_property_float_distance` helper, avoids having to set PROP_DISTANCE subtype explicitly each time...
2015-12-01 00:58:09 +01:00
RNA_def_float_distance(
Fix T76922: Meta-balls created twice the specified size
2020-05-21 18:18:00 +10:00
ot->srna, "radius", default_value, 0.0, OBJECT_ADD_SIZE_MAXF, "Radius", "", 0.001, 100.00);
}
void ED_object_add_unit_props_radius(wmOperatorType *ot)
{
ED_object_add_unit_props_radius_ex(ot, 1.0f);
move make_prim_radius_prop into a generic function.
2013-09-16 00:18:09 +00:00
}
void ED_object_add_generic_props(wmOperatorType *ot, bool do_editmode)
- all add object operators now take view_align as an argument, and enter_editmode where its used. Makes running the operator from python pradictable without having to know the user prefs. - missing return in function - python error in view3d (assumed active object exists)
2009-11-02 16:07:49 +00:00
{
Fix [#20750] adding Lattice object in Local space doesn't appears Now add object operators take a layer parameter (hidden in UI) to determine their layer when created.
2010-01-21 04:54:52 +00:00
PropertyRNA *prop;
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
style cleanup: follow style guide for formatting of if/for/while loops, and else if's
2012-03-24 06:38:07 +00:00
if (do_editmode) {
Cleanup: clang-format
2021-01-04 12:00:00 +11:00
prop = RNA_def_boolean(ot->srna,
"enter_editmode",
0,
"Enter Edit Mode",
"Enter edit mode when adding this object");
style cleanup: editors / mesh & object
2012-04-28 15:42:27 +00:00
RNA_def_property_flag(prop, PROP_HIDDEN | PROP_SKIP_SAVE);
Fix [#21982] Operator bug: Edit mode Hid the 'Enter Edit Mode' property when adding an object, not necessary anyway.
2010-04-12 00:40:56 +00:00
}
Cleanup: consistent use of tags: NOTE/TODO/FIXME/XXX Also use doxy style function reference `#` prefix chars when referencing identifiers.
2021-07-03 23:08:40 +10:00
/* NOTE: this property gets hidden for add-camera operator. */
Objects: new 3D cursor alignment option when adding objects The choices are now World, View and 3D Cursor. This breaks Python API compatibility, add-ons that add objects with this parameter will need to be updated. Differential Revision: https://developer.blender.org/D4706
2019-05-15 16:56:22 +02:00
prop = RNA_def_enum(
ot->srna, "align", align_options, ALIGN_WORLD, "Align", "The alignment of the new object");
RNA_def_property_update_runtime(prop, view_align_update);
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Fix/Cleanup possibility to type insane values in 'add' operators options. Our 'hard limit' values was too often max_int/float here, mis-typing could lead to crash (or infinite hanging) of Blender, see e.g. http://blender.stackexchange.com/questions/32790/blender-forces-computer-to-reboot-after-mistyping-extreme-value-for-resolution-i
2015-06-21 16:06:44 +02:00
prop = RNA_def_float_vector_xyz(ot->srna,
"location",
3,
NULL,
-OBJECT_ADD_SIZE_MAXF,
OBJECT_ADD_SIZE_MAXF,
"Location",
"Location for the newly added object",
-1000.0f,
1000.0f);
use skip-save for ED_object_add_generic_props(), not essential - but it was annoying to have 'Reset' move objects to 0,0,0
2012-01-11 20:14:15 +00:00
RNA_def_property_flag(prop, PROP_SKIP_SAVE);
Fix/Cleanup possibility to type insane values in 'add' operators options. Our 'hard limit' values was too often max_int/float here, mis-typing could lead to crash (or infinite hanging) of Blender, see e.g. http://blender.stackexchange.com/questions/32790/blender-forces-computer-to-reboot-after-mistyping-extreme-value-for-resolution-i
2015-06-21 16:06:44 +02:00
prop = RNA_def_float_rotation(ot->srna,
"rotation",
3,
NULL,
-OBJECT_ADD_SIZE_MAXF,
OBJECT_ADD_SIZE_MAXF,
"Rotation",
"Rotation for the newly added object",
DEG2RADF(-360.0f),
DEG2RADF(360.0f));
use skip-save for ED_object_add_generic_props(), not essential - but it was annoying to have 'Reset' move objects to 0,0,0
2012-01-11 20:14:15 +00:00
RNA_def_property_flag(prop, PROP_SKIP_SAVE);
Object: add scale argument to creation operators Needed for to create objects of a specific size.
2020-05-28 14:30:42 +10:00
prop = RNA_def_float_vector_xyz(ot->srna,
"scale",
3,
NULL,
-OBJECT_ADD_SIZE_MAXF,
OBJECT_ADD_SIZE_MAXF,
"Scale",
"Scale for the newly added object",
-1000.0f,
1000.0f);
RNA_def_property_flag(prop, PROP_HIDDEN | PROP_SKIP_SAVE);
- all add object operators now take view_align as an argument, and enter_editmode where its used. Makes running the operator from python pradictable without having to know the user prefs. - missing return in function - python error in view3d (assumed active object exists)
2009-11-02 16:07:49 +00:00
}
Fix T37879: Default UV generation for mesh primitives. Adds default-generated UVs to mesh primitives (cone, cylinder, icosphere, uvsphere, cube, circle, grid) when they are added to the scene, since some of them can be pretty awkward to unwrap manually. Original patch: Liam Mitchell (CommanderCorianderSalamander). Main review work: Campbell Barton (campbellbarton). Finalization, fixes and cleanup: Bastien Montagne (mont29). Reviewers: mont29, #mesh_modeling, campbellbarton Reviewed By: mont29, campbellbarton Subscribers: lkruel, campbellbarton, michaelknubben, kevindietrich Maniphest Tasks: T37879 Differential Revision: https://developer.blender.org/D481
2015-12-04 23:49:55 +01:00
void ED_object_add_mesh_props(wmOperatorType *ot)
{
Change startup defaults - Default Lamp increased strength (10x stronger) - 3D View & Camera Lens = 50mm - Camera film size = 36x24mm Full Frame - Render Size Percentage = 100% - Render Display = New Window - Scene Units = Metric - Color Management View = Filmic - Workbench Object Overlap = ON - Headers on top for all editors, except the Timeline at the bottom - Default Properties tab = Object Properties - Generate UV's = ON See T47064
2018-05-15 14:40:01 +02:00
RNA_def_boolean(ot->srna, "calc_uvs", true, "Generate UVs", "Generate a default UV map");
Fix T37879: Default UV generation for mesh primitives. Adds default-generated UVs to mesh primitives (cone, cylinder, icosphere, uvsphere, cube, circle, grid) when they are added to the scene, since some of them can be pretty awkward to unwrap manually. Original patch: Liam Mitchell (CommanderCorianderSalamander). Main review work: Campbell Barton (campbellbarton). Finalization, fixes and cleanup: Bastien Montagne (mont29). Reviewers: mont29, #mesh_modeling, campbellbarton Reviewed By: mont29, campbellbarton Subscribers: lkruel, campbellbarton, michaelknubben, kevindietrich Maniphest Tasks: T37879 Differential Revision: https://developer.blender.org/D481
2015-12-04 23:49:55 +01:00
}
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Fix adding objects in local view
2018-12-07 12:59:04 +11:00
bool ED_object_add_generic_get_opts(bContext *C,
wmOperator *op,
const char view_align_axis,
Cleanup: use return arg prefix for ED_object_add_generic_get_opts
2021-06-13 14:47:18 +10:00
float r_loc[3],
float r_rot[3],
float r_scale[3],
bool *r_enter_editmode,
ushort *r_local_view_bits,
bool *r_is_view_aligned)
- all add object operators now take view_align as an argument, and enter_editmode where its used. Makes running the operator from python pradictable without having to know the user prefs. - missing return in function - python error in view3d (assumed active object exists)
2009-11-02 16:07:49 +00:00
{
Cleanup: avoid the possibility of 'enter_editmode' being left unset While in practice this isn't an issue currently, always set 'enter_editmode' in ED_object_add_generic_get_opts to avoid problems in the future.
2021-06-13 14:47:07 +10:00
/* Edit Mode! (optional) */
{
code cleanup: minor BMESH_TODO's, some were left in even though they were done/invalid.
2013-04-15 04:34:14 +00:00
bool _enter_editmode;
Cleanup: use return arg prefix for ED_object_add_generic_get_opts
2021-06-13 14:47:18 +10:00
if (!r_enter_editmode) {
r_enter_editmode = &_enter_editmode;
Cleanup: style, use braces for editors
2019-04-22 09:19:45 +10:00
}
Cleanup: avoid the possibility of 'enter_editmode' being left unset While in practice this isn't an issue currently, always set 'enter_editmode' in ED_object_add_generic_get_opts to avoid problems in the future.
2021-06-13 14:47:07 +10:00
/* Only to ensure the value is _always_ set.
* Typically the property will exist when the argument is non-NULL. */
Cleanup: use return arg prefix for ED_object_add_generic_get_opts
2021-06-13 14:47:18 +10:00
*r_enter_editmode = false;
Cleanup: avoid the possibility of 'enter_editmode' being left unset While in practice this isn't an issue currently, always set 'enter_editmode' in ED_object_add_generic_get_opts to avoid problems in the future.
2021-06-13 14:47:07 +10:00
PropertyRNA *prop = RNA_struct_find_property(op->ptr, "enter_editmode");
if (prop != NULL) {
Cleanup: use return arg prefix for ED_object_add_generic_get_opts
2021-06-13 14:47:18 +10:00
if (RNA_property_is_set(op->ptr, prop) && r_enter_editmode) {
*r_enter_editmode = RNA_property_boolean_get(op->ptr, prop);
Cleanup: avoid the possibility of 'enter_editmode' being left unset While in practice this isn't an issue currently, always set 'enter_editmode' in ED_object_add_generic_get_opts to avoid problems in the future.
2021-06-13 14:47:07 +10:00
}
else {
Cleanup: use return arg prefix for ED_object_add_generic_get_opts
2021-06-13 14:47:18 +10:00
*r_enter_editmode = (U.flag & USER_ADD_EDITMODE) != 0;
RNA_property_boolean_set(op->ptr, prop, *r_enter_editmode);
Cleanup: avoid the possibility of 'enter_editmode' being left unset While in practice this isn't an issue currently, always set 'enter_editmode' in ED_object_add_generic_get_opts to avoid problems in the future.
2021-06-13 14:47:07 +10:00
}
Added location and rotation operator properties for adding objects. The Align to View boolean is now just used to set the rotation property value during invoke. This removes some reliance on 3d view info for non-interactive use, and also lets you specify new object's locations/rotations explicitly when calling from Python.
2009-12-28 04:09:46 +00:00
}
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
}
Cleanup: use return arg prefix for ED_object_add_generic_get_opts
2021-06-13 14:47:18 +10:00
if (r_local_view_bits) {
Fix adding objects in local view
2018-12-07 12:59:04 +11:00
View3D *v3d = CTX_wm_view3d(C);
Cleanup: use return arg prefix for ED_object_add_generic_get_opts
2021-06-13 14:47:18 +10:00
*r_local_view_bits = (v3d && v3d->localvd) ? v3d->local_view_uuid : 0;
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
}
Clean up in "add object" code: * Get rid of ED_object_add_generic_invoke() and all invoke callbacks using it, it was doing nothing exec() callbacks would not do. In fact, its only action (setting part of common add ops properties, like loc, layers, etc.) was needed too by direct exec call, so it was done twice in case of using invoke()! * Replace custom invoke code for metaballs by WM_menu_invoke helper (as already used by lamps). * Add a new OBJECT_OT_empty_add op, to allow direct addition of empties of a given drawtype. * And some general code cleanup (like trailing spaces, empty lines, ...). Did quite a bunch of tests/verifications, but obviously could not tackle all possible scenarios... Anyway, if any, bugs should arize quite quickly (but I don’t expect any! :p ).
2012-10-05 12:59:09 +00:00
/* Location! */
{
float _loc[3];
Cleanup: use return arg prefix for ED_object_add_generic_get_opts
2021-06-13 14:47:18 +10:00
if (!r_loc) {
r_loc = _loc;
Cleanup: style, use braces for editors
2019-04-22 09:19:45 +10:00
}
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Clean up in "add object" code: * Get rid of ED_object_add_generic_invoke() and all invoke callbacks using it, it was doing nothing exec() callbacks would not do. In fact, its only action (setting part of common add ops properties, like loc, layers, etc.) was needed too by direct exec call, so it was done twice in case of using invoke()! * Replace custom invoke code for metaballs by WM_menu_invoke helper (as already used by lamps). * Add a new OBJECT_OT_empty_add op, to allow direct addition of empties of a given drawtype. * And some general code cleanup (like trailing spaces, empty lines, ...). Did quite a bunch of tests/verifications, but obviously could not tackle all possible scenarios... Anyway, if any, bugs should arize quite quickly (but I don’t expect any! :p ).
2012-10-05 12:59:09 +00:00
if (RNA_struct_property_is_set(op->ptr, "location")) {
Cleanup: use return arg prefix for ED_object_add_generic_get_opts
2021-06-13 14:47:18 +10:00
RNA_float_get_array(op->ptr, "location", r_loc);
Clean up in "add object" code: * Get rid of ED_object_add_generic_invoke() and all invoke callbacks using it, it was doing nothing exec() callbacks would not do. In fact, its only action (setting part of common add ops properties, like loc, layers, etc.) was needed too by direct exec call, so it was done twice in case of using invoke()! * Replace custom invoke code for metaballs by WM_menu_invoke helper (as already used by lamps). * Add a new OBJECT_OT_empty_add op, to allow direct addition of empties of a given drawtype. * And some general code cleanup (like trailing spaces, empty lines, ...). Did quite a bunch of tests/verifications, but obviously could not tackle all possible scenarios... Anyway, if any, bugs should arize quite quickly (but I don’t expect any! :p ).
2012-10-05 12:59:09 +00:00
}
else {
Cleanup: use return arg prefix for ED_object_add_generic_get_opts
2021-06-13 14:47:18 +10:00
ED_object_location_from_view(C, r_loc);
RNA_float_set_array(op->ptr, "location", r_loc);
adding curve and mesh objects through python would create the object without assigning it to any layers. now initialize from the scene (when the value is unset), and throw an error when the value is set to all false.
2010-06-14 15:39:50 +00:00
}
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
}
Clean up in "add object" code: * Get rid of ED_object_add_generic_invoke() and all invoke callbacks using it, it was doing nothing exec() callbacks would not do. In fact, its only action (setting part of common add ops properties, like loc, layers, etc.) was needed too by direct exec call, so it was done twice in case of using invoke()! * Replace custom invoke code for metaballs by WM_menu_invoke helper (as already used by lamps). * Add a new OBJECT_OT_empty_add op, to allow direct addition of empties of a given drawtype. * And some general code cleanup (like trailing spaces, empty lines, ...). Did quite a bunch of tests/verifications, but obviously could not tackle all possible scenarios... Anyway, if any, bugs should arize quite quickly (but I don’t expect any! :p ).
2012-10-05 12:59:09 +00:00
/* Rotation! */
{
code cleanup: minor BMESH_TODO's, some were left in even though they were done/invalid.
2013-04-15 04:34:14 +00:00
bool _is_view_aligned;
Clean up in "add object" code: * Get rid of ED_object_add_generic_invoke() and all invoke callbacks using it, it was doing nothing exec() callbacks would not do. In fact, its only action (setting part of common add ops properties, like loc, layers, etc.) was needed too by direct exec call, so it was done twice in case of using invoke()! * Replace custom invoke code for metaballs by WM_menu_invoke helper (as already used by lamps). * Add a new OBJECT_OT_empty_add op, to allow direct addition of empties of a given drawtype. * And some general code cleanup (like trailing spaces, empty lines, ...). Did quite a bunch of tests/verifications, but obviously could not tackle all possible scenarios... Anyway, if any, bugs should arize quite quickly (but I don’t expect any! :p ).
2012-10-05 12:59:09 +00:00
float _rot[3];
Cleanup: use return arg prefix for ED_object_add_generic_get_opts
2021-06-13 14:47:18 +10:00
if (!r_is_view_aligned) {
r_is_view_aligned = &_is_view_aligned;
Cleanup: style, use braces for editors
2019-04-22 09:19:45 +10:00
}
Cleanup: use return arg prefix for ED_object_add_generic_get_opts
2021-06-13 14:47:18 +10:00
if (!r_rot) {
r_rot = _rot;
Cleanup: style, use braces for editors
2019-04-22 09:19:45 +10:00
}
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Cleanup: style, use braces for editors
2019-04-22 09:19:45 +10:00
if (RNA_struct_property_is_set(op->ptr, "rotation")) {
Fix T69576, T74059: issues with rotation when adding objects This clarifies logic in ED_object_add_generic_get_opts (see comments in code). Also following issues are adressed: - do not enforce setting the op UI to WORLD when rotation is set (e.g. on redo). This is not wrong (happens in world space), but is more confusing than helpful (was added in own rB3b8a14a3c072). - respect setting the User Preference to WORLD properly (could fail when set to something else, then back to WORLD) Maniphest Tasks: T69576 Differential Revision: https://developer.blender.org/D6943
2020-02-21 23:41:56 +01:00
/* If rotation is set, always use it. Alignment (and corresponding user preference)
* can be ignored since this is in world space anyways.
Cleanup: spelling
2021-02-10 07:57:52 +11:00
* To not confuse (e.g. on redo), don't set it to #ALIGN_WORLD in the op UI though. */
Cleanup: use return arg prefix for ED_object_add_generic_get_opts
2021-06-13 14:47:18 +10:00
*r_is_view_aligned = false;
RNA_float_get_array(op->ptr, "rotation", r_rot);
Cleanup: style, use braces for editors
2019-04-22 09:19:45 +10:00
}
Clean up in "add object" code: * Get rid of ED_object_add_generic_invoke() and all invoke callbacks using it, it was doing nothing exec() callbacks would not do. In fact, its only action (setting part of common add ops properties, like loc, layers, etc.) was needed too by direct exec call, so it was done twice in case of using invoke()! * Replace custom invoke code for metaballs by WM_menu_invoke helper (as already used by lamps). * Add a new OBJECT_OT_empty_add op, to allow direct addition of empties of a given drawtype. * And some general code cleanup (like trailing spaces, empty lines, ...). Did quite a bunch of tests/verifications, but obviously could not tackle all possible scenarios... Anyway, if any, bugs should arize quite quickly (but I don’t expect any! :p ).
2012-10-05 12:59:09 +00:00
else {
Fix T69576, T74059: issues with rotation when adding objects This clarifies logic in ED_object_add_generic_get_opts (see comments in code). Also following issues are adressed: - do not enforce setting the op UI to WORLD when rotation is set (e.g. on redo). This is not wrong (happens in world space), but is more confusing than helpful (was added in own rB3b8a14a3c072). - respect setting the User Preference to WORLD properly (could fail when set to something else, then back to WORLD) Maniphest Tasks: T69576 Differential Revision: https://developer.blender.org/D6943
2020-02-21 23:41:56 +01:00
int alignment = ALIGN_WORLD;
Cleanup: avoid the possibility of 'enter_editmode' being left unset While in practice this isn't an issue currently, always set 'enter_editmode' in ED_object_add_generic_get_opts to avoid problems in the future.
2021-06-13 14:47:07 +10:00
PropertyRNA *prop = RNA_struct_find_property(op->ptr, "align");
Fix T69576, T74059: issues with rotation when adding objects This clarifies logic in ED_object_add_generic_get_opts (see comments in code). Also following issues are adressed: - do not enforce setting the op UI to WORLD when rotation is set (e.g. on redo). This is not wrong (happens in world space), but is more confusing than helpful (was added in own rB3b8a14a3c072). - respect setting the User Preference to WORLD properly (could fail when set to something else, then back to WORLD) Maniphest Tasks: T69576 Differential Revision: https://developer.blender.org/D6943
2020-02-21 23:41:56 +01:00
if (RNA_property_is_set(op->ptr, prop)) {
/* If alignment is set, always use it. */
Cleanup: use return arg prefix for ED_object_add_generic_get_opts
2021-06-13 14:47:18 +10:00
*r_is_view_aligned = alignment == ALIGN_VIEW;
Fix T69576, T74059: issues with rotation when adding objects This clarifies logic in ED_object_add_generic_get_opts (see comments in code). Also following issues are adressed: - do not enforce setting the op UI to WORLD when rotation is set (e.g. on redo). This is not wrong (happens in world space), but is more confusing than helpful (was added in own rB3b8a14a3c072). - respect setting the User Preference to WORLD properly (could fail when set to something else, then back to WORLD) Maniphest Tasks: T69576 Differential Revision: https://developer.blender.org/D6943
2020-02-21 23:41:56 +01:00
alignment = RNA_property_enum_get(op->ptr, prop);
Objects: new 3D cursor alignment option when adding objects The choices are now World, View and 3D Cursor. This breaks Python API compatibility, add-ons that add objects with this parameter will need to be updated. Differential Revision: https://developer.blender.org/D4706
2019-05-15 16:56:22 +02:00
}
Fix T69576, T74059: issues with rotation when adding objects This clarifies logic in ED_object_add_generic_get_opts (see comments in code). Also following issues are adressed: - do not enforce setting the op UI to WORLD when rotation is set (e.g. on redo). This is not wrong (happens in world space), but is more confusing than helpful (was added in own rB3b8a14a3c072). - respect setting the User Preference to WORLD properly (could fail when set to something else, then back to WORLD) Maniphest Tasks: T69576 Differential Revision: https://developer.blender.org/D6943
2020-02-21 23:41:56 +01:00
else {
/* If alignment is not set, use User Preferences. */
Cleanup: use return arg prefix for ED_object_add_generic_get_opts
2021-06-13 14:47:18 +10:00
*r_is_view_aligned = (U.flag & USER_ADD_VIEWALIGNED) != 0;
if (*r_is_view_aligned) {
Fix T69576, T74059: issues with rotation when adding objects This clarifies logic in ED_object_add_generic_get_opts (see comments in code). Also following issues are adressed: - do not enforce setting the op UI to WORLD when rotation is set (e.g. on redo). This is not wrong (happens in world space), but is more confusing than helpful (was added in own rB3b8a14a3c072). - respect setting the User Preference to WORLD properly (could fail when set to something else, then back to WORLD) Maniphest Tasks: T69576 Differential Revision: https://developer.blender.org/D6943
2020-02-21 23:41:56 +01:00
RNA_property_enum_set(op->ptr, prop, ALIGN_VIEW);
alignment = ALIGN_VIEW;
}
else if ((U.flag & USER_ADD_CURSORALIGNED) != 0) {
RNA_property_enum_set(op->ptr, prop, ALIGN_CURSOR);
alignment = ALIGN_CURSOR;
}
else {
RNA_property_enum_set(op->ptr, prop, ALIGN_WORLD);
alignment = ALIGN_WORLD;
}
Objects: new 3D cursor alignment option when adding objects The choices are now World, View and 3D Cursor. This breaks Python API compatibility, add-ons that add objects with this parameter will need to be updated. Differential Revision: https://developer.blender.org/D4706
2019-05-15 16:56:22 +02:00
}
Fix T69576, T74059: issues with rotation when adding objects This clarifies logic in ED_object_add_generic_get_opts (see comments in code). Also following issues are adressed: - do not enforce setting the op UI to WORLD when rotation is set (e.g. on redo). This is not wrong (happens in world space), but is more confusing than helpful (was added in own rB3b8a14a3c072). - respect setting the User Preference to WORLD properly (could fail when set to something else, then back to WORLD) Maniphest Tasks: T69576 Differential Revision: https://developer.blender.org/D6943
2020-02-21 23:41:56 +01:00
switch (alignment) {
case ALIGN_WORLD:
Cleanup: use return arg prefix for ED_object_add_generic_get_opts
2021-06-13 14:47:18 +10:00
RNA_float_get_array(op->ptr, "rotation", r_rot);
Fix T69576, T74059: issues with rotation when adding objects This clarifies logic in ED_object_add_generic_get_opts (see comments in code). Also following issues are adressed: - do not enforce setting the op UI to WORLD when rotation is set (e.g. on redo). This is not wrong (happens in world space), but is more confusing than helpful (was added in own rB3b8a14a3c072). - respect setting the User Preference to WORLD properly (could fail when set to something else, then back to WORLD) Maniphest Tasks: T69576 Differential Revision: https://developer.blender.org/D6943
2020-02-21 23:41:56 +01:00
break;
case ALIGN_VIEW:
Cleanup: use return arg prefix for ED_object_add_generic_get_opts
2021-06-13 14:47:18 +10:00
ED_object_rotation_from_view(C, r_rot, view_align_axis);
RNA_float_set_array(op->ptr, "rotation", r_rot);
Fix T69576, T74059: issues with rotation when adding objects This clarifies logic in ED_object_add_generic_get_opts (see comments in code). Also following issues are adressed: - do not enforce setting the op UI to WORLD when rotation is set (e.g. on redo). This is not wrong (happens in world space), but is more confusing than helpful (was added in own rB3b8a14a3c072). - respect setting the User Preference to WORLD properly (could fail when set to something else, then back to WORLD) Maniphest Tasks: T69576 Differential Revision: https://developer.blender.org/D6943
2020-02-21 23:41:56 +01:00
break;
case ALIGN_CURSOR: {
const Scene *scene = CTX_data_scene(C);
float tmat[3][3];
BKE_scene_cursor_rot_to_mat3(&scene->cursor, tmat);
Cleanup: use return arg prefix for ED_object_add_generic_get_opts
2021-06-13 14:47:18 +10:00
mat3_normalized_to_eul(r_rot, tmat);
RNA_float_set_array(op->ptr, "rotation", r_rot);
Fix T69576, T74059: issues with rotation when adding objects This clarifies logic in ED_object_add_generic_get_opts (see comments in code). Also following issues are adressed: - do not enforce setting the op UI to WORLD when rotation is set (e.g. on redo). This is not wrong (happens in world space), but is more confusing than helpful (was added in own rB3b8a14a3c072). - respect setting the User Preference to WORLD properly (could fail when set to something else, then back to WORLD) Maniphest Tasks: T69576 Differential Revision: https://developer.blender.org/D6943
2020-02-21 23:41:56 +01:00
break;
}
Objects: new 3D cursor alignment option when adding objects The choices are now World, View and 3D Cursor. This breaks Python API compatibility, add-ons that add objects with this parameter will need to be updated. Differential Revision: https://developer.blender.org/D4706
2019-05-15 16:56:22 +02:00
}
Cleanup: style, use braces for editors
2019-04-22 09:19:45 +10:00
}
Fix for [#28425] when user prefs -> editing -> align to == "view" newly inserted objects do not show the applied rotation in the tools panel Patch by Andrew Wiggin, thanks! :)
2011-08-30 14:41:23 +00:00
}
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Object: add scale argument to creation operators Needed for to create objects of a specific size.
2020-05-28 14:30:42 +10:00
/* Scale! */
{
float _scale[3];
Cleanup: use return arg prefix for ED_object_add_generic_get_opts
2021-06-13 14:47:18 +10:00
if (!r_scale) {
r_scale = _scale;
Object: add scale argument to creation operators Needed for to create objects of a specific size.
2020-05-28 14:30:42 +10:00
}
/* For now this is optional, we can make it always use. */
Cleanup: use return arg prefix for ED_object_add_generic_get_opts
2021-06-13 14:47:18 +10:00
copy_v3_fl(r_scale, 1.0f);
Cleanup: avoid the possibility of 'enter_editmode' being left unset While in practice this isn't an issue currently, always set 'enter_editmode' in ED_object_add_generic_get_opts to avoid problems in the future.
2021-06-13 14:47:07 +10:00
PropertyRNA *prop = RNA_struct_find_property(op->ptr, "scale");
if (prop != NULL) {
Object: add scale argument to creation operators Needed for to create objects of a specific size.
2020-05-28 14:30:42 +10:00
if (RNA_property_is_set(op->ptr, prop)) {
Cleanup: use return arg prefix for ED_object_add_generic_get_opts
2021-06-13 14:47:18 +10:00
RNA_property_float_get_array(op->ptr, prop, r_scale);
Object: add scale argument to creation operators Needed for to create objects of a specific size.
2020-05-28 14:30:42 +10:00
}
else {
Cleanup: use return arg prefix for ED_object_add_generic_get_opts
2021-06-13 14:47:18 +10:00
copy_v3_fl(r_scale, 1.0f);
RNA_property_float_set_array(op->ptr, prop, r_scale);
Object: add scale argument to creation operators Needed for to create objects of a specific size.
2020-05-28 14:30:42 +10:00
}
}
}
move make_prim_radius_prop into a generic function.
2013-09-16 00:18:09 +00:00
return true;
- all add object operators now take view_align as an argument, and enter_editmode where its used. Makes running the operator from python pradictable without having to know the user prefs. - missing return in function - python error in view3d (assumed active object exists)
2009-11-02 16:07:49 +00:00
}
Fix OBJECT_OT_data_instance_add creating empty data-blocks ED_object_add_type creates empty object data, add ED_object_add_type_with_obdata which can take existing object data.
2020-09-07 13:45:14 +10:00
Object *ED_object_add_type_with_obdata(bContext *C,
const int type,
const char *name,
const float loc[3],
const float rot[3],
const bool enter_editmode,
const ushort local_view_bits,
ID *obdata)
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
{
style cleanup: editors / mesh & object
2012-04-28 15:42:27 +00:00
Main *bmain = CTX_data_main(C);
Scene *scene = CTX_data_scene(C);
Cleanup: Rename ViewLayer *sl > ViewLayer *view_layer
2017-11-23 13:51:49 -02:00
ViewLayer *view_layer = CTX_data_view_layer(C);
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Fix T79464: Crash adding objects without an active screen Running add-objects operator without an active screen would crash as CTX_data_edit_object would return NULL in this case. This could happen when adding objects from frame-change handlers for e.g. In the case of adding new objects there is no need for a context lookup, pass this directly to ED_object_editmode_exit_ex.
2020-09-11 19:50:38 +10:00
{
Object *obedit = OBEDIT_FROM_VIEW_LAYER(view_layer);
if (obedit != NULL) {
ED_object_editmode_exit_ex(bmain, scene, obedit, EM_FREEDATA);
}
Undo System: remove nested edit-mode undo calls Regression in recent undo system changes, This caused T55048. When each mode had its own undo stack it was important to initialize it when entering edit-mode.
2018-05-15 10:02:01 +02:00
}
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Cleanup: remove legacy layer and dupli code.
2018-09-04 15:08:57 +02:00
/* deselects all, sets active object */
Cleanup: Declare variables where initialized
2020-10-09 16:39:39 -05:00
Object *ob;
Fix OBJECT_OT_data_instance_add creating empty data-blocks ED_object_add_type creates empty object data, add ED_object_add_type_with_obdata which can take existing object data.
2020-09-07 13:45:14 +10:00
if (obdata != NULL) {
BLI_assert(type == BKE_object_obdata_to_type(obdata));
ob = BKE_object_add_for_data(bmain, view_layer, type, name, obdata, true);
const short *materials_len_p = BKE_id_material_len_p(obdata);
if (materials_len_p && *materials_len_p > 0) {
BKE_object_materials_test(bmain, ob, ob->data);
}
}
else {
Cleanup: remove redundant scene argument in BKE_object_add
2020-09-07 14:09:50 +10:00
ob = BKE_object_add(bmain, view_layer, type, name);
Fix OBJECT_OT_data_instance_add creating empty data-blocks ED_object_add_type creates empty object data, add ED_object_add_type_with_obdata which can take existing object data.
2020-09-07 13:45:14 +10:00
}
Fix adding objects in local view
2018-12-07 12:59:04 +11:00
BASACT(view_layer)->local_view_bits = local_view_bits;
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
/* editor level activate, notifiers */
Cleanup: Rename ViewLayer *sl > ViewLayer *view_layer
2017-11-23 13:51:49 -02:00
ED_object_base_activate(C, view_layer->basact);
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02: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
/* more editor stuff */
Fix T68112: Align View on object add is broken No need to use BKE_object_where_is_calc() in this case: there is no parenting or constraint system involved on object add. So simply use direct object matrix calculation from it's local transform. No need in dependency graph either in this case.
2019-08-02 15:13:59 +02:00
ED_object_base_init_transform_on_add(ob, loc, rot);
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Depsgraph: Don't call DEG ID update functions directly There might be much more logic involved there, also we might not know proper evaluated CoW pointer there yet. So we leave this to dependency graph to decide what exactly to do here.
2017-11-28 12:13:07 +01:00
/* TODO(sergey): This is weird to manually tag objects for update, better to
* use DEG_id_tag_update here perhaps.
*/
Replace all old DAG calls with direct calls to new DEG and remove BKE_depsgraph.h This removes BKE_depsgraph.h and depsgraph.c
2017-06-08 10:14:53 +02:00
DEG_id_type_tag(bmain, ID_OB);
DEG_relations_tag_update(bmain);
Depsgraph: Don't call DEG ID update functions directly There might be much more logic involved there, also we might not know proper evaluated CoW pointer there yet. So we leave this to dependency graph to decide what exactly to do here.
2017-11-28 12:13:07 +01:00
if (ob->data != NULL) {
Depsgraph: Remove duplicated sets of recalc/update flags There were at least three copies of those: - OB_RECALC* family of flags, which are rudiment of an old dependency graph system. - PSYS_RECALC* which were used by old dependency graph system as a separate set since the graph itself did not handle particle systems. - DEG_TAG_* which was used to tag IDs. Now there is a single set, which defines what can be tagged and queried for an update. It also has some aggregate flags to make queries simpler. Lets once and for all solve the madness of those flags, stick to a single set, which will not overlap with anything or require any extra conversion. Technically, shouldn't be measurable user difference, but some of the agregate flags for few dependency graph components did change. Fixes T58632: Particle don't update rotation settings
2018-12-06 17:52:37 +01:00
DEG_id_tag_update_ex(bmain, (ID *)ob->data, ID_RECALC_EDITORS);
fix for crash adding empty object
2011-11-29 01:05:26 +00:00
}
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Cleanup: remove EM_IGNORE_LAYER Call ED_object_editmode_enter_ex instead.
2019-01-31 15:36:24 +11:00
if (enter_editmode) {
ED_object_editmode_enter_ex(bmain, scene, ob, 0);
}
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
style cleanup: editors / mesh & object
2012-04-28 15:42:27 +00:00
WM_event_add_notifier(C, NC_SCENE | ND_LAYER_CONTENT, scene);
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Layer/Depsgraph: Update depsgraph for new objects
2017-04-03 18:42:01 +02:00
/* TODO(sergey): Use proper flag for tagging here. */
Replace all old DAG calls with direct calls to new DEG and remove BKE_depsgraph.h This removes BKE_depsgraph.h and depsgraph.c
2017-06-08 10:14:53 +02:00
DEG_id_tag_update(&scene->id, 0);
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Outliner: Synced selection and active element highlighting Adds a toggle to the filter menu for outliner synced selection. Enabled by default, this ensures selection is synced between objects, bones, and sequences. An active outliner element theme color is added to indicate which element is active. Synced selection is controlled on the operator level. Each operator that modifies selection for objects, bones, sequences, or outliner elements needs to call the respective ED_outliner_select_sync_from.. function to tag outliners to be synced. Syncing is done lazily on outliner draw.
2019-08-07 22:27:07 -06:00
ED_outliner_select_sync_from_object_tag(C);
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
return ob;
}
Fix OBJECT_OT_data_instance_add creating empty data-blocks ED_object_add_type creates empty object data, add ED_object_add_type_with_obdata which can take existing object data.
2020-09-07 13:45:14 +10:00
Object *ED_object_add_type(bContext *C,
const int type,
const char *name,
const float loc[3],
const float rot[3],
const bool enter_editmode,
const ushort local_view_bits)
{
return ED_object_add_type_with_obdata(
C, type, name, loc, rot, enter_editmode, local_view_bits, NULL);
}
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
/* for object add operator */
static int object_add_exec(bContext *C, wmOperator *op)
{
Fix adding objects in local view
2018-12-07 12:59:04 +11:00
ushort local_view_bits;
Cleanup: Declare variables where initialized
2020-10-09 16:39:39 -05:00
bool enter_editmode;
Lattice: add-object radius should never scale data own error, lattice assumes rest state is unscaled data, scaling needs to be done in object mode.
2014-10-28 15:53:31 +01:00
float loc[3], rot[3], radius;
Support more object types scene-scale (on creation) - lamp - camera - font - empty & effector Also fix inconsistency with apply transform (modified shape-keys for meshes but not curve/lattice)
2014-09-01 20:09:31 +10:00
WM_operator_view3d_unit_defaults(C, op);
Fix adding objects in local view
2018-12-07 12:59:04 +11:00
if (!ED_object_add_generic_get_opts(
Object: add scale argument to creation operators Needed for to create objects of a specific size.
2020-05-28 14:30:42 +10:00
C, op, 'Z', loc, rot, NULL, &enter_editmode, &local_view_bits, NULL)) {
adding curve and mesh objects through python would create the object without assigning it to any layers. now initialize from the scene (when the value is unset), and throw an error when the value is set to all false.
2010-06-14 15:39:50 +00:00
return OPERATOR_CANCELLED;
Fix adding objects in local view
2018-12-07 12:59:04 +11:00
}
Lattice: add-object radius should never scale data own error, lattice assumes rest state is unscaled data, scaling needs to be done in object mode.
2014-10-28 15:53:31 +01:00
radius = RNA_float_get(op->ptr, "radius");
Cleanup: Declare variables where initialized
2020-10-09 16:39:39 -05:00
Object *ob = ED_object_add_type(
Fix adding objects in local view
2018-12-07 12:59:04 +11:00
C, RNA_enum_get(op->ptr, "type"), NULL, loc, rot, enter_editmode, local_view_bits);
Lattice: add-object radius should never scale data own error, lattice assumes rest state is unscaled data, scaling needs to be done in object mode.
2014-10-28 15:53:31 +01:00
if (ob->type == OB_LATTICE) {
/* lattice is a special case!
* we never want to scale the obdata since that is the rest-state */
DNA: rename Object.size -> scale Resolves a common cause of confusion.
2019-02-18 15:43:06 +11:00
copy_v3_fl(ob->scale, radius);
Lattice: add-object radius should never scale data own error, lattice assumes rest state is unscaled data, scaling needs to be done in object mode.
2014-10-28 15:53:31 +01:00
}
else {
BKE_object_obdata_size_init(ob, radius);
}
Some effect-less code cleanup...
2012-10-05 07:05: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
return OPERATOR_FINISHED;
}
void OBJECT_OT_add(wmOperatorType *ot)
{
/* identifiers */
style cleanup: spaces aroudn operators for operator definitions.
2012-03-22 07:26:09 +00:00
ot->name = "Add Object";
batch remove .'s used with RNA_def_struct_ui_text
2010-02-10 21:15:44 +00:00
ot->description = "Add an object to the scene";
style cleanup: spaces aroudn operators for operator definitions.
2012-03-22 07:26:09 +00:00
ot->idname = "OBJECT_OT_add";
Some effect-less code cleanup...
2012-10-05 07:05: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
/* api callbacks */
style cleanup: spaces aroudn operators for operator definitions.
2012-03-22 07:26:09 +00:00
ot->exec = object_add_exec;
ot->poll = ED_operator_objectmode;
Some effect-less code cleanup...
2012-10-05 07:05: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
/* flags */
style cleanup: editors / mesh & object
2012-04-28 15:42:27 +00:00
ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
Some effect-less code cleanup...
2012-10-05 07:05:52 +00:00
Support more object types scene-scale (on creation) - lamp - camera - font - empty & effector Also fix inconsistency with apply transform (modified shape-keys for meshes but not curve/lattice)
2014-09-01 20:09:31 +10:00
/* properties */
UI: 'Add Object' rename dimensions D3943 by @Zachman w/ edits
2018-11-15 17:44:50 +11:00
ED_object_add_unit_props_radius(ot);
I18N Messages: fix confusion with Light meanings. Using ID_LIGHT or ID_ID for "Lamp" meaning, "Light" without context being for 'not heavy'. That rename of data-block was not really nice on that side of things :/ Related to T43295.
2019-02-12 22:13:42 +01:00
PropertyRNA *prop = RNA_def_enum(ot->srna, "type", rna_enum_object_type_items, 0, "Type", "");
RNA_def_property_translation_context(prop, BLT_I18NCONTEXT_ID_ID);
- all add object operators now take view_align as an argument, and enter_editmode where its used. Makes running the operator from python pradictable without having to know the user prefs. - missing return in function - python error in view3d (assumed active object exists)
2009-11-02 16:07:49 +00:00
Code cleanup: remove TRUE/FALSE & WITH_BOOL_COMPAT define
2014-04-01 11:34:00 +11:00
ED_object_add_generic_props(ot, true);
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
}
Cleanup: use doxy sections for object_add.c
2019-05-16 14:03:31 +10:00
/** \} */
/* -------------------------------------------------------------------- */
/** \name Add Probe Operator
* \{ */
Probe: Add panel and "Add-menu" items. Also revisits defaults.
2017-06-07 18:32:27 +02:00
/* for object add operator */
UI: Name added LightProbe objects after their type. Just like Light objects do. Thanks ThinkingPolygons from DevTalk forums for suggesting this! See T56950
2018-11-09 02:16:26 +01:00
static const char *get_lightprobe_defname(int type)
{
switch (type) {
Cleanup: rename `BLT_I18NCONTEXT_ID_LAMP` -> `BLT_I18NCONTEXT_ID_LIGHT`.
2019-02-12 21:51:51 +01:00
case LIGHTPROBE_TYPE_GRID:
return CTX_DATA_(BLT_I18NCONTEXT_ID_LIGHT, "IrradianceVolume");
case LIGHTPROBE_TYPE_PLANAR:
return CTX_DATA_(BLT_I18NCONTEXT_ID_LIGHT, "ReflectionPlane");
case LIGHTPROBE_TYPE_CUBE:
return CTX_DATA_(BLT_I18NCONTEXT_ID_LIGHT, "ReflectionCubemap");
UI: Name added LightProbe objects after their type. Just like Light objects do. Thanks ThinkingPolygons from DevTalk forums for suggesting this! See T56950
2018-11-09 02:16:26 +01:00
default:
Cleanup: rename `BLT_I18NCONTEXT_ID_LAMP` -> `BLT_I18NCONTEXT_ID_LIGHT`.
2019-02-12 21:51:51 +01:00
return CTX_DATA_(BLT_I18NCONTEXT_ID_LIGHT, "LightProbe");
UI: Name added LightProbe objects after their type. Just like Light objects do. Thanks ThinkingPolygons from DevTalk forums for suggesting this! See T56950
2018-11-09 02:16:26 +01:00
}
}
Rename probe to light-probe Probe is a real general term, the new name is used often in docs online.
2017-06-12 20:59:54 +10:00
static int lightprobe_add_exec(bContext *C, wmOperator *op)
Probe: Add panel and "Add-menu" items. Also revisits defaults.
2017-06-07 18:32:27 +02:00
{
bool enter_editmode;
Fix adding objects in local view
2018-12-07 12:59:04 +11:00
ushort local_view_bits;
Probe: Add panel and "Add-menu" items. Also revisits defaults.
2017-06-07 18:32:27 +02:00
float loc[3], rot[3];
WM_operator_view3d_unit_defaults(C, op);
Fix adding objects in local view
2018-12-07 12:59:04 +11:00
if (!ED_object_add_generic_get_opts(
Object: add scale argument to creation operators Needed for to create objects of a specific size.
2020-05-28 14:30:42 +10:00
C, op, 'Z', loc, rot, NULL, &enter_editmode, &local_view_bits, NULL)) {
Probe: Add panel and "Add-menu" items. Also revisits defaults.
2017-06-07 18:32:27 +02:00
return OPERATOR_CANCELLED;
Fix adding objects in local view
2018-12-07 12:59:04 +11:00
}
Cleanup: Declare variables where initialized
2020-10-09 16:39:39 -05:00
int type = RNA_enum_get(op->ptr, "type");
float radius = RNA_float_get(op->ptr, "radius");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Cleanup: Declare variables where initialized
2020-10-09 16:39:39 -05:00
Object *ob = ED_object_add_type(
Fix adding objects in local view
2018-12-07 12:59:04 +11:00
C, OB_LIGHTPROBE, get_lightprobe_defname(type), loc, rot, false, local_view_bits);
Fix T59928: 'Radius' option does nothing when adding light probe
2019-03-11 15:35:30 +01:00
copy_v3_fl(ob->scale, radius);
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Cleanup: Declare variables where initialized
2020-10-09 16:39:39 -05:00
LightProbe *probe = (LightProbe *)ob->data;
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Cleanup: rename lightprobe configure to type_set Consistent with similar API functions.
2020-01-20 17:54:38 +11:00
BKE_lightprobe_type_set(probe, type);
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Probe: Add panel and "Add-menu" items. Also revisits defaults.
2017-06-07 18:32:27 +02:00
return OPERATOR_FINISHED;
}
Rename probe to light-probe Probe is a real general term, the new name is used often in docs online.
2017-06-12 20:59:54 +10:00
void OBJECT_OT_lightprobe_add(wmOperatorType *ot)
Probe: Add panel and "Add-menu" items. Also revisits defaults.
2017-06-07 18:32:27 +02:00
{
/* identifiers */
Rename probe to light-probe Probe is a real general term, the new name is used often in docs online.
2017-06-12 20:59:54 +10:00
ot->name = "Add Light Probe";
ot->description = "Add a light probe object";
ot->idname = "OBJECT_OT_lightprobe_add";
Probe: Add panel and "Add-menu" items. Also revisits defaults.
2017-06-07 18:32:27 +02:00
/* api callbacks */
Rename probe to light-probe Probe is a real general term, the new name is used often in docs online.
2017-06-12 20:59:54 +10:00
ot->exec = lightprobe_add_exec;
Probe: Add panel and "Add-menu" items. Also revisits defaults.
2017-06-07 18:32:27 +02:00
ot->poll = ED_operator_objectmode;
/* flags */
ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
/* properties */
Rename probe to light-probe Probe is a real general term, the new name is used often in docs online.
2017-06-12 20:59:54 +10:00
ot->prop = RNA_def_enum(ot->srna, "type", lightprobe_type_items, 0, "Type", "");
Probe: Add panel and "Add-menu" items. Also revisits defaults.
2017-06-07 18:32:27 +02:00
UI: 'Add Object' rename dimensions D3943 by @Zachman w/ edits
2018-11-15 17:44:50 +11:00
ED_object_add_unit_props_radius(ot);
Probe: Add panel and "Add-menu" items. Also revisits defaults.
2017-06-07 18:32:27 +02:00
ED_object_add_generic_props(ot, true);
}
Cleanup: use doxy sections for object_add.c
2019-05-16 14:03:31 +10:00
/** \} */
/* -------------------------------------------------------------------- */
/** \name Add Effector Operator
* \{ */
Unified effector functionality for particles, cloth and softbody * Unified scene wide gravity (currently in scene buttons) instead of each simulation having it's own gravity. * Weight parameters for all effectors and an effector group setting. * Every effector can use noise. * Most effectors have "shapes" point, plane, surface, every point. - "Point" is most like the old effectors and uses the effector location as the effector point. - "Plane" uses the closest point on effectors local xy-plane as the effector point. - "Surface" uses the closest point on an effector object's surface as the effector point. - "Every Point" uses every point in a mesh effector object as an effector point. - The falloff is calculated from this point, so for example with "surface" shape and "use only negative z axis" it's possible to apply force only "inside" the effector object. * Spherical effector is now renamed as "force" as it's no longer just spherical. * New effector parameter "flow", which makes the effector act as surrounding air velocity, so the resulting force is proportional to the velocity difference of the point and "air velocity". For example a wind field with flow=1.0 results in proper non-accelerating wind. * New effector fields "turbulence", which creates nice random flow paths, and "drag", which slows the points down. * Much improved vortex field. * Effectors can now effect particle rotation as well as location. * Use full, or only positive/negative z-axis to apply force (note. the z-axis is the surface normal in the case of effector shape "surface") * New "force field" submenu in add menu, which adds an empty with the chosen effector (curve object for corve guides). * Other dynamics should be quite easy to add to the effector system too if wanted. * "Unified" doesn't mean that force fields give the exact same results for particles, softbody & cloth, since their final effect depends on many external factors, like for example the surface area of the effected faces. Code changes * Subversion bump for correct handling of global gravity. * Separate ui py file for common dynamics stuff. * Particle settings updating is flushed with it's id through DAG_id_flush_update(..). Known issues * Curve guides don't yet have all ui buttons in place, but they should work none the less. * Hair dynamics don't yet respect force fields. Other changes * Particle emission defaults now to frames 1-200 with life of 50 frames to fill the whole default timeline. * Many particles drawing related crashes fixed. * Sometimes particles didn't update on first frame properly. * Hair with object/group visualization didn't work properly. * Memory leaks with PointCacheID lists (Genscher, remember to free pidlists after use :).
2009-09-30 22:10:14 +00:00
Clean up in "add object" code: * Get rid of ED_object_add_generic_invoke() and all invoke callbacks using it, it was doing nothing exec() callbacks would not do. In fact, its only action (setting part of common add ops properties, like loc, layers, etc.) was needed too by direct exec call, so it was done twice in case of using invoke()! * Replace custom invoke code for metaballs by WM_menu_invoke helper (as already used by lamps). * Add a new OBJECT_OT_empty_add op, to allow direct addition of empties of a given drawtype. * And some general code cleanup (like trailing spaces, empty lines, ...). Did quite a bunch of tests/verifications, but obviously could not tackle all possible scenarios... Anyway, if any, bugs should arize quite quickly (but I don’t expect any! :p ).
2012-10-05 12:59:09 +00:00
/* for object add operator */
UI: Name force fields using the type of force by default When adding multiple force fields of different types they are all called "Field", making it difficult to tell them apart. Lights were already named based on their type. This follows the light code. New names: - Force - Vortex - Magnet - Wind - Guide - TextureField - Harmonic - Charge - Lennard-Jones - Boid - Turbulence - Drag - Fluid - Field Reviewed by: Julian Eisel Differential Revision: https://developer.blender.org/D8420
2020-08-06 13:54:04 +02:00
static const char *get_effector_defname(ePFieldType type)
{
switch (type) {
case PFIELD_FORCE:
return CTX_DATA_(BLT_I18NCONTEXT_ID_OBJECT, "Force");
case PFIELD_VORTEX:
return CTX_DATA_(BLT_I18NCONTEXT_ID_OBJECT, "Vortex");
case PFIELD_MAGNET:
return CTX_DATA_(BLT_I18NCONTEXT_ID_OBJECT, "Magnet");
case PFIELD_WIND:
return CTX_DATA_(BLT_I18NCONTEXT_ID_OBJECT, "Wind");
case PFIELD_GUIDE:
return CTX_DATA_(BLT_I18NCONTEXT_ID_OBJECT, "CurveGuide");
case PFIELD_TEXTURE:
return CTX_DATA_(BLT_I18NCONTEXT_ID_OBJECT, "TextureField");
case PFIELD_HARMONIC:
return CTX_DATA_(BLT_I18NCONTEXT_ID_OBJECT, "Harmonic");
case PFIELD_CHARGE:
return CTX_DATA_(BLT_I18NCONTEXT_ID_OBJECT, "Charge");
case PFIELD_LENNARDJ:
return CTX_DATA_(BLT_I18NCONTEXT_ID_OBJECT, "Lennard-Jones");
case PFIELD_BOID:
return CTX_DATA_(BLT_I18NCONTEXT_ID_OBJECT, "Boid");
case PFIELD_TURBULENCE:
return CTX_DATA_(BLT_I18NCONTEXT_ID_OBJECT, "Turbulence");
case PFIELD_DRAG:
return CTX_DATA_(BLT_I18NCONTEXT_ID_OBJECT, "Drag");
Cleanup: make format
2020-08-07 10:07:36 +02:00
case PFIELD_FLUIDFLOW:
UI: Name force fields using the type of force by default When adding multiple force fields of different types they are all called "Field", making it difficult to tell them apart. Lights were already named based on their type. This follows the light code. New names: - Force - Vortex - Magnet - Wind - Guide - TextureField - Harmonic - Charge - Lennard-Jones - Boid - Turbulence - Drag - Fluid - Field Reviewed by: Julian Eisel Differential Revision: https://developer.blender.org/D8420
2020-08-06 13:54:04 +02:00
return CTX_DATA_(BLT_I18NCONTEXT_ID_OBJECT, "FluidField");
case PFIELD_NULL:
return CTX_DATA_(BLT_I18NCONTEXT_ID_OBJECT, "Field");
case NUM_PFIELD_TYPES:
break;
}
BLI_assert(false);
return CTX_DATA_(BLT_I18NCONTEXT_ID_OBJECT, "Field");
}
Clean up in "add object" code: * Get rid of ED_object_add_generic_invoke() and all invoke callbacks using it, it was doing nothing exec() callbacks would not do. In fact, its only action (setting part of common add ops properties, like loc, layers, etc.) was needed too by direct exec call, so it was done twice in case of using invoke()! * Replace custom invoke code for metaballs by WM_menu_invoke helper (as already used by lamps). * Add a new OBJECT_OT_empty_add op, to allow direct addition of empties of a given drawtype. * And some general code cleanup (like trailing spaces, empty lines, ...). Did quite a bunch of tests/verifications, but obviously could not tackle all possible scenarios... Anyway, if any, bugs should arize quite quickly (but I don’t expect any! :p ).
2012-10-05 12:59:09 +00:00
static int effector_add_exec(bContext *C, wmOperator *op)
Unified effector functionality for particles, cloth and softbody * Unified scene wide gravity (currently in scene buttons) instead of each simulation having it's own gravity. * Weight parameters for all effectors and an effector group setting. * Every effector can use noise. * Most effectors have "shapes" point, plane, surface, every point. - "Point" is most like the old effectors and uses the effector location as the effector point. - "Plane" uses the closest point on effectors local xy-plane as the effector point. - "Surface" uses the closest point on an effector object's surface as the effector point. - "Every Point" uses every point in a mesh effector object as an effector point. - The falloff is calculated from this point, so for example with "surface" shape and "use only negative z axis" it's possible to apply force only "inside" the effector object. * Spherical effector is now renamed as "force" as it's no longer just spherical. * New effector parameter "flow", which makes the effector act as surrounding air velocity, so the resulting force is proportional to the velocity difference of the point and "air velocity". For example a wind field with flow=1.0 results in proper non-accelerating wind. * New effector fields "turbulence", which creates nice random flow paths, and "drag", which slows the points down. * Much improved vortex field. * Effectors can now effect particle rotation as well as location. * Use full, or only positive/negative z-axis to apply force (note. the z-axis is the surface normal in the case of effector shape "surface") * New "force field" submenu in add menu, which adds an empty with the chosen effector (curve object for corve guides). * Other dynamics should be quite easy to add to the effector system too if wanted. * "Unified" doesn't mean that force fields give the exact same results for particles, softbody & cloth, since their final effect depends on many external factors, like for example the surface area of the effected faces. Code changes * Subversion bump for correct handling of global gravity. * Separate ui py file for common dynamics stuff. * Particle settings updating is flushed with it's id through DAG_id_flush_update(..). Known issues * Curve guides don't yet have all ui buttons in place, but they should work none the less. * Hair dynamics don't yet respect force fields. Other changes * Particle emission defaults now to frames 1-200 with life of 50 frames to fill the whole default timeline. * Many particles drawing related crashes fixed. * Sometimes particles didn't update on first frame properly. * Hair with object/group visualization didn't work properly. * Memory leaks with PointCacheID lists (Genscher, remember to free pidlists after use :).
2009-09-30 22:10:14 +00:00
{
code cleanup: minor BMESH_TODO's, some were left in even though they were done/invalid.
2013-04-15 04:34:14 +00:00
bool enter_editmode;
Fix adding objects in local view
2018-12-07 12:59:04 +11:00
ushort local_view_bits;
Added location and rotation operator properties for adding objects. The Align to View boolean is now just used to set the rotation property value during invoke. This removes some reliance on 3d view info for non-interactive use, and also lets you specify new object's locations/rotations explicitly when calling from Python.
2009-12-28 04:09:46 +00:00
float loc[3], rot[3];
Support more object types scene-scale (on creation) - lamp - camera - font - empty & effector Also fix inconsistency with apply transform (modified shape-keys for meshes but not curve/lattice)
2014-09-01 20:09:31 +10:00
WM_operator_view3d_unit_defaults(C, op);
Fix adding objects in local view
2018-12-07 12:59:04 +11:00
if (!ED_object_add_generic_get_opts(
Object: add scale argument to creation operators Needed for to create objects of a specific size.
2020-05-28 14:30:42 +10:00
C, op, 'Z', loc, rot, NULL, &enter_editmode, &local_view_bits, NULL)) {
Clean up in "add object" code: * Get rid of ED_object_add_generic_invoke() and all invoke callbacks using it, it was doing nothing exec() callbacks would not do. In fact, its only action (setting part of common add ops properties, like loc, layers, etc.) was needed too by direct exec call, so it was done twice in case of using invoke()! * Replace custom invoke code for metaballs by WM_menu_invoke helper (as already used by lamps). * Add a new OBJECT_OT_empty_add op, to allow direct addition of empties of a given drawtype. * And some general code cleanup (like trailing spaces, empty lines, ...). Did quite a bunch of tests/verifications, but obviously could not tackle all possible scenarios... Anyway, if any, bugs should arize quite quickly (but I don’t expect any! :p ).
2012-10-05 12:59:09 +00:00
return OPERATOR_CANCELLED;
Fix adding objects in local view
2018-12-07 12:59:04 +11:00
}
Cleanup: Declare variables where initialized
2020-10-09 16:39:39 -05:00
int type = RNA_enum_get(op->ptr, "type");
float dia = RNA_float_get(op->ptr, "radius");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Cleanup: Declare variables where initialized
2020-10-09 16:39:39 -05:00
Object *ob;
style cleanup: editors / mesh & object
2012-04-28 15:42:27 +00:00
if (type == PFIELD_GUIDE) {
Fix T79464: Crash adding objects without an active screen Running add-objects operator without an active screen would crash as CTX_data_edit_object would return NULL in this case. This could happen when adding objects from frame-change handlers for e.g. In the case of adding new objects there is no need for a context lookup, pass this directly to ED_object_editmode_exit_ex.
2020-09-11 19:50:38 +10:00
Main *bmain = CTX_data_main(C);
Scene *scene = CTX_data_scene(C);
Curves: save active point to file Changed curve active point from pointer to index. Allows curve active point to be saved to file and retained between modes for free. Also some small optimisations by removing pointer look up code. - Made active point access functions into BKE API calls. - Fixes operators where curve de-selection resulted in unsel-active point. - Split curve delete into 2 functions
2014-01-27 15:18:40 +11:00
Curve *cu;
UI: Name force fields using the type of force by default When adding multiple force fields of different types they are all called "Field", making it difficult to tell them apart. Lights were already named based on their type. This follows the light code. New names: - Force - Vortex - Magnet - Wind - Guide - TextureField - Harmonic - Charge - Lennard-Jones - Boid - Turbulence - Drag - Fluid - Field Reviewed by: Julian Eisel Differential Revision: https://developer.blender.org/D8420
2020-08-06 13:54:04 +02:00
ob = ED_object_add_type(
C, OB_CURVE, get_effector_defname(type), loc, rot, false, local_view_bits);
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Curves: save active point to file Changed curve active point from pointer to index. Allows curve active point to be saved to file and retained between modes for free. Also some small optimisations by removing pointer look up code. - Made active point access functions into BKE API calls. - Fixes operators where curve de-selection resulted in unsel-active point. - Split curve delete into 2 functions
2014-01-27 15:18:40 +11:00
cu = ob->data;
cu->flag |= CU_PATH | CU_3D;
Fix T79464: Crash adding objects without an active screen Running add-objects operator without an active screen would crash as CTX_data_edit_object would return NULL in this case. This could happen when adding objects from frame-change handlers for e.g. In the case of adding new objects there is no need for a context lookup, pass this directly to ED_object_editmode_exit_ex.
2020-09-11 19:50:38 +10:00
ED_object_editmode_enter_ex(bmain, scene, ob, 0);
Cleanup: Declare variables where initialized
2020-10-09 16:39:39 -05:00
float mat[4][4];
Fix T84638: Wrong scale for primitives with radius Creating some primitives allows for a scale value (via python) that will scale the object accordingly. For objects with a radius parameter (like cylinders, spheres, etc.) passing a scale different to (1,1,1) would result in unexpected behavior. For example: `>>> bpy.ops.mesh.primitive_uv_sphere_add(radius=2, scale=(1,1,2))` We would expect this to create a sphere with a radius of 2 (dimensions 4,4,4) and then be scaled *2 along the z-axis (dimensions 4,4,8). But this would previously create a scaled sphere with dimensions (2,2,4). The scale was simply divided by two. Maybe because the "radius" parameter for creating the primitives was confusingly named "diameter" (but used as the radius). The fix adds a scale parameter to `ED_object_new_primitive_matrix` and also renames the wrongly named "diameter" parameters to "radius". Reviewed By: campbellbarton Maniphest Tasks: T84638 Ref D10093
2021-09-13 17:50:41 +10:00
ED_object_new_primitive_matrix(C, ob, loc, rot, NULL, mat);
Fix radius not taken into account when adding curve guide force field Wrong usage of ED_curve_add_nurbs_primitive from {rBe8f3fa99de81}. Differential Revision: https://developer.blender.org/D11166
2021-05-05 11:46:24 +02:00
mul_mat3_m4_fl(mat, dia);
Cleanup: editor api naming - use ED_ prefix for api calls - use ED_*_select_pick for mouse selection (was already done in parts)
2015-11-18 12:20:28 +11:00
BLI_addtail(&cu->editnurb->nurbs,
Fix radius not taken into account when adding curve guide force field Wrong usage of ED_curve_add_nurbs_primitive from {rBe8f3fa99de81}. Differential Revision: https://developer.blender.org/D11166
2021-05-05 11:46:24 +02:00
ED_curve_add_nurbs_primitive(C, ob, mat, CU_NURBS | CU_PRIM_PATH, 1));
Cleanup: style, use braces for editors
2019-04-22 09:19:45 +10:00
if (!enter_editmode) {
Fix T79464: Crash adding objects without an active screen Running add-objects operator without an active screen would crash as CTX_data_edit_object would return NULL in this case. This could happen when adding objects from frame-change handlers for e.g. In the case of adding new objects there is no need for a context lookup, pass this directly to ED_object_editmode_exit_ex.
2020-09-11 19:50:38 +10:00
ED_object_editmode_exit_ex(bmain, scene, ob, EM_FREEDATA);
Cleanup: style, use braces for editors
2019-04-22 09:19:45 +10:00
}
Unified effector functionality for particles, cloth and softbody * Unified scene wide gravity (currently in scene buttons) instead of each simulation having it's own gravity. * Weight parameters for all effectors and an effector group setting. * Every effector can use noise. * Most effectors have "shapes" point, plane, surface, every point. - "Point" is most like the old effectors and uses the effector location as the effector point. - "Plane" uses the closest point on effectors local xy-plane as the effector point. - "Surface" uses the closest point on an effector object's surface as the effector point. - "Every Point" uses every point in a mesh effector object as an effector point. - The falloff is calculated from this point, so for example with "surface" shape and "use only negative z axis" it's possible to apply force only "inside" the effector object. * Spherical effector is now renamed as "force" as it's no longer just spherical. * New effector parameter "flow", which makes the effector act as surrounding air velocity, so the resulting force is proportional to the velocity difference of the point and "air velocity". For example a wind field with flow=1.0 results in proper non-accelerating wind. * New effector fields "turbulence", which creates nice random flow paths, and "drag", which slows the points down. * Much improved vortex field. * Effectors can now effect particle rotation as well as location. * Use full, or only positive/negative z-axis to apply force (note. the z-axis is the surface normal in the case of effector shape "surface") * New "force field" submenu in add menu, which adds an empty with the chosen effector (curve object for corve guides). * Other dynamics should be quite easy to add to the effector system too if wanted. * "Unified" doesn't mean that force fields give the exact same results for particles, softbody & cloth, since their final effect depends on many external factors, like for example the surface area of the effected faces. Code changes * Subversion bump for correct handling of global gravity. * Separate ui py file for common dynamics stuff. * Particle settings updating is flushed with it's id through DAG_id_flush_update(..). Known issues * Curve guides don't yet have all ui buttons in place, but they should work none the less. * Hair dynamics don't yet respect force fields. Other changes * Particle emission defaults now to frames 1-200 with life of 50 frames to fill the whole default timeline. * Many particles drawing related crashes fixed. * Sometimes particles didn't update on first frame properly. * Hair with object/group visualization didn't work properly. * Memory leaks with PointCacheID lists (Genscher, remember to free pidlists after use :).
2009-09-30 22:10:14 +00:00
}
* Set some custom empty draw types on adding force fields, where relevant
2009-11-02 11:37:35 +00:00
else {
Cleanup: make format
2020-08-07 10:07:36 +02:00
ob = ED_object_add_type(
C, OB_EMPTY, get_effector_defname(type), loc, rot, false, local_view_bits);
Support more object types scene-scale (on creation) - lamp - camera - font - empty & effector Also fix inconsistency with apply transform (modified shape-keys for meshes but not curve/lattice)
2014-09-01 20:09:31 +10:00
BKE_object_obdata_size_init(ob, dia);
Cleanup: style, use braces for editors
2019-04-22 09:19:45 +10:00
if (ELEM(type, PFIELD_WIND, PFIELD_VORTEX)) {
Clean up in "add object" code: * Get rid of ED_object_add_generic_invoke() and all invoke callbacks using it, it was doing nothing exec() callbacks would not do. In fact, its only action (setting part of common add ops properties, like loc, layers, etc.) was needed too by direct exec call, so it was done twice in case of using invoke()! * Replace custom invoke code for metaballs by WM_menu_invoke helper (as already used by lamps). * Add a new OBJECT_OT_empty_add op, to allow direct addition of empties of a given drawtype. * And some general code cleanup (like trailing spaces, empty lines, ...). Did quite a bunch of tests/verifications, but obviously could not tackle all possible scenarios... Anyway, if any, bugs should arize quite quickly (but I don’t expect any! :p ).
2012-10-05 12:59:09 +00:00
ob->empty_drawtype = OB_SINGLE_ARROW;
Cleanup: style, use braces for editors
2019-04-22 09:19:45 +10:00
}
* Set some custom empty draw types on adding force fields, where relevant
2009-11-02 11:37:35 +00:00
}
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Cleanup: BKE_effect.h naming
2018-12-02 14:14:51 +11:00
ob->pd = BKE_partdeflect_new(type);
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Unified effector functionality for particles, cloth and softbody * Unified scene wide gravity (currently in scene buttons) instead of each simulation having it's own gravity. * Weight parameters for all effectors and an effector group setting. * Every effector can use noise. * Most effectors have "shapes" point, plane, surface, every point. - "Point" is most like the old effectors and uses the effector location as the effector point. - "Plane" uses the closest point on effectors local xy-plane as the effector point. - "Surface" uses the closest point on an effector object's surface as the effector point. - "Every Point" uses every point in a mesh effector object as an effector point. - The falloff is calculated from this point, so for example with "surface" shape and "use only negative z axis" it's possible to apply force only "inside" the effector object. * Spherical effector is now renamed as "force" as it's no longer just spherical. * New effector parameter "flow", which makes the effector act as surrounding air velocity, so the resulting force is proportional to the velocity difference of the point and "air velocity". For example a wind field with flow=1.0 results in proper non-accelerating wind. * New effector fields "turbulence", which creates nice random flow paths, and "drag", which slows the points down. * Much improved vortex field. * Effectors can now effect particle rotation as well as location. * Use full, or only positive/negative z-axis to apply force (note. the z-axis is the surface normal in the case of effector shape "surface") * New "force field" submenu in add menu, which adds an empty with the chosen effector (curve object for corve guides). * Other dynamics should be quite easy to add to the effector system too if wanted. * "Unified" doesn't mean that force fields give the exact same results for particles, softbody & cloth, since their final effect depends on many external factors, like for example the surface area of the effected faces. Code changes * Subversion bump for correct handling of global gravity. * Separate ui py file for common dynamics stuff. * Particle settings updating is flushed with it's id through DAG_id_flush_update(..). Known issues * Curve guides don't yet have all ui buttons in place, but they should work none the less. * Hair dynamics don't yet respect force fields. Other changes * Particle emission defaults now to frames 1-200 with life of 50 frames to fill the whole default timeline. * Many particles drawing related crashes fixed. * Sometimes particles didn't update on first frame properly. * Hair with object/group visualization didn't work properly. * Memory leaks with PointCacheID lists (Genscher, remember to free pidlists after use :).
2009-09-30 22:10:14 +00:00
return OPERATOR_FINISHED;
}
void OBJECT_OT_effector_add(wmOperatorType *ot)
{
/* identifiers */
style cleanup: spaces aroudn operators for operator definitions.
2012-03-22 07:26:09 +00:00
ot->name = "Add Effector";
batch remove .'s used with RNA_def_struct_ui_text
2010-02-10 21:15:44 +00:00
ot->description = "Add an empty object with a physics effector to the scene";
style cleanup: spaces aroudn operators for operator definitions.
2012-03-22 07:26:09 +00:00
ot->idname = "OBJECT_OT_effector_add";
Some effect-less code cleanup...
2012-10-05 07:05:52 +00:00
Unified effector functionality for particles, cloth and softbody * Unified scene wide gravity (currently in scene buttons) instead of each simulation having it's own gravity. * Weight parameters for all effectors and an effector group setting. * Every effector can use noise. * Most effectors have "shapes" point, plane, surface, every point. - "Point" is most like the old effectors and uses the effector location as the effector point. - "Plane" uses the closest point on effectors local xy-plane as the effector point. - "Surface" uses the closest point on an effector object's surface as the effector point. - "Every Point" uses every point in a mesh effector object as an effector point. - The falloff is calculated from this point, so for example with "surface" shape and "use only negative z axis" it's possible to apply force only "inside" the effector object. * Spherical effector is now renamed as "force" as it's no longer just spherical. * New effector parameter "flow", which makes the effector act as surrounding air velocity, so the resulting force is proportional to the velocity difference of the point and "air velocity". For example a wind field with flow=1.0 results in proper non-accelerating wind. * New effector fields "turbulence", which creates nice random flow paths, and "drag", which slows the points down. * Much improved vortex field. * Effectors can now effect particle rotation as well as location. * Use full, or only positive/negative z-axis to apply force (note. the z-axis is the surface normal in the case of effector shape "surface") * New "force field" submenu in add menu, which adds an empty with the chosen effector (curve object for corve guides). * Other dynamics should be quite easy to add to the effector system too if wanted. * "Unified" doesn't mean that force fields give the exact same results for particles, softbody & cloth, since their final effect depends on many external factors, like for example the surface area of the effected faces. Code changes * Subversion bump for correct handling of global gravity. * Separate ui py file for common dynamics stuff. * Particle settings updating is flushed with it's id through DAG_id_flush_update(..). Known issues * Curve guides don't yet have all ui buttons in place, but they should work none the less. * Hair dynamics don't yet respect force fields. Other changes * Particle emission defaults now to frames 1-200 with life of 50 frames to fill the whole default timeline. * Many particles drawing related crashes fixed. * Sometimes particles didn't update on first frame properly. * Hair with object/group visualization didn't work properly. * Memory leaks with PointCacheID lists (Genscher, remember to free pidlists after use :).
2009-09-30 22:10:14 +00:00
/* api callbacks */
style cleanup: spaces aroudn operators for operator definitions.
2012-03-22 07:26:09 +00:00
ot->exec = effector_add_exec;
ot->poll = ED_operator_objectmode;
Some effect-less code cleanup...
2012-10-05 07:05:52 +00:00
Unified effector functionality for particles, cloth and softbody * Unified scene wide gravity (currently in scene buttons) instead of each simulation having it's own gravity. * Weight parameters for all effectors and an effector group setting. * Every effector can use noise. * Most effectors have "shapes" point, plane, surface, every point. - "Point" is most like the old effectors and uses the effector location as the effector point. - "Plane" uses the closest point on effectors local xy-plane as the effector point. - "Surface" uses the closest point on an effector object's surface as the effector point. - "Every Point" uses every point in a mesh effector object as an effector point. - The falloff is calculated from this point, so for example with "surface" shape and "use only negative z axis" it's possible to apply force only "inside" the effector object. * Spherical effector is now renamed as "force" as it's no longer just spherical. * New effector parameter "flow", which makes the effector act as surrounding air velocity, so the resulting force is proportional to the velocity difference of the point and "air velocity". For example a wind field with flow=1.0 results in proper non-accelerating wind. * New effector fields "turbulence", which creates nice random flow paths, and "drag", which slows the points down. * Much improved vortex field. * Effectors can now effect particle rotation as well as location. * Use full, or only positive/negative z-axis to apply force (note. the z-axis is the surface normal in the case of effector shape "surface") * New "force field" submenu in add menu, which adds an empty with the chosen effector (curve object for corve guides). * Other dynamics should be quite easy to add to the effector system too if wanted. * "Unified" doesn't mean that force fields give the exact same results for particles, softbody & cloth, since their final effect depends on many external factors, like for example the surface area of the effected faces. Code changes * Subversion bump for correct handling of global gravity. * Separate ui py file for common dynamics stuff. * Particle settings updating is flushed with it's id through DAG_id_flush_update(..). Known issues * Curve guides don't yet have all ui buttons in place, but they should work none the less. * Hair dynamics don't yet respect force fields. Other changes * Particle emission defaults now to frames 1-200 with life of 50 frames to fill the whole default timeline. * Many particles drawing related crashes fixed. * Sometimes particles didn't update on first frame properly. * Hair with object/group visualization didn't work properly. * Memory leaks with PointCacheID lists (Genscher, remember to free pidlists after use :).
2009-09-30 22:10:14 +00:00
/* flags */
style cleanup: editors / mesh & object
2012-04-28 15:42:27 +00:00
ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
Some effect-less code cleanup...
2012-10-05 07:05:52 +00:00
Support more object types scene-scale (on creation) - lamp - camera - font - empty & effector Also fix inconsistency with apply transform (modified shape-keys for meshes but not curve/lattice)
2014-09-01 20:09:31 +10:00
/* properties */
style cleanup: spaces aroudn operators for operator definitions.
2012-03-22 07:26:09 +00:00
ot->prop = RNA_def_enum(ot->srna, "type", field_type_items, 0, "Type", "");
- all add object operators now take view_align as an argument, and enter_editmode where its used. Makes running the operator from python pradictable without having to know the user prefs. - missing return in function - python error in view3d (assumed active object exists)
2009-11-02 16:07:49 +00:00
UI: 'Add Object' rename dimensions D3943 by @Zachman w/ edits
2018-11-15 17:44:50 +11:00
ED_object_add_unit_props_radius(ot);
Code cleanup: remove TRUE/FALSE & WITH_BOOL_COMPAT define
2014-04-01 11:34:00 +11:00
ED_object_add_generic_props(ot, true);
Unified effector functionality for particles, cloth and softbody * Unified scene wide gravity (currently in scene buttons) instead of each simulation having it's own gravity. * Weight parameters for all effectors and an effector group setting. * Every effector can use noise. * Most effectors have "shapes" point, plane, surface, every point. - "Point" is most like the old effectors and uses the effector location as the effector point. - "Plane" uses the closest point on effectors local xy-plane as the effector point. - "Surface" uses the closest point on an effector object's surface as the effector point. - "Every Point" uses every point in a mesh effector object as an effector point. - The falloff is calculated from this point, so for example with "surface" shape and "use only negative z axis" it's possible to apply force only "inside" the effector object. * Spherical effector is now renamed as "force" as it's no longer just spherical. * New effector parameter "flow", which makes the effector act as surrounding air velocity, so the resulting force is proportional to the velocity difference of the point and "air velocity". For example a wind field with flow=1.0 results in proper non-accelerating wind. * New effector fields "turbulence", which creates nice random flow paths, and "drag", which slows the points down. * Much improved vortex field. * Effectors can now effect particle rotation as well as location. * Use full, or only positive/negative z-axis to apply force (note. the z-axis is the surface normal in the case of effector shape "surface") * New "force field" submenu in add menu, which adds an empty with the chosen effector (curve object for corve guides). * Other dynamics should be quite easy to add to the effector system too if wanted. * "Unified" doesn't mean that force fields give the exact same results for particles, softbody & cloth, since their final effect depends on many external factors, like for example the surface area of the effected faces. Code changes * Subversion bump for correct handling of global gravity. * Separate ui py file for common dynamics stuff. * Particle settings updating is flushed with it's id through DAG_id_flush_update(..). Known issues * Curve guides don't yet have all ui buttons in place, but they should work none the less. * Hair dynamics don't yet respect force fields. Other changes * Particle emission defaults now to frames 1-200 with life of 50 frames to fill the whole default timeline. * Many particles drawing related crashes fixed. * Sometimes particles didn't update on first frame properly. * Hair with object/group visualization didn't work properly. * Memory leaks with PointCacheID lists (Genscher, remember to free pidlists after use :).
2009-09-30 22:10:14 +00:00
}
Cleanup: use doxy sections for object_add.c
2019-05-16 14:03:31 +10:00
/** \} */
/* -------------------------------------------------------------------- */
/** \name Add Camera Operator
* \{ */
Fix [#20600] First added camera is not made active Also forced view align on when adding cameras
2010-01-11 06:57:41 +00:00
static int object_camera_add_exec(bContext *C, wmOperator *op)
{
View3D *v3d = CTX_wm_view3d(C);
style cleanup: editors / mesh & object
2012-04-28 15:42:27 +00:00
Scene *scene = CTX_data_scene(C);
Some effect-less code cleanup...
2012-10-05 07:05:52 +00:00
Fix [#20600] First added camera is not made active Also forced view align on when adding cameras
2010-01-11 06:57:41 +00:00
/* force view align for cameras */
Objects: new 3D cursor alignment option when adding objects The choices are now World, View and 3D Cursor. This breaks Python API compatibility, add-ons that add objects with this parameter will need to be updated. Differential Revision: https://developer.blender.org/D4706
2019-05-15 16:56:22 +02:00
RNA_enum_set(op->ptr, "align", ALIGN_VIEW);
Some effect-less code cleanup...
2012-10-05 07:05:52 +00:00
Cleanup: Declare variables where initialized
2020-10-09 16:39:39 -05:00
ushort local_view_bits;
bool enter_editmode;
float loc[3], rot[3];
Fix adding objects in local view
2018-12-07 12:59:04 +11:00
if (!ED_object_add_generic_get_opts(
Object: add scale argument to creation operators Needed for to create objects of a specific size.
2020-05-28 14:30:42 +10:00
C, op, 'Z', loc, rot, NULL, &enter_editmode, &local_view_bits, NULL)) {
adding curve and mesh objects through python would create the object without assigning it to any layers. now initialize from the scene (when the value is unset), and throw an error when the value is set to all false.
2010-06-14 15:39:50 +00:00
return OPERATOR_CANCELLED;
Fix adding objects in local view
2018-12-07 12:59:04 +11:00
}
Cleanup: Declare variables where initialized
2020-10-09 16:39:39 -05:00
Object *ob = ED_object_add_type(C, OB_CAMERA, NULL, loc, rot, false, local_view_bits);
Some effect-less code cleanup...
2012-10-05 07:05:52 +00:00
Fix [#20600] First added camera is not made active Also forced view align on when adding cameras
2010-01-11 06:57:41 +00:00
if (v3d) {
Cleanup: style, use braces for editors
2019-04-22 09:19:45 +10:00
if (v3d->camera == NULL) {
Fix [#20600] First added camera is not made active Also forced view align on when adding cameras
2010-01-11 06:57:41 +00:00
v3d->camera = ob;
Cleanup: style, use braces for editors
2019-04-22 09:19:45 +10:00
}
style cleanup: editors / mesh & object
2012-04-28 15:42:27 +00:00
if (v3d->scenelock && scene->camera == NULL) {
Fix [#20600] First added camera is not made active Also forced view align on when adding cameras
2010-01-11 06:57:41 +00:00
scene->camera = ob;
}
}
Cleanup: Declare variables where initialized
2020-10-09 16:39:39 -05:00
Camera *cam = ob->data;
Fix T41602: Camera draw size ignores scene scale
2014-08-28 20:24:43 +10:00
cam->drawsize = v3d ? ED_view3d_grid_scale(scene, v3d, NULL) : ED_scene_grid_scale(scene, NULL);
Fix [#20600] First added camera is not made active Also forced view align on when adding cameras
2010-01-11 06:57:41 +00:00
return OPERATOR_FINISHED;
}
void OBJECT_OT_camera_add(wmOperatorType *ot)
{
Bugfix #26672 Minor glitch: Add Camera operator showed option "view aligned", but that doesn't work for camera. Is now hidden.
2011-04-01 13:56:01 +00:00
PropertyRNA *prop;
Some effect-less code cleanup...
2012-10-05 07:05:52 +00:00
Fix [#20600] First added camera is not made active Also forced view align on when adding cameras
2010-01-11 06:57:41 +00:00
/* identifiers */
style cleanup: spaces aroudn operators for operator definitions.
2012-03-22 07:26:09 +00:00
ot->name = "Add Camera";
batch remove .'s used with RNA_def_struct_ui_text
2010-02-10 21:15:44 +00:00
ot->description = "Add a camera object to the scene";
style cleanup: spaces aroudn operators for operator definitions.
2012-03-22 07:26:09 +00:00
ot->idname = "OBJECT_OT_camera_add";
Some effect-less code cleanup...
2012-10-05 07:05:52 +00:00
Fix [#20600] First added camera is not made active Also forced view align on when adding cameras
2010-01-11 06:57:41 +00:00
/* api callbacks */
style cleanup: spaces aroudn operators for operator definitions.
2012-03-22 07:26:09 +00:00
ot->exec = object_camera_add_exec;
ot->poll = ED_operator_objectmode;
Some effect-less code cleanup...
2012-10-05 07:05:52 +00:00
Fix [#20600] First added camera is not made active Also forced view align on when adding cameras
2010-01-11 06:57:41 +00:00
/* flags */
style cleanup: editors / mesh & object
2012-04-28 15:42:27 +00:00
ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
Some effect-less code cleanup...
2012-10-05 07:05:52 +00:00
Code cleanup: remove TRUE/FALSE & WITH_BOOL_COMPAT define
2014-04-01 11:34:00 +11:00
ED_object_add_generic_props(ot, true);
Some effect-less code cleanup...
2012-10-05 07:05:52 +00:00
Bugfix #26672 Minor glitch: Add Camera operator showed option "view aligned", but that doesn't work for camera. Is now hidden.
2011-04-01 13:56:01 +00:00
/* hide this for cameras, default */
Objects: new 3D cursor alignment option when adding objects The choices are now World, View and 3D Cursor. This breaks Python API compatibility, add-ons that add objects with this parameter will need to be updated. Differential Revision: https://developer.blender.org/D4706
2019-05-15 16:56:22 +02:00
prop = RNA_struct_type_find_property(ot->srna, "align");
Bugfix #26672 Minor glitch: Add Camera operator showed option "view aligned", but that doesn't work for camera. Is now hidden.
2011-04-01 13:56:01 +00:00
RNA_def_property_flag(prop, PROP_HIDDEN);
Fix [#20600] First added camera is not made active Also forced view align on when adding cameras
2010-01-11 06:57:41 +00:00
}
Cleanup: use doxy sections for object_add.c
2019-05-16 14:03:31 +10:00
/** \} */
/* -------------------------------------------------------------------- */
/** \name Add Metaball Operator
* \{ */
Some effect-less code cleanup...
2012-10-05 07:05: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
static int object_metaball_add_exec(bContext *C, wmOperator *op)
{
Fix T79464: Crash adding objects without an active screen Running add-objects operator without an active screen would crash as CTX_data_edit_object would return NULL in this case. This could happen when adding objects from frame-change handlers for e.g. In the case of adding new objects there is no need for a context lookup, pass this directly to ED_object_editmode_exit_ex.
2020-09-11 19:50:38 +10:00
Main *bmain = CTX_data_main(C);
Scene *scene = CTX_data_scene(C);
ViewLayer *view_layer = CTX_data_view_layer(C);
Cleanup: Declare variables where initialized
2020-10-09 16:39:39 -05:00
Fix adding objects in local view
2018-12-07 12:59:04 +11:00
ushort local_view_bits;
Cleanup: Declare variables where initialized
2020-10-09 16:39:39 -05:00
bool enter_editmode;
Added location and rotation operator properties for adding objects. The Align to View boolean is now just used to set the rotation property value during invoke. This removes some reliance on 3d view info for non-interactive use, and also lets you specify new object's locations/rotations explicitly when calling from Python.
2009-12-28 04:09:46 +00:00
float loc[3], rot[3];
fix [#36537] "Grid Floor Scaling" can have some unexpected behaviour on new objects curves and metaballs now behave the same as meshes wrt grid scaling. remove WM_operator_view3d_distance_invoke(), and replace with a function called from exec which initializes defaults, this way operators can have their own invoke functions.
2013-09-16 04:19:48 +00:00
WM_operator_view3d_unit_defaults(C, op);
Fix adding objects in local view
2018-12-07 12:59:04 +11:00
if (!ED_object_add_generic_get_opts(
Object: add scale argument to creation operators Needed for to create objects of a specific size.
2020-05-28 14:30:42 +10:00
C, op, 'Z', loc, rot, NULL, &enter_editmode, &local_view_bits, NULL)) {
adding curve and mesh objects through python would create the object without assigning it to any layers. now initialize from the scene (when the value is unset), and throw an error when the value is set to all false.
2010-06-14 15:39:50 +00:00
return OPERATOR_CANCELLED;
Fix adding objects in local view
2018-12-07 12:59:04 +11:00
}
Cleanup: Declare variables where initialized
2020-10-09 16:39:39 -05:00
bool newob = false;
Object *obedit = OBEDIT_FROM_VIEW_LAYER(view_layer);
style cleanup: editors / mesh & object
2012-04-28 15:42:27 +00:00
if (obedit == NULL || obedit->type != OB_MBALL) {
Fix adding objects in local view
2018-12-07 12:59:04 +11:00
obedit = ED_object_add_type(C, OB_MBALL, NULL, loc, rot, true, local_view_bits);
code cleanup: minor BMESH_TODO's, some were left in even though they were done/invalid.
2013-04-15 04:34:14 +00:00
newob = true;
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
}
fix [#36537] "Grid Floor Scaling" can have some unexpected behaviour on new objects curves and metaballs now behave the same as meshes wrt grid scaling. remove WM_operator_view3d_distance_invoke(), and replace with a function called from exec which initializes defaults, this way operators can have their own invoke functions.
2013-09-16 04:19:48 +00:00
else {
Depsgraph: Remove duplicated sets of recalc/update flags There were at least three copies of those: - OB_RECALC* family of flags, which are rudiment of an old dependency graph system. - PSYS_RECALC* which were used by old dependency graph system as a separate set since the graph itself did not handle particle systems. - DEG_TAG_* which was used to tag IDs. Now there is a single set, which defines what can be tagged and queried for an update. It also has some aggregate flags to make queries simpler. Lets once and for all solve the madness of those flags, stick to a single set, which will not overlap with anything or require any extra conversion. Technically, shouldn't be measurable user difference, but some of the agregate flags for few dependency graph components did change. Fixes T58632: Particle don't update rotation settings
2018-12-06 17:52:37 +01:00
DEG_id_tag_update(&obedit->id, ID_RECALC_GEOMETRY);
fix [#36537] "Grid Floor Scaling" can have some unexpected behaviour on new objects curves and metaballs now behave the same as meshes wrt grid scaling. remove WM_operator_view3d_distance_invoke(), and replace with a function called from exec which initializes defaults, this way operators can have their own invoke functions.
2013-09-16 04:19:48 +00:00
}
Some effect-less code cleanup...
2012-10-05 07:05:52 +00:00
Cleanup: Declare variables where initialized
2020-10-09 16:39:39 -05:00
float mat[4][4];
Fix T84638: Wrong scale for primitives with radius Creating some primitives allows for a scale value (via python) that will scale the object accordingly. For objects with a radius parameter (like cylinders, spheres, etc.) passing a scale different to (1,1,1) would result in unexpected behavior. For example: `>>> bpy.ops.mesh.primitive_uv_sphere_add(radius=2, scale=(1,1,2))` We would expect this to create a sphere with a radius of 2 (dimensions 4,4,4) and then be scaled *2 along the z-axis (dimensions 4,4,8). But this would previously create a scaled sphere with dimensions (2,2,4). The scale was simply divided by two. Maybe because the "radius" parameter for creating the primitives was confusingly named "diameter" (but used as the radius). The fix adds a scale parameter to `ED_object_new_primitive_matrix` and also renames the wrongly named "diameter" parameters to "radius". Reviewed By: campbellbarton Maniphest Tasks: T84638 Ref D10093
2021-09-13 17:50:41 +10:00
ED_object_new_primitive_matrix(C, obedit, loc, rot, NULL, mat);
Fix T76922: Meta-balls created twice the specified size
2020-05-21 18:18:00 +10:00
/* Halving here is done to account for constant values from #BKE_mball_element_add.
* While the default radius of the resulting meta element is 2,
* we want to pass in 1 so other values such as resolution are scaled by 1.0. */
Cleanup: Declare variables where initialized
2020-10-09 16:39:39 -05:00
float dia = RNA_float_get(op->ptr, "radius") / 2;
Some effect-less code cleanup...
2012-10-05 07:05:52 +00:00
Fix T63411: Crash adding meta-ball with a small radius Change how the radius, changing the size of meta plane, sphere & cube. Previously the size of these primitives would be kept the same, with only the radius outside the primitive being scaled. This led to small scale adding a lot of polygons instead of scaling the primitive down as users would expect. Also change behavior not to change the resolution when adding to an existing meta-ball.
2020-06-17 21:10:36 +10:00
ED_mball_add_primitive(C, obedit, newob, mat, dia, RNA_enum_get(op->ptr, "type"));
rna: move metaball.active_element to metaball.elements.active added rna funcs... elem = metaball.elements.new() metaball.elements.remove(elem)
2010-08-23 00:57:19 +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
/* userdef */
- all add object operators now take view_align as an argument, and enter_editmode where its used. Makes running the operator from python pradictable without having to know the user prefs. - missing return in function - python error in view3d (assumed active object exists)
2009-11-02 16:07:49 +00:00
if (newob && !enter_editmode) {
Fix T79464: Crash adding objects without an active screen Running add-objects operator without an active screen would crash as CTX_data_edit_object would return NULL in this case. This could happen when adding objects from frame-change handlers for e.g. In the case of adding new objects there is no need for a context lookup, pass this directly to ED_object_editmode_exit_ex.
2020-09-11 19:50:38 +10:00
ED_object_editmode_exit_ex(bmain, scene, obedit, EM_FREEDATA);
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
}
Cleanup: redundant update calls adding objects These update calls are already performed by ED_object_add_type_with_obdata.
2021-08-26 13:53:15 +10:00
else {
/* Only needed in edit-mode (#ED_object_add_type normally handles this). */
WM_event_add_notifier(C, NC_OBJECT | ND_DRAW, obedit);
}
Some effect-less code cleanup...
2012-10-05 07:05: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
return OPERATOR_FINISHED;
}
void OBJECT_OT_metaball_add(wmOperatorType *ot)
{
/* identifiers */
style cleanup: spaces aroudn operators for operator definitions.
2012-03-22 07:26:09 +00:00
ot->name = "Add Metaball";
ot->description = "Add an metaball object to the scene";
ot->idname = "OBJECT_OT_metaball_add";
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
/* api callbacks */
fix [#36537] "Grid Floor Scaling" can have some unexpected behaviour on new objects curves and metaballs now behave the same as meshes wrt grid scaling. remove WM_operator_view3d_distance_invoke(), and replace with a function called from exec which initializes defaults, this way operators can have their own invoke functions.
2013-09-16 04:19:48 +00:00
ot->invoke = WM_menu_invoke;
style cleanup: spaces aroudn operators for operator definitions.
2012-03-22 07:26:09 +00:00
ot->exec = object_metaball_add_exec;
ot->poll = ED_operator_scene_editable;
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
/* flags */
style cleanup: editors / mesh & object
2012-04-28 15:42:27 +00:00
ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
Some effect-less code cleanup...
2012-10-05 07:05:52 +00:00
Cleanup: use `rna_enum_` prefix for RNA enums Definitions could shadow local vars.
2015-11-23 13:49:52 +11:00
ot->prop = RNA_def_enum(ot->srna, "type", rna_enum_metaelem_type_items, 0, "Primitive", "");
Clean up in "add object" code: * Get rid of ED_object_add_generic_invoke() and all invoke callbacks using it, it was doing nothing exec() callbacks would not do. In fact, its only action (setting part of common add ops properties, like loc, layers, etc.) was needed too by direct exec call, so it was done twice in case of using invoke()! * Replace custom invoke code for metaballs by WM_menu_invoke helper (as already used by lamps). * Add a new OBJECT_OT_empty_add op, to allow direct addition of empties of a given drawtype. * And some general code cleanup (like trailing spaces, empty lines, ...). Did quite a bunch of tests/verifications, but obviously could not tackle all possible scenarios... Anyway, if any, bugs should arize quite quickly (but I don’t expect any! :p ).
2012-10-05 12:59:09 +00:00
Fix T76922: Meta-balls created twice the specified size
2020-05-21 18:18:00 +10:00
ED_object_add_unit_props_radius_ex(ot, 2.0f);
Code cleanup: remove TRUE/FALSE & WITH_BOOL_COMPAT define
2014-04-01 11:34:00 +11:00
ED_object_add_generic_props(ot, true);
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
}
Fix [#20600] First added camera is not made active Also forced view align on when adding cameras
2010-01-11 06:57:41 +00:00
Cleanup: use doxy sections for object_add.c
2019-05-16 14:03:31 +10:00
/** \} */
/* -------------------------------------------------------------------- */
/** \name Add Text Operator
* \{ */
Some effect-less code cleanup...
2012-10-05 07:05: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
static int object_add_text_exec(bContext *C, wmOperator *op)
{
style cleanup: editors / mesh & object
2012-04-28 15:42:27 +00:00
Object *obedit = CTX_data_edit_object(C);
code cleanup: minor BMESH_TODO's, some were left in even though they were done/invalid.
2013-04-15 04:34:14 +00:00
bool enter_editmode;
Fix adding objects in local view
2018-12-07 12:59:04 +11:00
ushort local_view_bits;
Added location and rotation operator properties for adding objects. The Align to View boolean is now just used to set the rotation property value during invoke. This removes some reliance on 3d view info for non-interactive use, and also lets you specify new object's locations/rotations explicitly when calling from Python.
2009-12-28 04:09:46 +00:00
float loc[3], rot[3];
Some effect-less code cleanup...
2012-10-05 07:05:52 +00:00
Support more object types scene-scale (on creation) - lamp - camera - font - empty & effector Also fix inconsistency with apply transform (modified shape-keys for meshes but not curve/lattice)
2014-09-01 20:09:31 +10:00
WM_operator_view3d_unit_defaults(C, op);
Fix adding objects in local view
2018-12-07 12:59:04 +11:00
if (!ED_object_add_generic_get_opts(
Object: add scale argument to creation operators Needed for to create objects of a specific size.
2020-05-28 14:30:42 +10:00
C, op, 'Z', loc, rot, NULL, &enter_editmode, &local_view_bits, NULL)) {
adding curve and mesh objects through python would create the object without assigning it to any layers. now initialize from the scene (when the value is unset), and throw an error when the value is set to all false.
2010-06-14 15:39:50 +00:00
return OPERATOR_CANCELLED;
Fix adding objects in local view
2018-12-07 12:59:04 +11:00
}
Cleanup: style, use braces for editors
2019-04-22 09:19:45 +10:00
if (obedit && obedit->type == OB_FONT) {
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
return OPERATOR_CANCELLED;
Cleanup: style, use braces for editors
2019-04-22 09:19:45 +10: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
Fix adding objects in local view
2018-12-07 12:59:04 +11:00
obedit = ED_object_add_type(C, OB_FONT, NULL, loc, rot, enter_editmode, local_view_bits);
Support more object types scene-scale (on creation) - lamp - camera - font - empty & effector Also fix inconsistency with apply transform (modified shape-keys for meshes but not curve/lattice)
2014-09-01 20:09:31 +10:00
BKE_object_obdata_size_init(obedit, RNA_float_get(op->ptr, "radius"));
Some effect-less code cleanup...
2012-10-05 07:05: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
return OPERATOR_FINISHED;
}
void OBJECT_OT_text_add(wmOperatorType *ot)
{
/* identifiers */
style cleanup: spaces aroudn operators for operator definitions.
2012-03-22 07:26:09 +00:00
ot->name = "Add Text";
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
ot->description = "Add a text object to the scene";
style cleanup: spaces aroudn operators for operator definitions.
2012-03-22 07:26:09 +00:00
ot->idname = "OBJECT_OT_text_add";
Some effect-less code cleanup...
2012-10-05 07:05: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
/* api callbacks */
style cleanup: spaces aroudn operators for operator definitions.
2012-03-22 07:26:09 +00:00
ot->exec = object_add_text_exec;
ot->poll = ED_operator_objectmode;
Some effect-less code cleanup...
2012-10-05 07:05: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
/* flags */
style cleanup: editors / mesh & object
2012-04-28 15:42:27 +00:00
ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
Support more object types scene-scale (on creation) - lamp - camera - font - empty & effector Also fix inconsistency with apply transform (modified shape-keys for meshes but not curve/lattice)
2014-09-01 20:09:31 +10:00
/* properties */
UI: 'Add Object' rename dimensions D3943 by @Zachman w/ edits
2018-11-15 17:44:50 +11:00
ED_object_add_unit_props_radius(ot);
Code cleanup: remove TRUE/FALSE & WITH_BOOL_COMPAT define
2014-04-01 11:34:00 +11:00
ED_object_add_generic_props(ot, true);
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
}
Cleanup: use doxy sections for object_add.c
2019-05-16 14:03:31 +10:00
/** \} */
/* -------------------------------------------------------------------- */
/** \name Add Armature Operator
* \{ */
Some effect-less code cleanup...
2012-10-05 07:05: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
static int object_armature_add_exec(bContext *C, wmOperator *op)
{
Fix T79464: Crash adding objects without an active screen Running add-objects operator without an active screen would crash as CTX_data_edit_object would return NULL in this case. This could happen when adding objects from frame-change handlers for e.g. In the case of adding new objects there is no need for a context lookup, pass this directly to ED_object_editmode_exit_ex.
2020-09-11 19:50:38 +10:00
Main *bmain = CTX_data_main(C);
Scene *scene = CTX_data_scene(C);
ViewLayer *view_layer = CTX_data_view_layer(C);
Object *obedit = OBEDIT_FROM_VIEW_LAYER(view_layer);
style cleanup: editors / mesh & object
2012-04-28 15:42:27 +00:00
RegionView3D *rv3d = CTX_wm_region_view3d(C);
code cleanup: minor BMESH_TODO's, some were left in even though they were done/invalid.
2013-04-15 04:34:14 +00:00
bool newob = false;
bool enter_editmode;
Fix adding objects in local view
2018-12-07 12:59:04 +11:00
ushort local_view_bits;
Support more object types scene-scale (on creation) - lamp - camera - font - empty & effector Also fix inconsistency with apply transform (modified shape-keys for meshes but not curve/lattice)
2014-09-01 20:09:31 +10:00
float loc[3], rot[3], dia;
Fix #35997: add armature > single bone, then change location or rotation would move only the origin and not the bone. It doesn't need to use any object matrices to add the bone, the only reason this worked before is because they were still unit matrices due to depsgraph not running immediately on add.
2013-07-04 14:59:26 +00:00
bool view_aligned = rv3d && (U.flag & USER_ADD_VIEWALIGNED);
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Support more object types scene-scale (on creation) - lamp - camera - font - empty & effector Also fix inconsistency with apply transform (modified shape-keys for meshes but not curve/lattice)
2014-09-01 20:09:31 +10:00
WM_operator_view3d_unit_defaults(C, op);
Fix adding objects in local view
2018-12-07 12:59:04 +11:00
if (!ED_object_add_generic_get_opts(
Object: add scale argument to creation operators Needed for to create objects of a specific size.
2020-05-28 14:30:42 +10:00
C, op, 'Z', loc, rot, NULL, &enter_editmode, &local_view_bits, NULL)) {
adding curve and mesh objects through python would create the object without assigning it to any layers. now initialize from the scene (when the value is unset), and throw an error when the value is set to all false.
2010-06-14 15:39:50 +00:00
return OPERATOR_CANCELLED;
Fix adding objects in local view
2018-12-07 12:59:04 +11:00
}
style cleanup: editors / mesh & object
2012-04-28 15:42:27 +00:00
if ((obedit == NULL) || (obedit->type != OB_ARMATURE)) {
Fix adding objects in local view
2018-12-07 12:59:04 +11:00
obedit = ED_object_add_type(C, OB_ARMATURE, NULL, loc, rot, true, local_view_bits);
Fix T79464: Crash adding objects without an active screen Running add-objects operator without an active screen would crash as CTX_data_edit_object would return NULL in this case. This could happen when adding objects from frame-change handlers for e.g. In the case of adding new objects there is no need for a context lookup, pass this directly to ED_object_editmode_exit_ex.
2020-09-11 19:50:38 +10:00
ED_object_editmode_enter_ex(bmain, scene, obedit, 0);
code cleanup: minor BMESH_TODO's, some were left in even though they were done/invalid.
2013-04-15 04:34:14 +00:00
newob = true;
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
}
code cleanup: favor braces when blocks have mixed brace use.
2013-03-09 03:46:30 +00:00
else {
Depsgraph: Remove duplicated sets of recalc/update flags There were at least three copies of those: - OB_RECALC* family of flags, which are rudiment of an old dependency graph system. - PSYS_RECALC* which were used by old dependency graph system as a separate set since the graph itself did not handle particle systems. - DEG_TAG_* which was used to tag IDs. Now there is a single set, which defines what can be tagged and queried for an update. It also has some aggregate flags to make queries simpler. Lets once and for all solve the madness of those flags, stick to a single set, which will not overlap with anything or require any extra conversion. Technically, shouldn't be measurable user difference, but some of the agregate flags for few dependency graph components did change. Fixes T58632: Particle don't update rotation settings
2018-12-06 17:52:37 +01:00
DEG_id_tag_update(&obedit->id, ID_RECALC_GEOMETRY);
code cleanup: favor braces when blocks have mixed brace use.
2013-03-09 03:46:30 +00:00
}
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
style cleanup: editors / mesh & object
2012-04-28 15:42:27 +00:00
if (obedit == NULL) {
Changed "Convert" to "Convert to" since the first one is incorrect. Removed some dots at the end of tooltips following the standard
2011-06-04 23:02:44 +00:00
BKE_report(op->reports, RPT_ERROR, "Cannot create editmode armature");
check for error that could happen when making editmode armatures
2009-10-30 13:08:58 +00:00
return OPERATOR_CANCELLED;
}
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Support more object types scene-scale (on creation) - lamp - camera - font - empty & effector Also fix inconsistency with apply transform (modified shape-keys for meshes but not curve/lattice)
2014-09-01 20:09:31 +10:00
dia = RNA_float_get(op->ptr, "radius");
Cleanup: ED_armature naming - Wasn't clear which functions handle edit-bones. - Mixed both ebone and edit_bone in names. - Didn't use ED_armature_* prefix for public API. See P655 to apply to branches.
2018-04-15 11:45:51 +02:00
ED_armature_ebone_add_primitive(obedit, dia, view_aligned);
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02: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
/* userdef */
Cleanup: style, use braces for editors
2019-04-22 09:19:45 +10:00
if (newob && !enter_editmode) {
Fix T79464: Crash adding objects without an active screen Running add-objects operator without an active screen would crash as CTX_data_edit_object would return NULL in this case. This could happen when adding objects from frame-change handlers for e.g. In the case of adding new objects there is no need for a context lookup, pass this directly to ED_object_editmode_exit_ex.
2020-09-11 19:50:38 +10:00
ED_object_editmode_exit_ex(bmain, scene, obedit, EM_FREEDATA);
Cleanup: style, use braces for editors
2019-04-22 09:19:45 +10:00
}
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02: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
return OPERATOR_FINISHED;
}
void OBJECT_OT_armature_add(wmOperatorType *ot)
Some effect-less code cleanup...
2012-10-05 07:05: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
/* identifiers */
style cleanup: spaces aroudn operators for operator definitions.
2012-03-22 07:26:09 +00:00
ot->name = "Add Armature";
batch remove .'s used with RNA_def_struct_ui_text
2010-02-10 21:15:44 +00:00
ot->description = "Add an armature object to the scene";
style cleanup: spaces aroudn operators for operator definitions.
2012-03-22 07:26:09 +00:00
ot->idname = "OBJECT_OT_armature_add";
Some effect-less code cleanup...
2012-10-05 07:05: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
/* api callbacks */
style cleanup: spaces aroudn operators for operator definitions.
2012-03-22 07:26:09 +00:00
ot->exec = object_armature_add_exec;
ot->poll = ED_operator_objectmode;
Some effect-less code cleanup...
2012-10-05 07:05: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
/* flags */
style cleanup: editors / mesh & object
2012-04-28 15:42:27 +00:00
ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
Support more object types scene-scale (on creation) - lamp - camera - font - empty & effector Also fix inconsistency with apply transform (modified shape-keys for meshes but not curve/lattice)
2014-09-01 20:09:31 +10:00
/* properties */
UI: 'Add Object' rename dimensions D3943 by @Zachman w/ edits
2018-11-15 17:44:50 +11:00
ED_object_add_unit_props_radius(ot);
Code cleanup: remove TRUE/FALSE & WITH_BOOL_COMPAT define
2014-04-01 11:34:00 +11:00
ED_object_add_generic_props(ot, true);
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
}
Cleanup: use doxy sections for object_add.c
2019-05-16 14:03:31 +10:00
/** \} */
/* -------------------------------------------------------------------- */
/** \name Add Empty Operator
* \{ */
Clean up in "add object" code: * Get rid of ED_object_add_generic_invoke() and all invoke callbacks using it, it was doing nothing exec() callbacks would not do. In fact, its only action (setting part of common add ops properties, like loc, layers, etc.) was needed too by direct exec call, so it was done twice in case of using invoke()! * Replace custom invoke code for metaballs by WM_menu_invoke helper (as already used by lamps). * Add a new OBJECT_OT_empty_add op, to allow direct addition of empties of a given drawtype. * And some general code cleanup (like trailing spaces, empty lines, ...). Did quite a bunch of tests/verifications, but obviously could not tackle all possible scenarios... Anyway, if any, bugs should arize quite quickly (but I don’t expect any! :p ).
2012-10-05 12:59:09 +00:00
static int object_empty_add_exec(bContext *C, wmOperator *op)
{
Object *ob;
int type = RNA_enum_get(op->ptr, "type");
Fix adding objects in local view
2018-12-07 12:59:04 +11:00
ushort local_view_bits;
Clean up in "add object" code: * Get rid of ED_object_add_generic_invoke() and all invoke callbacks using it, it was doing nothing exec() callbacks would not do. In fact, its only action (setting part of common add ops properties, like loc, layers, etc.) was needed too by direct exec call, so it was done twice in case of using invoke()! * Replace custom invoke code for metaballs by WM_menu_invoke helper (as already used by lamps). * Add a new OBJECT_OT_empty_add op, to allow direct addition of empties of a given drawtype. * And some general code cleanup (like trailing spaces, empty lines, ...). Did quite a bunch of tests/verifications, but obviously could not tackle all possible scenarios... Anyway, if any, bugs should arize quite quickly (but I don’t expect any! :p ).
2012-10-05 12:59:09 +00:00
float loc[3], rot[3];
Support more object types scene-scale (on creation) - lamp - camera - font - empty & effector Also fix inconsistency with apply transform (modified shape-keys for meshes but not curve/lattice)
2014-09-01 20:09:31 +10:00
WM_operator_view3d_unit_defaults(C, op);
Object: add scale argument to creation operators Needed for to create objects of a specific size.
2020-05-28 14:30:42 +10:00
if (!ED_object_add_generic_get_opts(C, op, 'Z', loc, rot, NULL, NULL, &local_view_bits, NULL)) {
Clean up in "add object" code: * Get rid of ED_object_add_generic_invoke() and all invoke callbacks using it, it was doing nothing exec() callbacks would not do. In fact, its only action (setting part of common add ops properties, like loc, layers, etc.) was needed too by direct exec call, so it was done twice in case of using invoke()! * Replace custom invoke code for metaballs by WM_menu_invoke helper (as already used by lamps). * Add a new OBJECT_OT_empty_add op, to allow direct addition of empties of a given drawtype. * And some general code cleanup (like trailing spaces, empty lines, ...). Did quite a bunch of tests/verifications, but obviously could not tackle all possible scenarios... Anyway, if any, bugs should arize quite quickly (but I don’t expect any! :p ).
2012-10-05 12:59:09 +00:00
return OPERATOR_CANCELLED;
Fix adding objects in local view
2018-12-07 12:59:04 +11:00
}
ob = ED_object_add_type(C, OB_EMPTY, NULL, loc, rot, false, local_view_bits);
Empties with Images draw type: add support for movies and image sequences This adds an ImageUser to such empties with all the typical settings. Reviewed By: brecht, campbellbarton Differential Revision: https://developer.blender.org/D108
2014-01-13 21:57:05 +01:00
BKE_object_empty_draw_type_set(ob, type);
Support more object types scene-scale (on creation) - lamp - camera - font - empty & effector Also fix inconsistency with apply transform (modified shape-keys for meshes but not curve/lattice)
2014-09-01 20:09:31 +10:00
BKE_object_obdata_size_init(ob, RNA_float_get(op->ptr, "radius"));
Clean up in "add object" code: * Get rid of ED_object_add_generic_invoke() and all invoke callbacks using it, it was doing nothing exec() callbacks would not do. In fact, its only action (setting part of common add ops properties, like loc, layers, etc.) was needed too by direct exec call, so it was done twice in case of using invoke()! * Replace custom invoke code for metaballs by WM_menu_invoke helper (as already used by lamps). * Add a new OBJECT_OT_empty_add op, to allow direct addition of empties of a given drawtype. * And some general code cleanup (like trailing spaces, empty lines, ...). Did quite a bunch of tests/verifications, but obviously could not tackle all possible scenarios... Anyway, if any, bugs should arize quite quickly (but I don’t expect any! :p ).
2012-10-05 12:59:09 +00:00
return OPERATOR_FINISHED;
}
void OBJECT_OT_empty_add(wmOperatorType *ot)
{
/* identifiers */
ot->name = "Add Empty";
ot->description = "Add an empty object to the scene";
ot->idname = "OBJECT_OT_empty_add";
/* api callbacks */
ot->invoke = WM_menu_invoke;
ot->exec = object_empty_add_exec;
ot->poll = ED_operator_objectmode;
/* flags */
ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
/* properties */
Cleanup: use `rna_enum_` prefix for RNA enums Definitions could shadow local vars.
2015-11-23 13:49:52 +11:00
ot->prop = RNA_def_enum(ot->srna, "type", rna_enum_object_empty_drawtype_items, 0, "Type", "");
Clean up in "add object" code: * Get rid of ED_object_add_generic_invoke() and all invoke callbacks using it, it was doing nothing exec() callbacks would not do. In fact, its only action (setting part of common add ops properties, like loc, layers, etc.) was needed too by direct exec call, so it was done twice in case of using invoke()! * Replace custom invoke code for metaballs by WM_menu_invoke helper (as already used by lamps). * Add a new OBJECT_OT_empty_add op, to allow direct addition of empties of a given drawtype. * And some general code cleanup (like trailing spaces, empty lines, ...). Did quite a bunch of tests/verifications, but obviously could not tackle all possible scenarios... Anyway, if any, bugs should arize quite quickly (but I don’t expect any! :p ).
2012-10-05 12:59:09 +00:00
UI: 'Add Object' rename dimensions D3943 by @Zachman w/ edits
2018-11-15 17:44:50 +11:00
ED_object_add_unit_props_radius(ot);
Code cleanup: remove TRUE/FALSE & WITH_BOOL_COMPAT define
2014-04-01 11:34:00 +11:00
ED_object_add_generic_props(ot, false);
Clean up in "add object" code: * Get rid of ED_object_add_generic_invoke() and all invoke callbacks using it, it was doing nothing exec() callbacks would not do. In fact, its only action (setting part of common add ops properties, like loc, layers, etc.) was needed too by direct exec call, so it was done twice in case of using invoke()! * Replace custom invoke code for metaballs by WM_menu_invoke helper (as already used by lamps). * Add a new OBJECT_OT_empty_add op, to allow direct addition of empties of a given drawtype. * And some general code cleanup (like trailing spaces, empty lines, ...). Did quite a bunch of tests/verifications, but obviously could not tackle all possible scenarios... Anyway, if any, bugs should arize quite quickly (but I don’t expect any! :p ).
2012-10-05 12:59:09 +00:00
}
code cleanup: use const events for modal and invoke operators.
2013-03-13 09:03:46 +00:00
static int empty_drop_named_image_invoke(bContext *C, wmOperator *op, const wmEvent *event)
patch [#34411] Patch for image drag and drop to create Empty rather than BG image from Kevin Mackay (yakca)
2013-02-24 23:18:21 +00:00
{
Fix for dropping images into the 3D View - wasn't allocing image-user. - wasn't managing user counts.
2014-05-07 16:53:58 +10:00
Scene *scene = CTX_data_scene(C);
patch [#34411] Patch for image drag and drop to create Empty rather than BG image from Kevin Mackay (yakca)
2013-02-24 23:18:21 +00:00
Image *ima = NULL;
Cleanup: de-duplicate image drag & drop logic also don't make library paths relative on image load.
2014-11-23 22:48:48 +01:00
ima = (Image *)WM_operator_drop_load_path(C, op, ID_IM);
if (!ima) {
patch [#34411] Patch for image drag and drop to create Empty rather than BG image from Kevin Mackay (yakca)
2013-02-24 23:18:21 +00:00
return OPERATOR_CANCELLED;
}
Cleanup: de-duplicate image drag & drop logic also don't make library paths relative on image load.
2014-11-23 22:48:48 +01:00
/* handled below */
Cleanup: argument naming, redundant NULL checks
2019-10-03 07:31:24 +10:00
id_us_min(&ima->id);
patch [#34411] Patch for image drag and drop to create Empty rather than BG image from Kevin Mackay (yakca)
2013-02-24 23:18:21 +00:00
Image Empties: Usability improvements and fixes - new "Align to View" option when loading a new image - automatically align to view when dropping an image into a viewport - larger default size for image empties - fix image empty gizmo in orthographic view - new "Align Objects to View" operator Reviewer: brecht Differential: https://developer.blender.org/D3778
2018-10-09 14:36:15 +02:00
Object *ob = NULL;
Object *ob_cursor = ED_view3d_give_object_under_cursor(C, event->mval);
patch [#34411] Patch for image drag and drop to create Empty rather than BG image from Kevin Mackay (yakca)
2013-02-24 23:18:21 +00:00
Image Empties: Usability improvements and fixes - new "Align to View" option when loading a new image - automatically align to view when dropping an image into a viewport - larger default size for image empties - fix image empty gizmo in orthographic view - new "Align Objects to View" operator Reviewer: brecht Differential: https://developer.blender.org/D3778
2018-10-09 14:36:15 +02:00
/* either change empty under cursor or create a new empty */
if (ob_cursor && ob_cursor->type == OB_EMPTY) {
Fix for dropping images into the 3D View - wasn't allocing image-user. - wasn't managing user counts.
2014-05-07 16:53:58 +10:00
WM_event_add_notifier(C, NC_SCENE | ND_OB_ACTIVE, scene);
Depsgraph: Remove duplicated sets of recalc/update flags There were at least three copies of those: - OB_RECALC* family of flags, which are rudiment of an old dependency graph system. - PSYS_RECALC* which were used by old dependency graph system as a separate set since the graph itself did not handle particle systems. - DEG_TAG_* which was used to tag IDs. Now there is a single set, which defines what can be tagged and queried for an update. It also has some aggregate flags to make queries simpler. Lets once and for all solve the madness of those flags, stick to a single set, which will not overlap with anything or require any extra conversion. Technically, shouldn't be measurable user difference, but some of the agregate flags for few dependency graph components did change. Fixes T58632: Particle don't update rotation settings
2018-12-06 17:52:37 +01:00
DEG_id_tag_update((ID *)ob_cursor, ID_RECALC_TRANSFORM);
Image Empties: Usability improvements and fixes - new "Align to View" option when loading a new image - automatically align to view when dropping an image into a viewport - larger default size for image empties - fix image empty gizmo in orthographic view - new "Align Objects to View" operator Reviewer: brecht Differential: https://developer.blender.org/D3778
2018-10-09 14:36:15 +02:00
ob = ob_cursor;
patch [#34411] Patch for image drag and drop to create Empty rather than BG image from Kevin Mackay (yakca)
2013-02-24 23:18:21 +00:00
}
else {
Fix adding objects in local view
2018-12-07 12:59:04 +11:00
/* add new empty */
ushort local_view_bits;
float rot[3];
Object: add scale argument to creation operators Needed for to create objects of a specific size.
2020-05-28 14:30:42 +10:00
if (!ED_object_add_generic_get_opts(
C, op, 'Z', NULL, rot, NULL, NULL, &local_view_bits, NULL)) {
Fix adding objects in local view
2018-12-07 12:59:04 +11:00
return OPERATOR_CANCELLED;
}
ob = ED_object_add_type(C, OB_EMPTY, NULL, NULL, rot, false, local_view_bits);
fix for own error r54703, the event->mval was relative to a different region. also make recent image dnd patch add the new object at the mouse cursor.
2013-02-25 00:45:20 +00:00
ED_object_location_from_view(C, ob->loc);
Add depth and orientation options to 3D cursor tool
2018-06-22 15:07:11 +02:00
ED_view3d_cursor3d_position(C, event->mval, false, ob->loc);
Image Empties: Usability improvements and fixes - new "Align to View" option when loading a new image - automatically align to view when dropping an image into a viewport - larger default size for image empties - fix image empty gizmo in orthographic view - new "Align Objects to View" operator Reviewer: brecht Differential: https://developer.blender.org/D3778
2018-10-09 14:36:15 +02:00
ED_object_rotation_from_view(C, ob->rot, 'Z');
Empty Image: use draw size instead of object scale Object scale has implications for parenting, use draw size instead. Also use add-empty view_align option instead of a separate operator.
2018-10-10 08:55:23 +11:00
ob->empty_drawsize = 5.0f;
patch [#34411] Patch for image drag and drop to create Empty rather than BG image from Kevin Mackay (yakca)
2013-02-24 23:18:21 +00:00
}
Fix for dropping images into the 3D View - wasn't allocing image-user. - wasn't managing user counts.
2014-05-07 16:53:58 +10:00
BKE_object_empty_draw_type_set(ob, OB_EMPTY_IMAGE);
id_us_min(ob->data);
patch [#34411] Patch for image drag and drop to create Empty rather than BG image from Kevin Mackay (yakca)
2013-02-24 23:18:21 +00:00
ob->data = ima;
Fix for dropping images into the 3D View - wasn't allocing image-user. - wasn't managing user counts.
2014-05-07 16:53:58 +10:00
id_us_plus(ob->data);
patch [#34411] Patch for image drag and drop to create Empty rather than BG image from Kevin Mackay (yakca)
2013-02-24 23:18:21 +00:00
now dragging an image onto an empty can be done without holding Ctrl. Make it set the empty draw type for existing empty object. change from yakca on IRC also some whitespace cleanup.
2013-03-02 12:05:25 +00:00
return OPERATOR_FINISHED;
patch [#34411] Patch for image drag and drop to create Empty rather than BG image from Kevin Mackay (yakca)
2013-02-24 23:18:21 +00:00
}
void OBJECT_OT_drop_named_image(wmOperatorType *ot)
{
PropertyRNA *prop;
/* identifiers */
UI: Fix Capitalization Differential Revision: https://developer.blender.org/D5716
2019-09-20 14:31:24 +02:00
ot->name = "Add Empty Image/Drop Image to Empty";
patch [#34411] Patch for image drag and drop to create Empty rather than BG image from Kevin Mackay (yakca)
2013-02-24 23:18:21 +00:00
ot->description = "Add an empty image type to scene with data";
ot->idname = "OBJECT_OT_drop_named_image";
/* api callbacks */
ot->invoke = empty_drop_named_image_invoke;
ot->poll = ED_operator_objectmode;
/* flags */
ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
/* properties */
Code Cleanup: no need to pass empty strings as default values
2014-01-16 21:43:22 +11:00
prop = RNA_def_string(ot->srna, "filepath", NULL, FILE_MAX, "Filepath", "Path to image file");
patch [#34411] Patch for image drag and drop to create Empty rather than BG image from Kevin Mackay (yakca)
2013-02-24 23:18:21 +00:00
RNA_def_property_flag(prop, PROP_HIDDEN | PROP_SKIP_SAVE);
More fixes related to D&D: * Same issue as T42760 was also reproducible in some cases in 3DView. * You got an error message about missing RNA prop in some drop-called operators. * You could not drop a movie file in nodes, (some cases of) 3DView, nor ImageEditor.
2014-11-30 17:18:03 +01:00
RNA_def_boolean(ot->srna,
"relative_path",
true,
"Relative Path",
"Select the file relative to the blend file");
RNA_def_property_flag(prop, PROP_HIDDEN | PROP_SKIP_SAVE);
Code Cleanup: no need to pass empty strings as default values
2014-01-16 21:43:22 +11:00
prop = RNA_def_string(ot->srna, "name", NULL, MAX_ID_NAME - 2, "Name", "Image name to assign");
patch [#34411] Patch for image drag and drop to create Empty rather than BG image from Kevin Mackay (yakca)
2013-02-24 23:18:21 +00:00
RNA_def_property_flag(prop, PROP_HIDDEN | PROP_SKIP_SAVE);
Code cleanup: remove TRUE/FALSE & WITH_BOOL_COMPAT define
2014-04-01 11:34:00 +11:00
ED_object_add_generic_props(ot, false);
patch [#34411] Patch for image drag and drop to create Empty rather than BG image from Kevin Mackay (yakca)
2013-02-24 23:18:21 +00:00
}
Cleanup: use doxy sections for object_add.c
2019-05-16 14:03:31 +10:00
/** \} */
/* -------------------------------------------------------------------- */
/** \name Add Gpencil Operator
* \{ */
GP: Cleanup previous commit
2019-01-21 18:30:15 +01:00
static bool object_gpencil_add_poll(bContext *C)
Fix T60714: Avoid creation of nested objects In grease pencil is not logic add an object inside other object in edit mode. The object must be created only in Object mode.
2019-01-21 18:29:02 +01:00
{
Scene *scene = CTX_data_scene(C);
Object *obact = CTX_data_active_object(C);
if ((scene == NULL) || (ID_IS_LINKED(scene))) {
return false;
}
if (obact && obact->type == OB_GPENCIL) {
if (obact->mode != OB_MODE_OBJECT) {
return false;
}
}
return true;
}
New Grease Pencil object for 2D animation This commit merge the full development done in greasepencil-object branch and include mainly the following features. - New grease pencil object. - New drawing engine. - New grease pencil modes Draw/Sculpt/Edit and Weight Paint. - New brushes for grease pencil. - New modifiers for grease pencil. - New shaders FX. - New material system (replace old palettes and colors). - Split of annotations (old grease pencil) and new grease pencil object. - UI adapted to blender 2.8. You can get more info here: https://code.blender.org/2017/12/drawing-2d-animation-in-blender-2-8/ https://code.blender.org/2018/07/grease-pencil-status-update/ This is the result of nearly two years of development and I want thanks firstly the other members of the grease pencil team: Daniel M. Lara, Matias Mendiola and Joshua Leung for their support, ideas and to keep working in the project all the time, without them this project had been impossible. Also, I want thanks other Blender developers for their help, advices and to be there always to help me, and specially to Clément Foucault, Dalai Felinto, Pablo Vázquez and Campbell Barton.
2018-07-31 10:22:19 +02:00
static int object_gpencil_add_exec(bContext *C, wmOperator *op)
{
Grease Pencil: Add LineArt modifier This adds the LineArt grease pencil modifier. It takes objects or collections as input and generates various grease pencil lines from these objects with the help of the active scene camera. For example it can generate contour lines, intersection lines and crease lines to name a few. This is really useful as artists can then use 3D meshes to automatically generate grease pencil lines for characters, enviroments or other visualization purposes. These lines can then be baked and edited as regular grease pencil lines. Reviewed By: Sebastian Parborg, Antonio Vazquez, Matias Mendiola Differential Revision: http://developer.blender.org/D8758
2021-03-16 19:35:53 +01:00
Object *ob = CTX_data_active_object(C), *ob_orig = ob;
New Grease Pencil object for 2D animation This commit merge the full development done in greasepencil-object branch and include mainly the following features. - New grease pencil object. - New drawing engine. - New grease pencil modes Draw/Sculpt/Edit and Weight Paint. - New brushes for grease pencil. - New modifiers for grease pencil. - New shaders FX. - New material system (replace old palettes and colors). - Split of annotations (old grease pencil) and new grease pencil object. - UI adapted to blender 2.8. You can get more info here: https://code.blender.org/2017/12/drawing-2d-animation-in-blender-2-8/ https://code.blender.org/2018/07/grease-pencil-status-update/ This is the result of nearly two years of development and I want thanks firstly the other members of the grease pencil team: Daniel M. Lara, Matias Mendiola and Joshua Leung for their support, ideas and to keep working in the project all the time, without them this project had been impossible. Also, I want thanks other Blender developers for their help, advices and to be there always to help me, and specially to Clément Foucault, Dalai Felinto, Pablo Vázquez and Campbell Barton.
2018-07-31 10:22:19 +02:00
bGPdata *gpd = (ob && (ob->type == OB_GPENCIL)) ? ob->data : NULL;
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
New Grease Pencil object for 2D animation This commit merge the full development done in greasepencil-object branch and include mainly the following features. - New grease pencil object. - New drawing engine. - New grease pencil modes Draw/Sculpt/Edit and Weight Paint. - New brushes for grease pencil. - New modifiers for grease pencil. - New shaders FX. - New material system (replace old palettes and colors). - Split of annotations (old grease pencil) and new grease pencil object. - UI adapted to blender 2.8. You can get more info here: https://code.blender.org/2017/12/drawing-2d-animation-in-blender-2-8/ https://code.blender.org/2018/07/grease-pencil-status-update/ This is the result of nearly two years of development and I want thanks firstly the other members of the grease pencil team: Daniel M. Lara, Matias Mendiola and Joshua Leung for their support, ideas and to keep working in the project all the time, without them this project had been impossible. Also, I want thanks other Blender developers for their help, advices and to be there always to help me, and specially to Clément Foucault, Dalai Felinto, Pablo Vázquez and Campbell Barton.
2018-07-31 10:22:19 +02:00
const int type = RNA_enum_get(op->ptr, "type");
LineArt: Custom UI for adding GP object. This allows extra options (in-front and stroke order) to be shown when adding line art kind of grease pencil object. Reviewed by: Antonio Vazquez (antoniov) Diff: https://developer.blender.org/D11130
2021-05-10 09:15:33 +08:00
const bool use_in_front = RNA_boolean_get(op->ptr, "use_in_front");
GPencil: Add a use_light option when creating object. This option is default off when creating line art objects because line art seldom use lighting and the normal data would be all over the place anyway. Reviewed By: Antonio Vazquez (antoniov) Differential Revision: https://developer.blender.org/D11372
2021-05-25 23:45:47 +08:00
const bool use_lights = RNA_boolean_get(op->ptr, "use_lights");
LineArt: Custom UI for adding GP object. This allows extra options (in-front and stroke order) to be shown when adding line art kind of grease pencil object. Reviewed by: Antonio Vazquez (antoniov) Diff: https://developer.blender.org/D11130
2021-05-10 09:15:33 +08:00
const int stroke_depth_order = RNA_enum_get(op->ptr, "stroke_depth_order");
LineArt: Stroke offset towards camera. Allows the user to turn off in_front option for grease pencil object and offset strokes towards camera to allow depth interaction of the rest of the scene. Reviewed By: Antonio Vazquez (antoniov) Differential Revision: https://developer.blender.org/D12046
2021-10-26 22:55:27 +08:00
const float stroke_depth_offset = RNA_float_get(op->ptr, "stroke_depth_offset");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Fix adding objects in local view
2018-12-07 12:59:04 +11:00
ushort local_view_bits;
New Grease Pencil object for 2D animation This commit merge the full development done in greasepencil-object branch and include mainly the following features. - New grease pencil object. - New drawing engine. - New grease pencil modes Draw/Sculpt/Edit and Weight Paint. - New brushes for grease pencil. - New modifiers for grease pencil. - New shaders FX. - New material system (replace old palettes and colors). - Split of annotations (old grease pencil) and new grease pencil object. - UI adapted to blender 2.8. You can get more info here: https://code.blender.org/2017/12/drawing-2d-animation-in-blender-2-8/ https://code.blender.org/2018/07/grease-pencil-status-update/ This is the result of nearly two years of development and I want thanks firstly the other members of the grease pencil team: Daniel M. Lara, Matias Mendiola and Joshua Leung for their support, ideas and to keep working in the project all the time, without them this project had been impossible. Also, I want thanks other Blender developers for their help, advices and to be there always to help me, and specially to Clément Foucault, Dalai Felinto, Pablo Vázquez and Campbell Barton.
2018-07-31 10:22:19 +02:00
float loc[3], rot[3];
bool newob = false;
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Cleanup: consistent use of tags: NOTE/TODO/FIXME/XXX Also use doxy style function reference `#` prefix chars when referencing identifiers.
2021-07-03 23:08:40 +10:00
/* NOTE: We use 'Y' here (not 'Z'), as. */
New Grease Pencil object for 2D animation This commit merge the full development done in greasepencil-object branch and include mainly the following features. - New grease pencil object. - New drawing engine. - New grease pencil modes Draw/Sculpt/Edit and Weight Paint. - New brushes for grease pencil. - New modifiers for grease pencil. - New shaders FX. - New material system (replace old palettes and colors). - Split of annotations (old grease pencil) and new grease pencil object. - UI adapted to blender 2.8. You can get more info here: https://code.blender.org/2017/12/drawing-2d-animation-in-blender-2-8/ https://code.blender.org/2018/07/grease-pencil-status-update/ This is the result of nearly two years of development and I want thanks firstly the other members of the grease pencil team: Daniel M. Lara, Matias Mendiola and Joshua Leung for their support, ideas and to keep working in the project all the time, without them this project had been impossible. Also, I want thanks other Blender developers for their help, advices and to be there always to help me, and specially to Clément Foucault, Dalai Felinto, Pablo Vázquez and Campbell Barton.
2018-07-31 10:22:19 +02:00
WM_operator_view3d_unit_defaults(C, op);
Object: add scale argument to creation operators Needed for to create objects of a specific size.
2020-05-28 14:30:42 +10:00
if (!ED_object_add_generic_get_opts(C, op, 'Y', loc, rot, NULL, NULL, &local_view_bits, NULL)) {
New Grease Pencil object for 2D animation This commit merge the full development done in greasepencil-object branch and include mainly the following features. - New grease pencil object. - New drawing engine. - New grease pencil modes Draw/Sculpt/Edit and Weight Paint. - New brushes for grease pencil. - New modifiers for grease pencil. - New shaders FX. - New material system (replace old palettes and colors). - Split of annotations (old grease pencil) and new grease pencil object. - UI adapted to blender 2.8. You can get more info here: https://code.blender.org/2017/12/drawing-2d-animation-in-blender-2-8/ https://code.blender.org/2018/07/grease-pencil-status-update/ This is the result of nearly two years of development and I want thanks firstly the other members of the grease pencil team: Daniel M. Lara, Matias Mendiola and Joshua Leung for their support, ideas and to keep working in the project all the time, without them this project had been impossible. Also, I want thanks other Blender developers for their help, advices and to be there always to help me, and specially to Clément Foucault, Dalai Felinto, Pablo Vázquez and Campbell Barton.
2018-07-31 10:22:19 +02:00
return OPERATOR_CANCELLED;
Fix adding objects in local view
2018-12-07 12:59:04 +11:00
}
GPencil: Add Layer and Material to Blank objects Instead to create only the Blank object, now a new Layer and a simple material is added. This is a common request of artists. Reviewed By: mendio, pepeland Differential Revision: https://developer.blender.org/D11110
2021-04-28 23:38:03 +02:00
/* Add new object if not currently editing a GP object. */
if ((gpd == NULL) || (GPENCIL_ANY_MODE(gpd) == false)) {
Silence GP warning
2018-09-10 11:40:27 -03:00
const char *ob_name = NULL;
GP: Use correct name for new Stroke object To follow Blender standards, the name of the new primitive stroke must be different of blank object. Also changed the default orientation of Suzanne 2D to use the same as other objects (not aligned by default)
2018-09-10 15:29:22 +02:00
switch (type) {
GPencil: Add Layer and Material to Blank objects Instead to create only the Blank object, now a new Layer and a simple material is added. This is a common request of artists. Reviewed By: mendio, pepeland Differential Revision: https://developer.blender.org/D11110
2021-04-28 23:38:03 +02:00
case GP_EMPTY: {
ob_name = "GPencil";
break;
}
GP: Use correct name for new Stroke object To follow Blender standards, the name of the new primitive stroke must be different of blank object. Also changed the default orientation of Suzanne 2D to use the same as other objects (not aligned by default)
2018-09-10 15:29:22 +02:00
case GP_MONKEY: {
ob_name = "Suzanne";
break;
}
case GP_STROKE: {
ob_name = "Stroke";
break;
}
Grease Pencil: Add LineArt modifier This adds the LineArt grease pencil modifier. It takes objects or collections as input and generates various grease pencil lines from these objects with the help of the active scene camera. For example it can generate contour lines, intersection lines and crease lines to name a few. This is really useful as artists can then use 3D meshes to automatically generate grease pencil lines for characters, enviroments or other visualization purposes. These lines can then be baked and edited as regular grease pencil lines. Reviewed By: Sebastian Parborg, Antonio Vazquez, Matias Mendiola Differential Revision: http://developer.blender.org/D8758
2021-03-16 19:35:53 +01:00
case GP_LRT_OBJECT:
GPencil: Name Scene Line Art objects "Line Art" Matching Object and Collection line art type objects.
2021-05-09 01:51:12 +02:00
case GP_LRT_SCENE:
Grease Pencil: Add LineArt modifier This adds the LineArt grease pencil modifier. It takes objects or collections as input and generates various grease pencil lines from these objects with the help of the active scene camera. For example it can generate contour lines, intersection lines and crease lines to name a few. This is really useful as artists can then use 3D meshes to automatically generate grease pencil lines for characters, enviroments or other visualization purposes. These lines can then be baked and edited as regular grease pencil lines. Reviewed By: Sebastian Parborg, Antonio Vazquez, Matias Mendiola Differential Revision: http://developer.blender.org/D8758
2021-03-16 19:35:53 +01:00
case GP_LRT_COLLECTION: {
ob_name = "Line Art";
break;
}
GP: Use correct name for new Stroke object To follow Blender standards, the name of the new primitive stroke must be different of blank object. Also changed the default orientation of Suzanne 2D to use the same as other objects (not aligned by default)
2018-09-10 15:29:22 +02:00
default: {
break;
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
}
GP: Use correct name for new Stroke object To follow Blender standards, the name of the new primitive stroke must be different of blank object. Also changed the default orientation of Suzanne 2D to use the same as other objects (not aligned by default)
2018-09-10 15:29:22 +02:00
}
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Fix adding objects in local view
2018-12-07 12:59:04 +11:00
ob = ED_object_add_type(C, OB_GPENCIL, ob_name, loc, rot, true, local_view_bits);
New Grease Pencil object for 2D animation This commit merge the full development done in greasepencil-object branch and include mainly the following features. - New grease pencil object. - New drawing engine. - New grease pencil modes Draw/Sculpt/Edit and Weight Paint. - New brushes for grease pencil. - New modifiers for grease pencil. - New shaders FX. - New material system (replace old palettes and colors). - Split of annotations (old grease pencil) and new grease pencil object. - UI adapted to blender 2.8. You can get more info here: https://code.blender.org/2017/12/drawing-2d-animation-in-blender-2-8/ https://code.blender.org/2018/07/grease-pencil-status-update/ This is the result of nearly two years of development and I want thanks firstly the other members of the grease pencil team: Daniel M. Lara, Matias Mendiola and Joshua Leung for their support, ideas and to keep working in the project all the time, without them this project had been impossible. Also, I want thanks other Blender developers for their help, advices and to be there always to help me, and specially to Clément Foucault, Dalai Felinto, Pablo Vázquez and Campbell Barton.
2018-07-31 10:22:19 +02:00
gpd = ob->data;
newob = true;
}
else {
Depsgraph: Remove duplicated sets of recalc/update flags There were at least three copies of those: - OB_RECALC* family of flags, which are rudiment of an old dependency graph system. - PSYS_RECALC* which were used by old dependency graph system as a separate set since the graph itself did not handle particle systems. - DEG_TAG_* which was used to tag IDs. Now there is a single set, which defines what can be tagged and queried for an update. It also has some aggregate flags to make queries simpler. Lets once and for all solve the madness of those flags, stick to a single set, which will not overlap with anything or require any extra conversion. Technically, shouldn't be measurable user difference, but some of the agregate flags for few dependency graph components did change. Fixes T58632: Particle don't update rotation settings
2018-12-06 17:52:37 +01:00
DEG_id_tag_update(&ob->id, ID_RECALC_GEOMETRY);
New Grease Pencil object for 2D animation This commit merge the full development done in greasepencil-object branch and include mainly the following features. - New grease pencil object. - New drawing engine. - New grease pencil modes Draw/Sculpt/Edit and Weight Paint. - New brushes for grease pencil. - New modifiers for grease pencil. - New shaders FX. - New material system (replace old palettes and colors). - Split of annotations (old grease pencil) and new grease pencil object. - UI adapted to blender 2.8. You can get more info here: https://code.blender.org/2017/12/drawing-2d-animation-in-blender-2-8/ https://code.blender.org/2018/07/grease-pencil-status-update/ This is the result of nearly two years of development and I want thanks firstly the other members of the grease pencil team: Daniel M. Lara, Matias Mendiola and Joshua Leung for their support, ideas and to keep working in the project all the time, without them this project had been impossible. Also, I want thanks other Blender developers for their help, advices and to be there always to help me, and specially to Clément Foucault, Dalai Felinto, Pablo Vázquez and Campbell Barton.
2018-07-31 10:22:19 +02:00
WM_event_add_notifier(C, NC_GPENCIL | ND_DATA | NA_ADDED, NULL);
}
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
New Grease Pencil object for 2D animation This commit merge the full development done in greasepencil-object branch and include mainly the following features. - New grease pencil object. - New drawing engine. - New grease pencil modes Draw/Sculpt/Edit and Weight Paint. - New brushes for grease pencil. - New modifiers for grease pencil. - New shaders FX. - New material system (replace old palettes and colors). - Split of annotations (old grease pencil) and new grease pencil object. - UI adapted to blender 2.8. You can get more info here: https://code.blender.org/2017/12/drawing-2d-animation-in-blender-2-8/ https://code.blender.org/2018/07/grease-pencil-status-update/ This is the result of nearly two years of development and I want thanks firstly the other members of the grease pencil team: Daniel M. Lara, Matias Mendiola and Joshua Leung for their support, ideas and to keep working in the project all the time, without them this project had been impossible. Also, I want thanks other Blender developers for their help, advices and to be there always to help me, and specially to Clément Foucault, Dalai Felinto, Pablo Vázquez and Campbell Barton.
2018-07-31 10:22:19 +02:00
/* create relevant geometry */
switch (type) {
GPencil: Add Layer and Material to Blank objects Instead to create only the Blank object, now a new Layer and a simple material is added. This is a common request of artists. Reviewed By: mendio, pepeland Differential Revision: https://developer.blender.org/D11110
2021-04-28 23:38:03 +02:00
case GP_EMPTY: {
float mat[4][4];
Fix T84638: Wrong scale for primitives with radius Creating some primitives allows for a scale value (via python) that will scale the object accordingly. For objects with a radius parameter (like cylinders, spheres, etc.) passing a scale different to (1,1,1) would result in unexpected behavior. For example: `>>> bpy.ops.mesh.primitive_uv_sphere_add(radius=2, scale=(1,1,2))` We would expect this to create a sphere with a radius of 2 (dimensions 4,4,4) and then be scaled *2 along the z-axis (dimensions 4,4,8). But this would previously create a scaled sphere with dimensions (2,2,4). The scale was simply divided by two. Maybe because the "radius" parameter for creating the primitives was confusingly named "diameter" (but used as the radius). The fix adds a scale parameter to `ED_object_new_primitive_matrix` and also renames the wrongly named "diameter" parameters to "radius". Reviewed By: campbellbarton Maniphest Tasks: T84638 Ref D10093
2021-09-13 17:50:41 +10:00
ED_object_new_primitive_matrix(C, ob, loc, rot, NULL, mat);
GPencil: Add Layer and Material to Blank objects Instead to create only the Blank object, now a new Layer and a simple material is added. This is a common request of artists. Reviewed By: mendio, pepeland Differential Revision: https://developer.blender.org/D11110
2021-04-28 23:38:03 +02:00
ED_gpencil_create_blank(C, ob, mat);
break;
}
New grease pencil primitive STROKE This creates a simple stroke with several colors to have a basic structure to start drawing.
2018-08-03 17:37:21 +02:00
case GP_STROKE: {
float radius = RNA_float_get(op->ptr, "radius");
Fix T84638: Wrong scale for primitives with radius Creating some primitives allows for a scale value (via python) that will scale the object accordingly. For objects with a radius parameter (like cylinders, spheres, etc.) passing a scale different to (1,1,1) would result in unexpected behavior. For example: `>>> bpy.ops.mesh.primitive_uv_sphere_add(radius=2, scale=(1,1,2))` We would expect this to create a sphere with a radius of 2 (dimensions 4,4,4) and then be scaled *2 along the z-axis (dimensions 4,4,8). But this would previously create a scaled sphere with dimensions (2,2,4). The scale was simply divided by two. Maybe because the "radius" parameter for creating the primitives was confusingly named "diameter" (but used as the radius). The fix adds a scale parameter to `ED_object_new_primitive_matrix` and also renames the wrongly named "diameter" parameters to "radius". Reviewed By: campbellbarton Maniphest Tasks: T84638 Ref D10093
2021-09-13 17:50:41 +10:00
float scale[3];
copy_v3_fl(scale, radius);
New grease pencil primitive STROKE This creates a simple stroke with several colors to have a basic structure to start drawing.
2018-08-03 17:37:21 +02:00
float mat[4][4];
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Fix T84638: Wrong scale for primitives with radius Creating some primitives allows for a scale value (via python) that will scale the object accordingly. For objects with a radius parameter (like cylinders, spheres, etc.) passing a scale different to (1,1,1) would result in unexpected behavior. For example: `>>> bpy.ops.mesh.primitive_uv_sphere_add(radius=2, scale=(1,1,2))` We would expect this to create a sphere with a radius of 2 (dimensions 4,4,4) and then be scaled *2 along the z-axis (dimensions 4,4,8). But this would previously create a scaled sphere with dimensions (2,2,4). The scale was simply divided by two. Maybe because the "radius" parameter for creating the primitives was confusingly named "diameter" (but used as the radius). The fix adds a scale parameter to `ED_object_new_primitive_matrix` and also renames the wrongly named "diameter" parameters to "radius". Reviewed By: campbellbarton Maniphest Tasks: T84638 Ref D10093
2021-09-13 17:50:41 +10:00
ED_object_new_primitive_matrix(C, ob, loc, rot, scale, mat);
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Fix T60022: Crash when adding grease pencil object to a collection disabled in viewport. See D4163 Thanks to Habib Gahbiche (@zazizizou) for the fix.
2019-01-03 18:10:39 +01:00
ED_gpencil_create_stroke(C, ob, mat);
New grease pencil primitive STROKE This creates a simple stroke with several colors to have a basic structure to start drawing.
2018-08-03 17:37:21 +02:00
break;
}
New Grease Pencil object for 2D animation This commit merge the full development done in greasepencil-object branch and include mainly the following features. - New grease pencil object. - New drawing engine. - New grease pencil modes Draw/Sculpt/Edit and Weight Paint. - New brushes for grease pencil. - New modifiers for grease pencil. - New shaders FX. - New material system (replace old palettes and colors). - Split of annotations (old grease pencil) and new grease pencil object. - UI adapted to blender 2.8. You can get more info here: https://code.blender.org/2017/12/drawing-2d-animation-in-blender-2-8/ https://code.blender.org/2018/07/grease-pencil-status-update/ This is the result of nearly two years of development and I want thanks firstly the other members of the grease pencil team: Daniel M. Lara, Matias Mendiola and Joshua Leung for their support, ideas and to keep working in the project all the time, without them this project had been impossible. Also, I want thanks other Blender developers for their help, advices and to be there always to help me, and specially to Clément Foucault, Dalai Felinto, Pablo Vázquez and Campbell Barton.
2018-07-31 10:22:19 +02:00
case GP_MONKEY: {
float radius = RNA_float_get(op->ptr, "radius");
Fix T84638: Wrong scale for primitives with radius Creating some primitives allows for a scale value (via python) that will scale the object accordingly. For objects with a radius parameter (like cylinders, spheres, etc.) passing a scale different to (1,1,1) would result in unexpected behavior. For example: `>>> bpy.ops.mesh.primitive_uv_sphere_add(radius=2, scale=(1,1,2))` We would expect this to create a sphere with a radius of 2 (dimensions 4,4,4) and then be scaled *2 along the z-axis (dimensions 4,4,8). But this would previously create a scaled sphere with dimensions (2,2,4). The scale was simply divided by two. Maybe because the "radius" parameter for creating the primitives was confusingly named "diameter" (but used as the radius). The fix adds a scale parameter to `ED_object_new_primitive_matrix` and also renames the wrongly named "diameter" parameters to "radius". Reviewed By: campbellbarton Maniphest Tasks: T84638 Ref D10093
2021-09-13 17:50:41 +10:00
float scale[3];
copy_v3_fl(scale, radius);
New Grease Pencil object for 2D animation This commit merge the full development done in greasepencil-object branch and include mainly the following features. - New grease pencil object. - New drawing engine. - New grease pencil modes Draw/Sculpt/Edit and Weight Paint. - New brushes for grease pencil. - New modifiers for grease pencil. - New shaders FX. - New material system (replace old palettes and colors). - Split of annotations (old grease pencil) and new grease pencil object. - UI adapted to blender 2.8. You can get more info here: https://code.blender.org/2017/12/drawing-2d-animation-in-blender-2-8/ https://code.blender.org/2018/07/grease-pencil-status-update/ This is the result of nearly two years of development and I want thanks firstly the other members of the grease pencil team: Daniel M. Lara, Matias Mendiola and Joshua Leung for their support, ideas and to keep working in the project all the time, without them this project had been impossible. Also, I want thanks other Blender developers for their help, advices and to be there always to help me, and specially to Clément Foucault, Dalai Felinto, Pablo Vázquez and Campbell Barton.
2018-07-31 10:22:19 +02:00
float mat[4][4];
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Fix T84638: Wrong scale for primitives with radius Creating some primitives allows for a scale value (via python) that will scale the object accordingly. For objects with a radius parameter (like cylinders, spheres, etc.) passing a scale different to (1,1,1) would result in unexpected behavior. For example: `>>> bpy.ops.mesh.primitive_uv_sphere_add(radius=2, scale=(1,1,2))` We would expect this to create a sphere with a radius of 2 (dimensions 4,4,4) and then be scaled *2 along the z-axis (dimensions 4,4,8). But this would previously create a scaled sphere with dimensions (2,2,4). The scale was simply divided by two. Maybe because the "radius" parameter for creating the primitives was confusingly named "diameter" (but used as the radius). The fix adds a scale parameter to `ED_object_new_primitive_matrix` and also renames the wrongly named "diameter" parameters to "radius". Reviewed By: campbellbarton Maniphest Tasks: T84638 Ref D10093
2021-09-13 17:50:41 +10:00
ED_object_new_primitive_matrix(C, ob, loc, rot, scale, mat);
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Fix T60022: Crash when adding grease pencil object to a collection disabled in viewport. See D4163 Thanks to Habib Gahbiche (@zazizizou) for the fix.
2019-01-03 18:10:39 +01:00
ED_gpencil_create_monkey(C, ob, mat);
New Grease Pencil object for 2D animation This commit merge the full development done in greasepencil-object branch and include mainly the following features. - New grease pencil object. - New drawing engine. - New grease pencil modes Draw/Sculpt/Edit and Weight Paint. - New brushes for grease pencil. - New modifiers for grease pencil. - New shaders FX. - New material system (replace old palettes and colors). - Split of annotations (old grease pencil) and new grease pencil object. - UI adapted to blender 2.8. You can get more info here: https://code.blender.org/2017/12/drawing-2d-animation-in-blender-2-8/ https://code.blender.org/2018/07/grease-pencil-status-update/ This is the result of nearly two years of development and I want thanks firstly the other members of the grease pencil team: Daniel M. Lara, Matias Mendiola and Joshua Leung for their support, ideas and to keep working in the project all the time, without them this project had been impossible. Also, I want thanks other Blender developers for their help, advices and to be there always to help me, and specially to Clément Foucault, Dalai Felinto, Pablo Vázquez and Campbell Barton.
2018-07-31 10:22:19 +02:00
break;
}
Grease Pencil: Add LineArt modifier This adds the LineArt grease pencil modifier. It takes objects or collections as input and generates various grease pencil lines from these objects with the help of the active scene camera. For example it can generate contour lines, intersection lines and crease lines to name a few. This is really useful as artists can then use 3D meshes to automatically generate grease pencil lines for characters, enviroments or other visualization purposes. These lines can then be baked and edited as regular grease pencil lines. Reviewed By: Sebastian Parborg, Antonio Vazquez, Matias Mendiola Differential Revision: http://developer.blender.org/D8758
2021-03-16 19:35:53 +01:00
case GP_LRT_SCENE:
case GP_LRT_COLLECTION:
case GP_LRT_OBJECT: {
float radius = RNA_float_get(op->ptr, "radius");
Fix T84638: Wrong scale for primitives with radius Creating some primitives allows for a scale value (via python) that will scale the object accordingly. For objects with a radius parameter (like cylinders, spheres, etc.) passing a scale different to (1,1,1) would result in unexpected behavior. For example: `>>> bpy.ops.mesh.primitive_uv_sphere_add(radius=2, scale=(1,1,2))` We would expect this to create a sphere with a radius of 2 (dimensions 4,4,4) and then be scaled *2 along the z-axis (dimensions 4,4,8). But this would previously create a scaled sphere with dimensions (2,2,4). The scale was simply divided by two. Maybe because the "radius" parameter for creating the primitives was confusingly named "diameter" (but used as the radius). The fix adds a scale parameter to `ED_object_new_primitive_matrix` and also renames the wrongly named "diameter" parameters to "radius". Reviewed By: campbellbarton Maniphest Tasks: T84638 Ref D10093
2021-09-13 17:50:41 +10:00
float scale[3];
copy_v3_fl(scale, radius);
Grease Pencil: Add LineArt modifier This adds the LineArt grease pencil modifier. It takes objects or collections as input and generates various grease pencil lines from these objects with the help of the active scene camera. For example it can generate contour lines, intersection lines and crease lines to name a few. This is really useful as artists can then use 3D meshes to automatically generate grease pencil lines for characters, enviroments or other visualization purposes. These lines can then be baked and edited as regular grease pencil lines. Reviewed By: Sebastian Parborg, Antonio Vazquez, Matias Mendiola Differential Revision: http://developer.blender.org/D8758
2021-03-16 19:35:53 +01:00
float mat[4][4];
Fix T84638: Wrong scale for primitives with radius Creating some primitives allows for a scale value (via python) that will scale the object accordingly. For objects with a radius parameter (like cylinders, spheres, etc.) passing a scale different to (1,1,1) would result in unexpected behavior. For example: `>>> bpy.ops.mesh.primitive_uv_sphere_add(radius=2, scale=(1,1,2))` We would expect this to create a sphere with a radius of 2 (dimensions 4,4,4) and then be scaled *2 along the z-axis (dimensions 4,4,8). But this would previously create a scaled sphere with dimensions (2,2,4). The scale was simply divided by two. Maybe because the "radius" parameter for creating the primitives was confusingly named "diameter" (but used as the radius). The fix adds a scale parameter to `ED_object_new_primitive_matrix` and also renames the wrongly named "diameter" parameters to "radius". Reviewed By: campbellbarton Maniphest Tasks: T84638 Ref D10093
2021-09-13 17:50:41 +10:00
ED_object_new_primitive_matrix(C, ob, loc, rot, scale, mat);
Grease Pencil: Add LineArt modifier This adds the LineArt grease pencil modifier. It takes objects or collections as input and generates various grease pencil lines from these objects with the help of the active scene camera. For example it can generate contour lines, intersection lines and crease lines to name a few. This is really useful as artists can then use 3D meshes to automatically generate grease pencil lines for characters, enviroments or other visualization purposes. These lines can then be baked and edited as regular grease pencil lines. Reviewed By: Sebastian Parborg, Antonio Vazquez, Matias Mendiola Differential Revision: http://developer.blender.org/D8758
2021-03-16 19:35:53 +01:00
ED_gpencil_create_lineart(C, ob);
gpd = ob->data;
/* Add Line Art modifier */
LineartGpencilModifierData *md = (LineartGpencilModifierData *)BKE_gpencil_modifier_new(
eGpencilModifierType_Lineart);
BLI_addtail(&ob->greasepencil_modifiers, md);
BKE_gpencil_modifier_unique_name(&ob->greasepencil_modifiers, (GpencilModifierData *)md);
if (type == GP_LRT_COLLECTION) {
md->source_type = LRT_SOURCE_COLLECTION;
md->source_collection = CTX_data_collection(C);
}
else if (type == GP_LRT_OBJECT) {
md->source_type = LRT_SOURCE_OBJECT;
md->source_object = ob_orig;
}
else {
/* Whole scene. */
md->source_type = LRT_SOURCE_SCENE;
}
/* Only created one layer and one material. */
strcpy(md->target_layer, ((bGPDlayer *)gpd->layers.first)->info);
md->target_material = BKE_gpencil_material(ob, 1);
LineArt: Fix unreported material user count error when apply modifier The number of users was 0 after applying the modifier.
2021-03-26 15:48:54 +01:00
if (md->target_material) {
id_us_plus(&md->target_material->id);
}
Grease Pencil: Add LineArt modifier This adds the LineArt grease pencil modifier. It takes objects or collections as input and generates various grease pencil lines from these objects with the help of the active scene camera. For example it can generate contour lines, intersection lines and crease lines to name a few. This is really useful as artists can then use 3D meshes to automatically generate grease pencil lines for characters, enviroments or other visualization purposes. These lines can then be baked and edited as regular grease pencil lines. Reviewed By: Sebastian Parborg, Antonio Vazquez, Matias Mendiola Differential Revision: http://developer.blender.org/D8758
2021-03-16 19:35:53 +01:00
GPencil: Add a use_light option when creating object. This option is default off when creating line art objects because line art seldom use lighting and the normal data would be all over the place anyway. Reviewed By: Antonio Vazquez (antoniov) Differential Revision: https://developer.blender.org/D11372
2021-05-25 23:45:47 +08:00
if (use_lights) {
ob->dtx |= OB_USE_GPENCIL_LIGHTS;
}
else {
ob->dtx &= ~OB_USE_GPENCIL_LIGHTS;
}
Grease Pencil: Add LineArt modifier This adds the LineArt grease pencil modifier. It takes objects or collections as input and generates various grease pencil lines from these objects with the help of the active scene camera. For example it can generate contour lines, intersection lines and crease lines to name a few. This is really useful as artists can then use 3D meshes to automatically generate grease pencil lines for characters, enviroments or other visualization purposes. These lines can then be baked and edited as regular grease pencil lines. Reviewed By: Sebastian Parborg, Antonio Vazquez, Matias Mendiola Differential Revision: http://developer.blender.org/D8758
2021-03-16 19:35:53 +01:00
/* Stroke object is drawn in front of meshes by default. */
LineArt: Custom UI for adding GP object. This allows extra options (in-front and stroke order) to be shown when adding line art kind of grease pencil object. Reviewed by: Antonio Vazquez (antoniov) Diff: https://developer.blender.org/D11130
2021-05-10 09:15:33 +08:00
if (use_in_front) {
ob->dtx |= OB_DRAW_IN_FRONT;
}
else {
if (stroke_depth_order == GP_DRAWMODE_3D) {
gpd->draw_mode = GP_DRAWMODE_3D;
}
LineArt: Stroke offset towards camera. Allows the user to turn off in_front option for grease pencil object and offset strokes towards camera to allow depth interaction of the rest of the scene. Reviewed By: Antonio Vazquez (antoniov) Differential Revision: https://developer.blender.org/D12046
2021-10-26 22:55:27 +08:00
md->stroke_depth_offset = stroke_depth_offset;
LineArt: Custom UI for adding GP object. This allows extra options (in-front and stroke order) to be shown when adding line art kind of grease pencil object. Reviewed by: Antonio Vazquez (antoniov) Diff: https://developer.blender.org/D11130
2021-05-10 09:15:33 +08:00
}
Add break statement missing from 5cb1e18f72077dcb9608a9ec8360caea70fbf329
2021-04-29 16:56:06 +10:00
break;
Grease Pencil: Add LineArt modifier This adds the LineArt grease pencil modifier. It takes objects or collections as input and generates various grease pencil lines from these objects with the help of the active scene camera. For example it can generate contour lines, intersection lines and crease lines to name a few. This is really useful as artists can then use 3D meshes to automatically generate grease pencil lines for characters, enviroments or other visualization purposes. These lines can then be baked and edited as regular grease pencil lines. Reviewed By: Sebastian Parborg, Antonio Vazquez, Matias Mendiola Differential Revision: http://developer.blender.org/D8758
2021-03-16 19:35:53 +01:00
}
New Grease Pencil object for 2D animation This commit merge the full development done in greasepencil-object branch and include mainly the following features. - New grease pencil object. - New drawing engine. - New grease pencil modes Draw/Sculpt/Edit and Weight Paint. - New brushes for grease pencil. - New modifiers for grease pencil. - New shaders FX. - New material system (replace old palettes and colors). - Split of annotations (old grease pencil) and new grease pencil object. - UI adapted to blender 2.8. You can get more info here: https://code.blender.org/2017/12/drawing-2d-animation-in-blender-2-8/ https://code.blender.org/2018/07/grease-pencil-status-update/ This is the result of nearly two years of development and I want thanks firstly the other members of the grease pencil team: Daniel M. Lara, Matias Mendiola and Joshua Leung for their support, ideas and to keep working in the project all the time, without them this project had been impossible. Also, I want thanks other Blender developers for their help, advices and to be there always to help me, and specially to Clément Foucault, Dalai Felinto, Pablo Vázquez and Campbell Barton.
2018-07-31 10:22:19 +02:00
default:
BKE_report(op->reports, RPT_WARNING, "Not implemented");
break;
}
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Cleanup: spelling (initialized)
2020-08-01 13:18:47 +10:00
/* If this is a new object, initialize default stuff (colors, etc.) */
New Grease Pencil object for 2D animation This commit merge the full development done in greasepencil-object branch and include mainly the following features. - New grease pencil object. - New drawing engine. - New grease pencil modes Draw/Sculpt/Edit and Weight Paint. - New brushes for grease pencil. - New modifiers for grease pencil. - New shaders FX. - New material system (replace old palettes and colors). - Split of annotations (old grease pencil) and new grease pencil object. - UI adapted to blender 2.8. You can get more info here: https://code.blender.org/2017/12/drawing-2d-animation-in-blender-2-8/ https://code.blender.org/2018/07/grease-pencil-status-update/ This is the result of nearly two years of development and I want thanks firstly the other members of the grease pencil team: Daniel M. Lara, Matias Mendiola and Joshua Leung for their support, ideas and to keep working in the project all the time, without them this project had been impossible. Also, I want thanks other Blender developers for their help, advices and to be there always to help me, and specially to Clément Foucault, Dalai Felinto, Pablo Vázquez and Campbell Barton.
2018-07-31 10:22:19 +02:00
if (newob) {
GPencil: Set Viewport color to black by default As the 2D viewport color is white, if the object default color is white, when wireframe is enabled the object is invisible. Now, the grease pencil object default viewport color is black.
2019-03-02 14:13:04 +01:00
/* set default viewport color to black */
copy_v3_fl(ob->color, 0.0f);
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Fix T60022: Crash when adding grease pencil object to a collection disabled in viewport. See D4163 Thanks to Habib Gahbiche (@zazizizou) for the fix.
2019-01-03 18:10:39 +01:00
ED_gpencil_add_defaults(C, ob);
New Grease Pencil object for 2D animation This commit merge the full development done in greasepencil-object branch and include mainly the following features. - New grease pencil object. - New drawing engine. - New grease pencil modes Draw/Sculpt/Edit and Weight Paint. - New brushes for grease pencil. - New modifiers for grease pencil. - New shaders FX. - New material system (replace old palettes and colors). - Split of annotations (old grease pencil) and new grease pencil object. - UI adapted to blender 2.8. You can get more info here: https://code.blender.org/2017/12/drawing-2d-animation-in-blender-2-8/ https://code.blender.org/2018/07/grease-pencil-status-update/ This is the result of nearly two years of development and I want thanks firstly the other members of the grease pencil team: Daniel M. Lara, Matias Mendiola and Joshua Leung for their support, ideas and to keep working in the project all the time, without them this project had been impossible. Also, I want thanks other Blender developers for their help, advices and to be there always to help me, and specially to Clément Foucault, Dalai Felinto, Pablo Vázquez and Campbell Barton.
2018-07-31 10:22:19 +02:00
}
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
New Grease Pencil object for 2D animation This commit merge the full development done in greasepencil-object branch and include mainly the following features. - New grease pencil object. - New drawing engine. - New grease pencil modes Draw/Sculpt/Edit and Weight Paint. - New brushes for grease pencil. - New modifiers for grease pencil. - New shaders FX. - New material system (replace old palettes and colors). - Split of annotations (old grease pencil) and new grease pencil object. - UI adapted to blender 2.8. You can get more info here: https://code.blender.org/2017/12/drawing-2d-animation-in-blender-2-8/ https://code.blender.org/2018/07/grease-pencil-status-update/ This is the result of nearly two years of development and I want thanks firstly the other members of the grease pencil team: Daniel M. Lara, Matias Mendiola and Joshua Leung for their support, ideas and to keep working in the project all the time, without them this project had been impossible. Also, I want thanks other Blender developers for their help, advices and to be there always to help me, and specially to Clément Foucault, Dalai Felinto, Pablo Vázquez and Campbell Barton.
2018-07-31 10:22:19 +02:00
return OPERATOR_FINISHED;
}
LineArt: Custom UI for adding GP object. This allows extra options (in-front and stroke order) to be shown when adding line art kind of grease pencil object. Reviewed by: Antonio Vazquez (antoniov) Diff: https://developer.blender.org/D11130
2021-05-10 09:15:33 +08:00
static void object_add_ui(bContext *UNUSED(C), wmOperator *op)
{
uiLayout *layout = op->layout;
uiLayoutSetPropSep(layout, true);
uiItemR(layout, op->ptr, "radius", 0, NULL, ICON_NONE);
uiItemR(layout, op->ptr, "align", 0, NULL, ICON_NONE);
uiItemR(layout, op->ptr, "location", 0, NULL, ICON_NONE);
uiItemR(layout, op->ptr, "rotation", 0, NULL, ICON_NONE);
uiItemR(layout, op->ptr, "type", 0, NULL, ICON_NONE);
int type = RNA_enum_get(op->ptr, "type");
Cleanup: use elem macros
2021-10-20 10:45:59 +11:00
if (ELEM(type, GP_LRT_COLLECTION, GP_LRT_OBJECT, GP_LRT_SCENE)) {
GPencil: Add a use_light option when creating object. This option is default off when creating line art objects because line art seldom use lighting and the normal data would be all over the place anyway. Reviewed By: Antonio Vazquez (antoniov) Differential Revision: https://developer.blender.org/D11372
2021-05-25 23:45:47 +08:00
uiItemR(layout, op->ptr, "use_lights", 0, NULL, ICON_NONE);
LineArt: Custom UI for adding GP object. This allows extra options (in-front and stroke order) to be shown when adding line art kind of grease pencil object. Reviewed by: Antonio Vazquez (antoniov) Diff: https://developer.blender.org/D11130
2021-05-10 09:15:33 +08:00
uiItemR(layout, op->ptr, "use_in_front", 0, NULL, ICON_NONE);
bool in_front = RNA_boolean_get(op->ptr, "use_in_front");
LineArt: Stroke offset towards camera. Allows the user to turn off in_front option for grease pencil object and offset strokes towards camera to allow depth interaction of the rest of the scene. Reviewed By: Antonio Vazquez (antoniov) Differential Revision: https://developer.blender.org/D12046
2021-10-26 22:55:27 +08:00
uiLayout *col = uiLayoutColumn(layout, false);
uiLayoutSetActive(col, !in_front);
uiItemR(col, op->ptr, "stroke_depth_offset", 0, NULL, ICON_NONE);
uiItemR(col, op->ptr, "stroke_depth_order", 0, NULL, ICON_NONE);
LineArt: Custom UI for adding GP object. This allows extra options (in-front and stroke order) to be shown when adding line art kind of grease pencil object. Reviewed by: Antonio Vazquez (antoniov) Diff: https://developer.blender.org/D11130
2021-05-10 09:15:33 +08:00
}
}
static EnumPropertyItem rna_enum_gpencil_add_stroke_depth_order_items[] = {
{GP_DRAWMODE_2D,
"2D",
0,
"2D Layers",
"Display strokes using grease pencil layers to define order"},
{GP_DRAWMODE_3D, "3D", 0, "3D Location", "Display strokes using real 3D position in 3D space"},
{0, NULL, 0, NULL, NULL},
};
New Grease Pencil object for 2D animation This commit merge the full development done in greasepencil-object branch and include mainly the following features. - New grease pencil object. - New drawing engine. - New grease pencil modes Draw/Sculpt/Edit and Weight Paint. - New brushes for grease pencil. - New modifiers for grease pencil. - New shaders FX. - New material system (replace old palettes and colors). - Split of annotations (old grease pencil) and new grease pencil object. - UI adapted to blender 2.8. You can get more info here: https://code.blender.org/2017/12/drawing-2d-animation-in-blender-2-8/ https://code.blender.org/2018/07/grease-pencil-status-update/ This is the result of nearly two years of development and I want thanks firstly the other members of the grease pencil team: Daniel M. Lara, Matias Mendiola and Joshua Leung for their support, ideas and to keep working in the project all the time, without them this project had been impossible. Also, I want thanks other Blender developers for their help, advices and to be there always to help me, and specially to Clément Foucault, Dalai Felinto, Pablo Vázquez and Campbell Barton.
2018-07-31 10:22:19 +02:00
void OBJECT_OT_gpencil_add(wmOperatorType *ot)
{
/* identifiers */
UI: Cleanup typos and minor tweaks to Grease Pencil related text First pass on adding articles, capitalize Grease Pencil, use 'keyframes' instead of 'frames' when possible, and other minor adjustments.
2018-10-30 19:54:25 +01:00
ot->name = "Add Grease Pencil";
ot->description = "Add a Grease Pencil object to the scene";
New Grease Pencil object for 2D animation This commit merge the full development done in greasepencil-object branch and include mainly the following features. - New grease pencil object. - New drawing engine. - New grease pencil modes Draw/Sculpt/Edit and Weight Paint. - New brushes for grease pencil. - New modifiers for grease pencil. - New shaders FX. - New material system (replace old palettes and colors). - Split of annotations (old grease pencil) and new grease pencil object. - UI adapted to blender 2.8. You can get more info here: https://code.blender.org/2017/12/drawing-2d-animation-in-blender-2-8/ https://code.blender.org/2018/07/grease-pencil-status-update/ This is the result of nearly two years of development and I want thanks firstly the other members of the grease pencil team: Daniel M. Lara, Matias Mendiola and Joshua Leung for their support, ideas and to keep working in the project all the time, without them this project had been impossible. Also, I want thanks other Blender developers for their help, advices and to be there always to help me, and specially to Clément Foucault, Dalai Felinto, Pablo Vázquez and Campbell Barton.
2018-07-31 10:22:19 +02:00
ot->idname = "OBJECT_OT_gpencil_add";
/* api callbacks */
ot->invoke = WM_menu_invoke;
ot->exec = object_gpencil_add_exec;
Fix T60714: Avoid creation of nested objects In grease pencil is not logic add an object inside other object in edit mode. The object must be created only in Object mode.
2019-01-21 18:29:02 +01:00
ot->poll = object_gpencil_add_poll;
New Grease Pencil object for 2D animation This commit merge the full development done in greasepencil-object branch and include mainly the following features. - New grease pencil object. - New drawing engine. - New grease pencil modes Draw/Sculpt/Edit and Weight Paint. - New brushes for grease pencil. - New modifiers for grease pencil. - New shaders FX. - New material system (replace old palettes and colors). - Split of annotations (old grease pencil) and new grease pencil object. - UI adapted to blender 2.8. You can get more info here: https://code.blender.org/2017/12/drawing-2d-animation-in-blender-2-8/ https://code.blender.org/2018/07/grease-pencil-status-update/ This is the result of nearly two years of development and I want thanks firstly the other members of the grease pencil team: Daniel M. Lara, Matias Mendiola and Joshua Leung for their support, ideas and to keep working in the project all the time, without them this project had been impossible. Also, I want thanks other Blender developers for their help, advices and to be there always to help me, and specially to Clément Foucault, Dalai Felinto, Pablo Vázquez and Campbell Barton.
2018-07-31 10:22:19 +02:00
/* flags */
ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
LineArt: Custom UI for adding GP object. This allows extra options (in-front and stroke order) to be shown when adding line art kind of grease pencil object. Reviewed by: Antonio Vazquez (antoniov) Diff: https://developer.blender.org/D11130
2021-05-10 09:15:33 +08:00
/* ui */
ot->ui = object_add_ui;
New Grease Pencil object for 2D animation This commit merge the full development done in greasepencil-object branch and include mainly the following features. - New grease pencil object. - New drawing engine. - New grease pencil modes Draw/Sculpt/Edit and Weight Paint. - New brushes for grease pencil. - New modifiers for grease pencil. - New shaders FX. - New material system (replace old palettes and colors). - Split of annotations (old grease pencil) and new grease pencil object. - UI adapted to blender 2.8. You can get more info here: https://code.blender.org/2017/12/drawing-2d-animation-in-blender-2-8/ https://code.blender.org/2018/07/grease-pencil-status-update/ This is the result of nearly two years of development and I want thanks firstly the other members of the grease pencil team: Daniel M. Lara, Matias Mendiola and Joshua Leung for their support, ideas and to keep working in the project all the time, without them this project had been impossible. Also, I want thanks other Blender developers for their help, advices and to be there always to help me, and specially to Clément Foucault, Dalai Felinto, Pablo Vázquez and Campbell Barton.
2018-07-31 10:22:19 +02:00
/* properties */
UI: 'Add Object' rename dimensions D3943 by @Zachman w/ edits
2018-11-15 17:44:50 +11:00
ED_object_add_unit_props_radius(ot);
New Grease Pencil object for 2D animation This commit merge the full development done in greasepencil-object branch and include mainly the following features. - New grease pencil object. - New drawing engine. - New grease pencil modes Draw/Sculpt/Edit and Weight Paint. - New brushes for grease pencil. - New modifiers for grease pencil. - New shaders FX. - New material system (replace old palettes and colors). - Split of annotations (old grease pencil) and new grease pencil object. - UI adapted to blender 2.8. You can get more info here: https://code.blender.org/2017/12/drawing-2d-animation-in-blender-2-8/ https://code.blender.org/2018/07/grease-pencil-status-update/ This is the result of nearly two years of development and I want thanks firstly the other members of the grease pencil team: Daniel M. Lara, Matias Mendiola and Joshua Leung for their support, ideas and to keep working in the project all the time, without them this project had been impossible. Also, I want thanks other Blender developers for their help, advices and to be there always to help me, and specially to Clément Foucault, Dalai Felinto, Pablo Vázquez and Campbell Barton.
2018-07-31 10:22:19 +02:00
ED_object_add_generic_props(ot, false);
ot->prop = RNA_def_enum(ot->srna, "type", rna_enum_object_gpencil_type_items, 0, "Type", "");
LineArt: Custom UI for adding GP object. This allows extra options (in-front and stroke order) to be shown when adding line art kind of grease pencil object. Reviewed by: Antonio Vazquez (antoniov) Diff: https://developer.blender.org/D11130
2021-05-10 09:15:33 +08:00
RNA_def_boolean(ot->srna,
"use_in_front",
LineArt: Stroke offset towards camera. Allows the user to turn off in_front option for grease pencil object and offset strokes towards camera to allow depth interaction of the rest of the scene. Reviewed By: Antonio Vazquez (antoniov) Differential Revision: https://developer.blender.org/D12046
2021-10-26 22:55:27 +08:00
true,
"Show In Front",
LineArt: Custom UI for adding GP object. This allows extra options (in-front and stroke order) to be shown when adding line art kind of grease pencil object. Reviewed by: Antonio Vazquez (antoniov) Diff: https://developer.blender.org/D11130
2021-05-10 09:15:33 +08:00
"Show line art grease pencil in front of everything");
LineArt: Stroke offset towards camera. Allows the user to turn off in_front option for grease pencil object and offset strokes towards camera to allow depth interaction of the rest of the scene. Reviewed By: Antonio Vazquez (antoniov) Differential Revision: https://developer.blender.org/D12046
2021-10-26 22:55:27 +08:00
RNA_def_float(ot->srna,
"stroke_depth_offset",
0.05f,
0.0f,
Fix: Assert on startup from incorrect float property min
2021-10-26 11:03:45 -05:00
FLT_MAX,
LineArt: Stroke offset towards camera. Allows the user to turn off in_front option for grease pencil object and offset strokes towards camera to allow depth interaction of the rest of the scene. Reviewed By: Antonio Vazquez (antoniov) Differential Revision: https://developer.blender.org/D12046
2021-10-26 22:55:27 +08:00
"Stroke Offset",
"Stroke offset for the line art modifier",
0.0f,
0.5f);
GPencil: Add a use_light option when creating object. This option is default off when creating line art objects because line art seldom use lighting and the normal data would be all over the place anyway. Reviewed By: Antonio Vazquez (antoniov) Differential Revision: https://developer.blender.org/D11372
2021-05-25 23:45:47 +08:00
RNA_def_boolean(
ot->srna, "use_lights", false, "Use Lights", "Use lights for this grease pencil object");
LineArt: Custom UI for adding GP object. This allows extra options (in-front and stroke order) to be shown when adding line art kind of grease pencil object. Reviewed by: Antonio Vazquez (antoniov) Diff: https://developer.blender.org/D11130
2021-05-10 09:15:33 +08:00
RNA_def_enum(
ot->srna,
"stroke_depth_order",
rna_enum_gpencil_add_stroke_depth_order_items,
GP_DRAWMODE_3D,
"Stroke Depth Order",
LineArt: Stroke offset towards camera. Allows the user to turn off in_front option for grease pencil object and offset strokes towards camera to allow depth interaction of the rest of the scene. Reviewed By: Antonio Vazquez (antoniov) Differential Revision: https://developer.blender.org/D12046
2021-10-26 22:55:27 +08:00
"Defines how the strokes are ordered in 3D space for objects not displayed 'In Front')");
New Grease Pencil object for 2D animation This commit merge the full development done in greasepencil-object branch and include mainly the following features. - New grease pencil object. - New drawing engine. - New grease pencil modes Draw/Sculpt/Edit and Weight Paint. - New brushes for grease pencil. - New modifiers for grease pencil. - New shaders FX. - New material system (replace old palettes and colors). - Split of annotations (old grease pencil) and new grease pencil object. - UI adapted to blender 2.8. You can get more info here: https://code.blender.org/2017/12/drawing-2d-animation-in-blender-2-8/ https://code.blender.org/2018/07/grease-pencil-status-update/ This is the result of nearly two years of development and I want thanks firstly the other members of the grease pencil team: Daniel M. Lara, Matias Mendiola and Joshua Leung for their support, ideas and to keep working in the project all the time, without them this project had been impossible. Also, I want thanks other Blender developers for their help, advices and to be there always to help me, and specially to Clément Foucault, Dalai Felinto, Pablo Vázquez and Campbell Barton.
2018-07-31 10:22:19 +02:00
}
Cleanup: use doxy sections for object_add.c
2019-05-16 14:03:31 +10:00
/** \} */
/* -------------------------------------------------------------------- */
/** \name Add Light Operator
* \{ */
Some effect-less code cleanup...
2012-10-05 07:05:52 +00:00
UI/Python: rename Lamps to Lights, to follow more standard terminology. Internally it's still mostly named lamps, though some modules like Cycles were already calling them lights.
2018-06-27 14:41:53 +02:00
static const char *get_light_defname(int type)
Fix [#22564] Object name by object type Restored auto-naming newly created objects by type, for Mesh, Lamp, Meta
2010-06-27 07:45:57 +00:00
{
switch (type) {
Cleanup: rename `BLT_I18NCONTEXT_ID_LAMP` -> `BLT_I18NCONTEXT_ID_LIGHT`.
2019-02-12 21:51:51 +01:00
case LA_LOCAL:
return CTX_DATA_(BLT_I18NCONTEXT_ID_LIGHT, "Point");
case LA_SUN:
return CTX_DATA_(BLT_I18NCONTEXT_ID_LIGHT, "Sun");
case LA_SPOT:
return CTX_DATA_(BLT_I18NCONTEXT_ID_LIGHT, "Spot");
case LA_AREA:
return CTX_DATA_(BLT_I18NCONTEXT_ID_LIGHT, "Area");
Fix [#22564] Object name by object type Restored auto-naming newly created objects by type, for Mesh, Lamp, Meta
2010-06-27 07:45:57 +00:00
default:
Cleanup: rename `BLT_I18NCONTEXT_ID_LAMP` -> `BLT_I18NCONTEXT_ID_LIGHT`.
2019-02-12 21:51:51 +01:00
return CTX_DATA_(BLT_I18NCONTEXT_ID_LIGHT, "Light");
Fix [#22564] Object name by object type Restored auto-naming newly created objects by type, for Mesh, Lamp, Meta
2010-06-27 07:45:57 +00:00
}
}
UI/Python: rename Lamps to Lights, to follow more standard terminology. Internally it's still mostly named lamps, though some modules like Cycles were already calling them lights.
2018-06-27 14:41:53 +02:00
static int object_light_add_exec(bContext *C, wmOperator *op)
Fix #19389: add lamp had no submenu to choose the type.
2009-09-21 10:54:15 +00:00
{
Object *ob;
DNA: rename Lamp -> Light - BKE_lamp -> BKE_light - Main.lamp -> light
2019-02-27 10:46:48 +11:00
Light *la;
style cleanup: editors / mesh & object
2012-04-28 15:42:27 +00:00
int type = RNA_enum_get(op->ptr, "type");
Fix adding objects in local view
2018-12-07 12:59:04 +11:00
ushort local_view_bits;
Added location and rotation operator properties for adding objects. The Align to View boolean is now just used to set the rotation property value during invoke. This removes some reliance on 3d view info for non-interactive use, and also lets you specify new object's locations/rotations explicitly when calling from Python.
2009-12-28 04:09:46 +00:00
float loc[3], rot[3];
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Support more object types scene-scale (on creation) - lamp - camera - font - empty & effector Also fix inconsistency with apply transform (modified shape-keys for meshes but not curve/lattice)
2014-09-01 20:09:31 +10:00
WM_operator_view3d_unit_defaults(C, op);
Object: add scale argument to creation operators Needed for to create objects of a specific size.
2020-05-28 14:30:42 +10:00
if (!ED_object_add_generic_get_opts(C, op, 'Z', loc, rot, NULL, NULL, &local_view_bits, NULL)) {
adding curve and mesh objects through python would create the object without assigning it to any layers. now initialize from the scene (when the value is unset), and throw an error when the value is set to all false.
2010-06-14 15:39:50 +00:00
return OPERATOR_CANCELLED;
Fix adding objects in local view
2018-12-07 12:59:04 +11:00
}
ob = ED_object_add_type(C, OB_LAMP, get_light_defname(type), loc, rot, false, local_view_bits);
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Lamps: Make default size more usable This way the area light shapes are more visible (and usable) by default. Changes were discussed with @venomgfx
2018-06-24 15:02:52 +02:00
float size = RNA_float_get(op->ptr, "radius");
UI/Python: rename Lamps to Lights, to follow more standard terminology. Internally it's still mostly named lamps, though some modules like Cycles were already calling them lights.
2018-06-27 14:41:53 +02:00
/* Better defaults for light size. */
Cleanup: code style
2018-06-25 12:02:57 +02:00
switch (type) {
Lamps: Make default size more usable This way the area light shapes are more visible (and usable) by default. Changes were discussed with @venomgfx
2018-06-24 15:02:52 +02:00
case LA_LOCAL:
case LA_SPOT:
break;
case LA_AREA:
size *= 4.0f;
break;
default:
size *= 0.5f;
break;
}
BKE_object_obdata_size_init(ob, size);
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
DNA: rename Lamp -> Light - BKE_lamp -> BKE_light - Main.lamp -> light
2019-02-27 10:46:48 +11:00
la = (Light *)ob->data;
style cleanup: editors / mesh & object
2012-04-28 15:42:27 +00:00
la->type = type;
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Lights: reduce default strength of sun light to 1.0
2019-05-15 16:07:34 +02:00
if (type == LA_SUN) {
la->energy = 1.0f;
}
Fix #19389: add lamp had no submenu to choose the type.
2009-09-21 10:54:15 +00:00
return OPERATOR_FINISHED;
}
UI/Python: rename Lamps to Lights, to follow more standard terminology. Internally it's still mostly named lamps, though some modules like Cycles were already calling them lights.
2018-06-27 14:41:53 +02:00
void OBJECT_OT_light_add(wmOperatorType *ot)
code cleanup: remove duplicate enum
2012-05-26 00:06:30 +00:00
{
Fix #19389: add lamp had no submenu to choose the type.
2009-09-21 10:54:15 +00:00
/* identifiers */
UI/Python: rename Lamps to Lights, to follow more standard terminology. Internally it's still mostly named lamps, though some modules like Cycles were already calling them lights.
2018-06-27 14:41:53 +02:00
ot->name = "Add Light";
ot->description = "Add a light object to the scene";
ot->idname = "OBJECT_OT_light_add";
Some effect-less code cleanup...
2012-10-05 07:05:52 +00:00
Fix #19389: add lamp had no submenu to choose the type.
2009-09-21 10:54:15 +00:00
/* api callbacks */
style cleanup: spaces aroudn operators for operator definitions.
2012-03-22 07:26:09 +00:00
ot->invoke = WM_menu_invoke;
UI/Python: rename Lamps to Lights, to follow more standard terminology. Internally it's still mostly named lamps, though some modules like Cycles were already calling them lights.
2018-06-27 14:41:53 +02:00
ot->exec = object_light_add_exec;
style cleanup: spaces aroudn operators for operator definitions.
2012-03-22 07:26:09 +00:00
ot->poll = ED_operator_objectmode;
Some effect-less code cleanup...
2012-10-05 07:05:52 +00:00
Fix #19389: add lamp had no submenu to choose the type.
2009-09-21 10:54:15 +00:00
/* flags */
style cleanup: editors / mesh & object
2012-04-28 15:42:27 +00:00
ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
Fix #19389: add lamp had no submenu to choose the type.
2009-09-21 10:54:15 +00:00
/* properties */
UI/Python: rename Lamps to Lights, to follow more standard terminology. Internally it's still mostly named lamps, though some modules like Cycles were already calling them lights.
2018-06-27 14:41:53 +02:00
ot->prop = RNA_def_enum(ot->srna, "type", rna_enum_light_type_items, 0, "Type", "");
Cleanup: rename `BLT_I18NCONTEXT_ID_LAMP` -> `BLT_I18NCONTEXT_ID_LIGHT`.
2019-02-12 21:51:51 +01:00
RNA_def_property_translation_context(ot->prop, BLT_I18NCONTEXT_ID_LIGHT);
- all add object operators now take view_align as an argument, and enter_editmode where its used. Makes running the operator from python pradictable without having to know the user prefs. - missing return in function - python error in view3d (assumed active object exists)
2009-11-02 16:07:49 +00:00
UI: 'Add Object' rename dimensions D3943 by @Zachman w/ edits
2018-11-15 17:44:50 +11:00
ED_object_add_unit_props_radius(ot);
Code cleanup: remove TRUE/FALSE & WITH_BOOL_COMPAT define
2014-04-01 11:34:00 +11:00
ED_object_add_generic_props(ot, false);
Fix #19389: add lamp had no submenu to choose the type.
2009-09-21 10:54:15 +00:00
}
Cleanup: use doxy sections for object_add.c
2019-05-16 14:03:31 +10:00
/** \} */
/* -------------------------------------------------------------------- */
/** \name Add Collection Instance Operator
* \{ */
Some effect-less code cleanup...
2012-10-05 07:05:52 +00:00
Collections and groups unification OVERVIEW * In 2.7 terminology, all layers and groups are now collection datablocks. * These collections are nestable, linkable, instanceable, overrideable, .. which opens up new ways to set up scenes and link + override data. * Viewport/render visibility and selectability are now a part of the collection and shared across all view layers and linkable. * View layers define which subset of the scene collection hierarchy is excluded for each. For many workflows one view layer can be used, these are more of an advanced feature now. OUTLINER * The outliner now has a "View Layer" display mode instead of "Collections", which can display the collections and/or objects in the view layer. * In this display mode, collections can be excluded with the right click menu. These will then be greyed out and their objects will be excluded. * To view collections not linked to any scene, the "Blender File" display mode can be used, with the new filtering option to just see Colleciton datablocks. * The outliner right click menus for collections and objects were reorganized. * Drag and drop still needs to be improved. Like before, dragging the icon or text gives different results, we'll unify this later. LINKING AND OVERRIDES * Collections can now be linked into the scene without creating an instance, with the link/append operator or from the collections view in the outliner. * Collections can get static overrides with the right click menu in the outliner, but this is rather unreliable and not clearly communicated at the moment. * We still need to improve the make override operator to turn collection instances into collections with overrides directly in the scene. PERFORMANCE * We tried to make performance not worse than before and improve it in some cases. The main thing that's still a bit slower is multiple scenes, we have to change the layer syncing to only updated affected scenes. * Collections keep a list of their parent collections for faster incremental updates in syncing and caching. * View layer bases are now in a object -> base hash to avoid quadratic time lookups internally and in API functions like visible_get(). VERSIONING * Compatibility with 2.7 files should be improved due to the new visibility controls. Of course users may not want to set up their scenes differently now to avoid having separate layers and groups. * Compatibility with 2.8 is mostly there, and was tested on Eevee demo and Hero files. There's a few things which are know to be not quite compatible, like nested layer collections inside groups. * The versioning code for 2.8 files is quite complicated, and isolated behind #ifdef so it can be removed at the end of the release cycle. KNOWN ISSUES * The G-key group operators in the 3D viewport were left mostly as is, they need to be modified still to fit better. * Same for the groups panel in the object properties. This needs to be updated still, or perhaps replaced by something better. * Collections must all have a unique name. Less restrictive namespacing is to be done later, we'll have to see how important this is as all objects within the collections must also have a unique name anyway. * Full scene copy and delete scene are exactly doing the right thing yet. Differential Revision: https://developer.blender.org/D3383 https://code.blender.org/2018/05/collections-and-groups/
2018-04-30 15:57:22 +02:00
static int collection_instance_add_exec(bContext *C, wmOperator *op)
'Add Group' back in the add object menu
2009-10-07 14:40:27 +00:00
{
Cleanup: get rid of last G.main usages in BKE library code.
2018-05-31 16:04:04 +02:00
Main *bmain = CTX_data_main(C);
Collections and groups unification OVERVIEW * In 2.7 terminology, all layers and groups are now collection datablocks. * These collections are nestable, linkable, instanceable, overrideable, .. which opens up new ways to set up scenes and link + override data. * Viewport/render visibility and selectability are now a part of the collection and shared across all view layers and linkable. * View layers define which subset of the scene collection hierarchy is excluded for each. For many workflows one view layer can be used, these are more of an advanced feature now. OUTLINER * The outliner now has a "View Layer" display mode instead of "Collections", which can display the collections and/or objects in the view layer. * In this display mode, collections can be excluded with the right click menu. These will then be greyed out and their objects will be excluded. * To view collections not linked to any scene, the "Blender File" display mode can be used, with the new filtering option to just see Colleciton datablocks. * The outliner right click menus for collections and objects were reorganized. * Drag and drop still needs to be improved. Like before, dragging the icon or text gives different results, we'll unify this later. LINKING AND OVERRIDES * Collections can now be linked into the scene without creating an instance, with the link/append operator or from the collections view in the outliner. * Collections can get static overrides with the right click menu in the outliner, but this is rather unreliable and not clearly communicated at the moment. * We still need to improve the make override operator to turn collection instances into collections with overrides directly in the scene. PERFORMANCE * We tried to make performance not worse than before and improve it in some cases. The main thing that's still a bit slower is multiple scenes, we have to change the layer syncing to only updated affected scenes. * Collections keep a list of their parent collections for faster incremental updates in syncing and caching. * View layer bases are now in a object -> base hash to avoid quadratic time lookups internally and in API functions like visible_get(). VERSIONING * Compatibility with 2.7 files should be improved due to the new visibility controls. Of course users may not want to set up their scenes differently now to avoid having separate layers and groups. * Compatibility with 2.8 is mostly there, and was tested on Eevee demo and Hero files. There's a few things which are know to be not quite compatible, like nested layer collections inside groups. * The versioning code for 2.8 files is quite complicated, and isolated behind #ifdef so it can be removed at the end of the release cycle. KNOWN ISSUES * The G-key group operators in the 3D viewport were left mostly as is, they need to be modified still to fit better. * Same for the groups panel in the object properties. This needs to be updated still, or perhaps replaced by something better. * Collections must all have a unique name. Less restrictive namespacing is to be done later, we'll have to see how important this is as all objects within the collections must also have a unique name anyway. * Full scene copy and delete scene are exactly doing the right thing yet. Differential Revision: https://developer.blender.org/D3383 https://code.blender.org/2018/05/collections-and-groups/
2018-04-30 15:57:22 +02:00
Collection *collection;
Fix adding objects in local view
2018-12-07 12:59:04 +11:00
ushort local_view_bits;
Added location and rotation operator properties for adding objects. The Align to View boolean is now just used to set the rotation property value during invoke. This removes some reliance on 3d view info for non-interactive use, and also lets you specify new object's locations/rotations explicitly when calling from Python.
2009-12-28 04:09:46 +00:00
float loc[3], rot[3];
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Cleanup: OBJECT_OT_collection_instance_add Minor changes to match OBJECT_OT_data_instance_add. - Access properties once & reuse them. - Early exit when the data to instance can't be found.
2020-09-07 14:43:13 +10:00
PropertyRNA *prop_name = RNA_struct_find_property(op->ptr, "name");
PropertyRNA *prop_location = RNA_struct_find_property(op->ptr, "location");
Fix T87912: use session id instead of name to identify dropped object The old code did not work when there were multiple ids with the same name (which can happen when ids are linked in). The solution is to use the session ids instead. Those are different even when two ids have the same name. Differential Revision: https://developer.blender.org/D11116
2021-11-19 15:28:44 +01:00
PropertyRNA *prop_session_uuid = RNA_struct_find_property(op->ptr, "session_uuid");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Fix T87912: use session id instead of name to identify dropped object The old code did not work when there were multiple ids with the same name (which can happen when ids are linked in). The solution is to use the session ids instead. Those are different even when two ids have the same name. Differential Revision: https://developer.blender.org/D11116
2021-11-19 15:28:44 +01:00
bool update_location_if_necessary = false;
Cleanup: OBJECT_OT_collection_instance_add Minor changes to match OBJECT_OT_data_instance_add. - Access properties once & reuse them. - Early exit when the data to instance can't be found.
2020-09-07 14:43:13 +10:00
if (RNA_property_is_set(op->ptr, prop_name)) {
char name[MAX_ID_NAME - 2];
RNA_property_string_get(op->ptr, prop_name, name);
Merge branch 'master' into blender2.8 Conflicts: source/blender/editors/object/object_add.c source/blender/editors/object/object_select.c source/blender/editors/space_outliner/outliner_edit.c
2018-05-31 16:21:47 +02:00
collection = (Collection *)BKE_libblock_find_name(bmain, ID_GR, name);
Fix T87912: use session id instead of name to identify dropped object The old code did not work when there were multiple ids with the same name (which can happen when ids are linked in). The solution is to use the session ids instead. Those are different even when two ids have the same name. Differential Revision: https://developer.blender.org/D11116
2021-11-19 15:28:44 +01:00
update_location_if_necessary = true;
}
else if (RNA_property_is_set(op->ptr, prop_session_uuid)) {
const uint32_t session_uuid = (uint32_t)RNA_property_int_get(op->ptr, prop_session_uuid);
collection = (Collection *)BKE_libblock_find_session_uuid(bmain, ID_GR, session_uuid);
update_location_if_necessary = true;
}
else {
collection = BLI_findlink(&bmain->collections, RNA_enum_get(op->ptr, "collection"));
}
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Fix T87912: use session id instead of name to identify dropped object The old code did not work when there were multiple ids with the same name (which can happen when ids are linked in). The solution is to use the session ids instead. Those are different even when two ids have the same name. Differential Revision: https://developer.blender.org/D11116
2021-11-19 15:28:44 +01:00
if (update_location_if_necessary) {
Fix object moved to cursor when editing last operation after dropping object Steps to reproduce were: * Drag object icon from the Outliner into the 3D view (or an object asset from the Asset Browser) * Open the "Adjust Last Operation" panel * Edit options in there - the object would move to the mouse location The same issue happens with collection instance and object data adding (e.g. via drag & drop). This patch addresses them too. The operator used the event state stored in the window. This shouldn't be accessed from the operator execute callback generally which happened here. Especially not if the operator supports editing properties.
2021-01-05 00:57:24 +01:00
int mval[2];
if (!RNA_property_is_set(op->ptr, prop_location) && object_add_drop_xy_get(C, op, &mval)) {
Todo item: - Drop group into 3d window now puts itself at mouse cursor location. - Drop objects into 3d window now doesn't move the 3d cursor anymore. Added new function ED_view3d_cursor3d_position() to handle this, so the temporarily object-drop operator macro also could go away. (Which was setting 3d cursor)
2012-12-26 16:24:50 +00:00
ED_object_location_from_view(C, loc);
Add depth and orientation options to 3D cursor tool
2018-06-22 15:07:11 +02:00
ED_view3d_cursor3d_position(C, mval, false, loc);
Cleanup: OBJECT_OT_collection_instance_add Minor changes to match OBJECT_OT_data_instance_add. - Access properties once & reuse them. - Early exit when the data to instance can't be found.
2020-09-07 14:43:13 +10:00
RNA_property_float_set_array(op->ptr, prop_location, loc);
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
}
Todo item: - Drop group into 3d window now puts itself at mouse cursor location. - Drop objects into 3d window now doesn't move the 3d cursor anymore. Added new function ED_view3d_cursor3d_position() to handle this, so the temporarily object-drop operator macro also could go away. (Which was setting 3d cursor)
2012-12-26 16:24:50 +00:00
}
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Cleanup: OBJECT_OT_collection_instance_add Minor changes to match OBJECT_OT_data_instance_add. - Access properties once & reuse them. - Early exit when the data to instance can't be found.
2020-09-07 14:43:13 +10:00
if (collection == NULL) {
adding curve and mesh objects through python would create the object without assigning it to any layers. now initialize from the scene (when the value is unset), and throw an error when the value is set to all false.
2010-06-14 15:39:50 +00:00
return OPERATOR_CANCELLED;
Fix adding objects in local view
2018-12-07 12:59:04 +11:00
}
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Cleanup: OBJECT_OT_collection_instance_add Minor changes to match OBJECT_OT_data_instance_add. - Access properties once & reuse them. - Early exit when the data to instance can't be found.
2020-09-07 14:43:13 +10:00
if (!ED_object_add_generic_get_opts(C, op, 'Z', loc, rot, NULL, NULL, &local_view_bits, NULL)) {
return OPERATOR_CANCELLED;
}
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Cleanup: OBJECT_OT_collection_instance_add Minor changes to match OBJECT_OT_data_instance_add. - Access properties once & reuse them. - Early exit when the data to instance can't be found.
2020-09-07 14:43:13 +10:00
ViewLayer *view_layer = CTX_data_view_layer(C);
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Cleanup: OBJECT_OT_collection_instance_add Minor changes to match OBJECT_OT_data_instance_add. - Access properties once & reuse them. - Early exit when the data to instance can't be found.
2020-09-07 14:43:13 +10:00
/* Avoid dependency cycles. */
LayerCollection *active_lc = BKE_layer_collection_get_active(view_layer);
while (BKE_collection_cycle_find(active_lc->collection, collection)) {
active_lc = BKE_layer_collection_activate_parent(view_layer, active_lc);
'Add Group' back in the add object menu
2009-10-07 14:40:27 +00:00
}
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Cleanup: OBJECT_OT_collection_instance_add Minor changes to match OBJECT_OT_data_instance_add. - Access properties once & reuse them. - Early exit when the data to instance can't be found.
2020-09-07 14:43:13 +10:00
Object *ob = ED_object_add_type(
C, OB_EMPTY, collection->id.name + 2, loc, rot, false, local_view_bits);
ob->instance_collection = collection;
ob->empty_drawsize = U.collection_instance_empty_size;
ob->transflag |= OB_DUPLICOLLECTION;
id_us_plus(&collection->id);
return OPERATOR_FINISHED;
'Add Group' back in the add object menu
2009-10-07 14:40:27 +00:00
}
Fix object moved to cursor when editing last operation after dropping object Steps to reproduce were: * Drag object icon from the Outliner into the 3D view (or an object asset from the Asset Browser) * Open the "Adjust Last Operation" panel * Edit options in there - the object would move to the mouse location The same issue happens with collection instance and object data adding (e.g. via drag & drop). This patch addresses them too. The operator used the event state stored in the window. This shouldn't be accessed from the operator execute callback generally which happened here. Especially not if the operator supports editing properties.
2021-01-05 00:57:24 +01:00
static int object_instance_add_invoke(bContext *C, wmOperator *op, const wmEvent *event)
{
if (!object_add_drop_xy_is_set(op)) {
Cleanup: use an array for wmEvent cursor position variables Use arrays for wmEvent coordinates, this quiets warnings with GCC11. - `x, y` -> `xy`. - `prevx, prevy` -> `prev_xy`. - `prevclickx, prevclicky` -> `prev_click_xy`. There is still some cleanup such as using `copy_v2_v2_int()`, this can be done separately. Reviewed By: campbellbarton, Severin Ref D12901
2021-10-20 23:45:30 +11:00
RNA_int_set(op->ptr, "drop_x", event->xy[0]);
RNA_int_set(op->ptr, "drop_y", event->xy[1]);
Fix object moved to cursor when editing last operation after dropping object Steps to reproduce were: * Drag object icon from the Outliner into the 3D view (or an object asset from the Asset Browser) * Open the "Adjust Last Operation" panel * Edit options in there - the object would move to the mouse location The same issue happens with collection instance and object data adding (e.g. via drag & drop). This patch addresses them too. The operator used the event state stored in the window. This shouldn't be accessed from the operator execute callback generally which happened here. Especially not if the operator supports editing properties.
2021-01-05 00:57:24 +01:00
}
Fix T87912: use session id instead of name to identify dropped object The old code did not work when there were multiple ids with the same name (which can happen when ids are linked in). The solution is to use the session ids instead. Those are different even when two ids have the same name. Differential Revision: https://developer.blender.org/D11116
2021-11-19 15:28:44 +01:00
if (!RNA_struct_property_is_set(op->ptr, "name") &&
!RNA_struct_property_is_set(op->ptr, "session_uuid")) {
Fix object moved to cursor when editing last operation after dropping object Steps to reproduce were: * Drag object icon from the Outliner into the 3D view (or an object asset from the Asset Browser) * Open the "Adjust Last Operation" panel * Edit options in there - the object would move to the mouse location The same issue happens with collection instance and object data adding (e.g. via drag & drop). This patch addresses them too. The operator used the event state stored in the window. This shouldn't be accessed from the operator execute callback generally which happened here. Especially not if the operator supports editing properties.
2021-01-05 00:57:24 +01:00
return WM_enum_search_invoke(C, op, event);
}
return op->type->exec(C, op);
}
Collections and groups unification OVERVIEW * In 2.7 terminology, all layers and groups are now collection datablocks. * These collections are nestable, linkable, instanceable, overrideable, .. which opens up new ways to set up scenes and link + override data. * Viewport/render visibility and selectability are now a part of the collection and shared across all view layers and linkable. * View layers define which subset of the scene collection hierarchy is excluded for each. For many workflows one view layer can be used, these are more of an advanced feature now. OUTLINER * The outliner now has a "View Layer" display mode instead of "Collections", which can display the collections and/or objects in the view layer. * In this display mode, collections can be excluded with the right click menu. These will then be greyed out and their objects will be excluded. * To view collections not linked to any scene, the "Blender File" display mode can be used, with the new filtering option to just see Colleciton datablocks. * The outliner right click menus for collections and objects were reorganized. * Drag and drop still needs to be improved. Like before, dragging the icon or text gives different results, we'll unify this later. LINKING AND OVERRIDES * Collections can now be linked into the scene without creating an instance, with the link/append operator or from the collections view in the outliner. * Collections can get static overrides with the right click menu in the outliner, but this is rather unreliable and not clearly communicated at the moment. * We still need to improve the make override operator to turn collection instances into collections with overrides directly in the scene. PERFORMANCE * We tried to make performance not worse than before and improve it in some cases. The main thing that's still a bit slower is multiple scenes, we have to change the layer syncing to only updated affected scenes. * Collections keep a list of their parent collections for faster incremental updates in syncing and caching. * View layer bases are now in a object -> base hash to avoid quadratic time lookups internally and in API functions like visible_get(). VERSIONING * Compatibility with 2.7 files should be improved due to the new visibility controls. Of course users may not want to set up their scenes differently now to avoid having separate layers and groups. * Compatibility with 2.8 is mostly there, and was tested on Eevee demo and Hero files. There's a few things which are know to be not quite compatible, like nested layer collections inside groups. * The versioning code for 2.8 files is quite complicated, and isolated behind #ifdef so it can be removed at the end of the release cycle. KNOWN ISSUES * The G-key group operators in the 3D viewport were left mostly as is, they need to be modified still to fit better. * Same for the groups panel in the object properties. This needs to be updated still, or perhaps replaced by something better. * Collections must all have a unique name. Less restrictive namespacing is to be done later, we'll have to see how important this is as all objects within the collections must also have a unique name anyway. * Full scene copy and delete scene are exactly doing the right thing yet. Differential Revision: https://developer.blender.org/D3383 https://code.blender.org/2018/05/collections-and-groups/
2018-04-30 15:57:22 +02:00
void OBJECT_OT_collection_instance_add(wmOperatorType *ot)
Some effect-less code cleanup...
2012-10-05 07:05:52 +00:00
{
Fix: T40016 ID Names translated in menus
2014-05-05 15:09:29 +10:00
PropertyRNA *prop;
Some effect-less code cleanup...
2012-10-05 07:05:52 +00:00
/* identifiers */
Collections and groups unification OVERVIEW * In 2.7 terminology, all layers and groups are now collection datablocks. * These collections are nestable, linkable, instanceable, overrideable, .. which opens up new ways to set up scenes and link + override data. * Viewport/render visibility and selectability are now a part of the collection and shared across all view layers and linkable. * View layers define which subset of the scene collection hierarchy is excluded for each. For many workflows one view layer can be used, these are more of an advanced feature now. OUTLINER * The outliner now has a "View Layer" display mode instead of "Collections", which can display the collections and/or objects in the view layer. * In this display mode, collections can be excluded with the right click menu. These will then be greyed out and their objects will be excluded. * To view collections not linked to any scene, the "Blender File" display mode can be used, with the new filtering option to just see Colleciton datablocks. * The outliner right click menus for collections and objects were reorganized. * Drag and drop still needs to be improved. Like before, dragging the icon or text gives different results, we'll unify this later. LINKING AND OVERRIDES * Collections can now be linked into the scene without creating an instance, with the link/append operator or from the collections view in the outliner. * Collections can get static overrides with the right click menu in the outliner, but this is rather unreliable and not clearly communicated at the moment. * We still need to improve the make override operator to turn collection instances into collections with overrides directly in the scene. PERFORMANCE * We tried to make performance not worse than before and improve it in some cases. The main thing that's still a bit slower is multiple scenes, we have to change the layer syncing to only updated affected scenes. * Collections keep a list of their parent collections for faster incremental updates in syncing and caching. * View layer bases are now in a object -> base hash to avoid quadratic time lookups internally and in API functions like visible_get(). VERSIONING * Compatibility with 2.7 files should be improved due to the new visibility controls. Of course users may not want to set up their scenes differently now to avoid having separate layers and groups. * Compatibility with 2.8 is mostly there, and was tested on Eevee demo and Hero files. There's a few things which are know to be not quite compatible, like nested layer collections inside groups. * The versioning code for 2.8 files is quite complicated, and isolated behind #ifdef so it can be removed at the end of the release cycle. KNOWN ISSUES * The G-key group operators in the 3D viewport were left mostly as is, they need to be modified still to fit better. * Same for the groups panel in the object properties. This needs to be updated still, or perhaps replaced by something better. * Collections must all have a unique name. Less restrictive namespacing is to be done later, we'll have to see how important this is as all objects within the collections must also have a unique name anyway. * Full scene copy and delete scene are exactly doing the right thing yet. Differential Revision: https://developer.blender.org/D3383 https://code.blender.org/2018/05/collections-and-groups/
2018-04-30 15:57:22 +02:00
ot->name = "Add Collection Instance";
ot->description = "Add a collection instance";
ot->idname = "OBJECT_OT_collection_instance_add";
Some effect-less code cleanup...
2012-10-05 07:05:52 +00:00
/* api callbacks */
Fix object moved to cursor when editing last operation after dropping object Steps to reproduce were: * Drag object icon from the Outliner into the 3D view (or an object asset from the Asset Browser) * Open the "Adjust Last Operation" panel * Edit options in there - the object would move to the mouse location The same issue happens with collection instance and object data adding (e.g. via drag & drop). This patch addresses them too. The operator used the event state stored in the window. This shouldn't be accessed from the operator execute callback generally which happened here. Especially not if the operator supports editing properties.
2021-01-05 00:57:24 +01:00
ot->invoke = object_instance_add_invoke;
Collections and groups unification OVERVIEW * In 2.7 terminology, all layers and groups are now collection datablocks. * These collections are nestable, linkable, instanceable, overrideable, .. which opens up new ways to set up scenes and link + override data. * Viewport/render visibility and selectability are now a part of the collection and shared across all view layers and linkable. * View layers define which subset of the scene collection hierarchy is excluded for each. For many workflows one view layer can be used, these are more of an advanced feature now. OUTLINER * The outliner now has a "View Layer" display mode instead of "Collections", which can display the collections and/or objects in the view layer. * In this display mode, collections can be excluded with the right click menu. These will then be greyed out and their objects will be excluded. * To view collections not linked to any scene, the "Blender File" display mode can be used, with the new filtering option to just see Colleciton datablocks. * The outliner right click menus for collections and objects were reorganized. * Drag and drop still needs to be improved. Like before, dragging the icon or text gives different results, we'll unify this later. LINKING AND OVERRIDES * Collections can now be linked into the scene without creating an instance, with the link/append operator or from the collections view in the outliner. * Collections can get static overrides with the right click menu in the outliner, but this is rather unreliable and not clearly communicated at the moment. * We still need to improve the make override operator to turn collection instances into collections with overrides directly in the scene. PERFORMANCE * We tried to make performance not worse than before and improve it in some cases. The main thing that's still a bit slower is multiple scenes, we have to change the layer syncing to only updated affected scenes. * Collections keep a list of their parent collections for faster incremental updates in syncing and caching. * View layer bases are now in a object -> base hash to avoid quadratic time lookups internally and in API functions like visible_get(). VERSIONING * Compatibility with 2.7 files should be improved due to the new visibility controls. Of course users may not want to set up their scenes differently now to avoid having separate layers and groups. * Compatibility with 2.8 is mostly there, and was tested on Eevee demo and Hero files. There's a few things which are know to be not quite compatible, like nested layer collections inside groups. * The versioning code for 2.8 files is quite complicated, and isolated behind #ifdef so it can be removed at the end of the release cycle. KNOWN ISSUES * The G-key group operators in the 3D viewport were left mostly as is, they need to be modified still to fit better. * Same for the groups panel in the object properties. This needs to be updated still, or perhaps replaced by something better. * Collections must all have a unique name. Less restrictive namespacing is to be done later, we'll have to see how important this is as all objects within the collections must also have a unique name anyway. * Full scene copy and delete scene are exactly doing the right thing yet. Differential Revision: https://developer.blender.org/D3383 https://code.blender.org/2018/05/collections-and-groups/
2018-04-30 15:57:22 +02:00
ot->exec = collection_instance_add_exec;
Some effect-less code cleanup...
2012-10-05 07:05:52 +00:00
ot->poll = ED_operator_objectmode;
/* flags */
ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
/* properties */
Collections and groups unification OVERVIEW * In 2.7 terminology, all layers and groups are now collection datablocks. * These collections are nestable, linkable, instanceable, overrideable, .. which opens up new ways to set up scenes and link + override data. * Viewport/render visibility and selectability are now a part of the collection and shared across all view layers and linkable. * View layers define which subset of the scene collection hierarchy is excluded for each. For many workflows one view layer can be used, these are more of an advanced feature now. OUTLINER * The outliner now has a "View Layer" display mode instead of "Collections", which can display the collections and/or objects in the view layer. * In this display mode, collections can be excluded with the right click menu. These will then be greyed out and their objects will be excluded. * To view collections not linked to any scene, the "Blender File" display mode can be used, with the new filtering option to just see Colleciton datablocks. * The outliner right click menus for collections and objects were reorganized. * Drag and drop still needs to be improved. Like before, dragging the icon or text gives different results, we'll unify this later. LINKING AND OVERRIDES * Collections can now be linked into the scene without creating an instance, with the link/append operator or from the collections view in the outliner. * Collections can get static overrides with the right click menu in the outliner, but this is rather unreliable and not clearly communicated at the moment. * We still need to improve the make override operator to turn collection instances into collections with overrides directly in the scene. PERFORMANCE * We tried to make performance not worse than before and improve it in some cases. The main thing that's still a bit slower is multiple scenes, we have to change the layer syncing to only updated affected scenes. * Collections keep a list of their parent collections for faster incremental updates in syncing and caching. * View layer bases are now in a object -> base hash to avoid quadratic time lookups internally and in API functions like visible_get(). VERSIONING * Compatibility with 2.7 files should be improved due to the new visibility controls. Of course users may not want to set up their scenes differently now to avoid having separate layers and groups. * Compatibility with 2.8 is mostly there, and was tested on Eevee demo and Hero files. There's a few things which are know to be not quite compatible, like nested layer collections inside groups. * The versioning code for 2.8 files is quite complicated, and isolated behind #ifdef so it can be removed at the end of the release cycle. KNOWN ISSUES * The G-key group operators in the 3D viewport were left mostly as is, they need to be modified still to fit better. * Same for the groups panel in the object properties. This needs to be updated still, or perhaps replaced by something better. * Collections must all have a unique name. Less restrictive namespacing is to be done later, we'll have to see how important this is as all objects within the collections must also have a unique name anyway. * Full scene copy and delete scene are exactly doing the right thing yet. Differential Revision: https://developer.blender.org/D3383 https://code.blender.org/2018/05/collections-and-groups/
2018-04-30 15:57:22 +02:00
RNA_def_string(
ot->srna, "name", "Collection", MAX_ID_NAME - 2, "Name", "Collection name to add");
prop = RNA_def_enum(ot->srna, "collection", DummyRNA_NULL_items, 0, "Collection", "");
RNA_def_enum_funcs(prop, RNA_collection_itemf);
Fix: T40016 ID Names translated in menus
2014-05-05 15:09:29 +10:00
RNA_def_property_flag(prop, PROP_ENUM_NO_TRANSLATE);
ot->prop = prop;
Code cleanup: remove TRUE/FALSE & WITH_BOOL_COMPAT define
2014-04-01 11:34:00 +11:00
ED_object_add_generic_props(ot, false);
Fix object moved to cursor when editing last operation after dropping object Steps to reproduce were: * Drag object icon from the Outliner into the 3D view (or an object asset from the Asset Browser) * Open the "Adjust Last Operation" panel * Edit options in there - the object would move to the mouse location The same issue happens with collection instance and object data adding (e.g. via drag & drop). This patch addresses them too. The operator used the event state stored in the window. This shouldn't be accessed from the operator execute callback generally which happened here. Especially not if the operator supports editing properties.
2021-01-05 00:57:24 +01:00
Fix Adjust Last Operation panel showing session UUID number button This is implementation specific data that should never be exposed to regular users. Also make sure this data is not saved to presets.
2022-01-07 22:55:45 +01:00
prop = RNA_def_int(ot->srna,
"session_uuid",
0,
INT32_MIN,
INT32_MAX,
"Session UUID",
"Session UUID of the collection to add",
INT32_MIN,
INT32_MAX);
RNA_def_property_flag(prop, PROP_SKIP_SAVE | PROP_HIDDEN);
Fix T87912: use session id instead of name to identify dropped object The old code did not work when there were multiple ids with the same name (which can happen when ids are linked in). The solution is to use the session ids instead. Those are different even when two ids have the same name. Differential Revision: https://developer.blender.org/D11116
2021-11-19 15:28:44 +01:00
Fix object moved to cursor when editing last operation after dropping object Steps to reproduce were: * Drag object icon from the Outliner into the 3D view (or an object asset from the Asset Browser) * Open the "Adjust Last Operation" panel * Edit options in there - the object would move to the mouse location The same issue happens with collection instance and object data adding (e.g. via drag & drop). This patch addresses them too. The operator used the event state stored in the window. This shouldn't be accessed from the operator execute callback generally which happened here. Especially not if the operator supports editing properties.
2021-01-05 00:57:24 +01:00
object_add_drop_xy_props(ot);
Some effect-less code cleanup...
2012-10-05 07:05:52 +00:00
}
Cleanup: use doxy sections for object_add.c
2019-05-16 14:03:31 +10:00
/** \} */
Viewport: support dropping object-data to create instances This allows orphan object data for example (meshes, curves, etc) to be dropped into the 3D View from the outliner, creating a new object instance. Previously the only way to do this was to add the same type of object then swap it's data through the ID selector drop-down.
2020-09-06 18:35:27 +10:00
/* -------------------------------------------------------------------- */
/** \name Add Data Instance Operator
*
* Use for dropping ID's from the outliner.
* \{ */
static int object_data_instance_add_exec(bContext *C, wmOperator *op)
{
Main *bmain = CTX_data_main(C);
ID *id = NULL;
ushort local_view_bits;
float loc[3], rot[3];
PropertyRNA *prop_name = RNA_struct_find_property(op->ptr, "name");
PropertyRNA *prop_type = RNA_struct_find_property(op->ptr, "type");
PropertyRNA *prop_location = RNA_struct_find_property(op->ptr, "location");
/* These shouldn't fail when created by outliner dropping as it checks the ID is valid. */
if (!RNA_property_is_set(op->ptr, prop_name) || !RNA_property_is_set(op->ptr, prop_type)) {
return OPERATOR_CANCELLED;
}
const short id_type = RNA_property_enum_get(op->ptr, prop_type);
char name[MAX_ID_NAME - 2];
RNA_property_string_get(op->ptr, prop_name, name);
id = BKE_libblock_find_name(bmain, id_type, name);
if (id == NULL) {
return OPERATOR_CANCELLED;
}
const int object_type = BKE_object_obdata_to_type(id);
if (object_type == -1) {
return OPERATOR_CANCELLED;
}
Fix object moved to cursor when editing last operation after dropping object Steps to reproduce were: * Drag object icon from the Outliner into the 3D view (or an object asset from the Asset Browser) * Open the "Adjust Last Operation" panel * Edit options in there - the object would move to the mouse location The same issue happens with collection instance and object data adding (e.g. via drag & drop). This patch addresses them too. The operator used the event state stored in the window. This shouldn't be accessed from the operator execute callback generally which happened here. Especially not if the operator supports editing properties.
2021-01-05 00:57:24 +01:00
int mval[2];
if (!RNA_property_is_set(op->ptr, prop_location) && object_add_drop_xy_get(C, op, &mval)) {
Viewport: support dropping object-data to create instances This allows orphan object data for example (meshes, curves, etc) to be dropped into the 3D View from the outliner, creating a new object instance. Previously the only way to do this was to add the same type of object then swap it's data through the ID selector drop-down.
2020-09-06 18:35:27 +10:00
ED_object_location_from_view(C, loc);
ED_view3d_cursor3d_position(C, mval, false, loc);
RNA_property_float_set_array(op->ptr, prop_location, loc);
}
if (!ED_object_add_generic_get_opts(C, op, 'Z', loc, rot, NULL, NULL, &local_view_bits, NULL)) {
return OPERATOR_CANCELLED;
}
Fix OBJECT_OT_data_instance_add creating empty data-blocks ED_object_add_type creates empty object data, add ED_object_add_type_with_obdata which can take existing object data.
2020-09-07 13:45:14 +10:00
ED_object_add_type_with_obdata(
C, object_type, id->name + 2, loc, rot, false, local_view_bits, id);
Viewport: support dropping object-data to create instances This allows orphan object data for example (meshes, curves, etc) to be dropped into the 3D View from the outliner, creating a new object instance. Previously the only way to do this was to add the same type of object then swap it's data through the ID selector drop-down.
2020-09-06 18:35:27 +10:00
return OPERATOR_FINISHED;
}
void OBJECT_OT_data_instance_add(wmOperatorType *ot)
{
/* identifiers */
ot->name = "Add Object Data Instance";
ot->description = "Add an object data instance";
ot->idname = "OBJECT_OT_data_instance_add";
/* api callbacks */
Fix object moved to cursor when editing last operation after dropping object Steps to reproduce were: * Drag object icon from the Outliner into the 3D view (or an object asset from the Asset Browser) * Open the "Adjust Last Operation" panel * Edit options in there - the object would move to the mouse location The same issue happens with collection instance and object data adding (e.g. via drag & drop). This patch addresses them too. The operator used the event state stored in the window. This shouldn't be accessed from the operator execute callback generally which happened here. Especially not if the operator supports editing properties.
2021-01-05 00:57:24 +01:00
ot->invoke = object_add_drop_xy_generic_invoke;
Viewport: support dropping object-data to create instances This allows orphan object data for example (meshes, curves, etc) to be dropped into the 3D View from the outliner, creating a new object instance. Previously the only way to do this was to add the same type of object then swap it's data through the ID selector drop-down.
2020-09-06 18:35:27 +10:00
ot->exec = object_data_instance_add_exec;
ot->poll = ED_operator_objectmode;
/* flags */
ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
/* properties */
RNA_def_string(ot->srna, "name", "Name", MAX_ID_NAME - 2, "Name", "ID name to add");
PropertyRNA *prop = RNA_def_enum(ot->srna, "type", rna_enum_id_type_items, 0, "Type", "");
RNA_def_property_translation_context(prop, BLT_I18NCONTEXT_ID_ID);
ED_object_add_generic_props(ot, false);
Fix object moved to cursor when editing last operation after dropping object Steps to reproduce were: * Drag object icon from the Outliner into the 3D view (or an object asset from the Asset Browser) * Open the "Adjust Last Operation" panel * Edit options in there - the object would move to the mouse location The same issue happens with collection instance and object data adding (e.g. via drag & drop). This patch addresses them too. The operator used the event state stored in the window. This shouldn't be accessed from the operator execute callback generally which happened here. Especially not if the operator supports editing properties.
2021-01-05 00:57:24 +01:00
object_add_drop_xy_props(ot);
Viewport: support dropping object-data to create instances This allows orphan object data for example (meshes, curves, etc) to be dropped into the 3D View from the outliner, creating a new object instance. Previously the only way to do this was to add the same type of object then swap it's data through the ID selector drop-down.
2020-09-06 18:35:27 +10:00
}
/** \} */
Cleanup: use doxy sections for object_add.c
2019-05-16 14:03:31 +10:00
/* -------------------------------------------------------------------- */
/** \name Add Speaker Operator
* \{ */
Some effect-less code cleanup...
2012-10-05 07:05:52 +00:00
3D Audio GSoC: Adds new speaker object type. Notes: * Needs some nice icons * Quickily review by Joshua Leung (5 mins) * Properties UI updated (with help of Thomans Dinges) * Speakers have their own theme color * No real audio functionality yet. * Minor bug regarding lamps/lattices fixed in interface_templates.c I personality tested: * Creation, Deletion, Duplication * Saving, Loading * Library linking (incl. make local) * Tracking * Dope Sheet, Outliner * Animation * Drawing (incl. Theme)
2011-08-01 11:44:20 +00:00
static int object_speaker_add_exec(bContext *C, wmOperator *op)
{
Sound: Fix queries of sound info A lot of areas were querying sound information directly using audio handle which does not exist on an original sound IDs. This change basically makes it so it's possible to query information about given sound ID, without worrying about whether it's loaded or not: if it is needed to load it first it happens automatically (no automatically-opened handles are left behind though). While this seems a bit extreme to open files on such queries it is still better than the old situation when all sound handles were opened on file load, no matter if it's needed or not. Besides, none of the changed code paths are performance critical, just handful of tools. Fixes T65696: Sequencer fails to create a new sound sequence strip via Python Fixes T65656: Audio strip - SHIFT K crashes Blender Reviewers: brecht Reviewed By: brecht Subscribers: ISS Maniphest Tasks: T65696, T65656 Differential Revision: https://developer.blender.org/D5061
2019-06-11 10:55:13 +02:00
Main *bmain = CTX_data_main(C);
3D Audio GSoC: Speaker objects fully functional! Minor changes: * Fixed three memory bugs found via valgrind. * Fixed bug with jack transport crashing after file loading. * Sound NLA Strips now start at CFRA instead of 0.
2011-08-09 08:38:14 +00:00
Scene *scene = CTX_data_scene(C);
3D Audio GSoC: Adds new speaker object type. Notes: * Needs some nice icons * Quickily review by Joshua Leung (5 mins) * Properties UI updated (with help of Thomans Dinges) * Speakers have their own theme color * No real audio functionality yet. * Minor bug regarding lamps/lattices fixed in interface_templates.c I personality tested: * Creation, Deletion, Duplication * Saving, Loading * Library linking (incl. make local) * Tracking * Dope Sheet, Outliner * Animation * Drawing (incl. Theme)
2011-08-01 11:44:20 +00:00
Cleanup: Declare variables where initialized
2020-10-09 16:39:39 -05:00
ushort local_view_bits;
float loc[3], rot[3];
Object: add scale argument to creation operators Needed for to create objects of a specific size.
2020-05-28 14:30:42 +10:00
if (!ED_object_add_generic_get_opts(C, op, 'Z', loc, rot, NULL, NULL, &local_view_bits, NULL)) {
3D Audio GSoC: Adds new speaker object type. Notes: * Needs some nice icons * Quickily review by Joshua Leung (5 mins) * Properties UI updated (with help of Thomans Dinges) * Speakers have their own theme color * No real audio functionality yet. * Minor bug regarding lamps/lattices fixed in interface_templates.c I personality tested: * Creation, Deletion, Duplication * Saving, Loading * Library linking (incl. make local) * Tracking * Dope Sheet, Outliner * Animation * Drawing (incl. Theme)
2011-08-01 11:44:20 +00:00
return OPERATOR_CANCELLED;
Fix adding objects in local view
2018-12-07 12:59:04 +11:00
}
Cleanup: Declare variables where initialized
2020-10-09 16:39:39 -05:00
Object *ob = ED_object_add_type(C, OB_SPEAKER, NULL, loc, rot, false, local_view_bits);
LibOverride: Add initial support for adding new NLA tracks. Also makes NLA tracks and strips overridable. User can either edit existing strips in existing NLA tracks (but not add or remove them), and/or add new NLA tracks after those comming from the linked data. Most of the work was as usual checking operators and adding protections against illegal operations in override context. Note that since we can only rely on indices to deal with local added tracks, we forbid any local track being before any linked/original track. Maniphest Tasks: T72629 Differential Revision: https://developer.blender.org/D9611
2020-12-07 16:58:18 +01:00
const bool is_liboverride = ID_IS_OVERRIDE_LIBRARY(ob);
Some effect-less code cleanup...
2012-10-05 07:05:52 +00:00
Cleanup: correct spelling in comments
2021-02-05 16:23:34 +11:00
/* To make it easier to start using this immediately in NLA, a default sound clip is created
* ready to be moved around to re-time the sound and/or make new sound clips. */
Nla Sound Strips + Add Speaker Second part of previous commit. Now, when speaker objects are created, they are created by default with an NLA sound strip so that it is easy to just start immediately using this to do cool stuff (i.e. timing when you want the sound to start).
2011-08-07 12:43:44 +00:00
{
/* create new data for NLA hierarchy */
Cleanup: rename BKE_animdata_{add=>ensure}_id Use the term `ensure` as existing data is used when present.
2021-07-09 11:53:16 +10:00
AnimData *adt = BKE_animdata_ensure_id(&ob->id);
LibOverride: Add initial support for adding new NLA tracks. Also makes NLA tracks and strips overridable. User can either edit existing strips in existing NLA tracks (but not add or remove them), and/or add new NLA tracks after those comming from the linked data. Most of the work was as usual checking operators and adding protections against illegal operations in override context. Note that since we can only rely on indices to deal with local added tracks, we forbid any local track being before any linked/original track. Maniphest Tasks: T72629 Differential Revision: https://developer.blender.org/D9611
2020-12-07 16:58:18 +01:00
NlaTrack *nlt = BKE_nlatrack_add(adt, NULL, is_liboverride);
Sound: Fix queries of sound info A lot of areas were querying sound information directly using audio handle which does not exist on an original sound IDs. This change basically makes it so it's possible to query information about given sound ID, without worrying about whether it's loaded or not: if it is needed to load it first it happens automatically (no automatically-opened handles are left behind though). While this seems a bit extreme to open files on such queries it is still better than the old situation when all sound handles were opened on file load, no matter if it's needed or not. Besides, none of the changed code paths are performance critical, just handful of tools. Fixes T65696: Sequencer fails to create a new sound sequence strip via Python Fixes T65656: Audio strip - SHIFT K crashes Blender Reviewers: brecht Reviewed By: brecht Subscribers: ISS Maniphest Tasks: T65696, T65656 Differential Revision: https://developer.blender.org/D5061
2019-06-11 10:55:13 +02:00
NlaStrip *strip = BKE_nla_add_soundstrip(bmain, scene, ob->data);
3D Audio GSoC: Speaker objects fully functional! Minor changes: * Fixed three memory bugs found via valgrind. * Fixed bug with jack transport crashing after file loading. * Sound NLA Strips now start at CFRA instead of 0.
2011-08-09 08:38:14 +00:00
strip->start = CFRA;
strip->end += strip->start;
Some effect-less code cleanup...
2012-10-05 07:05:52 +00:00
Nla Sound Strips + Add Speaker Second part of previous commit. Now, when speaker objects are created, they are created by default with an NLA sound strip so that it is easy to just start immediately using this to do cool stuff (i.e. timing when you want the sound to start).
2011-08-07 12:43:44 +00:00
/* hook them up */
LibOverride: Add initial support for adding new NLA tracks. Also makes NLA tracks and strips overridable. User can either edit existing strips in existing NLA tracks (but not add or remove them), and/or add new NLA tracks after those comming from the linked data. Most of the work was as usual checking operators and adding protections against illegal operations in override context. Note that since we can only rely on indices to deal with local added tracks, we forbid any local track being before any linked/original track. Maniphest Tasks: T72629 Differential Revision: https://developer.blender.org/D9611
2020-12-07 16:58:18 +01:00
BKE_nlatrack_add_strip(nlt, strip, is_liboverride);
Some effect-less code cleanup...
2012-10-05 07:05:52 +00:00
Cleanup: comment blocks, trailing space in comments
2021-06-24 15:56:58 +10:00
/* Auto-name the strip, and give the track an interesting name. */
Code Cleanup: use BLI_strncpy when copying into fixed sized buffers
2013-12-03 09:12:44 +11:00
BLI_strncpy(nlt->name, DATA_("SoundTrack"), sizeof(nlt->name));
Nla Sound Strips + Add Speaker Second part of previous commit. Now, when speaker objects are created, they are created by default with an NLA sound strip so that it is easy to just start immediately using this to do cool stuff (i.e. timing when you want the sound to start).
2011-08-07 12:43:44 +00:00
BKE_nlastrip_validate_name(adt, strip);
Some effect-less code cleanup...
2012-10-05 07:05:52 +00:00
Fix T84586: missing Outliner redraws for certain NLA operators Outliner display under 'Animation' > 'NLA Tracks' was not updating in the following cases: - adding strips - removing strips - duplicating strips (possibly to different track) - swapping strips - reordering tracks - changing strip order by translating - translating strips between tracks - renaming tracks In the case of deleting strips/tracks, this was also resulting in a use- after-free error in Outliner drawing code (this was reported specifically in T84586). Most of these operators already sent a ND_NLA|NA_EDITED notifier, but the Outliner is not listening to these. Listening to NA_EDITED is also not what we want since this also happens a lot in cases irrelevant to the Outliner. Now be a bit more specific and send ND_NLA|NA_ADDED / ND_NLA| NA_REMOVED or a new ND_NLA_ORDER (to distinguish from NA_EDITED 'only' - where a redraw is not neccessary) and listen to these from the Outliner. (note: places that were listening to ND_NLA|NA_EDITED before are also listening to NA_ADDED or NA_REMOVED, so changing NA_EDITED should not be a problem here) (note 2: for cases like swapping tracks/strips order, NA_ADDED or NA_REMOVED does not make sense, neither can we use NA_EDITED [since we dont want to listen to this], so in this case an additional ND_NLA_ORDER is now sent) (note 3: in nla transform code, this is now always sent on confirm. There are cases were the notifier would not be needed, but checking exactly all cases were it actually would be needed seems overkill [history of D10073 has example code to check if strips moved between tracks]) Maniphest Tasks: T84586 Differential Revision: https://developer.blender.org/D10073
2021-01-11 13:56:15 +01:00
WM_event_add_notifier(C, NC_ANIMATION | ND_NLA | NA_ADDED, NULL);
Nla Sound Strips + Add Speaker Second part of previous commit. Now, when speaker objects are created, they are created by default with an NLA sound strip so that it is easy to just start immediately using this to do cool stuff (i.e. timing when you want the sound to start).
2011-08-07 12:43:44 +00:00
}
3D Audio GSoC: Adds new speaker object type. Notes: * Needs some nice icons * Quickily review by Joshua Leung (5 mins) * Properties UI updated (with help of Thomans Dinges) * Speakers have their own theme color * No real audio functionality yet. * Minor bug regarding lamps/lattices fixed in interface_templates.c I personality tested: * Creation, Deletion, Duplication * Saving, Loading * Library linking (incl. make local) * Tracking * Dope Sheet, Outliner * Animation * Drawing (incl. Theme)
2011-08-01 11:44:20 +00:00
return OPERATOR_FINISHED;
}
void OBJECT_OT_speaker_add(wmOperatorType *ot)
{
/* identifiers */
style cleanup: spaces aroudn operators for operator definitions.
2012-03-22 07:26:09 +00:00
ot->name = "Add Speaker";
3D Audio GSoC: Adds new speaker object type. Notes: * Needs some nice icons * Quickily review by Joshua Leung (5 mins) * Properties UI updated (with help of Thomans Dinges) * Speakers have their own theme color * No real audio functionality yet. * Minor bug regarding lamps/lattices fixed in interface_templates.c I personality tested: * Creation, Deletion, Duplication * Saving, Loading * Library linking (incl. make local) * Tracking * Dope Sheet, Outliner * Animation * Drawing (incl. Theme)
2011-08-01 11:44:20 +00:00
ot->description = "Add a speaker object to the scene";
style cleanup: spaces aroudn operators for operator definitions.
2012-03-22 07:26:09 +00:00
ot->idname = "OBJECT_OT_speaker_add";
3D Audio GSoC: Adds new speaker object type. Notes: * Needs some nice icons * Quickily review by Joshua Leung (5 mins) * Properties UI updated (with help of Thomans Dinges) * Speakers have their own theme color * No real audio functionality yet. * Minor bug regarding lamps/lattices fixed in interface_templates.c I personality tested: * Creation, Deletion, Duplication * Saving, Loading * Library linking (incl. make local) * Tracking * Dope Sheet, Outliner * Animation * Drawing (incl. Theme)
2011-08-01 11:44:20 +00:00
/* api callbacks */
style cleanup: spaces aroudn operators for operator definitions.
2012-03-22 07:26:09 +00:00
ot->exec = object_speaker_add_exec;
ot->poll = ED_operator_objectmode;
3D Audio GSoC: Adds new speaker object type. Notes: * Needs some nice icons * Quickily review by Joshua Leung (5 mins) * Properties UI updated (with help of Thomans Dinges) * Speakers have their own theme color * No real audio functionality yet. * Minor bug regarding lamps/lattices fixed in interface_templates.c I personality tested: * Creation, Deletion, Duplication * Saving, Loading * Library linking (incl. make local) * Tracking * Dope Sheet, Outliner * Animation * Drawing (incl. Theme)
2011-08-01 11:44:20 +00:00
/* flags */
style cleanup: editors / mesh & object
2012-04-28 15:42:27 +00:00
ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
3D Audio GSoC: Adds new speaker object type. Notes: * Needs some nice icons * Quickily review by Joshua Leung (5 mins) * Properties UI updated (with help of Thomans Dinges) * Speakers have their own theme color * No real audio functionality yet. * Minor bug regarding lamps/lattices fixed in interface_templates.c I personality tested: * Creation, Deletion, Duplication * Saving, Loading * Library linking (incl. make local) * Tracking * Dope Sheet, Outliner * Animation * Drawing (incl. Theme)
2011-08-01 11:44:20 +00:00
Code cleanup: remove TRUE/FALSE & WITH_BOOL_COMPAT define
2014-04-01 11:34:00 +11:00
ED_object_add_generic_props(ot, true);
3D Audio GSoC: Adds new speaker object type. Notes: * Needs some nice icons * Quickily review by Joshua Leung (5 mins) * Properties UI updated (with help of Thomans Dinges) * Speakers have their own theme color * No real audio functionality yet. * Minor bug regarding lamps/lattices fixed in interface_templates.c I personality tested: * Creation, Deletion, Duplication * Saving, Loading * Library linking (incl. make local) * Tracking * Dope Sheet, Outliner * Animation * Drawing (incl. Theme)
2011-08-01 11:44:20 +00:00
}
Cleanup: use doxy sections for object_add.c
2019-05-16 14:03:31 +10:00
/** \} */
/* -------------------------------------------------------------------- */
Objects: add Volume object type, and prototypes for Hair and PointCloud Only the volume object is exposed in the user interface. It is based on OpenVDB internally. Drawing and rendering code will follow in another commit. https://wiki.blender.org/wiki/Source/Objects/Volume https://wiki.blender.org/wiki/Reference/Release_Notes/2.83/Volumes Hair and PointCloud object types are hidden behind a WITH_NEW_OBJECT_TYPES build option. These are unfinished, and included only to make it easier to cooperate on development in the future and avoid tricky merges. https://wiki.blender.org/wiki/Source/Objects/New_Object_Types Ref T73201, T68981 Differential Revision: https://developer.blender.org/D6945
2020-03-17 14:41:48 +01:00
/** \name Add Hair Operator
* \{ */
Preferences: New experimental settings for particle system and hair This replaces the cmake options `WITH_NEW_OBJECT_TYPES` and `WITH_NEW_SIMULATION_TYPE` with two experimental userpref settings: * `use_new_particle_system`: Enables the point cloud type and the simulation editor. * `use_new_hair_type`: Only displays the add-operator in the add menu for now. Note, in the current state you can't do anything productive with the new particle system or the new hair type. Features will be added step by step in the upcoming weeks and months. Reviewers: brecht Differential Revision: https://developer.blender.org/D8096
2020-06-23 11:30:46 +02:00
static bool object_hair_add_poll(bContext *C)
{
if (!U.experimental.use_new_hair_type) {
return false;
}
return ED_operator_objectmode(C);
}
Objects: add Volume object type, and prototypes for Hair and PointCloud Only the volume object is exposed in the user interface. It is based on OpenVDB internally. Drawing and rendering code will follow in another commit. https://wiki.blender.org/wiki/Source/Objects/Volume https://wiki.blender.org/wiki/Reference/Release_Notes/2.83/Volumes Hair and PointCloud object types are hidden behind a WITH_NEW_OBJECT_TYPES build option. These are unfinished, and included only to make it easier to cooperate on development in the future and avoid tricky merges. https://wiki.blender.org/wiki/Source/Objects/New_Object_Types Ref T73201, T68981 Differential Revision: https://developer.blender.org/D6945
2020-03-17 14:41:48 +01:00
static int object_hair_add_exec(bContext *C, wmOperator *op)
{
ushort local_view_bits;
float loc[3], rot[3];
Object: add scale argument to creation operators Needed for to create objects of a specific size.
2020-05-28 14:30:42 +10:00
if (!ED_object_add_generic_get_opts(C, op, 'Z', loc, rot, NULL, NULL, &local_view_bits, NULL)) {
Objects: add Volume object type, and prototypes for Hair and PointCloud Only the volume object is exposed in the user interface. It is based on OpenVDB internally. Drawing and rendering code will follow in another commit. https://wiki.blender.org/wiki/Source/Objects/Volume https://wiki.blender.org/wiki/Reference/Release_Notes/2.83/Volumes Hair and PointCloud object types are hidden behind a WITH_NEW_OBJECT_TYPES build option. These are unfinished, and included only to make it easier to cooperate on development in the future and avoid tricky merges. https://wiki.blender.org/wiki/Source/Objects/New_Object_Types Ref T73201, T68981 Differential Revision: https://developer.blender.org/D6945
2020-03-17 14:41:48 +01:00
return OPERATOR_CANCELLED;
}
Cleanup: Declare variables where initialized
2020-10-09 16:39:39 -05:00
Objects: add Volume object type, and prototypes for Hair and PointCloud Only the volume object is exposed in the user interface. It is based on OpenVDB internally. Drawing and rendering code will follow in another commit. https://wiki.blender.org/wiki/Source/Objects/Volume https://wiki.blender.org/wiki/Reference/Release_Notes/2.83/Volumes Hair and PointCloud object types are hidden behind a WITH_NEW_OBJECT_TYPES build option. These are unfinished, and included only to make it easier to cooperate on development in the future and avoid tricky merges. https://wiki.blender.org/wiki/Source/Objects/New_Object_Types Ref T73201, T68981 Differential Revision: https://developer.blender.org/D6945
2020-03-17 14:41:48 +01:00
Object *object = ED_object_add_type(C, OB_HAIR, NULL, loc, rot, false, local_view_bits);
object->dtx |= OB_DRAWBOUNDOX; /* TODO: remove once there is actual drawing. */
return OPERATOR_FINISHED;
}
void OBJECT_OT_hair_add(wmOperatorType *ot)
{
/* identifiers */
ot->name = "Add Hair";
ot->description = "Add a hair object to the scene";
ot->idname = "OBJECT_OT_hair_add";
/* api callbacks */
ot->exec = object_hair_add_exec;
Preferences: New experimental settings for particle system and hair This replaces the cmake options `WITH_NEW_OBJECT_TYPES` and `WITH_NEW_SIMULATION_TYPE` with two experimental userpref settings: * `use_new_particle_system`: Enables the point cloud type and the simulation editor. * `use_new_hair_type`: Only displays the add-operator in the add menu for now. Note, in the current state you can't do anything productive with the new particle system or the new hair type. Features will be added step by step in the upcoming weeks and months. Reviewers: brecht Differential Revision: https://developer.blender.org/D8096
2020-06-23 11:30:46 +02:00
ot->poll = object_hair_add_poll;
Objects: add Volume object type, and prototypes for Hair and PointCloud Only the volume object is exposed in the user interface. It is based on OpenVDB internally. Drawing and rendering code will follow in another commit. https://wiki.blender.org/wiki/Source/Objects/Volume https://wiki.blender.org/wiki/Reference/Release_Notes/2.83/Volumes Hair and PointCloud object types are hidden behind a WITH_NEW_OBJECT_TYPES build option. These are unfinished, and included only to make it easier to cooperate on development in the future and avoid tricky merges. https://wiki.blender.org/wiki/Source/Objects/New_Object_Types Ref T73201, T68981 Differential Revision: https://developer.blender.org/D6945
2020-03-17 14:41:48 +01:00
/* flags */
ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
ED_object_add_generic_props(ot, false);
}
/** \} */
/* -------------------------------------------------------------------- */
/** \name Add Point Cloud Operator
Cleanup: use doxy sections for object_add.c
2019-05-16 14:03:31 +10: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
Preferences: New experimental settings for particle system and hair This replaces the cmake options `WITH_NEW_OBJECT_TYPES` and `WITH_NEW_SIMULATION_TYPE` with two experimental userpref settings: * `use_new_particle_system`: Enables the point cloud type and the simulation editor. * `use_new_hair_type`: Only displays the add-operator in the add menu for now. Note, in the current state you can't do anything productive with the new particle system or the new hair type. Features will be added step by step in the upcoming weeks and months. Reviewers: brecht Differential Revision: https://developer.blender.org/D8096
2020-06-23 11:30:46 +02:00
static bool object_pointcloud_add_poll(bContext *C)
{
Move Point Cloud object back to Experimental Features The geometry-nodes features no longer depend on the point cloud object. Therefore the point cloud object, although important in the future, can be postponed until we have render and edit mode fully working. This reverts commits: * ea74ed5a7a2031b614d401e394f2e0146fc90155. * dc614c68ef2c8ca8b076a000974b5a20a4145a42.
2020-12-15 13:07:02 +01:00
if (!U.experimental.use_new_point_cloud_type) {
return false;
}
Preferences: New experimental settings for particle system and hair This replaces the cmake options `WITH_NEW_OBJECT_TYPES` and `WITH_NEW_SIMULATION_TYPE` with two experimental userpref settings: * `use_new_particle_system`: Enables the point cloud type and the simulation editor. * `use_new_hair_type`: Only displays the add-operator in the add menu for now. Note, in the current state you can't do anything productive with the new particle system or the new hair type. Features will be added step by step in the upcoming weeks and months. Reviewers: brecht Differential Revision: https://developer.blender.org/D8096
2020-06-23 11:30:46 +02:00
return ED_operator_objectmode(C);
}
Objects: add Volume object type, and prototypes for Hair and PointCloud Only the volume object is exposed in the user interface. It is based on OpenVDB internally. Drawing and rendering code will follow in another commit. https://wiki.blender.org/wiki/Source/Objects/Volume https://wiki.blender.org/wiki/Reference/Release_Notes/2.83/Volumes Hair and PointCloud object types are hidden behind a WITH_NEW_OBJECT_TYPES build option. These are unfinished, and included only to make it easier to cooperate on development in the future and avoid tricky merges. https://wiki.blender.org/wiki/Source/Objects/New_Object_Types Ref T73201, T68981 Differential Revision: https://developer.blender.org/D6945
2020-03-17 14:41:48 +01:00
static int object_pointcloud_add_exec(bContext *C, wmOperator *op)
{
ushort local_view_bits;
float loc[3], rot[3];
Object: add scale argument to creation operators Needed for to create objects of a specific size.
2020-05-28 14:30:42 +10:00
if (!ED_object_add_generic_get_opts(C, op, 'Z', loc, rot, NULL, NULL, &local_view_bits, NULL)) {
Objects: add Volume object type, and prototypes for Hair and PointCloud Only the volume object is exposed in the user interface. It is based on OpenVDB internally. Drawing and rendering code will follow in another commit. https://wiki.blender.org/wiki/Source/Objects/Volume https://wiki.blender.org/wiki/Reference/Release_Notes/2.83/Volumes Hair and PointCloud object types are hidden behind a WITH_NEW_OBJECT_TYPES build option. These are unfinished, and included only to make it easier to cooperate on development in the future and avoid tricky merges. https://wiki.blender.org/wiki/Source/Objects/New_Object_Types Ref T73201, T68981 Differential Revision: https://developer.blender.org/D6945
2020-03-17 14:41:48 +01:00
return OPERATOR_CANCELLED;
}
Cleanup: Declare variables where initialized
2020-10-09 16:39:39 -05:00
Objects: add Volume object type, and prototypes for Hair and PointCloud Only the volume object is exposed in the user interface. It is based on OpenVDB internally. Drawing and rendering code will follow in another commit. https://wiki.blender.org/wiki/Source/Objects/Volume https://wiki.blender.org/wiki/Reference/Release_Notes/2.83/Volumes Hair and PointCloud object types are hidden behind a WITH_NEW_OBJECT_TYPES build option. These are unfinished, and included only to make it easier to cooperate on development in the future and avoid tricky merges. https://wiki.blender.org/wiki/Source/Objects/New_Object_Types Ref T73201, T68981 Differential Revision: https://developer.blender.org/D6945
2020-03-17 14:41:48 +01:00
Object *object = ED_object_add_type(C, OB_POINTCLOUD, NULL, loc, rot, false, local_view_bits);
object->dtx |= OB_DRAWBOUNDOX; /* TODO: remove once there is actual drawing. */
return OPERATOR_FINISHED;
}
void OBJECT_OT_pointcloud_add(wmOperatorType *ot)
{
/* identifiers */
ot->name = "Add Point Cloud";
ot->description = "Add a point cloud object to the scene";
ot->idname = "OBJECT_OT_pointcloud_add";
/* api callbacks */
ot->exec = object_pointcloud_add_exec;
Preferences: New experimental settings for particle system and hair This replaces the cmake options `WITH_NEW_OBJECT_TYPES` and `WITH_NEW_SIMULATION_TYPE` with two experimental userpref settings: * `use_new_particle_system`: Enables the point cloud type and the simulation editor. * `use_new_hair_type`: Only displays the add-operator in the add menu for now. Note, in the current state you can't do anything productive with the new particle system or the new hair type. Features will be added step by step in the upcoming weeks and months. Reviewers: brecht Differential Revision: https://developer.blender.org/D8096
2020-06-23 11:30:46 +02:00
ot->poll = object_pointcloud_add_poll;
Objects: add Volume object type, and prototypes for Hair and PointCloud Only the volume object is exposed in the user interface. It is based on OpenVDB internally. Drawing and rendering code will follow in another commit. https://wiki.blender.org/wiki/Source/Objects/Volume https://wiki.blender.org/wiki/Reference/Release_Notes/2.83/Volumes Hair and PointCloud object types are hidden behind a WITH_NEW_OBJECT_TYPES build option. These are unfinished, and included only to make it easier to cooperate on development in the future and avoid tricky merges. https://wiki.blender.org/wiki/Source/Objects/New_Object_Types Ref T73201, T68981 Differential Revision: https://developer.blender.org/D6945
2020-03-17 14:41:48 +01:00
/* flags */
ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
ED_object_add_generic_props(ot, false);
}
/** \} */
/* -------------------------------------------------------------------- */
/** \name Delete Object Operator
* \{ */
Cleanup: move public doc-strings into headers for 'editors' Ref T92709
2021-12-09 00:55:11 +11:00
Farewell Scene->basact
2017-11-09 13:11:20 -02:00
void ED_object_base_free_and_unlink(Main *bmain, Scene *scene, Object *ob)
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
{
Cleanup: re-order expensive checks for indirect ID use Check for indirect ID use after other simple user count checks are made. Also assert ED_object_base_free_and_unlink_no_indirect_check object argument isn't indirectly used.
2021-03-28 18:39:18 +11:00
if (ID_REAL_USERS(ob) <= 1 && ID_EXTRA_USERS(ob) == 0 &&
BKE_library_ID_is_indirectly_used(bmain, ob)) {
"Fix" crash when deleting linked object which has indirect usages. This is in fact very hairy situation here... Objects are only refcounted by scenes, any other usage is 'free', which means once all object instanciations are gone Blender considers it can delete it. There is a trap here though: indirect usages. Typically, we should never modify linked data (because it is essencially useless, changes would be ignored and ost on next reload or even undo/redo). This means indirect usages are not affected by default 'safe' remapping/unlinking. For unlinking preceeding deletion however, this is not acceptable - we are likely to end with a zero-user ID (aka deletable one) which is still actually used by other linked data. Solution choosen here is double: I) From 'user-space' (i.e. outliner, operators...), we check for cases where deleting datablocks should not be allowed (indirect data or indirectly used data), and abort (with report) if needed. II) From 'lower' level (BKE_library_remap and RNA), we also unlink from linked data, which makes actual deletion possible and safe. Note that with previous behavior (2.77 one), linked object would be deleted, including from linked data - but then, once file is saved and reloaded, indirect usage would link back the deleted object, without any instanciation in scene, which made it somehow virtual and unreachable... With new behavior, this is no more possible, but on the other hand it means that in situations of dependency cycles (two linked objects using each other), linked objects become impossible to delete (from user space). Not sure what's best here, behavior with those corner cases of library linking is very poorly defined... :(
2016-07-01 17:51:08 +02:00
/* We cannot delete indirectly used object... */
printf(
Cleanup: spelling
2021-02-14 20:58:04 +11:00
"WARNING, undeletable object '%s', should have been caught before reaching this "
"Fix" crash when deleting linked object which has indirect usages. This is in fact very hairy situation here... Objects are only refcounted by scenes, any other usage is 'free', which means once all object instanciations are gone Blender considers it can delete it. There is a trap here though: indirect usages. Typically, we should never modify linked data (because it is essencially useless, changes would be ignored and ost on next reload or even undo/redo). This means indirect usages are not affected by default 'safe' remapping/unlinking. For unlinking preceeding deletion however, this is not acceptable - we are likely to end with a zero-user ID (aka deletable one) which is still actually used by other linked data. Solution choosen here is double: I) From 'user-space' (i.e. outliner, operators...), we check for cases where deleting datablocks should not be allowed (indirect data or indirectly used data), and abort (with report) if needed. II) From 'lower' level (BKE_library_remap and RNA), we also unlink from linked data, which makes actual deletion possible and safe. Note that with previous behavior (2.77 one), linked object would be deleted, including from linked data - but then, once file is saved and reloaded, indirect usage would link back the deleted object, without any instanciation in scene, which made it somehow virtual and unreachable... With new behavior, this is no more possible, but on the other hand it means that in situations of dependency cycles (two linked objects using each other), linked objects become impossible to delete (from user space). Not sure what's best here, behavior with those corner cases of library linking is very poorly defined... :(
2016-07-01 17:51:08 +02:00
"function!",
Render Layers and Collections (merge from render-layers) Design Documents ---------------- * https://wiki.blender.org/index.php/Dev:2.8/Source/Layers * https://wiki.blender.org/index.php/Dev:2.8/Source/DataDesignRevised User Commit Log --------------- * New Layer and Collection system to replace render layers and viewport layers. * A layer is a set of collections of objects (and their drawing options) required for specific tasks. * A collection is a set of objects, equivalent of the old layers in Blender. A collection can be shared across multiple layers. * All Scenes have a master collection that all other collections are children of. * New collection "context" tab (in Properties Editor) * New temporary viewport "collections" panel to control per-collection visibility Missing User Features --------------------- * Collection "Filter" Option to add objects based on their names * Collection Manager operators The existing buttons are placeholders * Collection Manager drawing The editor main region is empty * Collection Override * Per-Collection engine settings This will come as a separate commit, as part of the clay-engine branch Dev Commit Log -------------- * New DNA file (DNA_layer_types.h) with the new structs We are replacing Base by a new extended Base while keeping it backward compatible with some legacy settings (i.e., lay, flag_legacy). Renamed all Base to BaseLegacy to make it clear the areas of code that still need to be converted Note: manual changes were required on - deg_builder_nodes.h, rna_object.c, KX_Light.cpp * Unittesting for main syncronization requirements - read, write, add/copy/remove objects, copy scene, collection link/unlinking, context) * New Editor: Collection Manager Based on patch by Julian Eisel This is extracted from the layer-manager branch. With the following changes: - Renamed references of layer manager to collections manager - I doesn't include the editors/space_collections/ draw and util files - The drawing code itself will be implemented separately by Julian * Base / Object: A little note about them. Original Blender code would try to keep them in sync through the code, juggling flags back and forth. This will now be handled by Depsgraph, keeping Object and Bases more separated throughout the non-rendering code. Scene.base is being cleared in doversion, and the old viewport drawing code was poorly converted to use the new bases while the new viewport code doesn't get merged and replace the old one. Python API Changes ------------------ ``` - scene.layers + # no longer exists - scene.objects + scene.scene_layers.active.objects - scene.objects.active + scene.render_layers.active.objects.active - bpy.context.scene.objects.link() + bpy.context.scene_collection.objects.link() - bpy_extras.object_utils.object_data_add(context, obdata, operator=None, use_active_layer=True, name=None) + bpy_extras.object_utils.object_data_add(context, obdata, operator=None, name=None) - bpy.context.object.select + bpy.context.object.select = True + bpy.context.object.select = False + bpy.context.object.select_get() + bpy.context.object.select_set(action='SELECT') + bpy.context.object.select_set(action='DESELECT') -AddObjectHelper.layers + # no longer exists ```
2017-02-07 10:18:38 +01:00
ob->id.name + 2);
"Fix" crash when deleting linked object which has indirect usages. This is in fact very hairy situation here... Objects are only refcounted by scenes, any other usage is 'free', which means once all object instanciations are gone Blender considers it can delete it. There is a trap here though: indirect usages. Typically, we should never modify linked data (because it is essencially useless, changes would be ignored and ost on next reload or even undo/redo). This means indirect usages are not affected by default 'safe' remapping/unlinking. For unlinking preceeding deletion however, this is not acceptable - we are likely to end with a zero-user ID (aka deletable one) which is still actually used by other linked data. Solution choosen here is double: I) From 'user-space' (i.e. outliner, operators...), we check for cases where deleting datablocks should not be allowed (indirect data or indirectly used data), and abort (with report) if needed. II) From 'lower' level (BKE_library_remap and RNA), we also unlink from linked data, which makes actual deletion possible and safe. Note that with previous behavior (2.77 one), linked object would be deleted, including from linked data - but then, once file is saved and reloaded, indirect usage would link back the deleted object, without any instanciation in scene, which made it somehow virtual and unreachable... With new behavior, this is no more possible, but on the other hand it means that in situations of dependency cycles (two linked objects using each other), linked objects become impossible to delete (from user space). Not sure what's best here, behavior with those corner cases of library linking is very poorly defined... :(
2016-07-01 17:51:08 +02:00
return;
}
Depsgraph: Remove duplicated sets of recalc/update flags There were at least three copies of those: - OB_RECALC* family of flags, which are rudiment of an old dependency graph system. - PSYS_RECALC* which were used by old dependency graph system as a separate set since the graph itself did not handle particle systems. - DEG_TAG_* which was used to tag IDs. Now there is a single set, which defines what can be tagged and queried for an update. It also has some aggregate flags to make queries simpler. Lets once and for all solve the madness of those flags, stick to a single set, which will not overlap with anything or require any extra conversion. Technically, shouldn't be measurable user difference, but some of the agregate flags for few dependency graph components did change. Fixes T58632: Particle don't update rotation settings
2018-12-06 17:52:37 +01:00
DEG_id_tag_update_ex(bmain, &ob->id, ID_RECALC_BASE_FLAGS);
Depsgraph: Fix crash when deleting object which is linked both directly and indirectly
2017-11-24 15:13:45 +01:00
Collections and groups unification OVERVIEW * In 2.7 terminology, all layers and groups are now collection datablocks. * These collections are nestable, linkable, instanceable, overrideable, .. which opens up new ways to set up scenes and link + override data. * Viewport/render visibility and selectability are now a part of the collection and shared across all view layers and linkable. * View layers define which subset of the scene collection hierarchy is excluded for each. For many workflows one view layer can be used, these are more of an advanced feature now. OUTLINER * The outliner now has a "View Layer" display mode instead of "Collections", which can display the collections and/or objects in the view layer. * In this display mode, collections can be excluded with the right click menu. These will then be greyed out and their objects will be excluded. * To view collections not linked to any scene, the "Blender File" display mode can be used, with the new filtering option to just see Colleciton datablocks. * The outliner right click menus for collections and objects were reorganized. * Drag and drop still needs to be improved. Like before, dragging the icon or text gives different results, we'll unify this later. LINKING AND OVERRIDES * Collections can now be linked into the scene without creating an instance, with the link/append operator or from the collections view in the outliner. * Collections can get static overrides with the right click menu in the outliner, but this is rather unreliable and not clearly communicated at the moment. * We still need to improve the make override operator to turn collection instances into collections with overrides directly in the scene. PERFORMANCE * We tried to make performance not worse than before and improve it in some cases. The main thing that's still a bit slower is multiple scenes, we have to change the layer syncing to only updated affected scenes. * Collections keep a list of their parent collections for faster incremental updates in syncing and caching. * View layer bases are now in a object -> base hash to avoid quadratic time lookups internally and in API functions like visible_get(). VERSIONING * Compatibility with 2.7 files should be improved due to the new visibility controls. Of course users may not want to set up their scenes differently now to avoid having separate layers and groups. * Compatibility with 2.8 is mostly there, and was tested on Eevee demo and Hero files. There's a few things which are know to be not quite compatible, like nested layer collections inside groups. * The versioning code for 2.8 files is quite complicated, and isolated behind #ifdef so it can be removed at the end of the release cycle. KNOWN ISSUES * The G-key group operators in the 3D viewport were left mostly as is, they need to be modified still to fit better. * Same for the groups panel in the object properties. This needs to be updated still, or perhaps replaced by something better. * Collections must all have a unique name. Less restrictive namespacing is to be done later, we'll have to see how important this is as all objects within the collections must also have a unique name anyway. * Full scene copy and delete scene are exactly doing the right thing yet. Differential Revision: https://developer.blender.org/D3383 https://code.blender.org/2018/05/collections-and-groups/
2018-04-30 15:57:22 +02:00
BKE_scene_collections_object_remove(bmain, scene, ob, true);
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
}
Object: faster object deletion The `object_delete_exec` lead to `BKE_library_ID_is_indirectly_used` being called twice. With this patch deleting is around 20% faster. Example when deleting 10000 objects: Current: 35.6s This patch: 18.8s (updated, last rev 29.7s) Reviewed By: campbellbarton Ref D9857
2021-03-27 13:38:44 +11:00
void ED_object_base_free_and_unlink_no_indirect_check(Main *bmain, Scene *scene, Object *ob)
{
Cleanup: re-order expensive checks for indirect ID use Check for indirect ID use after other simple user count checks are made. Also assert ED_object_base_free_and_unlink_no_indirect_check object argument isn't indirectly used.
2021-03-28 18:39:18 +11:00
BLI_assert(!BKE_library_ID_is_indirectly_used(bmain, ob));
Object: faster object deletion The `object_delete_exec` lead to `BKE_library_ID_is_indirectly_used` being called twice. With this patch deleting is around 20% faster. Example when deleting 10000 objects: Current: 35.6s This patch: 18.8s (updated, last rev 29.7s) Reviewed By: campbellbarton Ref D9857
2021-03-27 13:38:44 +11:00
DEG_id_tag_update_ex(bmain, &ob->id, ID_RECALC_BASE_FLAGS);
BKE_scene_collections_object_remove(bmain, scene, ob, true);
}
add back feature from 2.4x - Shift+Del to delete objects from all scenes.
2011-11-15 04:11:01 +00:00
static int object_delete_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
{
style cleanup: editors / mesh & object
2012-04-28 15:42:27 +00:00
Main *bmain = CTX_data_main(C);
Scene *scene = CTX_data_scene(C);
Bugfix 33560 Setup: 2 windows, 2 scenes, shared objects and groups. Errors: - editing in 1 window, didn't correctly update shared stuff in the other (like child - parent relations) - deleting group members in 1 scene, could crash the other. Fixes: - On load, only a depsgraph was created for the "active" scene. Now it makes depsgraphs for all visible scenes. - "DAG ID flushes" were only working on active scenes too, they now take the other visible into account as well. - Delete object - notifier was only sent to the active scene. All in all it's a real depsgraph fix (for once!) :) Using multi-window and multi-scene setups now is more useful.
2012-12-17 12:03:31 +00:00
wmWindowManager *wm = CTX_wm_manager(C);
Code cleanup: remove TRUE/FALSE & WITH_BOOL_COMPAT define
2014-04-01 11:34:00 +11:00
const bool use_global = RNA_boolean_get(op->ptr, "use_global");
WM: quiet output of delete object operator Object deletion was reporting the number of objects deleted, causing tests to print noisy output. Now this is information is only included when invoked.
2021-10-14 16:41:40 +11:00
const bool confirm = op->flag & OP_IS_INVOKE;
Object: report number of deleted objects Part of D3953 by @Zachman w/ edits
2018-11-20 09:49:52 +11:00
uint changed_count = 0;
Object: faster object deletion The `object_delete_exec` lead to `BKE_library_ID_is_indirectly_used` being called twice. With this patch deleting is around 20% faster. Example when deleting 10000 objects: Current: 35.6s This patch: 18.8s (updated, last rev 29.7s) Reviewed By: campbellbarton Ref D9857
2021-03-27 13:38:44 +11:00
uint tagged_count = 0;
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Cleanup: style, use braces for editors
2019-04-22 09:19:45 +10:00
if (CTX_data_edit_object(C)) {
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
return OPERATOR_CANCELLED;
Cleanup: style, use braces for editors
2019-04-22 09:19:45 +10:00
}
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Object: faster object deletion The `object_delete_exec` lead to `BKE_library_ID_is_indirectly_used` being called twice. With this patch deleting is around 20% faster. Example when deleting 10000 objects: Current: 35.6s This patch: 18.8s (updated, last rev 29.7s) Reviewed By: campbellbarton Ref D9857
2021-03-27 13:38:44 +11:00
BKE_main_id_tag_all(bmain, LIB_TAG_DOIT, false);
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
CTX_DATA_BEGIN (C, Object *, ob, selected_objects) {
if (ob->id.tag & LIB_TAG_INDIRECT) {
"Fix" crash when deleting linked object which has indirect usages. This is in fact very hairy situation here... Objects are only refcounted by scenes, any other usage is 'free', which means once all object instanciations are gone Blender considers it can delete it. There is a trap here though: indirect usages. Typically, we should never modify linked data (because it is essencially useless, changes would be ignored and ost on next reload or even undo/redo). This means indirect usages are not affected by default 'safe' remapping/unlinking. For unlinking preceeding deletion however, this is not acceptable - we are likely to end with a zero-user ID (aka deletable one) which is still actually used by other linked data. Solution choosen here is double: I) From 'user-space' (i.e. outliner, operators...), we check for cases where deleting datablocks should not be allowed (indirect data or indirectly used data), and abort (with report) if needed. II) From 'lower' level (BKE_library_remap and RNA), we also unlink from linked data, which makes actual deletion possible and safe. Note that with previous behavior (2.77 one), linked object would be deleted, including from linked data - but then, once file is saved and reloaded, indirect usage would link back the deleted object, without any instanciation in scene, which made it somehow virtual and unreachable... With new behavior, this is no more possible, but on the other hand it means that in situations of dependency cycles (two linked objects using each other), linked objects become impossible to delete (from user space). Not sure what's best here, behavior with those corner cases of library linking is very poorly defined... :(
2016-07-01 17:51:08 +02:00
/* Can this case ever happen? */
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_reportf(op->reports,
RPT_WARNING,
"Cannot delete indirectly linked object '%s'",
ob->id.name + 2);
"Fix" crash when deleting linked object which has indirect usages. This is in fact very hairy situation here... Objects are only refcounted by scenes, any other usage is 'free', which means once all object instanciations are gone Blender considers it can delete it. There is a trap here though: indirect usages. Typically, we should never modify linked data (because it is essencially useless, changes would be ignored and ost on next reload or even undo/redo). This means indirect usages are not affected by default 'safe' remapping/unlinking. For unlinking preceeding deletion however, this is not acceptable - we are likely to end with a zero-user ID (aka deletable one) which is still actually used by other linked data. Solution choosen here is double: I) From 'user-space' (i.e. outliner, operators...), we check for cases where deleting datablocks should not be allowed (indirect data or indirectly used data), and abort (with report) if needed. II) From 'lower' level (BKE_library_remap and RNA), we also unlink from linked data, which makes actual deletion possible and safe. Note that with previous behavior (2.77 one), linked object would be deleted, including from linked data - but then, once file is saved and reloaded, indirect usage would link back the deleted object, without any instanciation in scene, which made it somehow virtual and unreachable... With new behavior, this is no more possible, but on the other hand it means that in situations of dependency cycles (two linked objects using each other), linked objects become impossible to delete (from user space). Not sure what's best here, behavior with those corner cases of library linking is very poorly defined... :(
2016-07-01 17:51:08 +02:00
continue;
}
Cleanup: re-order expensive checks for indirect ID use Check for indirect ID use after other simple user count checks are made. Also assert ED_object_base_free_and_unlink_no_indirect_check object argument isn't indirectly used.
2021-03-28 18:39:18 +11:00
Fix T89400: Possible to delete objects used by overrides of collections. This should not be allowed in general, added some initial call to check when user is allowed to delete a data to search for mandatory override usages...
2021-09-28 18:29:02 +02:00
if (!BKE_lib_override_library_id_is_user_deletable(bmain, &ob->id)) {
/* Can this case ever happen? */
BKE_reportf(op->reports,
RPT_WARNING,
"Cannot delete object '%s' as it used by override collections",
ob->id.name + 2);
continue;
}
Cleanup: re-order expensive checks for indirect ID use Check for indirect ID use after other simple user count checks are made. Also assert ED_object_base_free_and_unlink_no_indirect_check object argument isn't indirectly used.
2021-03-28 18:39:18 +11:00
if (ID_REAL_USERS(ob) <= 1 && ID_EXTRA_USERS(ob) == 0 &&
BKE_library_ID_is_indirectly_used(bmain, ob)) {
"Fix" crash when deleting linked object which has indirect usages. This is in fact very hairy situation here... Objects are only refcounted by scenes, any other usage is 'free', which means once all object instanciations are gone Blender considers it can delete it. There is a trap here though: indirect usages. Typically, we should never modify linked data (because it is essencially useless, changes would be ignored and ost on next reload or even undo/redo). This means indirect usages are not affected by default 'safe' remapping/unlinking. For unlinking preceeding deletion however, this is not acceptable - we are likely to end with a zero-user ID (aka deletable one) which is still actually used by other linked data. Solution choosen here is double: I) From 'user-space' (i.e. outliner, operators...), we check for cases where deleting datablocks should not be allowed (indirect data or indirectly used data), and abort (with report) if needed. II) From 'lower' level (BKE_library_remap and RNA), we also unlink from linked data, which makes actual deletion possible and safe. Note that with previous behavior (2.77 one), linked object would be deleted, including from linked data - but then, once file is saved and reloaded, indirect usage would link back the deleted object, without any instanciation in scene, which made it somehow virtual and unreachable... With new behavior, this is no more possible, but on the other hand it means that in situations of dependency cycles (two linked objects using each other), linked objects become impossible to delete (from user space). Not sure what's best here, behavior with those corner cases of library linking is very poorly defined... :(
2016-07-01 17:51:08 +02:00
BKE_reportf(op->reports,
RPT_WARNING,
Grease Pencil v2 Branch Improve current Grease Pencil in order to get a better 2D animation tool. More info in WIKI pages: https://wiki.blender.org/index.php/User:Antoniov Reviewed By: Severin, aligorith, campbellbarton Patch by @antoniov, with edits by @Severin. Differential Revision: https://developer.blender.org/D2115
2016-08-03 23:31:48 +02:00
"Cannot delete object '%s' from scene '%s', indirectly used objects need at "
"least one 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
ob->id.name + 2,
scene->id.name + 2);
"Fix" crash when deleting linked object which has indirect usages. This is in fact very hairy situation here... Objects are only refcounted by scenes, any other usage is 'free', which means once all object instanciations are gone Blender considers it can delete it. There is a trap here though: indirect usages. Typically, we should never modify linked data (because it is essencially useless, changes would be ignored and ost on next reload or even undo/redo). This means indirect usages are not affected by default 'safe' remapping/unlinking. For unlinking preceeding deletion however, this is not acceptable - we are likely to end with a zero-user ID (aka deletable one) which is still actually used by other linked data. Solution choosen here is double: I) From 'user-space' (i.e. outliner, operators...), we check for cases where deleting datablocks should not be allowed (indirect data or indirectly used data), and abort (with report) if needed. II) From 'lower' level (BKE_library_remap and RNA), we also unlink from linked data, which makes actual deletion possible and safe. Note that with previous behavior (2.77 one), linked object would be deleted, including from linked data - but then, once file is saved and reloaded, indirect usage would link back the deleted object, without any instanciation in scene, which made it somehow virtual and unreachable... With new behavior, this is no more possible, but on the other hand it means that in situations of dependency cycles (two linked objects using each other), linked objects become impossible to delete (from user space). Not sure what's best here, behavior with those corner cases of library linking is very poorly defined... :(
2016-07-01 17:51:08 +02:00
continue;
}
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
GP: Redesign logic of drawing engine for object instance support The initial design assumed that there was only one object for each unique name, but that was not the case when instances were created. Now, instances are supported and speed has been greatly improved when repetitions are used. As a result of this change, the option to create objects has been removed in the Instances modifier. This option was strange and was also against Blender's design rules, since a modifier should never create objects. The old functionality of the modifier can be achieved with instances. Also, several memory leakage problems that were not previously detected have been eliminated, and especially in the grid and in the drawing process Onion Skin is not supported in multi-user datablocks. Support this, makes incompatible with instances. We need find a solution in the long term, but now it's better keep disabled and make instances work. Anyway, the new instances makes unnecessary to use muli-user datablocks.
2018-08-15 16:07:16 +02:00
/* if grease pencil object, set cache as dirty */
if (ob->type == OB_GPENCIL) {
bGPdata *gpd = (bGPdata *)ob->data;
Depsgraph: Remove duplicated sets of recalc/update flags There were at least three copies of those: - OB_RECALC* family of flags, which are rudiment of an old dependency graph system. - PSYS_RECALC* which were used by old dependency graph system as a separate set since the graph itself did not handle particle systems. - DEG_TAG_* which was used to tag IDs. Now there is a single set, which defines what can be tagged and queried for an update. It also has some aggregate flags to make queries simpler. Lets once and for all solve the madness of those flags, stick to a single set, which will not overlap with anything or require any extra conversion. Technically, shouldn't be measurable user difference, but some of the agregate flags for few dependency graph components did change. Fixes T58632: Particle don't update rotation settings
2018-12-06 17:52:37 +01:00
DEG_id_tag_update(&gpd->id, ID_RECALC_TRANSFORM | ID_RECALC_GEOMETRY);
GP: Redesign logic of drawing engine for object instance support The initial design assumed that there was only one object for each unique name, but that was not the case when instances were created. Now, instances are supported and speed has been greatly improved when repetitions are used. As a result of this change, the option to create objects has been removed in the Instances modifier. This option was strange and was also against Blender's design rules, since a modifier should never create objects. The old functionality of the modifier can be achieved with instances. Also, several memory leakage problems that were not previously detected have been eliminated, and especially in the grid and in the drawing process Onion Skin is not supported in multi-user datablocks. Support this, makes incompatible with instances. We need find a solution in the long term, but now it's better keep disabled and make instances work. Anyway, the new instances makes unnecessary to use muli-user datablocks.
2018-08-15 16:07:16 +02:00
}
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Object: faster object deletion The `object_delete_exec` lead to `BKE_library_ID_is_indirectly_used` being called twice. With this patch deleting is around 20% faster. Example when deleting 10000 objects: Current: 35.6s This patch: 18.8s (updated, last rev 29.7s) Reviewed By: campbellbarton Ref D9857
2021-03-27 13:38:44 +11:00
/* Use multi tagged delete if `use_global=True`, or the object is used only in one scene. */
if (use_global || ID_REAL_USERS(ob) <= 1) {
ob->id.tag |= LIB_TAG_DOIT;
tagged_count += 1;
}
else {
/* Object is used in multiple scenes. Delete the object from the current scene only. */
ED_object_base_free_and_unlink_no_indirect_check(bmain, scene, ob);
changed_count += 1;
Cleanup: revert part of da160dc32d1518dc3e59a8fb7995b59c88870444 The grease-pencil parent check was enabled when deleting objects, when previously it was only done when unlinking. While harmless, the previous logic is correct.
2021-03-28 18:28:07 +11:00
/* FIXME: this will also remove parent from grease pencil from other scenes. */
/* Remove from Grease Pencil parent */
for (bGPdata *gpd = bmain->gpencils.first; gpd; gpd = gpd->id.next) {
LISTBASE_FOREACH (bGPDlayer *, gpl, &gpd->layers) {
if (gpl->parent != NULL) {
if (gpl->parent == ob) {
gpl->parent = NULL;
}
}
}
}
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02: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
}
CTX_DATA_END;
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Object: faster object deletion The `object_delete_exec` lead to `BKE_library_ID_is_indirectly_used` being called twice. With this patch deleting is around 20% faster. Example when deleting 10000 objects: Current: 35.6s This patch: 18.8s (updated, last rev 29.7s) Reviewed By: campbellbarton Ref D9857
2021-03-27 13:38:44 +11:00
if ((changed_count + tagged_count) == 0) {
UI: restore confirmation popups for delete operators. It turned out this was leading to accidental deleting in some cases when the info message was missed by users. Fixes T37801.
2013-12-20 01:38:07 +01:00
return OPERATOR_CANCELLED;
Object: report number of deleted objects Part of D3953 by @Zachman w/ edits
2018-11-20 09:49:52 +11:00
}
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Object: faster object deletion The `object_delete_exec` lead to `BKE_library_ID_is_indirectly_used` being called twice. With this patch deleting is around 20% faster. Example when deleting 10000 objects: Current: 35.6s This patch: 18.8s (updated, last rev 29.7s) Reviewed By: campbellbarton Ref D9857
2021-03-27 13:38:44 +11:00
if (tagged_count > 0) {
BKE_id_multi_tagged_delete(bmain);
}
WM: quiet output of delete object operator Object deletion was reporting the number of objects deleted, causing tests to print noisy output. Now this is information is only included when invoked.
2021-10-14 16:41:40 +11:00
if (confirm) {
BKE_reportf(op->reports, RPT_INFO, "Deleted %u object(s)", (changed_count + tagged_count));
}
Object: faster object deletion The `object_delete_exec` lead to `BKE_library_ID_is_indirectly_used` being called twice. With this patch deleting is around 20% faster. Example when deleting 10000 objects: Current: 35.6s This patch: 18.8s (updated, last rev 29.7s) Reviewed By: campbellbarton Ref D9857
2021-03-27 13:38:44 +11:00
Bugfix 33560 Setup: 2 windows, 2 scenes, shared objects and groups. Errors: - editing in 1 window, didn't correctly update shared stuff in the other (like child - parent relations) - deleting group members in 1 scene, could crash the other. Fixes: - On load, only a depsgraph was created for the "active" scene. Now it makes depsgraphs for all visible scenes. - "DAG ID flushes" were only working on active scenes too, they now take the other visible into account as well. - Delete object - notifier was only sent to the active scene. All in all it's a real depsgraph fix (for once!) :) Using multi-window and multi-scene setups now is more useful.
2012-12-17 12:03:31 +00:00
/* delete has to handle all open scenes */
Cleanup: use plural names for Main lists Convention was not to but after discussion on 918941483f7e we agree its best to change the convention. Names now mostly follow RNA. Some exceptions: - Use 'nodetrees' instead of 'nodegroups' since the struct is called NodeTree. - Use 'gpencils' instead of 'grease_pencil' since 'gpencil' is a common abbreviation in the C code. Other exceptions: - Leave 'wm' as it's a list of one. - Leave 'ipo' as is for versioning.
2019-03-08 09:29:17 +11:00
BKE_main_id_tag_listbase(&bmain->scenes, LIB_TAG_DOIT, true);
Cleanup: Declare variables where initialized
2020-10-09 16:39:39 -05:00
LISTBASE_FOREACH (wmWindow *, win, &wm->windows) {
Main Workspace Integration This commit does the main integration of workspaces, which is a design we agreed on during the 2.8 UI workshop (see https://wiki.blender.org/index.php/Dev:2.8/UI/Workshop_Writeup) Workspaces should generally be stable, I'm not aware of any remaining bugs (or I've forgotten them :) ). If you find any, let me know! (Exception: mode switching button might get out of sync with actual mode in some cases, would consider that a limitation/ToDo. Needs to be resolved at some point.) == Main Changes/Features * Introduces the new Workspaces as data-blocks. * Allow storing a number of custom workspaces as part of the user configuration. Needs further work to allow adding and deleting individual workspaces. * Bundle a default workspace configuration with Blender (current screen-layouts converted to workspaces). * Pressing button to add a workspace spawns a menu to select between "Duplicate Current" and the workspaces from the user configuration. If no workspaces are stored in the user configuration, the default workspaces are listed instead. * Store screen-layouts (`bScreen`) per workspace. * Store an active screen-layout per workspace. Changing the workspace will enable this layout. * Store active mode in workspace. Changing the workspace will also enter the mode of the new workspace. (Note that we still store the active mode in the object, moving this completely to workspaces is a separate project.) * Store an active render layer per workspace. * Moved mode switch from 3D View header to Info Editor header. * Store active scene in window (not directly workspace related, but overlaps quite a bit). * Removed 'Use Global Scene' User Preference option. * Compatibility with old files - a new workspace is created for every screen-layout of old files. Old Blender versions should be able to read files saved with workspace support as well. * Default .blend only contains one workspace ("General"). * Support appending workspaces. Opening files without UI and commandline rendering should work fine. Note that the UI is temporary! We plan to introduce a new global topbar that contains the workspace options and tabs for switching workspaces. == Technical Notes * Workspaces are data-blocks. * Adding and removing `bScreen`s should be done through `ED_workspace_layout` API now. * A workspace can be active in multiple windows at the same time. * The mode menu (which is now in the Info Editor header) doesn't display "Grease Pencil Edit" mode anymore since its availability depends on the active editor. Will be fixed by making Grease Pencil an own object type (as planned). * The button to change the active workspace object mode may get out of sync with the mode of the active object. Will either be resolved by moving mode out of object data, or we'll disable workspace modes again (there's a `#define USE_WORKSPACE_MODE` for that). * Screen-layouts (`bScreen`) are IDs and thus stored in a main list-base. Had to add a wrapper `WorkSpaceLayout` so we can store them in a list-base within workspaces, too. On the long run we could completely replace `bScreen` by workspace structs. * `WorkSpace` types use some special compiler trickery to allow marking structs and struct members as private. BKE_workspace API should be used for accessing those. * Added scene operators `SCENE_OT_`. Was previously done through screen operators. == BPY API Changes * Removed `Screen.scene`, added `Window.scene` * Removed `UserPreferencesView.use_global_scene` * Added `Context.workspace`, `Window.workspace` and `BlendData.workspaces` * Added `bpy.types.WorkSpace` containing `screens`, `object_mode` and `render_layer` * Added Screen.layout_name for the layout name that'll be displayed in the UI (may differ from internal name) == What's left? * There are a few open design questions (T50521). We should find the needed answers and implement them. * Allow adding and removing individual workspaces from workspace configuration (needs UI design). * Get the override system ready and support overrides per workspace. * Support custom UI setups as part of workspaces (hidden panels, hidden buttons, customizable toolbars, etc). * Allow enabling add-ons per workspace. * Support custom workspace keymaps. * Remove special exception for workspaces in linking code (so they're always appended, never linked). Depends on a few things, so best to solve later. * Get the topbar done. * Workspaces need a proper icon, current one is just a placeholder :) Reviewed By: campbellbarton, mont29 Tags: #user_interface, #bf_blender_2.8 Maniphest Tasks: T50521 Differential Revision: https://developer.blender.org/D2451
2017-06-01 19:56:58 +02:00
scene = WM_window_get_active_scene(win);
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Split id->flag in two, persistent flags and runtime tags. This is purely internal sanitizing/cleanup, no change in behavior is expected at all. This change was also needed because we were getting short on ID flags, and future enhancement of 'user_one' ID behavior requires two new ones. id->flag remains for persistent data (fakeuser only, so far!), this also allows us 100% backward & forward compatibility. New id->tag is used for most flags. Though written in .blend files, its content is cleared at read time. Note that .blend file version was bumped, so that we can clear runtimeflags from old .blends, important in case we add new persistent flags in future. Also, behavior of tags (either status ones, or whether they need to be cleared before/after use) has been added as comments to their declaration. Reviewers: sergey, campbellbarton Differential Revision: https://developer.blender.org/D1683
2015-12-27 11:53:50 +01:00
if (scene->id.tag & LIB_TAG_DOIT) {
scene->id.tag &= ~LIB_TAG_DOIT;
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Replace all old DAG calls with direct calls to new DEG and remove BKE_depsgraph.h This removes BKE_depsgraph.h and depsgraph.c
2017-06-08 10:14:53 +02:00
DEG_relations_tag_update(bmain);
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Depsgraph: Remove duplicated sets of recalc/update flags There were at least three copies of those: - OB_RECALC* family of flags, which are rudiment of an old dependency graph system. - PSYS_RECALC* which were used by old dependency graph system as a separate set since the graph itself did not handle particle systems. - DEG_TAG_* which was used to tag IDs. Now there is a single set, which defines what can be tagged and queried for an update. It also has some aggregate flags to make queries simpler. Lets once and for all solve the madness of those flags, stick to a single set, which will not overlap with anything or require any extra conversion. Technically, shouldn't be measurable user difference, but some of the agregate flags for few dependency graph components did change. Fixes T58632: Particle don't update rotation settings
2018-12-06 17:52:37 +01:00
DEG_id_tag_update(&scene->id, ID_RECALC_SELECT);
Bugfix 33560 Setup: 2 windows, 2 scenes, shared objects and groups. Errors: - editing in 1 window, didn't correctly update shared stuff in the other (like child - parent relations) - deleting group members in 1 scene, could crash the other. Fixes: - On load, only a depsgraph was created for the "active" scene. Now it makes depsgraphs for all visible scenes. - "DAG ID flushes" were only working on active scenes too, they now take the other visible into account as well. - Delete object - notifier was only sent to the active scene. All in all it's a real depsgraph fix (for once!) :) Using multi-window and multi-scene setups now is more useful.
2012-12-17 12:03:31 +00:00
WM_event_add_notifier(C, NC_SCENE | ND_OB_ACTIVE, scene);
WM_event_add_notifier(C, NC_SCENE | ND_LAYER_CONTENT, scene);
}
}
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02: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
return OPERATOR_FINISHED;
}
void OBJECT_OT_delete(wmOperatorType *ot)
{
/* identifiers */
style cleanup: spaces aroudn operators for operator definitions.
2012-03-22 07:26:09 +00:00
ot->name = "Delete";
batch remove .'s used with RNA_def_struct_ui_text
2010-02-10 21:15:44 +00:00
ot->description = "Delete selected objects";
style cleanup: spaces aroudn operators for operator definitions.
2012-03-22 07:26:09 +00:00
ot->idname = "OBJECT_OT_delete";
Some effect-less code cleanup...
2012-10-05 07:05: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
/* api callbacks */
Keymap: only use delete confirmation for X-key Only use confirmation w/ X-key since this is more likely to be pressed by accident. Delete-key delete doesn't confirm. Part of D3953 by @Zachman w/ edits
2018-11-20 10:06:02 +11:00
ot->invoke = WM_operator_confirm_or_exec;
style cleanup: spaces aroudn operators for operator definitions.
2012-03-22 07:26:09 +00:00
ot->exec = object_delete_exec;
ot->poll = ED_operator_objectmode;
Some effect-less code cleanup...
2012-10-05 07:05: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
/* flags */
style cleanup: editors / mesh & object
2012-04-28 15:42:27 +00:00
ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
add back feature from 2.4x - Shift+Del to delete objects from all scenes.
2011-11-15 04:11:01 +00:00
UI: remove delete redo panel Since the option is now hidden from the UI, add to the object menu (without this the key binding isn't discoverable).
2018-09-05 18:01:55 +10:00
PropertyRNA *prop;
prop = RNA_def_boolean(
ot->srna, "use_global", 0, "Delete Globally", "Remove object from all scenes");
RNA_def_property_flag(prop, PROP_HIDDEN | PROP_SKIP_SAVE);
Keymap: only use delete confirmation for X-key Only use confirmation w/ X-key since this is more likely to be pressed by accident. Delete-key delete doesn't confirm. Part of D3953 by @Zachman w/ edits
2018-11-20 10:06:02 +11:00
WM_operator_properties_confirm_or_exec(ot);
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
}
Cleanup: use doxy sections for object_add.c
2019-05-16 14:03:31 +10:00
/** \} */
/* -------------------------------------------------------------------- */
/** \name Copy Object Utilities
* \{ */
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
/* after copying objects, copied data should get new pointers */
Fix T46386: Duplicate fails updating driver links Duplicate wasn't updating links, so duplicatinvg a objects would still point to the originals for curve-taper, texmesh, drivers. Use generic id-looper to handle replacing data.
2015-10-08 20:29:49 +11:00
static void copy_object_set_idnew(bContext *C)
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
{
style cleanup: editors / mesh & object
2012-04-28 15:42:27 +00:00
Main *bmain = CTX_data_main(C);
Some effect-less code cleanup...
2012-10-05 07:05:52 +00:00
style cleanup: re - http://wiki.blender.org/index.php/Dev:Doc/CodeStyle#Braces_with_Macros
2012-04-30 16:22:40 +00:00
CTX_DATA_BEGIN (C, Object *, ob, selected_editable_objects) {
Fix T92629: Crash on mesh separate after rB43bc494892c3. rB43bc494892c3 switched `BKE_libblock_relink_to_newid` to use new ID remapping and libquery code. However, that new code does protect by default against remapping an objects's data pointer when that object is in Edit mode, since this is not a behavior that generic BKE code can handle (due to required editing data for most obdata types when in edit mode). So specific code that does create new IDs and need remapping in Edit mode has to pass specific exception flags to remaping code. This commit adds those remapping flags to `BKE_libblock_relink_to_newid` and add said exception flag to the remapping call from `ED_object_add_duplicate` when the object is in edit mode.
2021-11-01 15:19:17 +01:00
BKE_libblock_relink_to_newid(bmain, &ob->id, 0);
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
}
CTX_DATA_END;
Some effect-less code cleanup...
2012-10-05 07:05:52 +00:00
Fix T78330: Duplicating parented objects does not preserve relationships. Caused by refactor of duplicate code in rBad6cccf058d0, we need to take into account the duplication of groups of objects here too...
2020-07-01 17:10:30 +02:00
#ifndef NDEBUG
/* Call to `BKE_libblock_relink_to_newid` above is supposed to have cleared all those flags. */
ID *id_iter;
FOREACH_MAIN_ID_BEGIN (bmain, id_iter) {
if (GS(id_iter->name) == ID_OB) {
/* Not all duplicated objects would be used by other newly duplicated data, so their flag
* will not always be cleared. */
continue;
}
BLI_assert((id_iter->tag & LIB_TAG_NEW) == 0);
}
FOREACH_MAIN_ID_END;
#endif
Cleanup: rename BKE_main_id_{clear_newpoins => newptr_and_tag_clear} It wasn't obvious this function cleared the tag as well.
2021-05-27 22:44:02 +10:00
BKE_main_id_newptr_and_tag_clear(bmain);
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
}
Cleanup: use doxy sections for object_add.c
2019-05-16 14:03:31 +10:00
/** \} */
/* -------------------------------------------------------------------- */
/** \name Make Instanced Objects Real Operator
* \{ */
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
Cleanup: consistent use of tags: NOTE/TODO/FIXME/XXX Also use doxy style function reference `#` prefix chars when referencing identifiers.
2021-07-03 23:08:40 +10:00
/* XXX TODO: That whole hierarchy handling based on persistent_id tricks is
Fix T66282: Make Instances Real: Keep Hierarchy option broken with recursive instancing. Preserving/rebuilding relashionships in recursive instancing was simply not supported at all, code handling that was assuming a single level of instancing. This commit makes the following changes: * Mixing DupliCollection and DupliVerts/Faces in the recursive chain is now supported (by using a same GHash in all cases, differences of persistent_id handling in hashing and comparison is now down inside the relevant functions). * When both "keep hierarchy" and "parent" options are enabled, code will attempt to parent new objects to their version of instancer (instead of parenting them systematically to the root object). This will preserve the hierarchy much better. * Collection is removed from dupli empties that have been made 'real' (the duplication flag itself was already cleared, but the link to the instantiated collection was kept).
2019-07-05 18:09:17 +02:00
* very confusing and convoluted, and it will fail in many cases besides basic ones.
* Think this should be replaced by a proper tree-like representation of the instantiations,
* should help a lot in both readability, and precise consistent rebuilding of hierarchy.
*/
Fix T42838: Make dupli's real use_hierarchy fails Regression since the dupli-object refactor.
2014-12-08 16:13:27 +01:00
/**
Fix T66282: Make Instances Real: Keep Hierarchy option broken with recursive instancing. Preserving/rebuilding relashionships in recursive instancing was simply not supported at all, code handling that was assuming a single level of instancing. This commit makes the following changes: * Mixing DupliCollection and DupliVerts/Faces in the recursive chain is now supported (by using a same GHash in all cases, differences of persistent_id handling in hashing and comparison is now down inside the relevant functions). * When both "keep hierarchy" and "parent" options are enabled, code will attempt to parent new objects to their version of instancer (instead of parenting them systematically to the root object). This will preserve the hierarchy much better. * Collection is removed from dupli empties that have been made 'real' (the duplication flag itself was already cleared, but the link to the instantiated collection was kept).
2019-07-05 18:09:17 +02:00
* \note regarding hashing dupli-objects which come from OB_DUPLICOLLECTION,
Cleanup: comments (long lines) in editors
2019-04-22 00:18:34 +10:00
* skip the first member of #DupliObject.persistent_id
* since its a unique index and we only want to know if the group objects are from the same
* dupli-group instance.
Fix T66282: Make Instances Real: Keep Hierarchy option broken with recursive instancing. Preserving/rebuilding relashionships in recursive instancing was simply not supported at all, code handling that was assuming a single level of instancing. This commit makes the following changes: * Mixing DupliCollection and DupliVerts/Faces in the recursive chain is now supported (by using a same GHash in all cases, differences of persistent_id handling in hashing and comparison is now down inside the relevant functions). * When both "keep hierarchy" and "parent" options are enabled, code will attempt to parent new objects to their version of instancer (instead of parenting them systematically to the root object). This will preserve the hierarchy much better. * Collection is removed from dupli empties that have been made 'real' (the duplication flag itself was already cleared, but the link to the instantiated collection was kept).
2019-07-05 18:09:17 +02:00
*
* \note regarding hashing dupli-objects which come from non-OB_DUPLICOLLECTION,
* include the first member of #DupliObject.persistent_id
* since its the index of the vertex/face the object is instantiated on and we want to identify
* objects on the same vertex/face.
* In other words, we consider each group of objects from a same item as being
* the 'local group' where to check for parents.
Fix T42838: Make dupli's real use_hierarchy fails Regression since the dupli-object refactor.
2014-12-08 16:13:27 +01:00
*/
Cleanup: use abbreviated names for unsigned types in editors
2020-04-03 16:21:24 +11:00
static uint dupliobject_hash(const void *ptr)
Fix T42838: Make dupli's real use_hierarchy fails Regression since the dupli-object refactor.
2014-12-08 16:13:27 +01:00
{
const DupliObject *dob = ptr;
Cleanup: use abbreviated names for unsigned types in editors
2020-04-03 16:21:24 +11:00
uint hash = BLI_ghashutil_ptrhash(dob->ob);
Fix T66282: Make Instances Real: Keep Hierarchy option broken with recursive instancing. Preserving/rebuilding relashionships in recursive instancing was simply not supported at all, code handling that was assuming a single level of instancing. This commit makes the following changes: * Mixing DupliCollection and DupliVerts/Faces in the recursive chain is now supported (by using a same GHash in all cases, differences of persistent_id handling in hashing and comparison is now down inside the relevant functions). * When both "keep hierarchy" and "parent" options are enabled, code will attempt to parent new objects to their version of instancer (instead of parenting them systematically to the root object). This will preserve the hierarchy much better. * Collection is removed from dupli empties that have been made 'real' (the duplication flag itself was already cleared, but the link to the instantiated collection was kept).
2019-07-05 18:09:17 +02:00
if (dob->type == OB_DUPLICOLLECTION) {
for (int i = 1; (i < MAX_DUPLI_RECUR) && dob->persistent_id[i] != INT_MAX; i++) {
hash ^= (dob->persistent_id[i] ^ i);
}
}
else {
hash ^= (dob->persistent_id[0] ^ 0);
Fix T42838: Make dupli's real use_hierarchy fails Regression since the dupli-object refactor.
2014-12-08 16:13:27 +01:00
}
return hash;
}
Fix T49718: Wrong "Make Duplicates Real" behavior with "Keep Hierarchy" All objects were being parented to a single instance of each parent object, instead of their respective instances, when using dupliverts or dupligroups. Behavior was caused by the `persistent_id[0]` (vertex/face id) being ignored when computing `parent_gh` hash, which caused all instances to have the same hash, and thus only the first one was included. Reviewed By: mont29 Differential Revision: https://developer.blender.org/D2370
2016-11-22 14:38:43 -02:00
/**
Fix T66282: Make Instances Real: Keep Hierarchy option broken with recursive instancing. Preserving/rebuilding relashionships in recursive instancing was simply not supported at all, code handling that was assuming a single level of instancing. This commit makes the following changes: * Mixing DupliCollection and DupliVerts/Faces in the recursive chain is now supported (by using a same GHash in all cases, differences of persistent_id handling in hashing and comparison is now down inside the relevant functions). * When both "keep hierarchy" and "parent" options are enabled, code will attempt to parent new objects to their version of instancer (instead of parenting them systematically to the root object). This will preserve the hierarchy much better. * Collection is removed from dupli empties that have been made 'real' (the duplication flag itself was already cleared, but the link to the instantiated collection was kept).
2019-07-05 18:09:17 +02:00
* \note regarding hashing dupli-objects when using OB_DUPLICOLLECTION,
* skip the first member of #DupliObject.persistent_id
* since its a unique index and we only want to know if the group objects are from the same
* dupli-group instance.
Fix T49718: Wrong "Make Duplicates Real" behavior with "Keep Hierarchy" All objects were being parented to a single instance of each parent object, instead of their respective instances, when using dupliverts or dupligroups. Behavior was caused by the `persistent_id[0]` (vertex/face id) being ignored when computing `parent_gh` hash, which caused all instances to have the same hash, and thus only the first one was included. Reviewed By: mont29 Differential Revision: https://developer.blender.org/D2370
2016-11-22 14:38:43 -02:00
*/
Cleanup: use abbreviated names for unsigned types in editors
2020-04-03 16:21:24 +11:00
static uint dupliobject_instancer_hash(const void *ptr)
Fix T49718: Wrong "Make Duplicates Real" behavior with "Keep Hierarchy" All objects were being parented to a single instance of each parent object, instead of their respective instances, when using dupliverts or dupligroups. Behavior was caused by the `persistent_id[0]` (vertex/face id) being ignored when computing `parent_gh` hash, which caused all instances to have the same hash, and thus only the first one was included. Reviewed By: mont29 Differential Revision: https://developer.blender.org/D2370
2016-11-22 14:38:43 -02:00
{
const DupliObject *dob = ptr;
Cleanup: use abbreviated names for unsigned types in editors
2020-04-03 16:21:24 +11:00
uint hash = BLI_ghashutil_inthash(dob->persistent_id[0]);
Fix T66282: Make Instances Real: Keep Hierarchy option broken with recursive instancing. Preserving/rebuilding relashionships in recursive instancing was simply not supported at all, code handling that was assuming a single level of instancing. This commit makes the following changes: * Mixing DupliCollection and DupliVerts/Faces in the recursive chain is now supported (by using a same GHash in all cases, differences of persistent_id handling in hashing and comparison is now down inside the relevant functions). * When both "keep hierarchy" and "parent" options are enabled, code will attempt to parent new objects to their version of instancer (instead of parenting them systematically to the root object). This will preserve the hierarchy much better. * Collection is removed from dupli empties that have been made 'real' (the duplication flag itself was already cleared, but the link to the instantiated collection was kept).
2019-07-05 18:09:17 +02:00
for (int i = 1; (i < MAX_DUPLI_RECUR) && dob->persistent_id[i] != INT_MAX; i++) {
hash ^= (dob->persistent_id[i] ^ i);
}
Fix T49718: Wrong "Make Duplicates Real" behavior with "Keep Hierarchy" All objects were being parented to a single instance of each parent object, instead of their respective instances, when using dupliverts or dupligroups. Behavior was caused by the `persistent_id[0]` (vertex/face id) being ignored when computing `parent_gh` hash, which caused all instances to have the same hash, and thus only the first one was included. Reviewed By: mont29 Differential Revision: https://developer.blender.org/D2370
2016-11-22 14:38:43 -02:00
return hash;
}
Fix T66282: Make Instances Real: Keep Hierarchy option broken with recursive instancing. Preserving/rebuilding relashionships in recursive instancing was simply not supported at all, code handling that was assuming a single level of instancing. This commit makes the following changes: * Mixing DupliCollection and DupliVerts/Faces in the recursive chain is now supported (by using a same GHash in all cases, differences of persistent_id handling in hashing and comparison is now down inside the relevant functions). * When both "keep hierarchy" and "parent" options are enabled, code will attempt to parent new objects to their version of instancer (instead of parenting them systematically to the root object). This will preserve the hierarchy much better. * Collection is removed from dupli empties that have been made 'real' (the duplication flag itself was already cleared, but the link to the instantiated collection was kept).
2019-07-05 18:09:17 +02:00
/* Compare function that matches dupliobject_hash */
static bool dupliobject_cmp(const void *a_, const void *b_)
Fix T42838: Make dupli's real use_hierarchy fails Regression since the dupli-object refactor.
2014-12-08 16:13:27 +01:00
{
const DupliObject *a = a_;
const DupliObject *b = b_;
if (a->ob != b->ob) {
return true;
}
Fix T71199: Child-parent relationships arent kept after you make instances real. Comparison function of the of the parent ghash was not fully correct, could lead to some false positives in some cases...
2019-11-08 14:27:48 +01:00
if (a->type != b->type) {
return true;
}
if (a->type == OB_DUPLICOLLECTION) {
Fix T66282: Make Instances Real: Keep Hierarchy option broken with recursive instancing. Preserving/rebuilding relashionships in recursive instancing was simply not supported at all, code handling that was assuming a single level of instancing. This commit makes the following changes: * Mixing DupliCollection and DupliVerts/Faces in the recursive chain is now supported (by using a same GHash in all cases, differences of persistent_id handling in hashing and comparison is now down inside the relevant functions). * When both "keep hierarchy" and "parent" options are enabled, code will attempt to parent new objects to their version of instancer (instead of parenting them systematically to the root object). This will preserve the hierarchy much better. * Collection is removed from dupli empties that have been made 'real' (the duplication flag itself was already cleared, but the link to the instantiated collection was kept).
2019-07-05 18:09:17 +02:00
for (int i = 1; (i < MAX_DUPLI_RECUR); i++) {
if (a->persistent_id[i] != b->persistent_id[i]) {
return true;
}
Cleanup: Editors/Object, Clang-Tidy else-after-return fixes This addresses warnings from Clang-Tidy's `readability-else-after-return` rule in the `source/blender/editors/object` module. No functional changes.
2020-07-03 15:42:22 +02:00
if (a->persistent_id[i] == INT_MAX) {
Fix T66282: Make Instances Real: Keep Hierarchy option broken with recursive instancing. Preserving/rebuilding relashionships in recursive instancing was simply not supported at all, code handling that was assuming a single level of instancing. This commit makes the following changes: * Mixing DupliCollection and DupliVerts/Faces in the recursive chain is now supported (by using a same GHash in all cases, differences of persistent_id handling in hashing and comparison is now down inside the relevant functions). * When both "keep hierarchy" and "parent" options are enabled, code will attempt to parent new objects to their version of instancer (instead of parenting them systematically to the root object). This will preserve the hierarchy much better. * Collection is removed from dupli empties that have been made 'real' (the duplication flag itself was already cleared, but the link to the instantiated collection was kept).
2019-07-05 18:09:17 +02:00
break;
}
Fix T42838: Make dupli's real use_hierarchy fails Regression since the dupli-object refactor.
2014-12-08 16:13:27 +01:00
}
Fix T66282: Make Instances Real: Keep Hierarchy option broken with recursive instancing. Preserving/rebuilding relashionships in recursive instancing was simply not supported at all, code handling that was assuming a single level of instancing. This commit makes the following changes: * Mixing DupliCollection and DupliVerts/Faces in the recursive chain is now supported (by using a same GHash in all cases, differences of persistent_id handling in hashing and comparison is now down inside the relevant functions). * When both "keep hierarchy" and "parent" options are enabled, code will attempt to parent new objects to their version of instancer (instead of parenting them systematically to the root object). This will preserve the hierarchy much better. * Collection is removed from dupli empties that have been made 'real' (the duplication flag itself was already cleared, but the link to the instantiated collection was kept).
2019-07-05 18:09:17 +02:00
}
else {
if (a->persistent_id[0] != b->persistent_id[0]) {
return true;
Fix T42838: Make dupli's real use_hierarchy fails Regression since the dupli-object refactor.
2014-12-08 16:13:27 +01:00
}
}
/* matching */
return false;
}
Fix T66282: Make Instances Real: Keep Hierarchy option broken with recursive instancing. Preserving/rebuilding relashionships in recursive instancing was simply not supported at all, code handling that was assuming a single level of instancing. This commit makes the following changes: * Mixing DupliCollection and DupliVerts/Faces in the recursive chain is now supported (by using a same GHash in all cases, differences of persistent_id handling in hashing and comparison is now down inside the relevant functions). * When both "keep hierarchy" and "parent" options are enabled, code will attempt to parent new objects to their version of instancer (instead of parenting them systematically to the root object). This will preserve the hierarchy much better. * Collection is removed from dupli empties that have been made 'real' (the duplication flag itself was already cleared, but the link to the instantiated collection was kept).
2019-07-05 18:09:17 +02:00
/* Compare function that matches dupliobject_instancer_hash. */
static bool dupliobject_instancer_cmp(const void *a_, const void *b_)
Fix T49718: Wrong "Make Duplicates Real" behavior with "Keep Hierarchy" All objects were being parented to a single instance of each parent object, instead of their respective instances, when using dupliverts or dupligroups. Behavior was caused by the `persistent_id[0]` (vertex/face id) being ignored when computing `parent_gh` hash, which caused all instances to have the same hash, and thus only the first one was included. Reviewed By: mont29 Differential Revision: https://developer.blender.org/D2370
2016-11-22 14:38:43 -02:00
{
const DupliObject *a = a_;
const DupliObject *b = b_;
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Fix T66282: Make Instances Real: Keep Hierarchy option broken with recursive instancing. Preserving/rebuilding relashionships in recursive instancing was simply not supported at all, code handling that was assuming a single level of instancing. This commit makes the following changes: * Mixing DupliCollection and DupliVerts/Faces in the recursive chain is now supported (by using a same GHash in all cases, differences of persistent_id handling in hashing and comparison is now down inside the relevant functions). * When both "keep hierarchy" and "parent" options are enabled, code will attempt to parent new objects to their version of instancer (instead of parenting them systematically to the root object). This will preserve the hierarchy much better. * Collection is removed from dupli empties that have been made 'real' (the duplication flag itself was already cleared, but the link to the instantiated collection was kept).
2019-07-05 18:09:17 +02:00
for (int i = 0; (i < MAX_DUPLI_RECUR); i++) {
if (a->persistent_id[i] != b->persistent_id[i]) {
return true;
}
Cleanup: Editors/Object, Clang-Tidy else-after-return fixes This addresses warnings from Clang-Tidy's `readability-else-after-return` rule in the `source/blender/editors/object` module. No functional changes.
2020-07-03 15:42:22 +02:00
if (a->persistent_id[i] == INT_MAX) {
Fix T66282: Make Instances Real: Keep Hierarchy option broken with recursive instancing. Preserving/rebuilding relashionships in recursive instancing was simply not supported at all, code handling that was assuming a single level of instancing. This commit makes the following changes: * Mixing DupliCollection and DupliVerts/Faces in the recursive chain is now supported (by using a same GHash in all cases, differences of persistent_id handling in hashing and comparison is now down inside the relevant functions). * When both "keep hierarchy" and "parent" options are enabled, code will attempt to parent new objects to their version of instancer (instead of parenting them systematically to the root object). This will preserve the hierarchy much better. * Collection is removed from dupli empties that have been made 'real' (the duplication flag itself was already cleared, but the link to the instantiated collection was kept).
2019-07-05 18:09:17 +02:00
break;
}
Fix T49718: Wrong "Make Duplicates Real" behavior with "Keep Hierarchy" All objects were being parented to a single instance of each parent object, instead of their respective instances, when using dupliverts or dupligroups. Behavior was caused by the `persistent_id[0]` (vertex/face id) being ignored when computing `parent_gh` hash, which caused all instances to have the same hash, and thus only the first one was included. Reviewed By: mont29 Differential Revision: https://developer.blender.org/D2370
2016-11-22 14:38:43 -02:00
}
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Fix T49718: Wrong "Make Duplicates Real" behavior with "Keep Hierarchy" All objects were being parented to a single instance of each parent object, instead of their respective instances, when using dupliverts or dupligroups. Behavior was caused by the `persistent_id[0]` (vertex/face id) being ignored when computing `parent_gh` hash, which caused all instances to have the same hash, and thus only the first one was included. Reviewed By: mont29 Differential Revision: https://developer.blender.org/D2370
2016-11-22 14:38:43 -02:00
/* matching */
return false;
}
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Refactor access to dependency graph This change ensures that operators which needs access to evaluated data first makes sure there is a dependency graph. Other accesses to the dependency graph made it more explicit about whether they just need a valid dependency graph pointer or whether they expect the graph to be already evaluated. This replaces OPTYPE_USE_EVAL_DATA which is now removed. Some general rules about usage of accessors: - Drawing is expected to happen from a fully evaluated dependency graph. There is now a function to access it, which will in the future control that dependency graph is actually evaluated. This check is not yet done because there are some things to be taken care about first: for example, post-update hooks might leave scene in a state where something is still tagged for update. - All operators which needs to access evaluated state must use CTX_data_ensure_evaluated_depsgraph(). This function replaces OPTYPE_USE_EVAL_DATA. The call is generally to be done in the very beginning of the operator, prior other logic (unless this is some comprehensive operator which might or might not need access to an evaluated state). This call is never to be used from a loop. If some utility function requires evaluated state of dependency graph the graph is to be passed as an explicit argument. This way it is clear that no evaluation happens in a loop or something like this. - All cases which needs to know dependency graph pointer, but which doesn't want to actually evaluate it can use old-style function CTX_data_depsgraph_pointer(), assuming that underlying code will ensure dependency graph is evaluated prior to accessing it. - The new functions are replacing OPTYPE_USE_EVAL_DATA, so now it is explicit and local about where dependency graph is being ensured. This commit also contains some fixes of wrong usage of evaluation functions on original objects. Ideally should be split out, but in reality with all the APIs being renamed is quite tricky. Fixes T67454: Blender crash on rapid undo and select Speculation here is that sometimes undo and selection operators are sometimes handled in the same event loop iteration, which leaves non-evaluated dependency graph. Fixes T67973: Crash on Fix Deforms operator Fixes T67902: Crash when undo a loop cut Reviewers: brecht Reviewed By: brecht Subscribers: lichtwerk Maniphest Tasks: T67454 Differential Revision: https://developer.blender.org/D5343
2019-07-25 16:36:22 +02:00
static void make_object_duplilist_real(bContext *C,
Depsgraph *depsgraph,
Scene *scene,
Base *base,
const bool use_base_parent,
const bool use_hierarchy)
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
{
Making real need to remove proxies Otherwise some invalid pointers will be left which could be harmless if real object stays local, but crashes when linking them to another files. Was discovered here in the studio during Project Pampa, and the steps to reproduce are: - Create lib.blend, put armature and cube to it. Create a group with them. - Create scene.blend and link group from lib.blend. - Make a proxy from armature. - Make group real. - Add real objects to a group. - Create comp.blend and link group from scene.blend. This step will creah.
2013-10-22 15:19:37 +00:00
Main *bmain = CTX_data_main(C);
Cleanup: Rename ViewLayer *sl > ViewLayer *view_layer
2017-11-23 13:51:49 -02:00
ViewLayer *view_layer = CTX_data_view_layer(C);
Cleanup: Declare variables where initialized
2020-10-09 16:39:39 -05:00
GHash *parent_gh = NULL, *instancer_gh = NULL;
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Fix "Make Instances Real" to work with nodes modifier instances This commit changes the check at the beginning of the "Make Instances Real" operator to account for the instances created by nodes modifiers in the modifier stack. Differential Revision: https://developer.blender.org/D10059
2021-01-15 08:18:52 -06:00
Object *object_eval = DEG_get_evaluated_object(depsgraph, base->object);
Geometry Nodes: support for geometry instancing Previously, the Point Instance node in geometry nodes could only instance existing objects or collections. The reason was that large parts of Blender worked under the assumption that objects are the main unit of instancing. Now we also want to instance geometry within an object, so a slightly larger refactor was necessary. This should not affect files that do not use the new kind of instances. The main change is a redefinition of what "instanced data" is. Now, an instances is a cow-object + object-data (the geometry). This can be nicely seen in `struct DupliObject`. This allows the same object to generate multiple geometries of different types which can be instanced individually. A nice side effect of this refactor is that having multiple geometry components is not a special case in the depsgraph object iterator anymore, because those components are integrated with the `DupliObject` system. Unfortunately, different systems that work with instances in Blender (e.g. render engines and exporters) often work under the assumption that objects are the main unit of instancing. So those have to be updated as well to be able to handle the new instances. This patch updates Cycles, EEVEE and other viewport engines. Exporters have not been updated yet. Some minimal (not master-ready) changes to update the obj and alembic exporters can be found in P2336 and P2335. Different file formats may want to handle these new instances in different ways. For users, the only thing that changed is that the Point Instance node now has a geometry mode. This also fixes T88454. Differential Revision: https://developer.blender.org/D11841
2021-09-06 18:22:24 +02:00
if (!(base->object->transflag & OB_DUPLI) &&
!BKE_object_has_geometry_set_instances(object_eval)) {
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
return;
Cleanup: mostly namings in `make_object_duplilist_real` code.
2017-08-08 16:08:24 +02:00
}
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Cleanup: Declare variables where initialized
2020-10-09 16:39:39 -05:00
ListBase *lb_duplis = object_duplilist(depsgraph, scene, object_eval);
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Fix "Make Instances Real" to work with nodes modifier instances This commit changes the check at the beginning of the "Make Instances Real" operator to account for the instances created by nodes modifiers in the modifier stack. Differential Revision: https://developer.blender.org/D10059
2021-01-15 08:18:52 -06:00
if (BLI_listbase_is_empty(lb_duplis)) {
free_object_duplilist(lb_duplis);
return;
}
Cleanup: Declare variables where initialized
2020-10-09 16:39:39 -05:00
GHash *dupli_gh = BLI_ghash_ptr_new(__func__);
Fix T52260: Blender 2.79 Objects made duplicates real still refer armature proxy. New code was handling correctly ID's internal references to self, but not references between 'made real' different objects... Regression, to be backported in 2.79.
2017-08-08 16:01:48 +02:00
if (use_hierarchy) {
Fix T66282: Make Instances Real: Keep Hierarchy option broken with recursive instancing. Preserving/rebuilding relashionships in recursive instancing was simply not supported at all, code handling that was assuming a single level of instancing. This commit makes the following changes: * Mixing DupliCollection and DupliVerts/Faces in the recursive chain is now supported (by using a same GHash in all cases, differences of persistent_id handling in hashing and comparison is now down inside the relevant functions). * When both "keep hierarchy" and "parent" options are enabled, code will attempt to parent new objects to their version of instancer (instead of parenting them systematically to the root object). This will preserve the hierarchy much better. * Collection is removed from dupli empties that have been made 'real' (the duplication flag itself was already cleared, but the link to the instantiated collection was kept).
2019-07-05 18:09:17 +02:00
parent_gh = BLI_ghash_new(dupliobject_hash, dupliobject_cmp, __func__);
if (use_base_parent) {
instancer_gh = BLI_ghash_new(
dupliobject_instancer_hash, dupliobject_instancer_cmp, __func__);
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
}
Fix (unreported) asserts in `make_object_duplilist_real()`. Code would try to add multiple time the same key in `parent_gh` (for this ghash a lot of dupliobjects may generate same key). Was making the tool unusable in debug builds. Also optimise things a bit by avoiding creating parent_gh when only `use_base_parent` is set.
2016-11-04 08:30:22 +01:00
}
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Cleanup: Declare variables where initialized
2020-10-09 16:39:39 -05:00
LISTBASE_FOREACH (DupliObject *, dob, lb_duplis) {
Fix T58481: "Make duplicates real" operator settings crashes
2018-12-04 10:18:21 +01:00
Object *ob_src = DEG_get_original_object(dob->ob);
Refactor: remove `BKE_<id_type>_copy` functions. Those were only shallow wrappers around `BKE_id_copy`, barely used (even fully unused in some cases), and we want to get rid of those ID-specific helpers for the common ID management tasks. Also prevents weird custom behaviors (like `BKE_object_copy`, who was the only basic ID copy function to reset user count of the new copy to zero). Part of 71219.
2020-10-07 18:01:25 +02:00
Object *ob_dst = ID_NEW_SET(ob_src, BKE_id_copy(bmain, &ob_src->id));
id_us_min(&ob_dst->id);
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02: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
/* font duplis can have a totcol without material, we get them from parent
style cleanup - use aligned * prefixed blocks for descriptive comments (was already used a lot and part of proposed style guide).
2012-03-03 16:31:46 +00:00
* should be implemented better...
*/
Cleanup: mostly namings in `make_object_duplilist_real` code.
2017-08-08 16:08:24 +02:00
if (ob_dst->mat == NULL) {
ob_dst->totcol = 0;
}
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Collections and groups unification OVERVIEW * In 2.7 terminology, all layers and groups are now collection datablocks. * These collections are nestable, linkable, instanceable, overrideable, .. which opens up new ways to set up scenes and link + override data. * Viewport/render visibility and selectability are now a part of the collection and shared across all view layers and linkable. * View layers define which subset of the scene collection hierarchy is excluded for each. For many workflows one view layer can be used, these are more of an advanced feature now. OUTLINER * The outliner now has a "View Layer" display mode instead of "Collections", which can display the collections and/or objects in the view layer. * In this display mode, collections can be excluded with the right click menu. These will then be greyed out and their objects will be excluded. * To view collections not linked to any scene, the "Blender File" display mode can be used, with the new filtering option to just see Colleciton datablocks. * The outliner right click menus for collections and objects were reorganized. * Drag and drop still needs to be improved. Like before, dragging the icon or text gives different results, we'll unify this later. LINKING AND OVERRIDES * Collections can now be linked into the scene without creating an instance, with the link/append operator or from the collections view in the outliner. * Collections can get static overrides with the right click menu in the outliner, but this is rather unreliable and not clearly communicated at the moment. * We still need to improve the make override operator to turn collection instances into collections with overrides directly in the scene. PERFORMANCE * We tried to make performance not worse than before and improve it in some cases. The main thing that's still a bit slower is multiple scenes, we have to change the layer syncing to only updated affected scenes. * Collections keep a list of their parent collections for faster incremental updates in syncing and caching. * View layer bases are now in a object -> base hash to avoid quadratic time lookups internally and in API functions like visible_get(). VERSIONING * Compatibility with 2.7 files should be improved due to the new visibility controls. Of course users may not want to set up their scenes differently now to avoid having separate layers and groups. * Compatibility with 2.8 is mostly there, and was tested on Eevee demo and Hero files. There's a few things which are know to be not quite compatible, like nested layer collections inside groups. * The versioning code for 2.8 files is quite complicated, and isolated behind #ifdef so it can be removed at the end of the release cycle. KNOWN ISSUES * The G-key group operators in the 3D viewport were left mostly as is, they need to be modified still to fit better. * Same for the groups panel in the object properties. This needs to be updated still, or perhaps replaced by something better. * Collections must all have a unique name. Less restrictive namespacing is to be done later, we'll have to see how important this is as all objects within the collections must also have a unique name anyway. * Full scene copy and delete scene are exactly doing the right thing yet. Differential Revision: https://developer.blender.org/D3383 https://code.blender.org/2018/05/collections-and-groups/
2018-04-30 15:57:22 +02:00
BKE_collection_object_add_from(bmain, scene, base->object, ob_dst);
Cleanup: Declare variables where initialized
2020-10-09 16:39:39 -05:00
Base *base_dst = BKE_view_layer_base_find(view_layer, ob_dst);
Fix crash when Making Duplicates Real for groups
2017-10-17 20:13:51 -02:00
BLI_assert(base_dst != NULL);
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Fix T68191: Make-instances-real doesn't select the new instances 2.79 also did this [select the new instances] which was useful. 2.79 also kept the instancer selected [this patch deselects] Reviewed By: mont29 Maniphest Tasks: T68191 Differential Revision: https://developer.blender.org/D6233
2019-11-12 15:25:32 +01:00
ED_object_base_select(base_dst, BA_SELECT);
DEG_id_tag_update(&ob_dst->id, ID_RECALC_SELECT);
Merge branch 'master' into blender2.8 Conflicts: source/blender/depsgraph/intern/builder/deg_builder_relations.cc source/blender/editors/object/object_add.c source/blender/python/intern/bpy_app_handlers.c
2017-08-08 16:43:25 +02:00
BKE_scene_object_base_flag_sync_from_base(base_dst);
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Bugfix [#26106] No instant visual feed back for Dupliframes, parenting problem and crash - It turns out we still need the "copyob" still, if for nothing other than making sure that the unkeyed transforms can get restored. This was removed originally as I thought that just reevaluating the animation would work. - Removed a buggy line of logic that was causing crashes when there was no animation data. It's better to just assume that if animation data exists, that something exists there. - Make Duplicates Real was not clearing data such as the new animation data or constraints.
2011-02-16 21:54:41 +00:00
/* make sure apply works */
Cleanup: mostly namings in `make_object_duplilist_real` code.
2017-08-08 16:08:24 +02:00
BKE_animdata_free(&ob_dst->id, true);
ob_dst->adt = NULL;
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Fix T39033: Regression, duplicating proxy loses proxy fix for bug making duplicates real effected copying scenes and linked duplis.
2014-03-12 05:54:12 +11:00
/* Proxies are not to be copied. */
Cleanup: mostly namings in `make_object_duplilist_real` code.
2017-08-08 16:08:24 +02:00
ob_dst->proxy_from = NULL;
ob_dst->proxy_group = NULL;
ob_dst->proxy = NULL;
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Cleanup: mostly namings in `make_object_duplilist_real` code.
2017-08-08 16:08:24 +02:00
ob_dst->parent = NULL;
BKE_constraints_free(&ob_dst->constraints);
Cleanup/Refactor: Move CurveCache runtime data into Object.runtime struct. Also, fix missing cleanup of Object.runtime when copying Object datablocks!
2018-07-30 16:54:40 +02:00
ob_dst->runtime.curve_cache = NULL;
Fix T66282: Make Instances Real: Keep Hierarchy option broken with recursive instancing. Preserving/rebuilding relashionships in recursive instancing was simply not supported at all, code handling that was assuming a single level of instancing. This commit makes the following changes: * Mixing DupliCollection and DupliVerts/Faces in the recursive chain is now supported (by using a same GHash in all cases, differences of persistent_id handling in hashing and comparison is now down inside the relevant functions). * When both "keep hierarchy" and "parent" options are enabled, code will attempt to parent new objects to their version of instancer (instead of parenting them systematically to the root object). This will preserve the hierarchy much better. * Collection is removed from dupli empties that have been made 'real' (the duplication flag itself was already cleared, but the link to the instantiated collection was kept).
2019-07-05 18:09:17 +02:00
const bool is_dupli_instancer = (ob_dst->transflag & OB_DUPLI) != 0;
Cleanup: mostly namings in `make_object_duplilist_real` code.
2017-08-08 16:08:24 +02:00
ob_dst->transflag &= ~OB_DUPLI;
Fix T66282: Make Instances Real: Keep Hierarchy option broken with recursive instancing. Preserving/rebuilding relashionships in recursive instancing was simply not supported at all, code handling that was assuming a single level of instancing. This commit makes the following changes: * Mixing DupliCollection and DupliVerts/Faces in the recursive chain is now supported (by using a same GHash in all cases, differences of persistent_id handling in hashing and comparison is now down inside the relevant functions). * When both "keep hierarchy" and "parent" options are enabled, code will attempt to parent new objects to their version of instancer (instead of parenting them systematically to the root object). This will preserve the hierarchy much better. * Collection is removed from dupli empties that have been made 'real' (the duplication flag itself was already cleared, but the link to the instantiated collection was kept).
2019-07-05 18:09:17 +02:00
/* Remove instantiated collection, it's annoying to keep it here
* (and get potentially a lot of usages of it then...). */
id_us_min((ID *)ob_dst->instance_collection);
ob_dst->instance_collection = NULL;
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Cleanup: mostly namings in `make_object_duplilist_real` code.
2017-08-08 16:08:24 +02:00
copy_m4_m4(ob_dst->obmat, dob->mat);
BKE_object_apply_mat4(ob_dst, ob_dst->obmat, false, false);
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Cleanup: mostly namings in `make_object_duplilist_real` code.
2017-08-08 16:08:24 +02:00
BLI_ghash_insert(dupli_gh, dob, ob_dst);
Fix (unreported) asserts in `make_object_duplilist_real()`. Code would try to add multiple time the same key in `parent_gh` (for this ghash a lot of dupliobjects may generate same key). Was making the tool unusable in debug builds. Also optimise things a bit by avoiding creating parent_gh when only `use_base_parent` is set.
2016-11-04 08:30:22 +01:00
if (parent_gh) {
void **val;
Cleanup: comment line length (editors) Prevents clang-format wrapping text before comments.
2019-01-15 23:24:20 +11:00
/* Due to nature of hash/comparison of this ghash, a lot of duplis may be considered as
* 'the same', this avoids trying to insert same key several time and
* raise asserts in debug builds... */
Fix (unreported) asserts in `make_object_duplilist_real()`. Code would try to add multiple time the same key in `parent_gh` (for this ghash a lot of dupliobjects may generate same key). Was making the tool unusable in debug builds. Also optimise things a bit by avoiding creating parent_gh when only `use_base_parent` is set.
2016-11-04 08:30:22 +01:00
if (!BLI_ghash_ensure_p(parent_gh, dob, &val)) {
Cleanup: mostly namings in `make_object_duplilist_real` code.
2017-08-08 16:08:24 +02:00
*val = ob_dst;
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
}
Fix T66282: Make Instances Real: Keep Hierarchy option broken with recursive instancing. Preserving/rebuilding relashionships in recursive instancing was simply not supported at all, code handling that was assuming a single level of instancing. This commit makes the following changes: * Mixing DupliCollection and DupliVerts/Faces in the recursive chain is now supported (by using a same GHash in all cases, differences of persistent_id handling in hashing and comparison is now down inside the relevant functions). * When both "keep hierarchy" and "parent" options are enabled, code will attempt to parent new objects to their version of instancer (instead of parenting them systematically to the root object). This will preserve the hierarchy much better. * Collection is removed from dupli empties that have been made 'real' (the duplication flag itself was already cleared, but the link to the instantiated collection was kept).
2019-07-05 18:09:17 +02:00
if (is_dupli_instancer && instancer_gh) {
/* Same as above, we may have several 'hits'. */
if (!BLI_ghash_ensure_p(instancer_gh, dob, &val)) {
*val = ob_dst;
}
}
Fix (unreported) asserts in `make_object_duplilist_real()`. Code would try to add multiple time the same key in `parent_gh` (for this ghash a lot of dupliobjects may generate same key). Was making the tool unusable in debug builds. Also optimise things a bit by avoiding creating parent_gh when only `use_base_parent` is set.
2016-11-04 08:30:22 +01:00
}
Fix T52260: Blender 2.79 Objects made duplicates real still refer armature proxy. New code was handling correctly ID's internal references to self, but not references between 'made real' different objects... Regression, to be backported in 2.79.
2017-08-08 16:01:48 +02:00
}
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Cleanup: Declare variables where initialized
2020-10-09 16:39:39 -05:00
LISTBASE_FOREACH (DupliObject *, dob, lb_duplis) {
Fix T60056: Make Duplicates Real with Keep Hierarchy does nothing Caused by rB36ca072375deea4803df4681716c1d3224095e07 [one instance of `DEG_get_original_object` was neccesary, the other one breaks getting the parent in `BLI_ghash_lookup`] Reviewed by: brecht Differential Revision: https://developer.blender.org/D4154
2019-01-02 15:37:15 +01:00
Object *ob_src = dob->ob;
Fix T52260: Blender 2.79 Objects made duplicates real still refer armature proxy. New code was handling correctly ID's internal references to self, but not references between 'made real' different objects... Regression, to be backported in 2.79.
2017-08-08 16:01:48 +02:00
Object *ob_dst = BLI_ghash_lookup(dupli_gh, dob);
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Cleanup id->newid usage, initial work. This aims at always ensuring that ID.newid (and relevant LIB_TAG_NEW) stay in clean (i.e. cleared) state by default. To achieve this, instead of clearing after all id copy call (would be horribly noisy, and bad for performances), we try to completely remove the setting of id->newid by default when copying a new ID. This implies that areas actually needing that info (mainly, object editing area (make single user...) and make local area) have to ensure they set it themselves as needed. This is far from simple change, many complex code paths to consider, so will need some serious testing. :/
2016-11-30 15:25:54 +01:00
/* Remap new object to itself, and clear again newid pointer of orig object. */
Fix T92629: Crash on mesh separate after rB43bc494892c3. rB43bc494892c3 switched `BKE_libblock_relink_to_newid` to use new ID remapping and libquery code. However, that new code does protect by default against remapping an objects's data pointer when that object is in Edit mode, since this is not a behavior that generic BKE code can handle (due to required editing data for most obdata types when in edit mode). So specific code that does create new IDs and need remapping in Edit mode has to pass specific exception flags to remaping code. This commit adds those remapping flags to `BKE_libblock_relink_to_newid` and add said exception flag to the remapping call from `ED_object_add_duplicate` when the object is in edit mode.
2021-11-01 15:19:17 +01:00
BKE_libblock_relink_to_newid(bmain, &ob_dst->id, 0);
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Depsgraph: Remove duplicated sets of recalc/update flags There were at least three copies of those: - OB_RECALC* family of flags, which are rudiment of an old dependency graph system. - PSYS_RECALC* which were used by old dependency graph system as a separate set since the graph itself did not handle particle systems. - DEG_TAG_* which was used to tag IDs. Now there is a single set, which defines what can be tagged and queried for an update. It also has some aggregate flags to make queries simpler. Lets once and for all solve the madness of those flags, stick to a single set, which will not overlap with anything or require any extra conversion. Technically, shouldn't be measurable user difference, but some of the agregate flags for few dependency graph components did change. Fixes T58632: Particle don't update rotation settings
2018-12-06 17:52:37 +01:00
DEG_id_tag_update(&ob_dst->id, ID_RECALC_GEOMETRY);
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Fix T52260: Blender 2.79 Objects made duplicates real still refer armature proxy. New code was handling correctly ID's internal references to self, but not references between 'made real' different objects... Regression, to be backported in 2.79.
2017-08-08 16:01:48 +02:00
if (use_hierarchy) {
fix [#29183] Make duplicates real: parent informations of the group is not copied infact this is a feature request but we had reports about it before and its useful to have. 2 new options for OBJECT_OT_duplicates_make_real - parent to original duplicator - keep internal hierarchy
2011-11-07 05:28:26 +00:00
/* original parents */
style cleanup: editors / mesh & object
2012-04-28 15:42:27 +00:00
Object *ob_src_par = ob_src->parent;
Object *ob_dst_par = NULL;
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Fix #29640: make duplicates release keep hierarchy and parent properties not working for multiple objects. ID.newid only worked for one object, now it uses a hash instead.
2011-12-16 23:56:18 +00:00
/* find parent that was also made real */
style cleanup: follow style guide for formatting of if/for/while loops, and else if's
2012-03-24 06:38:07 +00:00
if (ob_src_par) {
Fix T42838: Make dupli's real use_hierarchy fails Regression since the dupli-object refactor.
2014-12-08 16:13:27 +01:00
/* OK to keep most of the members uninitialized,
* they won't be read, this is simply for a hash lookup. */
DupliObject dob_key;
dob_key.ob = ob_src_par;
Fix T66282: Make Instances Real: Keep Hierarchy option broken with recursive instancing. Preserving/rebuilding relashionships in recursive instancing was simply not supported at all, code handling that was assuming a single level of instancing. This commit makes the following changes: * Mixing DupliCollection and DupliVerts/Faces in the recursive chain is now supported (by using a same GHash in all cases, differences of persistent_id handling in hashing and comparison is now down inside the relevant functions). * When both "keep hierarchy" and "parent" options are enabled, code will attempt to parent new objects to their version of instancer (instead of parenting them systematically to the root object). This will preserve the hierarchy much better. * Collection is removed from dupli empties that have been made 'real' (the duplication flag itself was already cleared, but the link to the instantiated collection was kept).
2019-07-05 18:09:17 +02:00
dob_key.type = dob->type;
if (dob->type == OB_DUPLICOLLECTION) {
Fix T49718: Wrong "Make Duplicates Real" behavior with "Keep Hierarchy" All objects were being parented to a single instance of each parent object, instead of their respective instances, when using dupliverts or dupligroups. Behavior was caused by the `persistent_id[0]` (vertex/face id) being ignored when computing `parent_gh` hash, which caused all instances to have the same hash, and thus only the first one was included. Reviewed By: mont29 Differential Revision: https://developer.blender.org/D2370
2016-11-22 14:38:43 -02:00
memcpy(&dob_key.persistent_id[1],
Fix T52260: Blender 2.79 Objects made duplicates real still refer armature proxy. New code was handling correctly ID's internal references to self, but not references between 'made real' different objects... Regression, to be backported in 2.79.
2017-08-08 16:01:48 +02:00
&dob->persistent_id[1],
sizeof(dob->persistent_id[1]) * (MAX_DUPLI_RECUR - 1));
Fix T49718: Wrong "Make Duplicates Real" behavior with "Keep Hierarchy" All objects were being parented to a single instance of each parent object, instead of their respective instances, when using dupliverts or dupligroups. Behavior was caused by the `persistent_id[0]` (vertex/face id) being ignored when computing `parent_gh` hash, which caused all instances to have the same hash, and thus only the first one was included. Reviewed By: mont29 Differential Revision: https://developer.blender.org/D2370
2016-11-22 14:38:43 -02:00
}
else {
dob_key.persistent_id[0] = dob->persistent_id[0];
}
Fix T42838: Make dupli's real use_hierarchy fails Regression since the dupli-object refactor.
2014-12-08 16:13:27 +01:00
ob_dst_par = BLI_ghash_lookup(parent_gh, &dob_key);
Fix #29640: make duplicates release keep hierarchy and parent properties not working for multiple objects. ID.newid only worked for one object, now it uses a hash instead.
2011-12-16 23:56:18 +00:00
}
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Fix #29640: make duplicates release keep hierarchy and parent properties not working for multiple objects. ID.newid only worked for one object, now it uses a hash instead.
2011-12-16 23:56:18 +00:00
if (ob_dst_par) {
fix [#29183] Make duplicates real: parent informations of the group is not copied infact this is a feature request but we had reports about it before and its useful to have. 2 new options for OBJECT_OT_duplicates_make_real - parent to original duplicator - keep internal hierarchy
2011-11-07 05:28:26 +00:00
/* allow for all possible parent types */
style cleanup: editors / mesh & object
2012-04-28 15:42:27 +00:00
ob_dst->partype = ob_src->partype;
fix [#29183] Make duplicates real: parent informations of the group is not copied infact this is a feature request but we had reports about it before and its useful to have. 2 new options for OBJECT_OT_duplicates_make_real - parent to original duplicator - keep internal hierarchy
2011-11-07 05:28:26 +00:00
BLI_strncpy(ob_dst->parsubstr, ob_src->parsubstr, sizeof(ob_dst->parsubstr));
style cleanup: editors / mesh & object
2012-04-28 15:42:27 +00:00
ob_dst->par1 = ob_src->par1;
ob_dst->par2 = ob_src->par2;
ob_dst->par3 = ob_src->par3;
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
fix [#29183] Make duplicates real: parent informations of the group is not copied infact this is a feature request but we had reports about it before and its useful to have. 2 new options for OBJECT_OT_duplicates_make_real - parent to original duplicator - keep internal hierarchy
2011-11-07 05:28:26 +00:00
copy_m4_m4(ob_dst->parentinv, ob_src->parentinv);
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
style cleanup: editors / mesh & object
2012-04-28 15:42:27 +00:00
ob_dst->parent = ob_dst_par;
fix [#29183] Make duplicates real: parent informations of the group is not copied infact this is a feature request but we had reports about it before and its useful to have. 2 new options for OBJECT_OT_duplicates_make_real - parent to original duplicator - keep internal hierarchy
2011-11-07 05:28:26 +00:00
}
}
Fix T66282: Make Instances Real: Keep Hierarchy option broken with recursive instancing. Preserving/rebuilding relashionships in recursive instancing was simply not supported at all, code handling that was assuming a single level of instancing. This commit makes the following changes: * Mixing DupliCollection and DupliVerts/Faces in the recursive chain is now supported (by using a same GHash in all cases, differences of persistent_id handling in hashing and comparison is now down inside the relevant functions). * When both "keep hierarchy" and "parent" options are enabled, code will attempt to parent new objects to their version of instancer (instead of parenting them systematically to the root object). This will preserve the hierarchy much better. * Collection is removed from dupli empties that have been made 'real' (the duplication flag itself was already cleared, but the link to the instantiated collection was kept).
2019-07-05 18:09:17 +02:00
if (use_base_parent && ob_dst->parent == NULL) {
Object *ob_dst_par = NULL;
if (instancer_gh != NULL) {
/* OK to keep most of the members uninitialized,
* they won't be read, this is simply for a hash lookup. */
DupliObject dob_key;
Cleanup: spelling
2021-02-13 17:44:51 +11:00
/* We are looking one step upper in hierarchy, so we need to 'shift' the `persistent_id`,
Fix T66282: Make Instances Real: Keep Hierarchy option broken with recursive instancing. Preserving/rebuilding relashionships in recursive instancing was simply not supported at all, code handling that was assuming a single level of instancing. This commit makes the following changes: * Mixing DupliCollection and DupliVerts/Faces in the recursive chain is now supported (by using a same GHash in all cases, differences of persistent_id handling in hashing and comparison is now down inside the relevant functions). * When both "keep hierarchy" and "parent" options are enabled, code will attempt to parent new objects to their version of instancer (instead of parenting them systematically to the root object). This will preserve the hierarchy much better. * Collection is removed from dupli empties that have been made 'real' (the duplication flag itself was already cleared, but the link to the instantiated collection was kept).
2019-07-05 18:09:17 +02:00
* ignoring the first item.
* We only check on persistent_id here, since we have no idea what object it might be. */
memcpy(&dob_key.persistent_id[0],
&dob->persistent_id[1],
sizeof(dob_key.persistent_id[0]) * (MAX_DUPLI_RECUR - 1));
ob_dst_par = BLI_ghash_lookup(instancer_gh, &dob_key);
}
if (ob_dst_par == NULL) {
/* Default to parenting to root object...
* Always the case when use_hierarchy is false. */
ob_dst_par = base->object;
}
ob_dst->parent = ob_dst_par;
style cleanup: editors / mesh & object
2012-04-28 15:42:27 +00:00
ob_dst->partype = PAROBJECT;
Fix T52260: Blender 2.79 Objects made duplicates real still refer armature proxy. New code was handling correctly ID's internal references to self, but not references between 'made real' different objects... Regression, to be backported in 2.79.
2017-08-08 16:01:48 +02:00
}
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Fix T52260: Blender 2.79 Objects made duplicates real still refer armature proxy. New code was handling correctly ID's internal references to self, but not references between 'made real' different objects... Regression, to be backported in 2.79.
2017-08-08 16:01:48 +02:00
if (ob_dst->parent) {
Cleanup: consistent use of tags: NOTE/TODO/FIXME/XXX Also use doxy style function reference `#` prefix chars when referencing identifiers.
2021-07-03 23:08:40 +10:00
/* NOTE: this may be the parent of other objects, but it should
Fix T52260: Blender 2.79 Objects made duplicates real still refer armature proxy. New code was handling correctly ID's internal references to self, but not references between 'made real' different objects... Regression, to be backported in 2.79.
2017-08-08 16:01:48 +02:00
* still work out ok */
Code cleanup: remove TRUE/FALSE & WITH_BOOL_COMPAT define
2014-04-01 11:34:00 +11:00
BKE_object_apply_mat4(ob_dst, dob->mat, false, true);
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Merge branch 'master' into blender2.8
2018-09-27 15:49:59 +02:00
/* to set ob_dst->orig and in case there's any other discrepancies */
Depsgraph: Remove duplicated sets of recalc/update flags There were at least three copies of those: - OB_RECALC* family of flags, which are rudiment of an old dependency graph system. - PSYS_RECALC* which were used by old dependency graph system as a separate set since the graph itself did not handle particle systems. - DEG_TAG_* which was used to tag IDs. Now there is a single set, which defines what can be tagged and queried for an update. It also has some aggregate flags to make queries simpler. Lets once and for all solve the madness of those flags, stick to a single set, which will not overlap with anything or require any extra conversion. Technically, shouldn't be measurable user difference, but some of the agregate flags for few dependency graph components did change. Fixes T58632: Particle don't update rotation settings
2018-12-06 17:52:37 +01:00
DEG_id_tag_update(&ob_dst->id, ID_RECALC_TRANSFORM);
fix [#29183] Make duplicates real: parent informations of the group is not copied infact this is a feature request but we had reports about it before and its useful to have. 2 new options for OBJECT_OT_duplicates_make_real - parent to original duplicator - keep internal hierarchy
2011-11-07 05:28:26 +00:00
}
}
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
DNA: rename dup_* struct members to instance_*
2019-02-17 19:00:54 +11:00
if (base->object->transflag & OB_DUPLICOLLECTION && base->object->instance_collection) {
Cleanup: Declare variables where initialized
2020-10-09 16:39:39 -05:00
LISTBASE_FOREACH (Object *, ob, &bmain->objects) {
Cleanup: mostly namings in `make_object_duplilist_real` code.
2017-08-08 16:08:24 +02:00
if (ob->proxy_group == base->object) {
ob->proxy = NULL;
ob->proxy_from = NULL;
Depsgraph: Remove duplicated sets of recalc/update flags There were at least three copies of those: - OB_RECALC* family of flags, which are rudiment of an old dependency graph system. - PSYS_RECALC* which were used by old dependency graph system as a separate set since the graph itself did not handle particle systems. - DEG_TAG_* which was used to tag IDs. Now there is a single set, which defines what can be tagged and queried for an update. It also has some aggregate flags to make queries simpler. Lets once and for all solve the madness of those flags, stick to a single set, which will not overlap with anything or require any extra conversion. Technically, shouldn't be measurable user difference, but some of the agregate flags for few dependency graph components did change. Fixes T58632: Particle don't update rotation settings
2018-12-06 17:52:37 +01:00
DEG_id_tag_update(&ob->id, ID_RECALC_TRANSFORM);
Making real need to remove proxies Otherwise some invalid pointers will be left which could be harmless if real object stays local, but crashes when linking them to another files. Was discovered here in the studio during Project Pampa, and the steps to reproduce are: - Create lib.blend, put armature and cube to it. Create a group with them. - Create scene.blend and link group from lib.blend. - Make a proxy from armature. - Make group real. - Add real objects to a group. - Create comp.blend and link group from scene.blend. This step will creah.
2013-10-22 15:19:37 +00:00
}
}
Fix T66327 2/2: Make instance real does not clear collection
2019-07-02 18:16:55 -03:00
base->object->instance_collection = NULL;
Making real need to remove proxies Otherwise some invalid pointers will be left which could be harmless if real object stays local, but crashes when linking them to another files. Was discovered here in the studio during Project Pampa, and the steps to reproduce are: - Create lib.blend, put armature and cube to it. Create a group with them. - Create scene.blend and link group from lib.blend. - Make a proxy from armature. - Make group real. - Add real objects to a group. - Create comp.blend and link group from scene.blend. This step will creah.
2013-10-22 15:19:37 +00:00
}
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Fix T68191: Make-instances-real doesn't select the new instances 2.79 also did this [select the new instances] which was useful. 2.79 also kept the instancer selected [this patch deselects] Reviewed By: mont29 Maniphest Tasks: T68191 Differential Revision: https://developer.blender.org/D6233
2019-11-12 15:25:32 +01:00
ED_object_base_select(base, BA_DESELECT);
DEG_id_tag_update(&base->object->id, ID_RECALC_SELECT);
Fix T52260: Blender 2.79 Objects made duplicates real still refer armature proxy. New code was handling correctly ID's internal references to self, but not references between 'made real' different objects... Regression, to be backported in 2.79.
2017-08-08 16:01:48 +02:00
BLI_ghash_free(dupli_gh, NULL, NULL);
Cleanup: mostly namings in `make_object_duplilist_real` code.
2017-08-08 16:08:24 +02:00
if (parent_gh) {
Fix T42838: Make dupli's real use_hierarchy fails Regression since the dupli-object refactor.
2014-12-08 16:13:27 +01:00
BLI_ghash_free(parent_gh, NULL, NULL);
Cleanup: mostly namings in `make_object_duplilist_real` code.
2017-08-08 16:08:24 +02:00
}
Fix T66282: Make Instances Real: Keep Hierarchy option broken with recursive instancing. Preserving/rebuilding relashionships in recursive instancing was simply not supported at all, code handling that was assuming a single level of instancing. This commit makes the following changes: * Mixing DupliCollection and DupliVerts/Faces in the recursive chain is now supported (by using a same GHash in all cases, differences of persistent_id handling in hashing and comparison is now down inside the relevant functions). * When both "keep hierarchy" and "parent" options are enabled, code will attempt to parent new objects to their version of instancer (instead of parenting them systematically to the root object). This will preserve the hierarchy much better. * Collection is removed from dupli empties that have been made 'real' (the duplication flag itself was already cleared, but the link to the instantiated collection was kept).
2019-07-05 18:09:17 +02:00
if (instancer_gh) {
BLI_ghash_free(instancer_gh, NULL, NULL);
}
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Cleanup: mostly namings in `make_object_duplilist_real` code.
2017-08-08 16:08:24 +02:00
free_object_duplilist(lb_duplis);
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Cleanup: rename BKE_main_id_{clear_newpoins => newptr_and_tag_clear} It wasn't obvious this function cleared the tag as well.
2021-05-27 22:44:02 +10:00
BKE_main_id_newptr_and_tag_clear(bmain);
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
fix [#29183] Make duplicates real: parent informations of the group is not copied infact this is a feature request but we had reports about it before and its useful to have. 2 new options for OBJECT_OT_duplicates_make_real - parent to original duplicator - keep internal hierarchy
2011-11-07 05:28:26 +00:00
base->object->transflag &= ~OB_DUPLI;
Depsgraph: Remove duplicated sets of recalc/update flags There were at least three copies of those: - OB_RECALC* family of flags, which are rudiment of an old dependency graph system. - PSYS_RECALC* which were used by old dependency graph system as a separate set since the graph itself did not handle particle systems. - DEG_TAG_* which was used to tag IDs. Now there is a single set, which defines what can be tagged and queried for an update. It also has some aggregate flags to make queries simpler. Lets once and for all solve the madness of those flags, stick to a single set, which will not overlap with anything or require any extra conversion. Technically, shouldn't be measurable user difference, but some of the agregate flags for few dependency graph components did change. Fixes T58632: Particle don't update rotation settings
2018-12-06 17:52:37 +01:00
DEG_id_tag_update(&base->object->id, ID_RECALC_COPY_ON_WRITE);
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
}
fix [#29183] Make duplicates real: parent informations of the group is not copied infact this is a feature request but we had reports about it before and its useful to have. 2 new options for OBJECT_OT_duplicates_make_real - parent to original duplicator - keep internal hierarchy
2011-11-07 05:28:26 +00:00
static int object_duplicates_make_real_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
{
style cleanup: editors / mesh & object
2012-04-28 15:42:27 +00:00
Main *bmain = CTX_data_main(C);
Refactor access to dependency graph This change ensures that operators which needs access to evaluated data first makes sure there is a dependency graph. Other accesses to the dependency graph made it more explicit about whether they just need a valid dependency graph pointer or whether they expect the graph to be already evaluated. This replaces OPTYPE_USE_EVAL_DATA which is now removed. Some general rules about usage of accessors: - Drawing is expected to happen from a fully evaluated dependency graph. There is now a function to access it, which will in the future control that dependency graph is actually evaluated. This check is not yet done because there are some things to be taken care about first: for example, post-update hooks might leave scene in a state where something is still tagged for update. - All operators which needs to access evaluated state must use CTX_data_ensure_evaluated_depsgraph(). This function replaces OPTYPE_USE_EVAL_DATA. The call is generally to be done in the very beginning of the operator, prior other logic (unless this is some comprehensive operator which might or might not need access to an evaluated state). This call is never to be used from a loop. If some utility function requires evaluated state of dependency graph the graph is to be passed as an explicit argument. This way it is clear that no evaluation happens in a loop or something like this. - All cases which needs to know dependency graph pointer, but which doesn't want to actually evaluate it can use old-style function CTX_data_depsgraph_pointer(), assuming that underlying code will ensure dependency graph is evaluated prior to accessing it. - The new functions are replacing OPTYPE_USE_EVAL_DATA, so now it is explicit and local about where dependency graph is being ensured. This commit also contains some fixes of wrong usage of evaluation functions on original objects. Ideally should be split out, but in reality with all the APIs being renamed is quite tricky. Fixes T67454: Blender crash on rapid undo and select Speculation here is that sometimes undo and selection operators are sometimes handled in the same event loop iteration, which leaves non-evaluated dependency graph. Fixes T67973: Crash on Fix Deforms operator Fixes T67902: Crash when undo a loop cut Reviewers: brecht Reviewed By: brecht Subscribers: lichtwerk Maniphest Tasks: T67454 Differential Revision: https://developer.blender.org/D5343
2019-07-25 16:36:22 +02:00
Depsgraph *depsgraph = CTX_data_ensure_evaluated_depsgraph(C);
style cleanup: editors / mesh & object
2012-04-28 15:42:27 +00:00
Scene *scene = CTX_data_scene(C);
fix [#29183] Make duplicates real: parent informations of the group is not copied infact this is a feature request but we had reports about it before and its useful to have. 2 new options for OBJECT_OT_duplicates_make_real - parent to original duplicator - keep internal hierarchy
2011-11-07 05:28:26 +00:00
Code cleanup: use bool
2014-04-11 11:25:41 +10:00
const bool use_base_parent = RNA_boolean_get(op->ptr, "use_base_parent");
const bool use_hierarchy = RNA_boolean_get(op->ptr, "use_hierarchy");
Some effect-less code cleanup...
2012-10-05 07:05:52 +00:00
Cleanup: rename BKE_main_id_{clear_newpoins => newptr_and_tag_clear} It wasn't obvious this function cleared the tag as well.
2021-05-27 22:44:02 +10:00
BKE_main_id_newptr_and_tag_clear(bmain);
Some effect-less code cleanup...
2012-10-05 07:05:52 +00:00
style cleanup: re - http://wiki.blender.org/index.php/Dev:Doc/CodeStyle#Braces_with_Macros
2012-04-30 16:22:40 +00:00
CTX_DATA_BEGIN (C, Base *, base, selected_editable_bases) {
Refactor access to dependency graph This change ensures that operators which needs access to evaluated data first makes sure there is a dependency graph. Other accesses to the dependency graph made it more explicit about whether they just need a valid dependency graph pointer or whether they expect the graph to be already evaluated. This replaces OPTYPE_USE_EVAL_DATA which is now removed. Some general rules about usage of accessors: - Drawing is expected to happen from a fully evaluated dependency graph. There is now a function to access it, which will in the future control that dependency graph is actually evaluated. This check is not yet done because there are some things to be taken care about first: for example, post-update hooks might leave scene in a state where something is still tagged for update. - All operators which needs to access evaluated state must use CTX_data_ensure_evaluated_depsgraph(). This function replaces OPTYPE_USE_EVAL_DATA. The call is generally to be done in the very beginning of the operator, prior other logic (unless this is some comprehensive operator which might or might not need access to an evaluated state). This call is never to be used from a loop. If some utility function requires evaluated state of dependency graph the graph is to be passed as an explicit argument. This way it is clear that no evaluation happens in a loop or something like this. - All cases which needs to know dependency graph pointer, but which doesn't want to actually evaluate it can use old-style function CTX_data_depsgraph_pointer(), assuming that underlying code will ensure dependency graph is evaluated prior to accessing it. - The new functions are replacing OPTYPE_USE_EVAL_DATA, so now it is explicit and local about where dependency graph is being ensured. This commit also contains some fixes of wrong usage of evaluation functions on original objects. Ideally should be split out, but in reality with all the APIs being renamed is quite tricky. Fixes T67454: Blender crash on rapid undo and select Speculation here is that sometimes undo and selection operators are sometimes handled in the same event loop iteration, which leaves non-evaluated dependency graph. Fixes T67973: Crash on Fix Deforms operator Fixes T67902: Crash when undo a loop cut Reviewers: brecht Reviewed By: brecht Subscribers: lichtwerk Maniphest Tasks: T67454 Differential Revision: https://developer.blender.org/D5343
2019-07-25 16:36:22 +02:00
make_object_duplilist_real(C, depsgraph, scene, base, use_base_parent, use_hierarchy);
Fix #24180: Make duplicates real doesn't update immediatly the outliner
2010-10-07 12:18:09 +00:00
/* dependencies were changed */
style cleanup: editors / mesh & object
2012-04-28 15:42:27 +00:00
WM_event_add_notifier(C, NC_OBJECT | ND_PARENT, base->object);
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
}
CTX_DATA_END;
Replace all old DAG calls with direct calls to new DEG and remove BKE_depsgraph.h This removes BKE_depsgraph.h and depsgraph.c
2017-06-08 10:14:53 +02:00
DEG_relations_tag_update(bmain);
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
WM_event_add_notifier(C, NC_SCENE, scene);
style cleanup: editors / mesh & object
2012-04-28 15:42:27 +00:00
WM_main_add_notifier(NC_OBJECT | ND_DRAW, NULL);
Outliner: Fix selection sync for various operators Add missing outliner selection sync tagging for various non-outliner operators. * Curve separate * Grease Pencil separate * Mesh separate * Make instances real * 3D view paste * Sequencer paste * Armature delete, dissolve, separate, duplicate, subdivide, extrude, click extrude, primitive add * Pose Group select, delete Resolves T71404
2020-05-01 20:06:38 -06:00
ED_outliner_select_sync_from_object_tag(C);
Some effect-less code cleanup...
2012-10-05 07:05: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
return OPERATOR_FINISHED;
}
void OBJECT_OT_duplicates_make_real(wmOperatorType *ot)
{
/* identifiers */
UI: Rename Make Duplicates Real to Make Instances Real Part of T56648
2019-06-24 00:54:42 +02:00
ot->name = "Make Instances Real";
ot->description = "Make instanced objects attached to this object real";
style cleanup: spaces aroudn operators for operator definitions.
2012-03-22 07:26:09 +00:00
ot->idname = "OBJECT_OT_duplicates_make_real";
Some effect-less code cleanup...
2012-10-05 07:05: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
/* api callbacks */
style cleanup: spaces aroudn operators for operator definitions.
2012-03-22 07:26:09 +00:00
ot->exec = object_duplicates_make_real_exec;
Some effect-less code cleanup...
2012-10-05 07:05:52 +00:00
style cleanup: spaces aroudn operators for operator definitions.
2012-03-22 07:26:09 +00:00
ot->poll = ED_operator_objectmode;
Some effect-less code cleanup...
2012-10-05 07:05: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
/* flags */
Refactor access to dependency graph This change ensures that operators which needs access to evaluated data first makes sure there is a dependency graph. Other accesses to the dependency graph made it more explicit about whether they just need a valid dependency graph pointer or whether they expect the graph to be already evaluated. This replaces OPTYPE_USE_EVAL_DATA which is now removed. Some general rules about usage of accessors: - Drawing is expected to happen from a fully evaluated dependency graph. There is now a function to access it, which will in the future control that dependency graph is actually evaluated. This check is not yet done because there are some things to be taken care about first: for example, post-update hooks might leave scene in a state where something is still tagged for update. - All operators which needs to access evaluated state must use CTX_data_ensure_evaluated_depsgraph(). This function replaces OPTYPE_USE_EVAL_DATA. The call is generally to be done in the very beginning of the operator, prior other logic (unless this is some comprehensive operator which might or might not need access to an evaluated state). This call is never to be used from a loop. If some utility function requires evaluated state of dependency graph the graph is to be passed as an explicit argument. This way it is clear that no evaluation happens in a loop or something like this. - All cases which needs to know dependency graph pointer, but which doesn't want to actually evaluate it can use old-style function CTX_data_depsgraph_pointer(), assuming that underlying code will ensure dependency graph is evaluated prior to accessing it. - The new functions are replacing OPTYPE_USE_EVAL_DATA, so now it is explicit and local about where dependency graph is being ensured. This commit also contains some fixes of wrong usage of evaluation functions on original objects. Ideally should be split out, but in reality with all the APIs being renamed is quite tricky. Fixes T67454: Blender crash on rapid undo and select Speculation here is that sometimes undo and selection operators are sometimes handled in the same event loop iteration, which leaves non-evaluated dependency graph. Fixes T67973: Crash on Fix Deforms operator Fixes T67902: Crash when undo a loop cut Reviewers: brecht Reviewed By: brecht Subscribers: lichtwerk Maniphest Tasks: T67454 Differential Revision: https://developer.blender.org/D5343
2019-07-25 16:36:22 +02:00
ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
fix [#29183] Make duplicates real: parent informations of the group is not copied infact this is a feature request but we had reports about it before and its useful to have. 2 new options for OBJECT_OT_duplicates_make_real - parent to original duplicator - keep internal hierarchy
2011-11-07 05:28:26 +00:00
RNA_def_boolean(ot->srna,
"use_base_parent",
0,
"Parent",
UI: Clean up "Dupli" to "Instance" Following the naming conventions defined in T56648, where in this instance there were still a few remaining uses of the old term. Differential Revision: https://developer.blender.org/D9817
2021-02-24 13:49:14 -06:00
"Parent newly created objects to the original instancer");
fix [#29183] Make duplicates real: parent informations of the group is not copied infact this is a feature request but we had reports about it before and its useful to have. 2 new options for OBJECT_OT_duplicates_make_real - parent to original duplicator - keep internal hierarchy
2011-11-07 05:28:26 +00:00
RNA_def_boolean(
ot->srna, "use_hierarchy", 0, "Keep Hierarchy", "Maintain parent child relationships");
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
}
Cleanup: use doxy sections for object_add.c
2019-05-16 14:03:31 +10:00
/** \} */
/* -------------------------------------------------------------------- */
/** \name Data Convert Operator
* \{ */
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
Cleanup: Use const for RNA EnumPropertyItem args Practically all access to enum data is read-only.
2017-10-18 15:07:26 +11:00
static const EnumPropertyItem convert_target_items[] = {
UI: Improve labels in "Convert To" menu Move the information about the type of the source objects to the item descriptions instead of the names. The extra information in the names made the labels cluttered, and it's less important information. Differential Revision: https://developer.blender.org/D8352
2020-10-07 08:17:16 -05:00
{OB_CURVE, "CURVE", ICON_OUTLINER_OB_CURVE, "Curve", "Curve from Mesh or Text objects"},
{OB_MESH,
"MESH",
ICON_OUTLINER_OB_MESH,
"Mesh",
Move Point Cloud object back to Experimental Features The geometry-nodes features no longer depend on the point cloud object. Therefore the point cloud object, although important in the future, can be postponed until we have render and edit mode fully working. This reverts commits: * ea74ed5a7a2031b614d401e394f2e0146fc90155. * dc614c68ef2c8ca8b076a000974b5a20a4145a42.
2020-12-15 13:07:02 +01:00
#ifdef WITH_POINT_CLOUD
UI: Fix various issues with UI text - Use the name "Point Cloud" instead of "Pointcloud" - Fix a typo in UV_OT_smart_project. - Use the name "Install Light" to for the installation operator for MatCaps, HDRIs, and Studio Lights. Fixes T83585, T65291, and T54921 Differential Revision: https://developer.blender.org/D9867
2021-01-06 22:54:10 -06:00
"Mesh from Curve, Surface, Metaball, Text, or Point Cloud objects"},
Move Point Cloud object back to Experimental Features The geometry-nodes features no longer depend on the point cloud object. Therefore the point cloud object, although important in the future, can be postponed until we have render and edit mode fully working. This reverts commits: * ea74ed5a7a2031b614d401e394f2e0146fc90155. * dc614c68ef2c8ca8b076a000974b5a20a4145a42.
2020-12-15 13:07:02 +01:00
#else
"Mesh from Curve, Surface, Metaball, or Text objects"},
#endif
UI: Improve labels in "Convert To" menu Move the information about the type of the source objects to the item descriptions instead of the names. The extra information in the names made the labels cluttered, and it's less important information. Differential Revision: https://developer.blender.org/D8352
2020-10-07 08:17:16 -05:00
{OB_GPENCIL,
"GPENCIL",
ICON_OUTLINER_OB_GREASEPENCIL,
"Grease Pencil",
"Grease Pencil from Curve or Mesh objects"},
Move Point Cloud object back to Experimental Features The geometry-nodes features no longer depend on the point cloud object. Therefore the point cloud object, although important in the future, can be postponed until we have render and edit mode fully working. This reverts commits: * ea74ed5a7a2031b614d401e394f2e0146fc90155. * dc614c68ef2c8ca8b076a000974b5a20a4145a42.
2020-12-15 13:07:02 +01:00
#ifdef WITH_POINT_CLOUD
UI: Improve labels in "Convert To" menu Move the information about the type of the source objects to the item descriptions instead of the names. The extra information in the names made the labels cluttered, and it's less important information. Differential Revision: https://developer.blender.org/D8352
2020-10-07 08:17:16 -05:00
{OB_POINTCLOUD,
"POINTCLOUD",
ICON_OUTLINER_OB_POINTCLOUD,
UI: Fix various issues with UI text - Use the name "Point Cloud" instead of "Pointcloud" - Fix a typo in UV_OT_smart_project. - Use the name "Install Light" to for the installation operator for MatCaps, HDRIs, and Studio Lights. Fixes T83585, T65291, and T54921 Differential Revision: https://developer.blender.org/D9867
2021-01-06 22:54:10 -06:00
"Point Cloud",
"Point Cloud from Mesh objects"},
Move Point Cloud object back to Experimental Features The geometry-nodes features no longer depend on the point cloud object. Therefore the point cloud object, although important in the future, can be postponed until we have render and edit mode fully working. This reverts commits: * ea74ed5a7a2031b614d401e394f2e0146fc90155. * dc614c68ef2c8ca8b076a000974b5a20a4145a42.
2020-12-15 13:07:02 +01:00
#endif
Cleanup: trailing commas Needed for clan-format not to wrap onto one line.
2019-02-03 14:01:45 +11:00
{0, NULL, 0, NULL, NULL},
style cleanup: editors / mesh & object
2012-04-28 15:42:27 +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
Cleanup: name mesh join functions using ED_{type} prefix
2020-06-17 17:07:11 +10:00
static void object_data_convert_ensure_curve_cache(Depsgraph *depsgraph, Scene *scene, Object *ob)
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
{
Cleanup/Refactor: Move CurveCache runtime data into Object.runtime struct. Also, fix missing cleanup of Object.runtime when copying Object datablocks!
2018-07-30 16:54:40 +02:00
if (ob->runtime.curve_cache == NULL) {
Fix T39126: Convert To: Mesh from Curve/Meta/Surface does not respect "Keep Original" Own regression, didn't consider operator redo would leave scene in a non-evaluated state.
2014-03-12 13:59:45 +06:00
/* Force creation. This is normally not needed but on operator
* redo we might end up with an object which isn't evaluated yet.
Cleanup: comments (long lines) in editors
2019-04-22 00:18:34 +10:00
* Also happens in case we are working on a copy of the object
* (all its caches have been nuked then).
Fix T39126: Convert To: Mesh from Curve/Meta/Surface does not respect "Keep Original" Own regression, didn't consider operator redo would leave scene in a non-evaluated state.
2014-03-12 13:59:45 +06:00
*/
Defines: replace ELEM3-16 with ELEM(...), that can take varargs
2014-07-20 01:30:29 +10:00
if (ELEM(ob->type, OB_SURF, OB_CURVE, OB_FONT)) {
Fix T56906: Mesh from Curve not working on curves beveled by curves. Not exactly sure why we did not have cached displist for bevel object here... But anyway, that conversion operation should really happen outside of depsgraph evaluation area, so makes sense to do it as when generating geometry for rendering, imho. Also solves issues like loosing hidden parts of the curve/surface, etc. Still using viewport resolution for curves, though.
2018-11-28 18:14:40 +01:00
/* We need 'for render' ON here, to enable computing bevel dipslist if needed.
* Also makes sense anyway, we would not want e.g. to lose hidden parts etc. */
Cleanup: Remove unused "for_orco" argument to curve evaluation `BKE_displist_make_curveTypes` had a `for_orco` argument that was always false in calls to the function. Removing it allows the curve displist and modifier evaluation code to become simpler. There are some related cleanups in rBdf4299465279 and rB93aecd2b8107.
2021-06-28 15:14:43 -05:00
BKE_displist_make_curveTypes(depsgraph, scene, ob, true);
Fix T39126: Convert To: Mesh from Curve/Meta/Surface does not respect "Keep Original" Own regression, didn't consider operator redo would leave scene in a non-evaluated state.
2014-03-12 13:59:45 +06:00
}
else if (ob->type == OB_MBALL) {
Depsgraph: remove EvaluationContext, pass Depsgraph instead. The depsgraph was always created within a fixed evaluation context. Passing both risks the depsgraph and evaluation context not matching, and it complicates the Python API where we'd have to expose both which is not so easy to understand. This also removes the global evaluation context in main, which assumed there to be a single active scene and view layer. Differential Revision: https://developer.blender.org/D3152
2018-04-06 12:07:27 +02:00
BKE_displist_make_mball(depsgraph, scene, ob);
Fix T39126: Convert To: Mesh from Curve/Meta/Surface does not respect "Keep Original" Own regression, didn't consider operator redo would leave scene in a non-evaluated state.
2014-03-12 13:59:45 +06: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
Cleanup: name mesh join functions using ED_{type} prefix
2020-06-17 17:07:11 +10:00
static void object_data_convert_curve_to_mesh(Main *bmain, Depsgraph *depsgraph, Object *ob)
Fix T39126: Convert To: Mesh from Curve/Meta/Surface does not respect "Keep Original" Own regression, didn't consider operator redo would leave scene in a non-evaluated state.
2014-03-12 13:59:45 +06:00
{
Fix T65052: "Convert to mesh from curve" fail if the curve has a bevel Use evaluated object as an input for mesh construction. This ensures all dependencies are ready. Reviewers: brecht, mont29 Reviewed By: brecht, mont29 Differential Revision: https://developer.blender.org/D4955
2019-05-27 12:05:35 +02:00
Object *object_eval = DEG_get_evaluated_object(depsgraph, ob);
Curve *curve = ob->data;
Fix T66631: Crash when converting objects from Curve to Mesh When `BKE_mesh_new_from_object()` cannot convert an object to a mesh, it returns `NULL`. This case was not handled at all in `BKE_mesh_new_from_object_to_bmain()` or `curvetomesh()`, causing a segmentation fault. This commit fixes the segmentation fault, and leaves the curve object as a curve object. Reviewed By: mont29, brecht, sergey Differential Revision: https://developer.blender.org/D5217
2019-07-10 12:58:39 +02:00
Fix T65052: "Convert to mesh from curve" fail if the curve has a bevel Use evaluated object as an input for mesh construction. This ensures all dependencies are ready. Reviewers: brecht, mont29 Reviewed By: brecht, mont29 Differential Revision: https://developer.blender.org/D4955
2019-05-27 12:05:35 +02:00
Mesh *mesh = BKE_mesh_new_from_object_to_bmain(bmain, depsgraph, object_eval, true);
Fix T66631: Crash when converting objects from Curve to Mesh When `BKE_mesh_new_from_object()` cannot convert an object to a mesh, it returns `NULL`. This case was not handled at all in `BKE_mesh_new_from_object_to_bmain()` or `curvetomesh()`, causing a segmentation fault. This commit fixes the segmentation fault, and leaves the curve object as a curve object. Reviewed By: mont29, brecht, sergey Differential Revision: https://developer.blender.org/D5217
2019-07-10 12:58:39 +02:00
if (mesh == NULL) {
/* Unable to convert the curve to a mesh. */
return;
}
Fix T65052: "Convert to mesh from curve" fail if the curve has a bevel Use evaluated object as an input for mesh construction. This ensures all dependencies are ready. Reviewers: brecht, mont29 Reviewed By: brecht, mont29 Differential Revision: https://developer.blender.org/D4955
2019-05-27 12:05:35 +02:00
BKE_object_free_modifiers(ob, 0);
/* Replace curve used by the object itself. */
ob->data = mesh;
ob->type = OB_MESH;
id_us_min(&curve->id);
id_us_plus(&mesh->id);
/* Change objects which are using same curve.
* A bit annoying, but:
* - It's possible to have multiple curve objects selected which are sharing the same curve
Cleanup: repeated terms in code comments & error messages
2021-06-28 15:44:12 +10:00
* data-block. We don't want mesh to be created for every of those objects.
* - This is how conversion worked for a long time. */
Fix T65052: "Convert to mesh from curve" fail if the curve has a bevel Use evaluated object as an input for mesh construction. This ensures all dependencies are ready. Reviewers: brecht, mont29 Reviewed By: brecht, mont29 Differential Revision: https://developer.blender.org/D4955
2019-05-27 12:05:35 +02:00
LISTBASE_FOREACH (Object *, other_object, &bmain->objects) {
if (other_object->data == curve) {
other_object->type = OB_MESH;
id_us_min((ID *)other_object->data);
other_object->data = ob->data;
id_us_plus((ID *)other_object->data);
}
Fix T39490: BGE: Text to Mesh, then MouseOver does not work Non-mesh objects default to no collisions. lordloki provided a patch that sets the collision properties for a mesh converted from a curve/meta/surf/text to the default collision properties for a mesh.
2014-03-30 13:55:10 -07: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
}
Cleanup: name mesh join functions using ED_{type} prefix
2020-06-17 17:07:11 +10:00
static bool object_convert_poll(bContext *C)
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
{
style cleanup: editors / mesh & object
2012-04-28 15:42:27 +00:00
Scene *scene = CTX_data_scene(C);
Farewell Scene->base While getting rid of Scene->base we got the following fixes: * Fix "Convert To" operator * Fix "NLA allowing to selected objects that are not selectable * Fix scene.objects (readonly, no option to link/unlink) Note: Collada needs to use the context SceneLayer for adding objects however I added a placeholder, so Collada maintainers can fix this properly.
2017-11-08 12:16:49 -02:00
Base *base_act = CTX_data_active_base(C);
Object *obact = base_act ? base_act->object : NULL;
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
LibOverride: Fix lots of poll functions for Object operators. Prevent operators that should not perform on override data to be callable in those cases.
2020-06-30 17:51:41 +02:00
if (obact == NULL || obact->data == NULL || ID_IS_LINKED(obact) ||
ID_IS_OVERRIDE_LIBRARY(obact) || ID_IS_OVERRIDE_LIBRARY(obact->data)) {
return false;
}
return (!ID_IS_LINKED(scene) && (BKE_object_is_in_editmode(obact) == false) &&
(base_act->flag & BASE_SELECTED));
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
}
Cleanup: name mesh join functions using ED_{type} prefix
2020-06-17 17:07:11 +10:00
/* Helper for object_convert_exec */
Cleanup: Rename ViewLayer *sl > ViewLayer *view_layer
2017-11-23 13:51:49 -02:00
static Base *duplibase_for_convert(
Fix T65295: Convert curve to mesh fails with Keep Original. This code now expects to wrok from fully evaluated data, however when we keep original, we are actually working from data just copied from orig one. Ideally, we'd do a single depsgraph update/eval *after* we have created all new required data, but that is tricky to do properly in that code without risking breaking one thing or another. So for now, just going for the simple, if not optimal solution, and just repeatedly re-evaluating whole deg every time we duplicate an object to be converted. Yep, dummy, but simple and... safe. ;)
2019-06-10 11:06:16 +02:00
Main *bmain, Depsgraph *depsgraph, Scene *scene, ViewLayer *view_layer, Base *base, Object *ob)
Fix for convert_exec() "Keep original" option now works for all objects' types
2010-03-07 05:04:22 +00:00
{
if (ob == NULL) {
style cleanup: editors / mesh & object
2012-04-28 15:42:27 +00:00
ob = base->object;
Fix for convert_exec() "Keep original" option now works for all objects' types
2010-03-07 05:04:22 +00:00
}
Cleanup: Declare variables where initialized
2020-10-09 16:39:39 -05:00
Object *obn = (Object *)BKE_id_copy(bmain, &ob->id);
Refactor: remove `BKE_<id_type>_copy` functions. Those were only shallow wrappers around `BKE_id_copy`, barely used (even fully unused in some cases), and we want to get rid of those ID-specific helpers for the common ID management tasks. Also prevents weird custom behaviors (like `BKE_object_copy`, who was the only basic ID copy function to reset user count of the new copy to zero). Part of 71219.
2020-10-07 18:01:25 +02:00
id_us_min(&obn->id);
Fix T65295: Convert curve to mesh fails with Keep Original. This code now expects to wrok from fully evaluated data, however when we keep original, we are actually working from data just copied from orig one. Ideally, we'd do a single depsgraph update/eval *after* we have created all new required data, but that is tricky to do properly in that code without risking breaking one thing or another. So for now, just going for the simple, if not optimal solution, and just repeatedly re-evaluating whole deg every time we duplicate an object to be converted. Yep, dummy, but simple and... safe. ;)
2019-06-10 11:06:16 +02:00
DEG_id_tag_update(&obn->id, ID_RECALC_TRANSFORM | ID_RECALC_GEOMETRY | ID_RECALC_ANIMATION);
Collections and groups unification OVERVIEW * In 2.7 terminology, all layers and groups are now collection datablocks. * These collections are nestable, linkable, instanceable, overrideable, .. which opens up new ways to set up scenes and link + override data. * Viewport/render visibility and selectability are now a part of the collection and shared across all view layers and linkable. * View layers define which subset of the scene collection hierarchy is excluded for each. For many workflows one view layer can be used, these are more of an advanced feature now. OUTLINER * The outliner now has a "View Layer" display mode instead of "Collections", which can display the collections and/or objects in the view layer. * In this display mode, collections can be excluded with the right click menu. These will then be greyed out and their objects will be excluded. * To view collections not linked to any scene, the "Blender File" display mode can be used, with the new filtering option to just see Colleciton datablocks. * The outliner right click menus for collections and objects were reorganized. * Drag and drop still needs to be improved. Like before, dragging the icon or text gives different results, we'll unify this later. LINKING AND OVERRIDES * Collections can now be linked into the scene without creating an instance, with the link/append operator or from the collections view in the outliner. * Collections can get static overrides with the right click menu in the outliner, but this is rather unreliable and not clearly communicated at the moment. * We still need to improve the make override operator to turn collection instances into collections with overrides directly in the scene. PERFORMANCE * We tried to make performance not worse than before and improve it in some cases. The main thing that's still a bit slower is multiple scenes, we have to change the layer syncing to only updated affected scenes. * Collections keep a list of their parent collections for faster incremental updates in syncing and caching. * View layer bases are now in a object -> base hash to avoid quadratic time lookups internally and in API functions like visible_get(). VERSIONING * Compatibility with 2.7 files should be improved due to the new visibility controls. Of course users may not want to set up their scenes differently now to avoid having separate layers and groups. * Compatibility with 2.8 is mostly there, and was tested on Eevee demo and Hero files. There's a few things which are know to be not quite compatible, like nested layer collections inside groups. * The versioning code for 2.8 files is quite complicated, and isolated behind #ifdef so it can be removed at the end of the release cycle. KNOWN ISSUES * The G-key group operators in the 3D viewport were left mostly as is, they need to be modified still to fit better. * Same for the groups panel in the object properties. This needs to be updated still, or perhaps replaced by something better. * Collections must all have a unique name. Less restrictive namespacing is to be done later, we'll have to see how important this is as all objects within the collections must also have a unique name anyway. * Full scene copy and delete scene are exactly doing the right thing yet. Differential Revision: https://developer.blender.org/D3383 https://code.blender.org/2018/05/collections-and-groups/
2018-04-30 15:57:22 +02:00
BKE_collection_object_add_from(bmain, scene, ob, obn);
Fix for convert_exec() "Keep original" option now works for all objects' types
2010-03-07 05:04:22 +00:00
Cleanup: Declare variables where initialized
2020-10-09 16:39:39 -05:00
Base *basen = BKE_view_layer_base_find(view_layer, obn);
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
ED_object_base_select(basen, BA_SELECT);
Fix T65301: Convert to mesh with Keep Original loses adjust operator panel. That was a dummy typo in `duplibase_for_convert()` in fact...
2019-06-09 23:43:33 +02:00
ED_object_base_select(base, BA_DESELECT);
Fix T65295: Convert curve to mesh fails with Keep Original. This code now expects to wrok from fully evaluated data, however when we keep original, we are actually working from data just copied from orig one. Ideally, we'd do a single depsgraph update/eval *after* we have created all new required data, but that is tricky to do properly in that code without risking breaking one thing or another. So for now, just going for the simple, if not optimal solution, and just repeatedly re-evaluating whole deg every time we duplicate an object to be converted. Yep, dummy, but simple and... safe. ;)
2019-06-10 11:06:16 +02:00
Cleanup: spelling
2021-06-22 14:04:08 +10:00
/* XXX: An ugly hack needed because if we re-run depsgraph with some new meta-ball objects
* having same 'family name' as orig ones, they will affect end result of meta-ball computation.
Fix T65996: metaballs converted to meshes appear to render at an incorrect isosurface. Not much to be done here really, besides adding yet another hack to that giant pile of hacks that are mballs... So to avoid newly created copy of basis of mball to influence to mball computation, we simply switch it to Empty object for the depsgraph update run. Not nice, but working (besides a weird change of basis obflag which should not happen), and presumably reasonably safe change.
2019-06-24 20:40:56 +02:00
* For until we get rid of that name-based thingy in MBalls, that should do the trick
Cleanup: spelling
2021-06-22 14:04:08 +10:00
* (this is weak, but other solution (to change name of `obn`) is even worse imho).
Fix T65996: metaballs converted to meshes appear to render at an incorrect isosurface. Not much to be done here really, besides adding yet another hack to that giant pile of hacks that are mballs... So to avoid newly created copy of basis of mball to influence to mball computation, we simply switch it to Empty object for the depsgraph update run. Not nice, but working (besides a weird change of basis obflag which should not happen), and presumably reasonably safe change.
2019-06-24 20:40:56 +02:00
* See T65996. */
const bool is_meta_ball = (obn->type == OB_MBALL);
void *obdata = obn->data;
if (is_meta_ball) {
obn->type = OB_EMPTY;
obn->data = NULL;
}
Fix T65295: Convert curve to mesh fails with Keep Original. This code now expects to wrok from fully evaluated data, however when we keep original, we are actually working from data just copied from orig one. Ideally, we'd do a single depsgraph update/eval *after* we have created all new required data, but that is tricky to do properly in that code without risking breaking one thing or another. So for now, just going for the simple, if not optimal solution, and just repeatedly re-evaluating whole deg every time we duplicate an object to be converted. Yep, dummy, but simple and... safe. ;)
2019-06-10 11:06:16 +02:00
/* XXX Doing that here is stupid, it means we update and re-evaluate the whole depsgraph every
* time we need to duplicate an object to convert it. Even worse, this is not 100% correct, since
* we do not yet have duplicated obdata.
* However, that is a safe solution for now. Proper, longer-term solution is to refactor
Cleanup: name mesh join functions using ED_{type} prefix
2020-06-17 17:07:11 +10:00
* object_convert_exec to:
Fix T65295: Convert curve to mesh fails with Keep Original. This code now expects to wrok from fully evaluated data, however when we keep original, we are actually working from data just copied from orig one. Ideally, we'd do a single depsgraph update/eval *after* we have created all new required data, but that is tricky to do properly in that code without risking breaking one thing or another. So for now, just going for the simple, if not optimal solution, and just repeatedly re-evaluating whole deg every time we duplicate an object to be converted. Yep, dummy, but simple and... safe. ;)
2019-06-10 11:06:16 +02:00
* - duplicate all data it needs to in a first loop.
* - do a single update.
* - convert data in a second loop. */
DEG_graph_tag_relations_update(depsgraph);
CustomData_MeshMasks customdata_mask_prev = scene->customdata_mask;
CustomData_MeshMasks_update(&scene->customdata_mask, &CD_MASK_MESH);
BKE_scene_graph_update_tagged(depsgraph, bmain);
scene->customdata_mask = customdata_mask_prev;
Fix T65996: metaballs converted to meshes appear to render at an incorrect isosurface. Not much to be done here really, besides adding yet another hack to that giant pile of hacks that are mballs... So to avoid newly created copy of basis of mball to influence to mball computation, we simply switch it to Empty object for the depsgraph update run. Not nice, but working (besides a weird change of basis obflag which should not happen), and presumably reasonably safe change.
2019-06-24 20:40:56 +02:00
if (is_meta_ball) {
obn->type = OB_MBALL;
obn->data = obdata;
}
Fix for convert_exec() "Keep original" option now works for all objects' types
2010-03-07 05:04:22 +00:00
return basen;
}
Cleanup: name mesh join functions using ED_{type} prefix
2020-06-17 17:07:11 +10:00
static int object_convert_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
{
style cleanup: editors / mesh & object
2012-04-28 15:42:27 +00:00
Main *bmain = CTX_data_main(C);
Refactor access to dependency graph This change ensures that operators which needs access to evaluated data first makes sure there is a dependency graph. Other accesses to the dependency graph made it more explicit about whether they just need a valid dependency graph pointer or whether they expect the graph to be already evaluated. This replaces OPTYPE_USE_EVAL_DATA which is now removed. Some general rules about usage of accessors: - Drawing is expected to happen from a fully evaluated dependency graph. There is now a function to access it, which will in the future control that dependency graph is actually evaluated. This check is not yet done because there are some things to be taken care about first: for example, post-update hooks might leave scene in a state where something is still tagged for update. - All operators which needs to access evaluated state must use CTX_data_ensure_evaluated_depsgraph(). This function replaces OPTYPE_USE_EVAL_DATA. The call is generally to be done in the very beginning of the operator, prior other logic (unless this is some comprehensive operator which might or might not need access to an evaluated state). This call is never to be used from a loop. If some utility function requires evaluated state of dependency graph the graph is to be passed as an explicit argument. This way it is clear that no evaluation happens in a loop or something like this. - All cases which needs to know dependency graph pointer, but which doesn't want to actually evaluate it can use old-style function CTX_data_depsgraph_pointer(), assuming that underlying code will ensure dependency graph is evaluated prior to accessing it. - The new functions are replacing OPTYPE_USE_EVAL_DATA, so now it is explicit and local about where dependency graph is being ensured. This commit also contains some fixes of wrong usage of evaluation functions on original objects. Ideally should be split out, but in reality with all the APIs being renamed is quite tricky. Fixes T67454: Blender crash on rapid undo and select Speculation here is that sometimes undo and selection operators are sometimes handled in the same event loop iteration, which leaves non-evaluated dependency graph. Fixes T67973: Crash on Fix Deforms operator Fixes T67902: Crash when undo a loop cut Reviewers: brecht Reviewed By: brecht Subscribers: lichtwerk Maniphest Tasks: T67454 Differential Revision: https://developer.blender.org/D5343
2019-07-25 16:36:22 +02:00
Depsgraph *depsgraph = CTX_data_ensure_evaluated_depsgraph(C);
style cleanup: editors / mesh & object
2012-04-28 15:42:27 +00:00
Scene *scene = CTX_data_scene(C);
Rename any instance of scene layer or render layer in code with view layer The RenderResult struct still has a listbase of RenderLayer, but that's ok since this is strictly for rendering. * Subversion bump (to 2.80.2) * DNA low level doversion (renames) - only for .blend created since 2.80 started Note: We can't use DNA_struct_elem_find or get file version in init_structDNA, so we are manually iterating over the array of the SDNA elements instead. Note 2: This doversion change with renames can be reverted in a few months. But so far it's required for 2.8 files created between October 2016 and now. Reviewers: campbellbarton, sergey Differential Revision: https://developer.blender.org/D2927
2017-11-22 10:52:39 -02:00
ViewLayer *view_layer = CTX_data_view_layer(C);
Fix T66452: Convert Curve to Grease Pencil Strokes This commit adds support to convert curves to Grease Pencil strokes and create the materials too. Also, there is a new python API. This API is required by the modified SVG import addon to create strokes( see T67065). All curves selected in one operation are converted in the same Grease Pencil object.
2019-08-31 17:26:48 +02:00
View3D *v3d = CTX_wm_view3d(C);
remove unused code from object convert and indent.
2013-07-27 09:20:10 +00:00
Base *basen = NULL, *basact = NULL;
Merge branch 'master' into blender2.8
2018-08-14 15:41:11 +02:00
Object *ob1, *obact = CTX_data_active_object(C);
style cleanup: editors / mesh & object
2012-04-28 15:42:27 +00:00
const short target = RNA_enum_get(op->ptr, "target");
Fix/workaround 'convert object' messing up linked data. 'Convert To...' Object operation has very weird effect of actually working at obdata level, not object level, which means *all* objects (even unselected/hidden/in other scenes/...) using same obdata will be converted to new selected type. IMHO this is very bad behavior, but... not a bug really, so do not change this for now. But at least, do not do that when working on some linked data, else it leaves Blend file in invalid (incoherent) state until next reload. So workaround for now is to enforce the 'Keep Original' option when some linked object/obdata is affected by the operation. Also fixed somewhat broken usercount handling in Curve->Mesh part.
2017-06-15 15:40:24 +02:00
bool keep_original = RNA_boolean_get(op->ptr, "keep_original");
GPencil: Convert and Bake mesh animation to grease pencil strokes This patch adds two options: - Convert a mesh to grease pencil strokes. - Bake the mesh animation into grease pencil strokes. Both are related and must be included in the same patch. Related to tasks: T77629 and T77630 Notice: The conversion is done for mesh edges and it's not considering any visibility clipping. All edges are exported, no matters if it's visible or not. Example of Convert a Mesh to Grease Pencil strokes: {F8606028} This conversion was inspired by the technique used by @luamono in this tweet: https://twitter.com/luamono/status/1239983662176841730 Example of Bake Animation (the video is a little outdate, but the basic functionality is the same, only small changes in UI): {F8606032} Reviewed By: mendio, pepeland Maniphest Tasks: T77629, T77630 Differential Revision: https://developer.blender.org/D7983
2020-06-16 15:28:46 +02:00
const float angle = RNA_float_get(op->ptr, "angle");
const int thickness = RNA_int_get(op->ptr, "thickness");
const bool use_seams = RNA_boolean_get(op->ptr, "seams");
const bool use_faces = RNA_boolean_get(op->ptr, "faces");
const float offset = RNA_float_get(op->ptr, "offset");
style cleanup: editors / mesh & object
2012-04-28 15:42:27 +00:00
int a, mballConverted = 0;
GPencil: Remove curve objects after converting to strokes (unreported) This was detected fixing T69459 Part of Differential Revision: https://developer.blender.org/D6045 Note: done in a separated commit to keep track of changes done not directly related to bug reported in T69459.
2019-10-11 13:18:39 +02:00
bool gpencilConverted = false;
GPencil: Add "Convert Text to Gpencil" Currently when you try to convert a Text-object to Grease pencil from the Object-menu or via the operator in some other way, the Text-object is only converted to a Curve. This commit converts that curve to a Grease pencil object. Differential Revision: https://developer.blender.org/D11117
2021-04-29 17:45:46 +02:00
bool gpencilCurveConverted = false;
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02: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
/* don't forget multiple users! */
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
style cleanup: re - http://wiki.blender.org/index.php/Dev:Doc/CodeStyle#Braces_with_Macros
2012-04-30 16:22:40 +00:00
{
Cleanup: macro's w/ an _END need a matching _BEGIN Convention from 2.7x, since some looping macros don't need an '_END', it avoids confusion to keep this.
2018-03-01 19:00:54 +11:00
FOREACH_SCENE_OBJECT_BEGIN (scene, ob) {
Fix metaball->mesh removing all metas in the scene Assumed the entire scene used the one motherball.
2015-03-06 22:44:56 +11:00
ob->flag &= ~OB_DONE;
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Merge branch 'master' into blender2.8
2018-09-27 15:49:59 +02:00
/* flag data that's not been edited (only needed for !keep_original) */
Fix metaball->mesh removing all metas in the scene Assumed the entire scene used the one motherball.
2015-03-06 22:44:56 +11:00
if (ob->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
((ID *)ob->data)->tag |= LIB_TAG_DOIT;
Fix metaball->mesh removing all metas in the scene Assumed the entire scene used the one motherball.
2015-03-06 22:44:56 +11:00
}
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Fix metaball->mesh removing all metas in the scene Assumed the entire scene used the one motherball.
2015-03-06 22:44:56 +11:00
/* possible metaball basis is not in this scene */
if (ob->type == OB_MBALL && target == OB_MESH) {
if (BKE_mball_is_basis(ob) == false) {
Object *ob_basis;
ob_basis = BKE_mball_basis_find(scene, ob);
if (ob_basis) {
ob_basis->flag &= ~OB_DONE;
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
}
Fix metaball->mesh removing all metas in the scene Assumed the entire scene used the one motherball.
2015-03-06 22:44:56 +11:00
}
}
}
Cleanup: iterator macros - put render iterator in own scope (would shadow it's own variable if used multiple times). - enforce semicolon at end of iterator macros. - no need to typedef one-off macro structs.
2018-03-09 11:44:42 +11:00
FOREACH_SCENE_OBJECT_END;
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
}
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Fix T64972: object convert to mesh not working after recent changes This was the only remaining cases that used a string lookup, which didn't work anymore now that it's no longer a real value in the context.
2019-05-22 10:32:40 +02:00
ListBase selected_editable_bases;
CTX_data_selected_editable_bases(C, &selected_editable_bases);
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Fix T50950: Converting meshes fails w/ boolean
2017-03-17 09:58:05 +11:00
/* Ensure we get all meshes calculated with a sufficient data-mask,
* needed since re-evaluating single modifiers causes bugs if they depend
* on other objects data masks too, see: T50950. */
style cleanup: re - http://wiki.blender.org/index.php/Dev:Doc/CodeStyle#Braces_with_Macros
2012-04-30 16:22:40 +00:00
{
Code Quality: Replace for loops with LISTBASE_FOREACH Note this only changes cases where the variable was declared inside the for loop. To handle it outside as well is a different challenge. Differential Revision: https://developer.blender.org/D7320
2020-04-03 19:15:01 +02:00
LISTBASE_FOREACH (CollectionPointerLink *, link, &selected_editable_bases) {
Farewell Scene->base While getting rid of Scene->base we got the following fixes: * Fix "Convert To" operator * Fix "NLA allowing to selected objects that are not selectable * Fix scene.objects (readonly, no option to link/unlink) Note: Collada needs to use the context SceneLayer for adding objects however I added a placeholder, so Collada maintainers can fix this properly.
2017-11-08 12:16:49 -02:00
Base *base = link->ptr.data;
Object *ob = base->object;
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Cleanup: comments (long lines) in editors
2019-04-22 00:18:34 +10:00
/* The way object type conversion works currently (enforcing conversion of *all* objects
* using converted object-data, even some un-selected/hidden/another scene ones,
* sounds totally bad to me.
Cleanup: spelling
2018-12-19 10:16:08 +11:00
* However, changing this is more design than bug-fix, not to mention convoluted code below,
Fix/workaround 'convert object' messing up linked data. 'Convert To...' Object operation has very weird effect of actually working at obdata level, not object level, which means *all* objects (even unselected/hidden/in other scenes/...) using same obdata will be converted to new selected type. IMHO this is very bad behavior, but... not a bug really, so do not change this for now. But at least, do not do that when working on some linked data, else it leaves Blend file in invalid (incoherent) state until next reload. So workaround for now is to enforce the 'Keep Original' option when some linked object/obdata is affected by the operation. Also fixed somewhat broken usercount handling in Curve->Mesh part.
2017-06-15 15:40:24 +02:00
* so that will be for later.
* But at the very least, do not do that with linked IDs! */
Rename ID_IS_LINKED_DATABLOCK to ID_IS_LINKED. This makes code closer to id_override/assent-engine ones, which introduce a new type of linked data, and hence reserve ID_IS_LINKED_DATABLOCK to real linked datablocks.
2017-11-06 17:17:10 +01:00
if ((ID_IS_LINKED(ob) || (ob->data && ID_IS_LINKED(ob->data))) && !keep_original) {
Fix/workaround 'convert object' messing up linked data. 'Convert To...' Object operation has very weird effect of actually working at obdata level, not object level, which means *all* objects (even unselected/hidden/in other scenes/...) using same obdata will be converted to new selected type. IMHO this is very bad behavior, but... not a bug really, so do not change this for now. But at least, do not do that when working on some linked data, else it leaves Blend file in invalid (incoherent) state until next reload. So workaround for now is to enforce the 'Keep Original' option when some linked object/obdata is affected by the operation. Also fixed somewhat broken usercount handling in Curve->Mesh part.
2017-06-15 15:40:24 +02:00
keep_original = true;
Cleanup: redundant use of string formatting functions
2019-03-24 16:09:46 +11:00
BKE_report(
op->reports,
RPT_INFO,
"Converting some linked object/object data, enforcing 'Keep Original' option to True");
Fix/workaround 'convert object' messing up linked data. 'Convert To...' Object operation has very weird effect of actually working at obdata level, not object level, which means *all* objects (even unselected/hidden/in other scenes/...) using same obdata will be converted to new selected type. IMHO this is very bad behavior, but... not a bug really, so do not change this for now. But at least, do not do that when working on some linked data, else it leaves Blend file in invalid (incoherent) state until next reload. So workaround for now is to enforce the 'Keep Original' option when some linked object/obdata is affected by the operation. Also fixed somewhat broken usercount handling in Curve->Mesh part.
2017-06-15 15:40:24 +02:00
}
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Depsgraph: Remove duplicated sets of recalc/update flags There were at least three copies of those: - OB_RECALC* family of flags, which are rudiment of an old dependency graph system. - PSYS_RECALC* which were used by old dependency graph system as a separate set since the graph itself did not handle particle systems. - DEG_TAG_* which was used to tag IDs. Now there is a single set, which defines what can be tagged and queried for an update. It also has some aggregate flags to make queries simpler. Lets once and for all solve the madness of those flags, stick to a single set, which will not overlap with anything or require any extra conversion. Technically, shouldn't be measurable user difference, but some of the agregate flags for few dependency graph components did change. Fixes T58632: Particle don't update rotation settings
2018-12-06 17:52:37 +01:00
DEG_id_tag_update(&base->object->id, ID_RECALC_GEOMETRY);
Fix T50950: Converting meshes fails w/ boolean
2017-03-17 09:58:05 +11:00
}
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Refactor CDData masks, to have one mask per mesh elem type. We already have different storages for cddata of verts, edges etc., 'simply' do the same for the mask flags we use all around Blender code to request some data, or limit some operation to some layers, etc. Reason we need this is that some cddata types (like Normals) are actually shared between verts/polys/loops, and we don’t want to generate clnors everytime we request vnors! As a side note, this also does final fix to T59338, which was the trigger for this patch (need to request computed loop normals for another mesh than evaluated one). Reviewers: brecht, campbellbarton, sergey Differential Revision: https://developer.blender.org/D4407
2019-03-07 11:13:40 +01:00
CustomData_MeshMasks customdata_mask_prev = scene->customdata_mask;
CustomData_MeshMasks_update(&scene->customdata_mask, &CD_MASK_MESH);
Depsgraph: don't pass evaluation context to update functions. The depsgraph now contains all the state needed to evaluate it. Differential Revision: https://developer.blender.org/D3147
2018-04-06 11:21:20 +02:00
BKE_scene_graph_update_tagged(depsgraph, bmain);
Fix T50950: Converting meshes fails w/ boolean
2017-03-17 09:58:05 +11:00
scene->customdata_mask = customdata_mask_prev;
}
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Code Quality: Replace for loops with LISTBASE_FOREACH Note this only changes cases where the variable was declared inside the for loop. To handle it outside as well is a different challenge. Differential Revision: https://developer.blender.org/D7320
2020-04-03 19:15:01 +02:00
LISTBASE_FOREACH (CollectionPointerLink *, link, &selected_editable_bases) {
Fix use of uninitialized variable in some cases, in recent bugfix.
2018-08-14 15:27:25 +02:00
Object *newob = NULL;
Farewell Scene->base While getting rid of Scene->base we got the following fixes: * Fix "Convert To" operator * Fix "NLA allowing to selected objects that are not selectable * Fix scene.objects (readonly, no option to link/unlink) Note: Collada needs to use the context SceneLayer for adding objects however I added a placeholder, so Collada maintainers can fix this properly.
2017-11-08 12:16:49 -02:00
Base *base = link->ptr.data;
Object *ob = base->object;
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
style cleanup: follow style guide for formatting of if/for/while loops, and else if's
2012-03-24 06:38:07 +00:00
if (ob->flag & OB_DONE || !IS_TAGGED(ob->data)) {
Fix for convert_exec() "Keep original" option now works for all objects' types
2010-03-07 05:04:22 +00:00
if (ob->type != target) {
base->flag &= ~SELECT;
ob->flag &= ~SELECT;
}
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
fix [#26003] Twice applied modifier with Convert to mesh with several multi-user objects convert_exec could do with a re-write, getting quite confusing. update md5's for ctest results and some renaming in mesh_validate code.
2011-02-10 04:48:49 +00:00
/* obdata already modified */
style cleanup: follow style guide for formatting of if/for/while loops, and else if's
2012-03-24 06:38:07 +00:00
if (!IS_TAGGED(ob->data)) {
fix [#26003] Twice applied modifier with Convert to mesh with several multi-user objects convert_exec could do with a re-write, getting quite confusing. update md5's for ctest results and some renaming in mesh_validate code.
2011-02-10 04:48:49 +00:00
/* When 2 objects with linked data are selected, converting both
Cleanup: convert gforge task ID's to phabricator format Cleanup old tracker task format to the new. e.g: [#34039] to T34039 Ref D8718
2020-09-30 20:09:02 +10:00
* would keep modifiers on all but the converted object T26003. */
style cleanup: follow style guide for formatting of if/for/while loops, and else if's
2012-03-24 06:38:07 +00:00
if (ob->type == OB_MESH) {
Fix modifier freeing code re. ID refcounting. Free code should not handle ID refcounting at all. This has to be done at higher level, since in some case we want to free (temp) data that actually did not refcount at all its IDs. This change seems to be working OK, but as usual in that area, only lots of testing in real-case situation will say whether there are some hidden bugs or not.
2018-04-04 14:56:32 +02:00
BKE_object_free_modifiers(ob, 0); /* after derivedmesh calls! */
fix [#26003] Twice applied modifier with Convert to mesh with several multi-user objects convert_exec could do with a re-write, getting quite confusing. update md5's for ctest results and some renaming in mesh_validate code.
2011-02-10 04:48:49 +00:00
}
New Grease Pencil object for 2D animation This commit merge the full development done in greasepencil-object branch and include mainly the following features. - New grease pencil object. - New drawing engine. - New grease pencil modes Draw/Sculpt/Edit and Weight Paint. - New brushes for grease pencil. - New modifiers for grease pencil. - New shaders FX. - New material system (replace old palettes and colors). - Split of annotations (old grease pencil) and new grease pencil object. - UI adapted to blender 2.8. You can get more info here: https://code.blender.org/2017/12/drawing-2d-animation-in-blender-2-8/ https://code.blender.org/2018/07/grease-pencil-status-update/ This is the result of nearly two years of development and I want thanks firstly the other members of the grease pencil team: Daniel M. Lara, Matias Mendiola and Joshua Leung for their support, ideas and to keep working in the project all the time, without them this project had been impossible. Also, I want thanks other Blender developers for their help, advices and to be there always to help me, and specially to Clément Foucault, Dalai Felinto, Pablo Vázquez and Campbell Barton.
2018-07-31 10:22:19 +02:00
if (ob->type == OB_GPENCIL) {
BKE_object_free_modifiers(ob, 0); /* after derivedmesh calls! */
BKE_object_free_shaderfx(ob, 0);
}
fix [#26003] Twice applied modifier with Convert to mesh with several multi-user objects convert_exec could do with a re-write, getting quite confusing. update md5's for ctest results and some renaming in mesh_validate code.
2011-02-10 04:48:49 +00:00
}
Fix for convert_exec() "Keep original" option now works for all objects' types
2010-03-07 05:04:22 +00:00
}
style cleanup: editors / mesh & object
2012-04-28 15:42:27 +00:00
else if (ob->type == OB_MESH && target == OB_CURVE) {
added mesh to curve conversion (edge loops only) like the script in 2.4x
2009-10-09 22:09:48 +00:00
ob->flag |= OB_DONE;
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Fix for convert_exec() "Keep original" option now works for all objects' types
2010-03-07 05:04:22 +00:00
if (keep_original) {
Fix T65295: Convert curve to mesh fails with Keep Original. This code now expects to wrok from fully evaluated data, however when we keep original, we are actually working from data just copied from orig one. Ideally, we'd do a single depsgraph update/eval *after* we have created all new required data, but that is tricky to do properly in that code without risking breaking one thing or another. So for now, just going for the simple, if not optimal solution, and just repeatedly re-evaluating whole deg every time we duplicate an object to be converted. Yep, dummy, but simple and... safe. ;)
2019-06-10 11:06:16 +02:00
basen = duplibase_for_convert(bmain, depsgraph, scene, view_layer, base, NULL);
style cleanup: editors / mesh & object
2012-04-28 15:42:27 +00:00
newob = basen->object;
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Cleanup: comment blocks, trailing space in comments
2021-06-24 15:56:58 +10:00
/* Decrement original mesh's usage count. */
Cleanup: Declare variables where initialized
2020-10-09 16:39:39 -05:00
Mesh *me = newob->data;
Cleanup: avoid incrementing/decrementing id->us outside of BKE_library. We have callbacks for that, they also do some checks and help ensure things are done correctly. Only place where this is assumed not true is blenloader (since here we may affect refcount of library IDs as well...).
2015-11-09 19:47:10 +01:00
id_us_min(&me->id);
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Cleanup: comment blocks, trailing space in comments
2021-06-24 15:56:58 +10:00
/* Make a new copy of the mesh. */
Refactor: remove `BKE_<id_type>_copy` functions. Those were only shallow wrappers around `BKE_id_copy`, barely used (even fully unused in some cases), and we want to get rid of those ID-specific helpers for the common ID management tasks. Also prevents weird custom behaviors (like `BKE_object_copy`, who was the only basic ID copy function to reset user count of the new copy to zero). Part of 71219.
2020-10-07 18:01:25 +02:00
newob->data = BKE_id_copy(bmain, &me->id);
style cleanup: follow style guide for formatting of if/for/while loops, and else if's
2012-03-24 06:38:07 +00:00
}
else {
Fix for convert_exec() "Keep original" option now works for all objects' types
2010-03-07 05:04:22 +00:00
newob = ob;
}
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Merge branch 'master' into blender2.8 Conflicts: source/blender/blenkernel/BKE_mesh.h source/blender/blenkernel/intern/mesh_convert.c source/blender/editors/interface/interface_eyedropper_color.c source/blender/editors/object/object_add.c source/blender/editors/space_image/image_ops.c source/blender/makesrna/intern/rna_image.c source/blender/windowmanager/intern/wm_draw.c
2018-06-11 16:02:46 +02:00
BKE_mesh_to_curve(bmain, depsgraph, scene, newob);
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
rigidbody operators poll functions were mixing up CTX_data_active_object/ED_object_active_context. - replace ED_operator_rigidbody_add_poll with ED_operator_object_active_editable_mesh - replace ED_operator_rigidbody_active_poll with ED_operator_scene_editable for operators that use the entire selection. - remove rigid-body from objects that are converted from meshes to curves, while this isnt crashing it is confusing to see in the UI.
2013-04-09 01:43:39 +00:00
if (newob->type == OB_CURVE) {
Fix modifier freeing code re. ID refcounting. Free code should not handle ID refcounting at all. This has to be done at higher level, since in some case we want to free (temp) data that actually did not refcount at all its IDs. This change seems to be working OK, but as usual in that area, only lots of testing in real-case situation will say whether there are some hidden bugs or not.
2018-04-04 14:56:32 +02:00
BKE_object_free_modifiers(newob, 0); /* after derivedmesh calls! */
Fix T80596: Convert to Curve from Mesh crashes Blender The point cache code needs a non NULL rbw pointer. This could have been avoided if there was a sanity check in the convert function, so added a check there as well.
2020-09-09 11:46:40 +02:00
if (newob->rigidbody_object != NULL) {
ED_rigidbody_object_remove(bmain, scene, newob);
}
rigidbody operators poll functions were mixing up CTX_data_active_object/ED_object_active_context. - replace ED_operator_rigidbody_add_poll with ED_operator_object_active_editable_mesh - replace ED_operator_rigidbody_active_poll with ED_operator_scene_editable for operators that use the entire selection. - remove rigid-body from objects that are converted from meshes to curves, while this isnt crashing it is confusing to see in the UI.
2013-04-09 01:43:39 +00:00
}
added mesh to curve conversion (edge loops only) like the script in 2.4x
2009-10-09 22:09:48 +00:00
}
GPencil: Convert and Bake mesh animation to grease pencil strokes This patch adds two options: - Convert a mesh to grease pencil strokes. - Bake the mesh animation into grease pencil strokes. Both are related and must be included in the same patch. Related to tasks: T77629 and T77630 Notice: The conversion is done for mesh edges and it's not considering any visibility clipping. All edges are exported, no matters if it's visible or not. Example of Convert a Mesh to Grease Pencil strokes: {F8606028} This conversion was inspired by the technique used by @luamono in this tweet: https://twitter.com/luamono/status/1239983662176841730 Example of Bake Animation (the video is a little outdate, but the basic functionality is the same, only small changes in UI): {F8606032} Reviewed By: mendio, pepeland Maniphest Tasks: T77629, T77630 Differential Revision: https://developer.blender.org/D7983
2020-06-16 15:28:46 +02:00
else if (ob->type == OB_MESH && target == OB_GPENCIL) {
ob->flag |= OB_DONE;
/* Create a new grease pencil object and copy transformations. */
ushort local_view_bits = (v3d && v3d->localvd) ? v3d->local_view_uuid : 0;
float loc[3], size[3], rot[3][3], eul[3];
float matrix[4][4];
mat4_to_loc_rot_size(loc, rot, size, ob->obmat);
mat3_to_eul(eul, rot);
Cleanup: Declare variables where initialized
2020-10-09 16:39:39 -05:00
Object *ob_gpencil = ED_gpencil_add_object(C, loc, local_view_bits);
GPencil: Convert and Bake mesh animation to grease pencil strokes This patch adds two options: - Convert a mesh to grease pencil strokes. - Bake the mesh animation into grease pencil strokes. Both are related and must be included in the same patch. Related to tasks: T77629 and T77630 Notice: The conversion is done for mesh edges and it's not considering any visibility clipping. All edges are exported, no matters if it's visible or not. Example of Convert a Mesh to Grease Pencil strokes: {F8606028} This conversion was inspired by the technique used by @luamono in this tweet: https://twitter.com/luamono/status/1239983662176841730 Example of Bake Animation (the video is a little outdate, but the basic functionality is the same, only small changes in UI): {F8606032} Reviewed By: mendio, pepeland Maniphest Tasks: T77629, T77630 Differential Revision: https://developer.blender.org/D7983
2020-06-16 15:28:46 +02:00
copy_v3_v3(ob_gpencil->loc, loc);
copy_v3_v3(ob_gpencil->rot, eul);
copy_v3_v3(ob_gpencil->scale, size);
unit_m4(matrix);
/* Set object in 3D mode. */
bGPdata *gpd = (bGPdata *)ob_gpencil->data;
gpd->draw_mode = GP_DRAWMODE_3D;
Fix T80191: GPencil - Improve Mesh conversion There were some problems when converted several objects at the same time, especially with the material conversion. The problems were more visible when bake an animation with several objects at the same time. * Now the layer name include the object name. * Reorganize how the materials are generated including object name. * Fix color not converted to sRGB. * Avoid triangles when generate the stroke. This fix a draw manager issue and also add more geometry to use later. * Code cleanup.
2020-09-10 20:04:38 +02:00
gpencilConverted |= BKE_gpencil_convert_mesh(bmain,
depsgraph,
scene,
ob_gpencil,
ob,
angle,
thickness,
offset,
matrix,
0,
use_seams,
GPencil: Convert from Mesh copying Vertex Groups This patch adds the missing ability to keep the vertex groups when converting to a grease pencil object. This is increadible useful to create rigged grease pencil objects which move together with rigged meshes. Differential Revision: https://developer.blender.org/D12249
2021-08-17 20:04:27 +02:00
use_faces,
true);
GPencil: Convert and Bake mesh animation to grease pencil strokes This patch adds two options: - Convert a mesh to grease pencil strokes. - Bake the mesh animation into grease pencil strokes. Both are related and must be included in the same patch. Related to tasks: T77629 and T77630 Notice: The conversion is done for mesh edges and it's not considering any visibility clipping. All edges are exported, no matters if it's visible or not. Example of Convert a Mesh to Grease Pencil strokes: {F8606028} This conversion was inspired by the technique used by @luamono in this tweet: https://twitter.com/luamono/status/1239983662176841730 Example of Bake Animation (the video is a little outdate, but the basic functionality is the same, only small changes in UI): {F8606032} Reviewed By: mendio, pepeland Maniphest Tasks: T77629, T77630 Differential Revision: https://developer.blender.org/D7983
2020-06-16 15:28:46 +02:00
/* Remove unused materials. */
int actcol = ob_gpencil->actcol;
for (int slot = 1; slot <= ob_gpencil->totcol; slot++) {
Fix T91691: Selecting "Remove unused slots" in Materials panel removes slots that are assigned to particle systems/hair. `BKE_object_material_slot_used` would only check obdata usages, but particle settings can also (weirdly enough) use objects' material slots. So now, as its name suggests, `BKE_object_material_slot_used` does take an object as parameter, and also checks for potential slot usage from psys in the object.
2021-09-27 18:07:01 +02:00
while (slot <= ob_gpencil->totcol && !BKE_object_material_slot_used(ob_gpencil, slot)) {
GPencil: Convert and Bake mesh animation to grease pencil strokes This patch adds two options: - Convert a mesh to grease pencil strokes. - Bake the mesh animation into grease pencil strokes. Both are related and must be included in the same patch. Related to tasks: T77629 and T77630 Notice: The conversion is done for mesh edges and it's not considering any visibility clipping. All edges are exported, no matters if it's visible or not. Example of Convert a Mesh to Grease Pencil strokes: {F8606028} This conversion was inspired by the technique used by @luamono in this tweet: https://twitter.com/luamono/status/1239983662176841730 Example of Bake Animation (the video is a little outdate, but the basic functionality is the same, only small changes in UI): {F8606032} Reviewed By: mendio, pepeland Maniphest Tasks: T77629, T77630 Differential Revision: https://developer.blender.org/D7983
2020-06-16 15:28:46 +02:00
ob_gpencil->actcol = slot;
BKE_object_material_slot_remove(CTX_data_main(C), ob_gpencil);
if (actcol >= slot) {
actcol--;
}
}
}
ob_gpencil->actcol = actcol;
}
Pointclouds: support mesh <-> pointcloud in convert operator Just converts verts to points and vice versa. Materials and Attribute layers are preserved (so for example if you set custom radii on the pointcloud, convert to mesh, then convert back to pointcloud, this will be preserved). Also not add a Radius layer by default (it is still added and filled when adding a pointcloud object from the menu), a global Radius property that will be used if there is no radius attribute can be added later. A Radius attribute can also be added in the pointcloud data properties (and filled via python). This will also add a new utility function that copies materials between datablocks: BKE_id_materials_copy ref T75717 Differential Revision: https://developer.blender.org/D7391
2020-04-09 18:49:40 +02:00
else if (ob->type == OB_MESH && target == OB_POINTCLOUD) {
ob->flag |= OB_DONE;
if (keep_original) {
basen = duplibase_for_convert(bmain, depsgraph, scene, view_layer, base, NULL);
newob = basen->object;
Cleanup: comment blocks, trailing space in comments
2021-06-24 15:56:58 +10:00
/* Decrement original mesh's usage count. */
Cleanup: Declare variables where initialized
2020-10-09 16:39:39 -05:00
Mesh *me = newob->data;
Pointclouds: support mesh <-> pointcloud in convert operator Just converts verts to points and vice versa. Materials and Attribute layers are preserved (so for example if you set custom radii on the pointcloud, convert to mesh, then convert back to pointcloud, this will be preserved). Also not add a Radius layer by default (it is still added and filled when adding a pointcloud object from the menu), a global Radius property that will be used if there is no radius attribute can be added later. A Radius attribute can also be added in the pointcloud data properties (and filled via python). This will also add a new utility function that copies materials between datablocks: BKE_id_materials_copy ref T75717 Differential Revision: https://developer.blender.org/D7391
2020-04-09 18:49:40 +02:00
id_us_min(&me->id);
Cleanup: comment blocks, trailing space in comments
2021-06-24 15:56:58 +10:00
/* Make a new copy of the mesh. */
Refactor: remove `BKE_<id_type>_copy` functions. Those were only shallow wrappers around `BKE_id_copy`, barely used (even fully unused in some cases), and we want to get rid of those ID-specific helpers for the common ID management tasks. Also prevents weird custom behaviors (like `BKE_object_copy`, who was the only basic ID copy function to reset user count of the new copy to zero). Part of 71219.
2020-10-07 18:01:25 +02:00
newob->data = BKE_id_copy(bmain, &me->id);
Pointclouds: support mesh <-> pointcloud in convert operator Just converts verts to points and vice versa. Materials and Attribute layers are preserved (so for example if you set custom radii on the pointcloud, convert to mesh, then convert back to pointcloud, this will be preserved). Also not add a Radius layer by default (it is still added and filled when adding a pointcloud object from the menu), a global Radius property that will be used if there is no radius attribute can be added later. A Radius attribute can also be added in the pointcloud data properties (and filled via python). This will also add a new utility function that copies materials between datablocks: BKE_id_materials_copy ref T75717 Differential Revision: https://developer.blender.org/D7391
2020-04-09 18:49:40 +02:00
}
else {
newob = ob;
}
BKE_mesh_to_pointcloud(bmain, depsgraph, scene, newob);
if (newob->type == OB_POINTCLOUD) {
BKE_object_free_modifiers(newob, 0); /* after derivedmesh calls! */
ED_rigidbody_object_remove(bmain, scene, newob);
}
}
Mesh Convert: remove meaningless modifier check Meshes w/o modifiers wouldn't have their derived mesh applied. Check was to avoid crash but its in fact meaningless, since the modifier might be disabled, or there may be virtual modifiers.
2017-03-17 10:10:55 +11:00
else if (ob->type == OB_MESH) {
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
ob->flag |= OB_DONE;
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Fix for convert_exec() "Keep original" option now works for all objects' types
2010-03-07 05:04:22 +00:00
if (keep_original) {
Fix T65295: Convert curve to mesh fails with Keep Original. This code now expects to wrok from fully evaluated data, however when we keep original, we are actually working from data just copied from orig one. Ideally, we'd do a single depsgraph update/eval *after* we have created all new required data, but that is tricky to do properly in that code without risking breaking one thing or another. So for now, just going for the simple, if not optimal solution, and just repeatedly re-evaluating whole deg every time we duplicate an object to be converted. Yep, dummy, but simple and... safe. ;)
2019-06-10 11:06:16 +02:00
basen = duplibase_for_convert(bmain, depsgraph, scene, view_layer, base, NULL);
style cleanup: editors / mesh & object
2012-04-28 15:42:27 +00:00
newob = basen->object;
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Cleanup: comment blocks, trailing space in comments
2021-06-24 15:56:58 +10:00
/* Decrement original mesh's usage count. */
Cleanup: Declare variables where initialized
2020-10-09 16:39:39 -05:00
Mesh *me = newob->data;
Cleanup: avoid incrementing/decrementing id->us outside of BKE_library. We have callbacks for that, they also do some checks and help ensure things are done correctly. Only place where this is assumed not true is blenloader (since here we may affect refcount of library IDs as well...).
2015-11-09 19:47:10 +01:00
id_us_min(&me->id);
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Cleanup: comment blocks, trailing space in comments
2021-06-24 15:56:58 +10:00
/* Make a new copy of the mesh. */
Refactor: remove `BKE_<id_type>_copy` functions. Those were only shallow wrappers around `BKE_id_copy`, barely used (even fully unused in some cases), and we want to get rid of those ID-specific helpers for the common ID management tasks. Also prevents weird custom behaviors (like `BKE_object_copy`, who was the only basic ID copy function to reset user count of the new copy to zero). Part of 71219.
2020-10-07 18:01:25 +02:00
newob->data = BKE_id_copy(bmain, &me->id);
style cleanup: follow style guide for formatting of if/for/while loops, and else if's
2012-03-24 06:38:07 +00:00
}
else {
Fix for convert_exec() "Keep original" option now works for all objects' types
2010-03-07 05:04:22 +00:00
newob = ob;
Depsgraph: Remove duplicated sets of recalc/update flags There were at least three copies of those: - OB_RECALC* family of flags, which are rudiment of an old dependency graph system. - PSYS_RECALC* which were used by old dependency graph system as a separate set since the graph itself did not handle particle systems. - DEG_TAG_* which was used to tag IDs. Now there is a single set, which defines what can be tagged and queried for an update. It also has some aggregate flags to make queries simpler. Lets once and for all solve the madness of those flags, stick to a single set, which will not overlap with anything or require any extra conversion. Technically, shouldn't be measurable user difference, but some of the agregate flags for few dependency graph components did change. Fixes T58632: Particle don't update rotation settings
2018-12-06 17:52:37 +01:00
DEG_id_tag_update(&ob->id, ID_RECALC_TRANSFORM | ID_RECALC_GEOMETRY | ID_RECALC_ANIMATION);
Fix for convert_exec() "Keep original" option now works for all objects' types
2010-03-07 05:04:22 +00:00
}
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02: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
/* make new mesh data from the original copy */
Cleanup: consistent use of tags: NOTE/TODO/FIXME/XXX Also use doxy style function reference `#` prefix chars when referencing identifiers.
2021-07-03 23:08:40 +10:00
/* NOTE: get the mesh from the original, not from the copy in some
Merge branch 'master' into blender2.8
2018-09-27 15:49:59 +02:00
* cases this doesn't give correct results (when MDEF is used for eg)
convert to mesh (Alt+C), was failing in cases when MDef was used. make the mesh from the original rather then the copy.
2010-03-02 15:33:33 +00:00
*/
Fix T58788: Apply Visual Geometry crash
2018-12-06 18:28:32 +11:00
Scene *scene_eval = (Scene *)DEG_get_evaluated_id(depsgraph, &scene->id);
Object *ob_eval = DEG_get_evaluated_object(depsgraph, ob);
Refactor CDData masks, to have one mask per mesh elem type. We already have different storages for cddata of verts, edges etc., 'simply' do the same for the mask flags we use all around Blender code to request some data, or limit some operation to some layers, etc. Reason we need this is that some cddata types (like Normals) are actually shared between verts/polys/loops, and we don’t want to generate clnors everytime we request vnors! As a side note, this also does final fix to T59338, which was the trigger for this patch (need to request computed loop normals for another mesh than evaluated one). Reviewers: brecht, campbellbarton, sergey Differential Revision: https://developer.blender.org/D4407
2019-03-07 11:13:40 +01:00
Mesh *me_eval = mesh_get_eval_final(depsgraph, scene_eval, ob_eval, &CD_MASK_MESH);
Fix T58788: Apply Visual Geometry crash
2018-12-06 18:28:32 +11:00
me_eval = BKE_mesh_copy_for_eval(me_eval, false);
Fix T81997: Subsurf Optimal Display sticks after object conversion When using Optimal Display, some edges are not flagged `ME_EDGEDRAW` | `ME_EDGERENDER`. When the modifier is applied through the UI in the modifier stack this is not an issue because the `modifyMesh` callback is run with `MOD_APPLY_TO_BASE_MESH` (this will effectively turn of Optimal Display). When converting to mesh though, this will just get an evaluated mesh (where the edge flags are still the same as with the subdivision modifier). Now ensure every edge is flagged to draw after conversion. Maniphest Tasks: T81997 Differential Revision: https://developer.blender.org/D9331
2020-10-23 22:27:46 +02:00
/* Full (edge-angle based) draw calculation should ideally be performed. */
BKE_mesh_edges_set_draw_render(me_eval);
Materials: support materials when applying modifier This fixes the `Apply Modifier` and `Visual Geometry to Mesh` operator when a modifier changed materials on the evaluated geometry. This is necessary since rB1a81d268a19f2f1402f408ad1dadf92c7a399607. Differential Revision: https://developer.blender.org/D11303
2021-05-20 12:15:57 +02:00
BKE_object_material_from_eval_data(bmain, newob, &me_eval->id);
Refactor CDData masks, to have one mask per mesh elem type. We already have different storages for cddata of verts, edges etc., 'simply' do the same for the mask flags we use all around Blender code to request some data, or limit some operation to some layers, etc. Reason we need this is that some cddata types (like Normals) are actually shared between verts/polys/loops, and we don’t want to generate clnors everytime we request vnors! As a side note, this also does final fix to T59338, which was the trigger for this patch (need to request computed loop normals for another mesh than evaluated one). Reviewers: brecht, campbellbarton, sergey Differential Revision: https://developer.blender.org/D4407
2019-03-07 11:13:40 +01:00
BKE_mesh_nomain_to_mesh(me_eval, newob->data, newob, &CD_MASK_MESH, true);
Fix modifier freeing code re. ID refcounting. Free code should not handle ID refcounting at all. This has to be done at higher level, since in some case we want to free (temp) data that actually did not refcount at all its IDs. This change seems to be working OK, but as usual in that area, only lots of testing in real-case situation will say whether there are some hidden bugs or not.
2018-04-04 14:56:32 +02:00
BKE_object_free_modifiers(newob, 0); /* after derivedmesh calls! */
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
}
style cleanup: editors / mesh & object
2012-04-28 15:42:27 +00:00
else if (ob->type == OB_FONT) {
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
ob->flag |= OB_DONE;
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Fix for convert_exec() "Keep original" option now works for all objects' types
2010-03-07 05:04:22 +00:00
if (keep_original) {
Fix T65295: Convert curve to mesh fails with Keep Original. This code now expects to wrok from fully evaluated data, however when we keep original, we are actually working from data just copied from orig one. Ideally, we'd do a single depsgraph update/eval *after* we have created all new required data, but that is tricky to do properly in that code without risking breaking one thing or another. So for now, just going for the simple, if not optimal solution, and just repeatedly re-evaluating whole deg every time we duplicate an object to be converted. Yep, dummy, but simple and... safe. ;)
2019-06-10 11:06:16 +02:00
basen = duplibase_for_convert(bmain, depsgraph, scene, view_layer, base, NULL);
style cleanup: editors / mesh & object
2012-04-28 15:42:27 +00:00
newob = basen->object;
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Cleanup: comment blocks, trailing space in comments
2021-06-24 15:56:58 +10:00
/* Decrement original curve's usage count. */
Cleanup: avoid incrementing/decrementing id->us outside of BKE_library. We have callbacks for that, they also do some checks and help ensure things are done correctly. Only place where this is assumed not true is blenloader (since here we may affect refcount of library IDs as well...).
2015-11-09 19:47:10 +01:00
id_us_min(&((Curve *)newob->data)->id);
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Cleanup: comment blocks, trailing space in comments
2021-06-24 15:56:58 +10:00
/* Make a new copy of the curve. */
Refactor: remove `BKE_<id_type>_copy` functions. Those were only shallow wrappers around `BKE_id_copy`, barely used (even fully unused in some cases), and we want to get rid of those ID-specific helpers for the common ID management tasks. Also prevents weird custom behaviors (like `BKE_object_copy`, who was the only basic ID copy function to reset user count of the new copy to zero). Part of 71219.
2020-10-07 18:01:25 +02:00
newob->data = BKE_id_copy(bmain, ob->data);
style cleanup: follow style guide for formatting of if/for/while loops, and else if's
2012-03-24 06:38:07 +00:00
}
else {
style cleanup: editors / mesh & object
2012-04-28 15:42:27 +00:00
newob = ob;
Fix for convert_exec() "Keep original" option now works for all objects' types
2010-03-07 05:04:22 +00:00
}
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Cleanup: Declare variables where initialized
2020-10-09 16:39:39 -05:00
Curve *cu = newob->data;
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Fix T74700: "Convert Text to Curve" disregards "Text on Curve" There was an assert here as well since using the original object to read from was having an empty runtime curve cache. Now use BKE_vfont_to_curve_ex instead of BKE_vfont_to_curve, so we can read from the evaluated object and write to the original curves in order to have the modified data taken into account on next object evaluation. (BKE_vfont_to_curve would read and write to/from the same object) Final solution provided by @sergey in that report, thx!
2020-04-27 17:35:35 +02:00
Object *ob_eval = DEG_get_evaluated_object(depsgraph, ob);
BKE_vfont_to_curve_ex(ob_eval, ob_eval->data, FO_EDIT, &cu->nurb, NULL, NULL, NULL, NULL);
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
style cleanup: editors / mesh & object
2012-04-28 15:42:27 +00:00
newob->type = OB_CURVE;
cu->type = OB_CURVE;
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
style cleanup: follow style guide for formatting of if/for/while loops, and else if's
2012-03-24 06:38:07 +00:00
if (cu->vfont) {
Cleanup: avoid incrementing/decrementing id->us outside of BKE_library. We have callbacks for that, they also do some checks and help ensure things are done correctly. Only place where this is assumed not true is blenloader (since here we may affect refcount of library IDs as well...).
2015-11-09 19:47:10 +01:00
id_us_min(&cu->vfont->id);
style cleanup: editors / mesh & object
2012-04-28 15:42:27 +00:00
cu->vfont = NULL;
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
}
style cleanup: follow style guide for formatting of if/for/while loops, and else if's
2012-03-24 06:38:07 +00:00
if (cu->vfontb) {
Cleanup: avoid incrementing/decrementing id->us outside of BKE_library. We have callbacks for that, they also do some checks and help ensure things are done correctly. Only place where this is assumed not true is blenloader (since here we may affect refcount of library IDs as well...).
2015-11-09 19:47:10 +01:00
id_us_min(&cu->vfontb->id);
style cleanup: editors / mesh & object
2012-04-28 15:42:27 +00:00
cu->vfontb = NULL;
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
}
style cleanup: follow style guide for formatting of if/for/while loops, and else if's
2012-03-24 06:38:07 +00:00
if (cu->vfonti) {
Cleanup: avoid incrementing/decrementing id->us outside of BKE_library. We have callbacks for that, they also do some checks and help ensure things are done correctly. Only place where this is assumed not true is blenloader (since here we may affect refcount of library IDs as well...).
2015-11-09 19:47:10 +01:00
id_us_min(&cu->vfonti->id);
style cleanup: editors / mesh & object
2012-04-28 15:42:27 +00:00
cu->vfonti = NULL;
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
}
style cleanup: follow style guide for formatting of if/for/while loops, and else if's
2012-03-24 06:38:07 +00:00
if (cu->vfontbi) {
Cleanup: avoid incrementing/decrementing id->us outside of BKE_library. We have callbacks for that, they also do some checks and help ensure things are done correctly. Only place where this is assumed not true is blenloader (since here we may affect refcount of library IDs as well...).
2015-11-09 19:47:10 +01:00
id_us_min(&cu->vfontbi->id);
style cleanup: editors / mesh & object
2012-04-28 15:42:27 +00:00
cu->vfontbi = NULL;
Fix for convert_exec() "Keep original" option now works for all objects' types
2010-03-07 05:04:22 +00:00
}
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Fix for convert_exec() "Keep original" option now works for all objects' types
2010-03-07 05:04:22 +00:00
if (!keep_original) {
/* other users */
Cleanup: remove redundant function
2020-01-20 13:24:31 +01:00
if (ID_REAL_USERS(&cu->id) > 1) {
Cleanup: use plural names for Main lists Convention was not to but after discussion on 918941483f7e we agree its best to change the convention. Names now mostly follow RNA. Some exceptions: - Use 'nodetrees' instead of 'nodegroups' since the struct is called NodeTree. - Use 'gpencils' instead of 'grease_pencil' since 'gpencil' is a common abbreviation in the C code. Other exceptions: - Leave 'wm' as it's a list of one. - Leave 'ipo' as is for versioning.
2019-03-08 09:29:17 +11:00
for (ob1 = bmain->objects.first; ob1; ob1 = ob1->id.next) {
style cleanup: editors / mesh & object
2012-04-28 15:42:27 +00:00
if (ob1->data == ob->data) {
ob1->type = OB_CURVE;
Depsgraph: Remove duplicated sets of recalc/update flags There were at least three copies of those: - OB_RECALC* family of flags, which are rudiment of an old dependency graph system. - PSYS_RECALC* which were used by old dependency graph system as a separate set since the graph itself did not handle particle systems. - DEG_TAG_* which was used to tag IDs. Now there is a single set, which defines what can be tagged and queried for an update. It also has some aggregate flags to make queries simpler. Lets once and for all solve the madness of those flags, stick to a single set, which will not overlap with anything or require any extra conversion. Technically, shouldn't be measurable user difference, but some of the agregate flags for few dependency graph components did change. Fixes T58632: Particle don't update rotation settings
2018-12-06 17:52:37 +01:00
DEG_id_tag_update(&ob1->id,
ID_RECALC_TRANSFORM | ID_RECALC_GEOMETRY | ID_RECALC_ANIMATION);
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
}
}
}
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
}
Cleanup: Declare variables where initialized
2020-10-09 16:39:39 -05:00
LISTBASE_FOREACH (Nurb *, nu, &cu->nurb) {
style cleanup: editors / mesh & object
2012-04-28 15:42:27 +00:00
nu->charidx = 0;
Cleanup: style, use braces for editors
2019-04-22 09:19:45 +10:00
}
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Quicktime: remove backend with the old quicktime API, and keep the QTKit backend. This means that if you have WITH_BF_QUICKTIME or WITH_CODEC_QUICKTIME enabled, it will always use QTKit. The old backend was only used on 32 bit OS X builds, now 32 and 64 bit builds will give consistent input/output. On Windows or Linux quicktime isn't being used.
2013-11-06 01:45:15 +00:00
cu->flag &= ~CU_3D;
Curve: Remove 'CU_2D' flag used for nurbs This fixes T86440 As the CU_2D flag is set for nurbs, a Curve can have 2D nurbs mixed with 3D. But the UI does not allow this mixing. It updates all nurbs to 2D or 3D when set. So remove this specific flag for nurbs. This may break old files, since 2D curves with mixed 3D are now set as 3D. Differential Revision: https://developer.blender.org/D10738
2021-04-01 10:41:12 -03:00
BKE_curve_dimension_update(cu);
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
style cleanup: follow style guide for formatting of if/for/while loops, and else if's
2012-03-24 06:38:07 +00:00
if (target == OB_MESH) {
Fix T66631: Crash when converting objects from Curve to Mesh When `BKE_mesh_new_from_object()` cannot convert an object to a mesh, it returns `NULL`. This case was not handled at all in `BKE_mesh_new_from_object_to_bmain()` or `curvetomesh()`, causing a segmentation fault. This commit fixes the segmentation fault, and leaves the curve object as a curve object. Reviewed By: mont29, brecht, sergey Differential Revision: https://developer.blender.org/D5217
2019-07-10 12:58:39 +02:00
/* No assumption should be made that the resulting objects is a mesh, as conversion can
* fail. */
Cleanup: name mesh join functions using ED_{type} prefix
2020-06-17 17:07:11 +10:00
object_data_convert_curve_to_mesh(bmain, depsgraph, newob);
Todo item: linked curve objects behaves incorrect with modifiers Use object's displists for storing deformed tesselated curve. Was unable to totally get rid of curve's displist because of how texture space is calculating.
2011-01-05 10:40:38 +00:00
/* meshes doesn't use displist */
Move bevel list and path from Curve to Object datablock I know this is not so much nice to have this guys hanging around in a general Object datablock and ideally they better be wrapped around into a structure like DerivedMesh or something like this. But this is pure runtime only stuff and we could re-wrap them around later. Main purpose of this is making curves more thread safe, so no separate threads will ever start freeing the same path or the same bevel list. It also makes sense because path and bevel shall include deformation coming from modifiers which are applying on pre-tesselation point and different objects could have different set of modifiers. This used to be really confusing in the past and now data which depends on object is stored in an object, making things clear for understanding even. This doesn't make curve code fully thread-safe due to pre-tesselation modifiers still modifies actual nurbs and lock is still needed in makeDispListsCurveTypes, but this change makes usage of paths safe for threading. Once modifiers will stop modifying actual nurbs, curves will be fully safe for threading. Actually, this commit also contains wrapping runtime curve members into own structure This allows easier assignment on file loading, keeps curve- specific runtime data grouped and saves couple of bytes in Object for non-curve types. -- svn merge -r57938:57939 ^/branches/soc-2013-depsgraph_mt svn merge -r57957:57958^/branches/soc-2013-depsgraph_mt
2013-08-19 09:25:24 +00:00
BKE_object_free_curve_cache(newob);
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
}
GPencil: Add "Convert Text to Gpencil" Currently when you try to convert a Text-object to Grease pencil from the Object-menu or via the operator in some other way, the Text-object is only converted to a Curve. This commit converts that curve to a Grease pencil object. Differential Revision: https://developer.blender.org/D11117
2021-04-29 17:45:46 +02:00
else if (target == OB_GPENCIL) {
ushort local_view_bits = (v3d && v3d->localvd) ? v3d->local_view_uuid : 0;
Object *ob_gpencil = ED_gpencil_add_object(C, newob->loc, local_view_bits);
copy_v3_v3(ob_gpencil->rot, newob->rot);
copy_v3_v3(ob_gpencil->scale, newob->scale);
BKE_gpencil_convert_curve(bmain, scene, ob_gpencil, newob, false, 1.0f, 0.0f);
gpencilConverted = true;
gpencilCurveConverted = true;
basen = NULL;
}
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
}
style cleanup: follow style guide for formatting of if/for/while loops, and else if's
2012-03-24 06:38:07 +00:00
else if (ELEM(ob->type, OB_CURVE, OB_SURF)) {
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
ob->flag |= OB_DONE;
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
style cleanup: follow style guide for formatting of if/for/while loops, and else if's
2012-03-24 06:38:07 +00:00
if (target == OB_MESH) {
Fix for convert_exec() "Keep original" option now works for all objects' types
2010-03-07 05:04:22 +00:00
if (keep_original) {
Fix T65295: Convert curve to mesh fails with Keep Original. This code now expects to wrok from fully evaluated data, however when we keep original, we are actually working from data just copied from orig one. Ideally, we'd do a single depsgraph update/eval *after* we have created all new required data, but that is tricky to do properly in that code without risking breaking one thing or another. So for now, just going for the simple, if not optimal solution, and just repeatedly re-evaluating whole deg every time we duplicate an object to be converted. Yep, dummy, but simple and... safe. ;)
2019-06-10 11:06:16 +02:00
basen = duplibase_for_convert(bmain, depsgraph, scene, view_layer, base, NULL);
style cleanup: editors / mesh & object
2012-04-28 15:42:27 +00:00
newob = basen->object;
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Cleanup: comment blocks, trailing space in comments
2021-06-24 15:56:58 +10:00
/* Decrement original curve's usage count. */
Cleanup: avoid incrementing/decrementing id->us outside of BKE_library. We have callbacks for that, they also do some checks and help ensure things are done correctly. Only place where this is assumed not true is blenloader (since here we may affect refcount of library IDs as well...).
2015-11-09 19:47:10 +01:00
id_us_min(&((Curve *)newob->data)->id);
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Fix for convert_exec() "Keep original" option now works for all objects' types
2010-03-07 05:04:22 +00:00
/* make a new copy of the curve */
Refactor: remove `BKE_<id_type>_copy` functions. Those were only shallow wrappers around `BKE_id_copy`, barely used (even fully unused in some cases), and we want to get rid of those ID-specific helpers for the common ID management tasks. Also prevents weird custom behaviors (like `BKE_object_copy`, who was the only basic ID copy function to reset user count of the new copy to zero). Part of 71219.
2020-10-07 18:01:25 +02:00
newob->data = BKE_id_copy(bmain, ob->data);
style cleanup: follow style guide for formatting of if/for/while loops, and else if's
2012-03-24 06:38:07 +00:00
}
else {
style cleanup: editors / mesh & object
2012-04-28 15:42:27 +00:00
newob = ob;
Fix for convert_exec() "Keep original" option now works for all objects' types
2010-03-07 05:04:22 +00:00
}
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Fix T66631: Crash when converting objects from Curve to Mesh When `BKE_mesh_new_from_object()` cannot convert an object to a mesh, it returns `NULL`. This case was not handled at all in `BKE_mesh_new_from_object_to_bmain()` or `curvetomesh()`, causing a segmentation fault. This commit fixes the segmentation fault, and leaves the curve object as a curve object. Reviewed By: mont29, brecht, sergey Differential Revision: https://developer.blender.org/D5217
2019-07-10 12:58:39 +02:00
/* No assumption should be made that the resulting objects is a mesh, as conversion can
* fail. */
Cleanup: name mesh join functions using ED_{type} prefix
2020-06-17 17:07:11 +10:00
object_data_convert_curve_to_mesh(bmain, depsgraph, newob);
Remove direct displist creation from object conversion If the object is visible and editable it means there's no way DAG to fail to create needed display lists.
2014-01-09 23:11:50 +06:00
/* meshes doesn't use displist */
BKE_object_free_curve_cache(newob);
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
}
Fix T66452: Convert Curve to Grease Pencil Strokes This commit adds support to convert curves to Grease Pencil strokes and create the materials too. Also, there is a new python API. This API is required by the modified SVG import addon to create strokes( see T67065). All curves selected in one operation are converted in the same Grease Pencil object.
2019-08-31 17:26:48 +02:00
else if (target == OB_GPENCIL) {
if (ob->type != OB_CURVE) {
Fix T69459: Convert Curve to Grease Pencil clears Transform Also changed to create a grease pencil object for each curve. Part of differential revision: https://developer.blender.org/D6045
2019-10-11 13:10:33 +02:00
ob->flag &= ~OB_DONE;
Fix many typos and other issues in UI messages.
2020-02-17 13:00:01 +01:00
BKE_report(op->reports, RPT_ERROR, "Convert Surfaces to Grease Pencil is not supported");
Fix T66452: Convert Curve to Grease Pencil Strokes This commit adds support to convert curves to Grease Pencil strokes and create the materials too. Also, there is a new python API. This API is required by the modified SVG import addon to create strokes( see T67065). All curves selected in one operation are converted in the same Grease Pencil object.
2019-08-31 17:26:48 +02:00
}
else {
Fix T69459: Convert Curve to Grease Pencil clears Transform Also changed to create a grease pencil object for each curve. Part of differential revision: https://developer.blender.org/D6045
2019-10-11 13:10:33 +02:00
/* Create a new grease pencil object and copy transformations.
Fix T66452: Convert Curve to Grease Pencil Strokes This commit adds support to convert curves to Grease Pencil strokes and create the materials too. Also, there is a new python API. This API is required by the modified SVG import addon to create strokes( see T67065). All curves selected in one operation are converted in the same Grease Pencil object.
2019-08-31 17:26:48 +02:00
* Nurbs Surface are not supported.
*/
Fix T69459: Convert Curve to Grease Pencil clears Transform Also changed to create a grease pencil object for each curve. Part of differential revision: https://developer.blender.org/D6045
2019-10-11 13:10:33 +02:00
ushort local_view_bits = (v3d && v3d->localvd) ? v3d->local_view_uuid : 0;
Cleanup: Declare variables where initialized
2020-10-09 16:39:39 -05:00
Object *ob_gpencil = ED_gpencil_add_object(C, ob->loc, local_view_bits);
GPencil: Convert and Bake mesh animation to grease pencil strokes This patch adds two options: - Convert a mesh to grease pencil strokes. - Bake the mesh animation into grease pencil strokes. Both are related and must be included in the same patch. Related to tasks: T77629 and T77630 Notice: The conversion is done for mesh edges and it's not considering any visibility clipping. All edges are exported, no matters if it's visible or not. Example of Convert a Mesh to Grease Pencil strokes: {F8606028} This conversion was inspired by the technique used by @luamono in this tweet: https://twitter.com/luamono/status/1239983662176841730 Example of Bake Animation (the video is a little outdate, but the basic functionality is the same, only small changes in UI): {F8606032} Reviewed By: mendio, pepeland Maniphest Tasks: T77629, T77630 Differential Revision: https://developer.blender.org/D7983
2020-06-16 15:28:46 +02:00
copy_v3_v3(ob_gpencil->rot, ob->rot);
copy_v3_v3(ob_gpencil->scale, ob->scale);
GPencil: Remove unused parameter and fix warning
2020-08-13 08:38:05 +02:00
BKE_gpencil_convert_curve(bmain, scene, ob_gpencil, ob, false, 1.0f, 0.0f);
GPencil: Remove curve objects after converting to strokes (unreported) This was detected fixing T69459 Part of Differential Revision: https://developer.blender.org/D6045 Note: done in a separated commit to keep track of changes done not directly related to bug reported in T69459.
2019-10-11 13:18:39 +02:00
gpencilConverted = true;
Fix T66452: Convert Curve to Grease Pencil Strokes This commit adds support to convert curves to Grease Pencil strokes and create the materials too. Also, there is a new python API. This API is required by the modified SVG import addon to create strokes( see T67065). All curves selected in one operation are converted in the same Grease Pencil object.
2019-08-31 17:26:48 +02:00
}
}
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
}
style cleanup: editors / mesh & object
2012-04-28 15:42:27 +00:00
else if (ob->type == OB_MBALL && target == OB_MESH) {
Fix for convert_exec() "Keep original" option now works for all objects' types
2010-03-07 05:04:22 +00:00
Object *baseob;
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Farewell Scene->base While getting rid of Scene->base we got the following fixes: * Fix "Convert To" operator * Fix "NLA allowing to selected objects that are not selectable * Fix scene.objects (readonly, no option to link/unlink) Note: Collada needs to use the context SceneLayer for adding objects however I added a placeholder, so Collada maintainers can fix this properly.
2017-11-08 12:16:49 -02:00
base->flag &= ~BASE_SELECTED;
ob->base_flag &= ~BASE_SELECTED;
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Style cleanup: rename BKE_metaball* to BKE_mball -- mball is more commonly used term in Blender
2012-05-07 06:38:41 +00:00
baseob = BKE_mball_basis_find(scene, ob);
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Fix for convert_exec() "Keep original" option now works for all objects' types
2010-03-07 05:04:22 +00:00
if (ob != baseob) {
/* if motherball is converting it would be marked as done later */
ob->flag |= OB_DONE;
}
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
style cleanup: follow style guide for formatting of if/for/while loops, and else if's
2012-03-24 06:38:07 +00:00
if (!(baseob->flag & OB_DONE)) {
Fix T65295: Convert curve to mesh fails with Keep Original. This code now expects to wrok from fully evaluated data, however when we keep original, we are actually working from data just copied from orig one. Ideally, we'd do a single depsgraph update/eval *after* we have created all new required data, but that is tricky to do properly in that code without risking breaking one thing or another. So for now, just going for the simple, if not optimal solution, and just repeatedly re-evaluating whole deg every time we duplicate an object to be converted. Yep, dummy, but simple and... safe. ;)
2019-06-10 11:06:16 +02:00
basen = duplibase_for_convert(bmain, depsgraph, scene, view_layer, base, baseob);
style cleanup: editors / mesh & object
2012-04-28 15:42:27 +00:00
newob = basen->object;
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Cleanup: Declare variables where initialized
2020-10-09 16:39:39 -05:00
MetaBall *mb = newob->data;
Cleanup: avoid incrementing/decrementing id->us outside of BKE_library. We have callbacks for that, they also do some checks and help ensure things are done correctly. Only place where this is assumed not true is blenloader (since here we may affect refcount of library IDs as well...).
2015-11-09 19:47:10 +01:00
id_us_min(&mb->id);
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Fix #34040: Moving Normal Node with enabled Cycles Material Preview crashes Issue was caused by couple of circumstances: - Normal Map node requires tesselated faces to compute tangent space - All temporary meshes needed for Cycles export were adding to G.main - Undo pushes would temporary set meshes tessfaces to NULL - Moving node will cause undo push and tree re-evaluate fr preview All this leads to threading conflict between preview render and undo system. Solved it in way that all temporary meshes are adding to that exact Main which was passed to Cycles via BlendData. This required couple of mechanic changes like adding extra parameter to *_add() functions and adding some *_ex() functions to make it possible RNA adds objects to Main passed to new() RNA function. This was tricky to pass Main to RNA function and IMO that's not so nice to pass main to function, so ended up with such decision: - Object.to_mesh() will add temp mesh to G.main - Added Main.meshes.new_from_object() which does the same as to_mesh, but adds temporary mesh to specified Main. So now all temporary meshes needed for preview render would be added to preview_main which does not conflict with undo pushes. Viewport render shall not be an issue because object sync happens from main thread in this case. It could be some issues with final render, but that's not so much likely to happen, so shall be fine. Thanks to Brecht for review!
2013-02-05 12:46:15 +00:00
newob->data = BKE_mesh_add(bmain, "Mesh");
style cleanup: editors / mesh & object
2012-04-28 15:42:27 +00:00
newob->type = OB_MESH;
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Cleanup: Declare variables where initialized
2020-10-09 16:39:39 -05:00
Mesh *me = newob->data;
style cleanup: editors / mesh & object
2012-04-28 15:42:27 +00:00
me->totcol = mb->totcol;
style cleanup: follow style guide for formatting of if/for/while loops, and else if's
2012-03-24 06:38:07 +00:00
if (newob->totcol) {
style cleanup: editors / mesh & object
2012-04-28 15:42:27 +00:00
me->mat = MEM_dupallocN(mb->mat);
Cleanup: style, use braces for editors
2019-04-22 09:19:45 +10:00
for (a = 0; a < newob->totcol; a++) {
style cleanup: editors / mesh & object
2012-04-28 15:42:27 +00:00
id_us_plus((ID *)me->mat[a]);
Cleanup: style, use braces for editors
2019-04-22 09:19:45 +10: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
}
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Cleanup: name mesh join functions using ED_{type} prefix
2020-06-17 17:07:11 +10:00
object_data_convert_ensure_curve_cache(depsgraph, scene, baseob);
Cleanup/Refactor: Move CurveCache runtime data into Object.runtime struct. Also, fix missing cleanup of Object.runtime when copying Object datablocks!
2018-07-30 16:54:40 +02:00
BKE_mesh_from_metaball(&baseob->runtime.curve_cache->disp, newob->data);
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Fix for convert_exec() "Keep original" option now works for all objects' types
2010-03-07 05:04:22 +00:00
if (obact->type == OB_MBALL) {
style cleanup: editors / mesh & object
2012-04-28 15:42:27 +00:00
basact = basen;
Fix for convert_exec() "Keep original" option now works for all objects' types
2010-03-07 05:04:22 +00:00
}
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Fix T65996: metaballs converted to meshes appear to render at an incorrect isosurface. Not much to be done here really, besides adding yet another hack to that giant pile of hacks that are mballs... So to avoid newly created copy of basis of mball to influence to mball computation, we simply switch it to Empty object for the depsgraph update run. Not nice, but working (besides a weird change of basis obflag which should not happen), and presumably reasonably safe change.
2019-06-24 20:40:56 +02:00
baseob->flag |= OB_DONE;
style cleanup: editors / mesh & object
2012-04-28 15:42:27 +00:00
mballConverted = 1;
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
}
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
}
Pointclouds: support mesh <-> pointcloud in convert operator Just converts verts to points and vice versa. Materials and Attribute layers are preserved (so for example if you set custom radii on the pointcloud, convert to mesh, then convert back to pointcloud, this will be preserved). Also not add a Radius layer by default (it is still added and filled when adding a pointcloud object from the menu), a global Radius property that will be used if there is no radius attribute can be added later. A Radius attribute can also be added in the pointcloud data properties (and filled via python). This will also add a new utility function that copies materials between datablocks: BKE_id_materials_copy ref T75717 Differential Revision: https://developer.blender.org/D7391
2020-04-09 18:49:40 +02:00
else if (ob->type == OB_POINTCLOUD && target == OB_MESH) {
ob->flag |= OB_DONE;
if (keep_original) {
basen = duplibase_for_convert(bmain, depsgraph, scene, view_layer, base, NULL);
newob = basen->object;
Cleanup: Point cloud vs point-cloud in comments Point cloud is two separate words, this just changes comments in a few places where we were inconsistent. A small wording change to another comment is also included.
2021-12-12 23:00:39 -06:00
/* Decrement original point cloud's usage count. */
Cleanup: Declare variables where initialized
2020-10-09 16:39:39 -05:00
PointCloud *pointcloud = newob->data;
Pointclouds: support mesh <-> pointcloud in convert operator Just converts verts to points and vice versa. Materials and Attribute layers are preserved (so for example if you set custom radii on the pointcloud, convert to mesh, then convert back to pointcloud, this will be preserved). Also not add a Radius layer by default (it is still added and filled when adding a pointcloud object from the menu), a global Radius property that will be used if there is no radius attribute can be added later. A Radius attribute can also be added in the pointcloud data properties (and filled via python). This will also add a new utility function that copies materials between datablocks: BKE_id_materials_copy ref T75717 Differential Revision: https://developer.blender.org/D7391
2020-04-09 18:49:40 +02:00
id_us_min(&pointcloud->id);
Cleanup: Point cloud vs point-cloud in comments Point cloud is two separate words, this just changes comments in a few places where we were inconsistent. A small wording change to another comment is also included.
2021-12-12 23:00:39 -06:00
/* Make a new copy of the point cloud. */
Refactor: remove `BKE_<id_type>_copy` functions. Those were only shallow wrappers around `BKE_id_copy`, barely used (even fully unused in some cases), and we want to get rid of those ID-specific helpers for the common ID management tasks. Also prevents weird custom behaviors (like `BKE_object_copy`, who was the only basic ID copy function to reset user count of the new copy to zero). Part of 71219.
2020-10-07 18:01:25 +02:00
newob->data = BKE_id_copy(bmain, &pointcloud->id);
Pointclouds: support mesh <-> pointcloud in convert operator Just converts verts to points and vice versa. Materials and Attribute layers are preserved (so for example if you set custom radii on the pointcloud, convert to mesh, then convert back to pointcloud, this will be preserved). Also not add a Radius layer by default (it is still added and filled when adding a pointcloud object from the menu), a global Radius property that will be used if there is no radius attribute can be added later. A Radius attribute can also be added in the pointcloud data properties (and filled via python). This will also add a new utility function that copies materials between datablocks: BKE_id_materials_copy ref T75717 Differential Revision: https://developer.blender.org/D7391
2020-04-09 18:49:40 +02:00
}
else {
newob = ob;
}
BKE_pointcloud_to_mesh(bmain, depsgraph, scene, newob);
if (newob->type == OB_MESH) {
BKE_object_free_modifiers(newob, 0); /* after derivedmesh calls! */
ED_rigidbody_object_remove(bmain, scene, newob);
}
}
bugfix [#25310] Twice applied modifier with Convert to mesh with several multi-user objects
2010-12-20 07:21:08 +00:00
else {
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
continue;
bugfix [#25310] Twice applied modifier with Convert to mesh with several multi-user objects
2010-12-20 07:21:08 +00:00
}
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Fix T56363: Blender crash when deleting a curve object. Conversion code could leave object with inconsistent material data compared to its new obdata. Ideally, various conversion code would handle that properly, conserving materials when possible, but for now at least ensure we get valid result!
2018-08-14 14:05:09 +02:00
/* Ensure new object has consistent material data with its new obdata. */
Fix use of uninitialized variable in some cases, in recent bugfix.
2018-08-14 15:27:25 +02:00
if (newob) {
T73589: Code Quality: Renaming on BKE_material.h Old Name New Name ========= ========= init_def_material BKE_materials_init BKE_material_gpencil_default_free BKE_materials_exit test_object_materials BKE_object_materials_test test_all_objects_materials BKE_objects_materials_test_all give_matarar BKE_object_material_array give_totcolp BKE_object_material_num give_current_material_p BKE_object_material_get_p give_current_material BKE_object_material_get assign_material BKE_object_material_assign assign_matarar BKE_object_material_array_assign give_matarar_id BKE_id_material_array give_totcolp_id BKE_id_material_num assign_material_id BKE_id_material_assign clear_matcopybuf BKE_material_copybuf_clear free_matcopybuf BKE_material_copybuf_free copy_matcopybuf BKE_material_copybuf_copy paste_matcopybuf BKE_material_copybuf_paste BKE_material_init_gpencil_settings BKE_gpencil_material_attr_init BKE_material_add_gpencil BKE_gpencil_material_add BKE_material_gpencil_get BKE_gpencil_material BKE_material_gpencil_default_get BKE_gpencil_material_default BKE_material_gpencil_settings_get BKE_gpencil_material_settings
2020-02-05 11:23:58 +01:00
BKE_object_materials_test(bmain, newob, newob->data);
Fix use of uninitialized variable in some cases, in recent bugfix.
2018-08-14 15:27:25 +02:00
}
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
bugfix [#25310] Twice applied modifier with Convert to mesh with several multi-user objects
2010-12-20 07:21:08 +00:00
/* tag obdata if it was been changed */
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02: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
/* If the original object is active then make this object active */
style cleanup: follow style guide for formatting of if/for/while loops, and else if's
2012-03-24 06:38:07 +00:00
if (basen) {
if (ob == obact) {
[#21436] Do not set BASACT to NULL when new base wasn't created in convert_exec by Sergey Sharybin (nazgul) (from the patch) When new base wasn't created in convert_exec() function. BASACT will set to NULL, which is not convenient. For example, u can't enter edit mode after converting curve to mesh. Now BASACT changes only if base for active object was changed.
2010-03-03 18:49:26 +00:00
/* store new active base to update BASACT */
style cleanup: editors / mesh & object
2012-04-28 15:42:27 +00:00
basact = basen;
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
}
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
style cleanup: editors / mesh & object
2012-04-28 15:42:27 +00:00
basen = NULL;
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
}
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
bugfix [#25310] Twice applied modifier with Convert to mesh with several multi-user objects
2010-12-20 07:21:08 +00:00
if (!keep_original && (ob->flag & OB_DONE)) {
Fix missing ID tag when converting objects Parenting to a curve path animation depends on both geometry and transform components. Conversion of mesh to curve will make it so parent have path animation, conversion of curve to mesh makes it so there is no more path animation. Both cases affects children of the converted objects, and it's not possible to rely on special case for curve parent in the dependency graph as that link will be lost after conversion of curve to mesh. Simplest approach is to tag object for both geometry and transform update, which will ensure all children are at valid state after the conversion.
2020-05-13 14:15:52 +02:00
/* NOTE: Tag transform for update because object parenting to curve with path is handled
* differently from all other cases. Converting curve to mesh and mesh to curve will likely
* affect the way children are evaluated.
* It is not enough to tag only geometry and rely on the curve parenting relations because
* this relation is lost when curve is converted to mesh. */
DEG_id_tag_update(&ob->id, ID_RECALC_GEOMETRY | ID_RECALC_TRANSFORM);
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 *)ob->data)->tag &= ~LIB_TAG_DOIT; /* flag not to convert this datablock again */
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
}
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
}
Fix T50950: Converting meshes fails w/ boolean
2017-03-17 09:58:05 +11:00
BLI_freelistN(&selected_editable_bases);
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
style cleanup: follow style guide for formatting of if/for/while loops, and else if's
2012-03-24 06:38:07 +00:00
if (!keep_original) {
Fix for convert_exec() "Keep original" option now works for all objects' types
2010-03-07 05:04:22 +00:00
if (mballConverted) {
Fix (unreported) several issues when converting MBall to Mesh. Redo panel would be hidden (when 'keep original' was not set), due to same kind of (un)selected issue as in T65301 (see previous commit). Further more, not all MBall objects of the family were properly removed.
2019-06-09 22:56:37 +02:00
/* We need to remove non-basis MBalls first, otherwise we won't be able to detect them if
* their basis happens to be removed first. */
FOREACH_SCENE_OBJECT_BEGIN (scene, ob_mball) {
if (ob_mball->type == OB_MBALL) {
Object *ob_basis = NULL;
if (!BKE_mball_is_basis(ob_mball) &&
((ob_basis = BKE_mball_basis_find(scene, ob_mball)) && (ob_basis->flag & OB_DONE))) {
ED_object_base_free_and_unlink(bmain, scene, ob_mball);
}
}
}
FOREACH_SCENE_OBJECT_END;
Cleanup: macro's w/ an _END need a matching _BEGIN Convention from 2.7x, since some looping macros don't need an '_END', it avoids confusion to keep this.
2018-03-01 19:00:54 +11:00
FOREACH_SCENE_OBJECT_BEGIN (scene, ob_mball) {
Farewell Scene->base While getting rid of Scene->base we got the following fixes: * Fix "Convert To" operator * Fix "NLA allowing to selected objects that are not selectable * Fix scene.objects (readonly, no option to link/unlink) Note: Collada needs to use the context SceneLayer for adding objects however I added a placeholder, so Collada maintainers can fix this properly.
2017-11-08 12:16:49 -02:00
if (ob_mball->type == OB_MBALL) {
if (ob_mball->flag & OB_DONE) {
Fix (unreported) several issues when converting MBall to Mesh. Redo panel would be hidden (when 'keep original' was not set), due to same kind of (un)selected issue as in T65301 (see previous commit). Further more, not all MBall objects of the family were properly removed.
2019-06-09 22:56:37 +02:00
if (BKE_mball_is_basis(ob_mball)) {
Farewell Scene->basact
2017-11-09 13:11:20 -02:00
ED_object_base_free_and_unlink(bmain, scene, ob_mball);
Fix metaball->mesh removing all metas in the scene Assumed the entire scene used the one motherball.
2015-03-06 22:44:56 +11:00
}
}
Fix for convert_exec() "Keep original" option now works for all objects' types
2010-03-07 05:04:22 +00:00
}
}
Cleanup: iterator macros - put render iterator in own scope (would shadow it's own variable if used multiple times). - enforce semicolon at end of iterator macros. - no need to typedef one-off macro structs.
2018-03-09 11:44:42 +11:00
FOREACH_SCENE_OBJECT_END;
Fix for convert_exec() "Keep original" option now works for all objects' types
2010-03-07 05:04:22 +00:00
}
GPencil: Convert and Bake mesh animation to grease pencil strokes This patch adds two options: - Convert a mesh to grease pencil strokes. - Bake the mesh animation into grease pencil strokes. Both are related and must be included in the same patch. Related to tasks: T77629 and T77630 Notice: The conversion is done for mesh edges and it's not considering any visibility clipping. All edges are exported, no matters if it's visible or not. Example of Convert a Mesh to Grease Pencil strokes: {F8606028} This conversion was inspired by the technique used by @luamono in this tweet: https://twitter.com/luamono/status/1239983662176841730 Example of Bake Animation (the video is a little outdate, but the basic functionality is the same, only small changes in UI): {F8606032} Reviewed By: mendio, pepeland Maniphest Tasks: T77629, T77630 Differential Revision: https://developer.blender.org/D7983
2020-06-16 15:28:46 +02:00
/* Remove curves and meshes converted to Grease Pencil object. */
GPencil: Remove curve objects after converting to strokes (unreported) This was detected fixing T69459 Part of Differential Revision: https://developer.blender.org/D6045 Note: done in a separated commit to keep track of changes done not directly related to bug reported in T69459.
2019-10-11 13:18:39 +02:00
if (gpencilConverted) {
GPencil: Convert and Bake mesh animation to grease pencil strokes This patch adds two options: - Convert a mesh to grease pencil strokes. - Bake the mesh animation into grease pencil strokes. Both are related and must be included in the same patch. Related to tasks: T77629 and T77630 Notice: The conversion is done for mesh edges and it's not considering any visibility clipping. All edges are exported, no matters if it's visible or not. Example of Convert a Mesh to Grease Pencil strokes: {F8606028} This conversion was inspired by the technique used by @luamono in this tweet: https://twitter.com/luamono/status/1239983662176841730 Example of Bake Animation (the video is a little outdate, but the basic functionality is the same, only small changes in UI): {F8606032} Reviewed By: mendio, pepeland Maniphest Tasks: T77629, T77630 Differential Revision: https://developer.blender.org/D7983
2020-06-16 15:28:46 +02:00
FOREACH_SCENE_OBJECT_BEGIN (scene, ob_delete) {
Cleanup: use ELEM macro
2020-11-06 12:30:59 +11:00
if (ELEM(ob_delete->type, OB_CURVE, OB_MESH)) {
GPencil: Convert and Bake mesh animation to grease pencil strokes This patch adds two options: - Convert a mesh to grease pencil strokes. - Bake the mesh animation into grease pencil strokes. Both are related and must be included in the same patch. Related to tasks: T77629 and T77630 Notice: The conversion is done for mesh edges and it's not considering any visibility clipping. All edges are exported, no matters if it's visible or not. Example of Convert a Mesh to Grease Pencil strokes: {F8606028} This conversion was inspired by the technique used by @luamono in this tweet: https://twitter.com/luamono/status/1239983662176841730 Example of Bake Animation (the video is a little outdate, but the basic functionality is the same, only small changes in UI): {F8606032} Reviewed By: mendio, pepeland Maniphest Tasks: T77629, T77630 Differential Revision: https://developer.blender.org/D7983
2020-06-16 15:28:46 +02:00
if (ob_delete->flag & OB_DONE) {
ED_object_base_free_and_unlink(bmain, scene, ob_delete);
GPencil: Remove curve objects after converting to strokes (unreported) This was detected fixing T69459 Part of Differential Revision: https://developer.blender.org/D6045 Note: done in a separated commit to keep track of changes done not directly related to bug reported in T69459.
2019-10-11 13:18:39 +02:00
}
}
}
FOREACH_SCENE_OBJECT_END;
}
Fix for convert_exec() "Keep original" option now works for all objects' types
2010-03-07 05:04:22 +00:00
}
GPencil: Add "Convert Text to Gpencil" Currently when you try to convert a Text-object to Grease pencil from the Object-menu or via the operator in some other way, the Text-object is only converted to a Curve. This commit converts that curve to a Grease pencil object. Differential Revision: https://developer.blender.org/D11117
2021-04-29 17:45:46 +02:00
else {
/* Remove Text curves converted to Grease Pencil object to avoid duplicated curves. */
if (gpencilCurveConverted) {
FOREACH_SCENE_OBJECT_BEGIN (scene, ob_delete) {
if (ELEM(ob_delete->type, OB_CURVE) && (ob_delete->flag & OB_DONE)) {
ED_object_base_free_and_unlink(bmain, scene, ob_delete);
}
}
FOREACH_SCENE_OBJECT_END;
}
}
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
code cleanup: rename editmode functions so we have ED_object_editmode_load/enter/exit
2013-03-21 14:18:17 +00:00
// XXX ED_object_editmode_enter(C, 0);
Clenaup: remove unused EM_WAITCURSOR
2019-01-10 13:02:07 +11:00
// XXX exit_editmode(C, EM_FREEDATA|); /* freedata, but no undo */
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
[#21436] Do not set BASACT to NULL when new base wasn't created in convert_exec by Sergey Sharybin (nazgul) (from the patch) When new base wasn't created in convert_exec() function. BASACT will set to NULL, which is not convenient. For example, u can't enter edit mode after converting curve to mesh. Now BASACT changes only if base for active object was changed.
2010-03-03 18:49:26 +00:00
if (basact) {
/* active base was changed */
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
ED_object_base_activate(C, basact);
Rename any instance of scene layer or render layer in code with view layer The RenderResult struct still has a listbase of RenderLayer, but that's ok since this is strictly for rendering. * Subversion bump (to 2.80.2) * DNA low level doversion (renames) - only for .blend created since 2.80 started Note: We can't use DNA_struct_elem_find or get file version in init_structDNA, so we are manually iterating over the array of the SDNA elements instead. Note 2: This doversion change with renames can be reverted in a few months. But so far it's required for 2.8 files created between October 2016 and now. Reviewers: campbellbarton, sergey Differential Revision: https://developer.blender.org/D2927
2017-11-22 10:52:39 -02:00
BASACT(view_layer) = basact;
style cleanup: follow style guide for formatting of if/for/while loops, and else if's
2012-03-24 06:38:07 +00:00
}
Rename any instance of scene layer or render layer in code with view layer The RenderResult struct still has a listbase of RenderLayer, but that's ok since this is strictly for rendering. * Subversion bump (to 2.80.2) * DNA low level doversion (renames) - only for .blend created since 2.80 started Note: We can't use DNA_struct_elem_find or get file version in init_structDNA, so we are manually iterating over the array of the SDNA elements instead. Note 2: This doversion change with renames can be reverted in a few months. But so far it's required for 2.8 files created between October 2016 and now. Reviewers: campbellbarton, sergey Differential Revision: https://developer.blender.org/D2927
2017-11-22 10:52:39 -02:00
else if (BASACT(view_layer)->object->flag & OB_DONE) {
WM_event_add_notifier(C, NC_OBJECT | ND_MODIFIER, BASACT(view_layer)->object);
WM_event_add_notifier(C, NC_OBJECT | ND_DATA, BASACT(view_layer)->object);
[#21436] Do not set BASACT to NULL when new base wasn't created in convert_exec by Sergey Sharybin (nazgul) (from the patch) When new base wasn't created in convert_exec() function. BASACT will set to NULL, which is not convenient. For example, u can't enter edit mode after converting curve to mesh. Now BASACT changes only if base for active object was changed.
2010-03-03 18:49:26 +00:00
}
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Replace all old DAG calls with direct calls to new DEG and remove BKE_depsgraph.h This removes BKE_depsgraph.h and depsgraph.c
2017-06-08 10:14:53 +02:00
DEG_relations_tag_update(bmain);
Depsgraph: Remove duplicated sets of recalc/update flags There were at least three copies of those: - OB_RECALC* family of flags, which are rudiment of an old dependency graph system. - PSYS_RECALC* which were used by old dependency graph system as a separate set since the graph itself did not handle particle systems. - DEG_TAG_* which was used to tag IDs. Now there is a single set, which defines what can be tagged and queried for an update. It also has some aggregate flags to make queries simpler. Lets once and for all solve the madness of those flags, stick to a single set, which will not overlap with anything or require any extra conversion. Technically, shouldn't be measurable user difference, but some of the agregate flags for few dependency graph components did change. Fixes T58632: Particle don't update rotation settings
2018-12-06 17:52:37 +01:00
DEG_id_tag_update(&scene->id, ID_RECALC_SELECT);
style cleanup: editors / mesh & object
2012-04-28 15:42:27 +00:00
WM_event_add_notifier(C, NC_OBJECT | ND_DRAW, scene);
WM_event_add_notifier(C, NC_SCENE | ND_OB_SELECT, scene);
Outliner: Avoid rebuilding tree on selection/active changes We can avoid the rather expensive outliner tree rebuilds and only redraw if nothing but the selection or active item changes. This should give a bit of speedup for heavy scenes. For this to work I had to correct a few notifiers, some were only sending selection/active change notifiers that actually did things like adding objects. I also added a more precise notifier type for when the active collection changes. At the notifier subtype/action level we're not even close to running out of bits, so this should be fine. Also had to correct a wrong notifier check (was using `&` rather than `==`).
2020-08-20 20:17:00 +02:00
WM_event_add_notifier(C, NC_SCENE | ND_LAYER_CONTENT, scene);
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
- added redraw notifier. - removed custom invoke function, use generic names (was misleading since conversion is done on selection, not just active). - made convert mesh to curve use the 'keep_original' option.
2009-10-10 10:49:17 +00:00
return OPERATOR_FINISHED;
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
}
Cleanup: use 'wmOperator.ptr' in draw functions Draw functions used RNA_pointer_create to create the pointer, however this already exists in the operator.
2021-04-20 00:13:26 +10:00
static void object_convert_ui(bContext *UNUSED(C), wmOperator *op)
GPencil: Convert and Bake mesh animation to grease pencil strokes This patch adds two options: - Convert a mesh to grease pencil strokes. - Bake the mesh animation into grease pencil strokes. Both are related and must be included in the same patch. Related to tasks: T77629 and T77630 Notice: The conversion is done for mesh edges and it's not considering any visibility clipping. All edges are exported, no matters if it's visible or not. Example of Convert a Mesh to Grease Pencil strokes: {F8606028} This conversion was inspired by the technique used by @luamono in this tweet: https://twitter.com/luamono/status/1239983662176841730 Example of Bake Animation (the video is a little outdate, but the basic functionality is the same, only small changes in UI): {F8606032} Reviewed By: mendio, pepeland Maniphest Tasks: T77629, T77630 Differential Revision: https://developer.blender.org/D7983
2020-06-16 15:28:46 +02:00
{
uiLayout *layout = op->layout;
UI: Use consistent layout for custom operator UI Operators are one of the last places in Blender to use older UI designs that don't fit in with recent style conventions. This commit updates these custom operator UI callbacks for consistency and clarity. Some of the code is also simplified a lot. Some of the older operator layouts were much more complex (in terms of code) than they needed to be. See the differential revision for a before and after screenshot of each operator. Differential Revision: https://developer.blender.org/D8326
2020-07-21 11:13:18 -04:00
uiLayoutSetPropSep(layout, true);
Cleanup: use 'wmOperator.ptr' in draw functions Draw functions used RNA_pointer_create to create the pointer, however this already exists in the operator.
2021-04-20 00:13:26 +10:00
uiItemR(layout, op->ptr, "target", 0, NULL, ICON_NONE);
uiItemR(layout, op->ptr, "keep_original", 0, NULL, ICON_NONE);
GPencil: Convert and Bake mesh animation to grease pencil strokes This patch adds two options: - Convert a mesh to grease pencil strokes. - Bake the mesh animation into grease pencil strokes. Both are related and must be included in the same patch. Related to tasks: T77629 and T77630 Notice: The conversion is done for mesh edges and it's not considering any visibility clipping. All edges are exported, no matters if it's visible or not. Example of Convert a Mesh to Grease Pencil strokes: {F8606028} This conversion was inspired by the technique used by @luamono in this tweet: https://twitter.com/luamono/status/1239983662176841730 Example of Bake Animation (the video is a little outdate, but the basic functionality is the same, only small changes in UI): {F8606032} Reviewed By: mendio, pepeland Maniphest Tasks: T77629, T77630 Differential Revision: https://developer.blender.org/D7983
2020-06-16 15:28:46 +02:00
Cleanup: use 'wmOperator.ptr' in draw functions Draw functions used RNA_pointer_create to create the pointer, however this already exists in the operator.
2021-04-20 00:13:26 +10:00
if (RNA_enum_get(op->ptr, "target") == OB_GPENCIL) {
uiItemR(layout, op->ptr, "thickness", 0, NULL, ICON_NONE);
uiItemR(layout, op->ptr, "angle", 0, NULL, ICON_NONE);
uiItemR(layout, op->ptr, "offset", 0, NULL, ICON_NONE);
uiItemR(layout, op->ptr, "seams", 0, NULL, ICON_NONE);
uiItemR(layout, op->ptr, "faces", 0, NULL, ICON_NONE);
GPencil: Convert and Bake mesh animation to grease pencil strokes This patch adds two options: - Convert a mesh to grease pencil strokes. - Bake the mesh animation into grease pencil strokes. Both are related and must be included in the same patch. Related to tasks: T77629 and T77630 Notice: The conversion is done for mesh edges and it's not considering any visibility clipping. All edges are exported, no matters if it's visible or not. Example of Convert a Mesh to Grease Pencil strokes: {F8606028} This conversion was inspired by the technique used by @luamono in this tweet: https://twitter.com/luamono/status/1239983662176841730 Example of Bake Animation (the video is a little outdate, but the basic functionality is the same, only small changes in UI): {F8606032} Reviewed By: mendio, pepeland Maniphest Tasks: T77629, T77630 Differential Revision: https://developer.blender.org/D7983
2020-06-16 15:28:46 +02: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
void OBJECT_OT_convert(wmOperatorType *ot)
{
GPencil: Convert and Bake mesh animation to grease pencil strokes This patch adds two options: - Convert a mesh to grease pencil strokes. - Bake the mesh animation into grease pencil strokes. Both are related and must be included in the same patch. Related to tasks: T77629 and T77630 Notice: The conversion is done for mesh edges and it's not considering any visibility clipping. All edges are exported, no matters if it's visible or not. Example of Convert a Mesh to Grease Pencil strokes: {F8606028} This conversion was inspired by the technique used by @luamono in this tweet: https://twitter.com/luamono/status/1239983662176841730 Example of Bake Animation (the video is a little outdate, but the basic functionality is the same, only small changes in UI): {F8606032} Reviewed By: mendio, pepeland Maniphest Tasks: T77629, T77630 Differential Revision: https://developer.blender.org/D7983
2020-06-16 15:28:46 +02:00
PropertyRNA *prop;
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
/* identifiers */
UI: Fix capitalization in various places Follow the MLA style, agreed upon in T79589. This means "from" within UI labels should be lowercase. Differential Revision: https://developer.blender.org/D8345
2020-10-07 08:04:53 -05:00
ot->name = "Convert To";
batch remove .'s used with RNA_def_struct_ui_text
2010-02-10 21:15:44 +00:00
ot->description = "Convert selected objects to another type";
style cleanup: spaces aroudn operators for operator definitions.
2012-03-22 07:26:09 +00:00
ot->idname = "OBJECT_OT_convert";
Some effect-less code cleanup...
2012-10-05 07:05: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
/* api callbacks */
style cleanup: spaces aroudn operators for operator definitions.
2012-03-22 07:26:09 +00:00
ot->invoke = WM_menu_invoke;
Cleanup: name mesh join functions using ED_{type} prefix
2020-06-17 17:07:11 +10:00
ot->exec = object_convert_exec;
ot->poll = object_convert_poll;
ot->ui = object_convert_ui;
Some effect-less code cleanup...
2012-10-05 07:05: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
/* flags */
style cleanup: editors / mesh & object
2012-04-28 15:42:27 +00:00
ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
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
/* properties */
style cleanup: spaces aroudn operators for operator definitions.
2012-03-22 07:26:09 +00:00
ot->prop = RNA_def_enum(
ot->srna, "target", convert_target_items, OB_MESH, "Target", "Type of object to convert to");
Changed "Convert" to "Convert to" since the first one is incorrect. Removed some dots at the end of tooltips following the standard
2011-06-04 23:02:44 +00:00
RNA_def_boolean(ot->srna,
"keep_original",
0,
"Keep Original",
"Keep original objects instead of replacing them");
GPencil: Convert and Bake mesh animation to grease pencil strokes This patch adds two options: - Convert a mesh to grease pencil strokes. - Bake the mesh animation into grease pencil strokes. Both are related and must be included in the same patch. Related to tasks: T77629 and T77630 Notice: The conversion is done for mesh edges and it's not considering any visibility clipping. All edges are exported, no matters if it's visible or not. Example of Convert a Mesh to Grease Pencil strokes: {F8606028} This conversion was inspired by the technique used by @luamono in this tweet: https://twitter.com/luamono/status/1239983662176841730 Example of Bake Animation (the video is a little outdate, but the basic functionality is the same, only small changes in UI): {F8606032} Reviewed By: mendio, pepeland Maniphest Tasks: T77629, T77630 Differential Revision: https://developer.blender.org/D7983
2020-06-16 15:28:46 +02:00
prop = RNA_def_float_rotation(ot->srna,
"angle",
0,
NULL,
DEG2RADF(0.0f),
DEG2RADF(180.0f),
"Threshold Angle",
"Threshold to determine ends of the strokes",
DEG2RADF(0.0f),
DEG2RADF(180.0f));
RNA_def_property_float_default(prop, DEG2RADF(70.0f));
RNA_def_int(ot->srna, "thickness", 5, 1, 100, "Thickness", "", 1, 100);
RNA_def_boolean(ot->srna, "seams", 0, "Only Seam Edges", "Convert only seam edges");
RNA_def_boolean(ot->srna, "faces", 1, "Export Faces", "Export faces as filled strokes");
RNA_def_float_distance(ot->srna,
"offset",
0.01f,
0.0,
OBJECT_ADD_SIZE_MAXF,
"Stroke Offset",
"Offset strokes from fill",
0.0,
100.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
}
Cleanup: use doxy sections for object_add.c
2019-05-16 14:03:31 +10:00
/** \} */
/* -------------------------------------------------------------------- */
/** \name Duplicate Object Operator
* \{ */
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
Cleanup: strip trailing space in editors
2018-06-04 09:31:30 +02:00
/*
style cleanup - use aligned * prefixed blocks for descriptive comments (was already used a lot and part of proposed style guide).
2012-03-03 16:31:46 +00:00
* dupflag: a flag made from constants declared in DNA_userdef_types.h
Cleanup: comments (long lines) in editors
2019-04-22 00:18:34 +10:00
* The flag tells adduplicate() whether to copy data linked to the object,
* or to reference the existing data.
style cleanup - use aligned * prefixed blocks for descriptive comments (was already used a lot and part of proposed style guide).
2012-03-03 16:31:46 +00:00
* U.dupflag for default operations or you can construct a flag as python does
Cleanup: comments (long lines) in editors
2019-04-22 00:18:34 +10:00
* if the dupflag is 0 then no data will be copied (linked duplicate). */
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
/* used below, assumes id.new is correct */
/* leaves selection of base/object unaltered */
Cleanup id->newid usage, initial work. This aims at always ensuring that ID.newid (and relevant LIB_TAG_NEW) stay in clean (i.e. cleared) state by default. To achieve this, instead of clearing after all id copy call (would be horribly noisy, and bad for performances), we try to completely remove the setting of id->newid by default when copying a new ID. This implies that areas actually needing that info (mainly, object editing area (make single user...) and make local area) have to ensure they set it themselves as needed. This is far from simple change, many complex code paths to consider, so will need some serious testing. :/
2016-11-30 15:25:54 +01:00
/* Does set ID->newid pointers. */
Refactor duplicate of data-blocks. Main change from user side, besides that all pointers should now be properly remapped to new IDs, is that linked objects are no longer preserved when doing a full copy of scenes. Will open a task to check whether we actually still want that behavior (and re-code it in a more correct way then). This is the main part of work done here, it aims at uniformizing and sanitizing that 'deep copy' process for supported IDs (currently scenes, collections and objects). Note that there will be more follow up commits after that one, but this should be the most risky and changing one.
2020-06-17 15:02:04 +02:00
static Base *object_add_duplicate_internal(Main *bmain,
Scene *scene,
ViewLayer *view_layer,
Object *ob,
const eDupli_ID_Flags dupflag,
const eLibIDDuplicateFlags duplicate_options)
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
{
Fix crash when drag&drop invisible object from outliner to viewport This is not the issue actually mentioned there. However it is the most serious one. Now if the object being dragged was not in a collection linked in the viewlayer or invisible, we add it to the active collection (or create one if necessary). This is related to T50967, which is now fully fixed.
2018-01-25 09:26:15 -02:00
Base *base, *basen = NULL;
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
Object *obn;
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Remove workspace object mode, reverts changes w/ 2.8 This caused too many problems syncing object modes with multiple objects/windows/workspaces, see: D3130 for details.
2018-04-05 18:20:27 +02:00
if (ob->mode & OB_MODE_POSE) {
Cleanup: empty expression statement warning
2019-04-02 17:54:04 +11:00
/* nothing? */
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
}
Remove workspace object mode, reverts changes w/ 2.8 This caused too many problems syncing object modes with multiple objects/windows/workspaces, see: D3130 for details.
2018-04-05 18:20:27 +02:00
else {
Refactor duplicate of data-blocks. Main change from user side, besides that all pointers should now be properly remapped to new IDs, is that linked objects are no longer preserved when doing a full copy of scenes. Will open a task to check whether we actually still want that behavior (and re-code it in a more correct way then). This is the main part of work done here, it aims at uniformizing and sanitizing that 'deep copy' process for supported IDs (currently scenes, collections and objects). Note that there will be more follow up commits after that one, but this should be the most risky and changing one.
2020-06-17 15:02:04 +02:00
obn = ID_NEW_SET(ob, BKE_object_duplicate(bmain, ob, dupflag, duplicate_options));
Depsgraph: Remove duplicated sets of recalc/update flags There were at least three copies of those: - OB_RECALC* family of flags, which are rudiment of an old dependency graph system. - PSYS_RECALC* which were used by old dependency graph system as a separate set since the graph itself did not handle particle systems. - DEG_TAG_* which was used to tag IDs. Now there is a single set, which defines what can be tagged and queried for an update. It also has some aggregate flags to make queries simpler. Lets once and for all solve the madness of those flags, stick to a single set, which will not overlap with anything or require any extra conversion. Technically, shouldn't be measurable user difference, but some of the agregate flags for few dependency graph components did change. Fixes T58632: Particle don't update rotation settings
2018-12-06 17:52:37 +01:00
DEG_id_tag_update(&obn->id, ID_RECALC_TRANSFORM | ID_RECALC_GEOMETRY);
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Fix crash when drag&drop invisible object from outliner to viewport This is not the issue actually mentioned there. However it is the most serious one. Now if the object being dragged was not in a collection linked in the viewlayer or invisible, we add it to the active collection (or create one if necessary). This is related to T50967, which is now fully fixed.
2018-01-25 09:26:15 -02:00
base = BKE_view_layer_base_find(view_layer, ob);
Local Collections: Allow users to show hidden collections Users now can turn on in a viewport collections that are temporarily hidden (eye) in the view layer. Design task: T61327 As for the implementation, I had to decouple the visibility in the depsgraph from the visibility in the view layer. Also there is a "bug" that in a way was there before which is some operators (e.g., writing a text inside of a text object, tab into edit mode) run regardless of the visibility of the active object. The bug was present already (with object type visibility restriction) in 2.80 so if we decide to tackle it, can be done separately (I have a patch for it though P1132). Reviewed by: brecht (thank you) Differential Revision: D5992
2019-10-03 19:22:36 -03:00
if ((base != NULL) && (base->flag & BASE_VISIBLE_DEPSGRAPH)) {
Collections and groups unification OVERVIEW * In 2.7 terminology, all layers and groups are now collection datablocks. * These collections are nestable, linkable, instanceable, overrideable, .. which opens up new ways to set up scenes and link + override data. * Viewport/render visibility and selectability are now a part of the collection and shared across all view layers and linkable. * View layers define which subset of the scene collection hierarchy is excluded for each. For many workflows one view layer can be used, these are more of an advanced feature now. OUTLINER * The outliner now has a "View Layer" display mode instead of "Collections", which can display the collections and/or objects in the view layer. * In this display mode, collections can be excluded with the right click menu. These will then be greyed out and their objects will be excluded. * To view collections not linked to any scene, the "Blender File" display mode can be used, with the new filtering option to just see Colleciton datablocks. * The outliner right click menus for collections and objects were reorganized. * Drag and drop still needs to be improved. Like before, dragging the icon or text gives different results, we'll unify this later. LINKING AND OVERRIDES * Collections can now be linked into the scene without creating an instance, with the link/append operator or from the collections view in the outliner. * Collections can get static overrides with the right click menu in the outliner, but this is rather unreliable and not clearly communicated at the moment. * We still need to improve the make override operator to turn collection instances into collections with overrides directly in the scene. PERFORMANCE * We tried to make performance not worse than before and improve it in some cases. The main thing that's still a bit slower is multiple scenes, we have to change the layer syncing to only updated affected scenes. * Collections keep a list of their parent collections for faster incremental updates in syncing and caching. * View layer bases are now in a object -> base hash to avoid quadratic time lookups internally and in API functions like visible_get(). VERSIONING * Compatibility with 2.7 files should be improved due to the new visibility controls. Of course users may not want to set up their scenes differently now to avoid having separate layers and groups. * Compatibility with 2.8 is mostly there, and was tested on Eevee demo and Hero files. There's a few things which are know to be not quite compatible, like nested layer collections inside groups. * The versioning code for 2.8 files is quite complicated, and isolated behind #ifdef so it can be removed at the end of the release cycle. KNOWN ISSUES * The G-key group operators in the 3D viewport were left mostly as is, they need to be modified still to fit better. * Same for the groups panel in the object properties. This needs to be updated still, or perhaps replaced by something better. * Collections must all have a unique name. Less restrictive namespacing is to be done later, we'll have to see how important this is as all objects within the collections must also have a unique name anyway. * Full scene copy and delete scene are exactly doing the right thing yet. Differential Revision: https://developer.blender.org/D3383 https://code.blender.org/2018/05/collections-and-groups/
2018-04-30 15:57:22 +02:00
BKE_collection_object_add_from(bmain, scene, ob, obn);
Fix crash when drag&drop invisible object from outliner to viewport This is not the issue actually mentioned there. However it is the most serious one. Now if the object being dragged was not in a collection linked in the viewlayer or invisible, we add it to the active collection (or create one if necessary). This is related to T50967, which is now fully fixed.
2018-01-25 09:26:15 -02:00
}
else {
Collections and groups unification OVERVIEW * In 2.7 terminology, all layers and groups are now collection datablocks. * These collections are nestable, linkable, instanceable, overrideable, .. which opens up new ways to set up scenes and link + override data. * Viewport/render visibility and selectability are now a part of the collection and shared across all view layers and linkable. * View layers define which subset of the scene collection hierarchy is excluded for each. For many workflows one view layer can be used, these are more of an advanced feature now. OUTLINER * The outliner now has a "View Layer" display mode instead of "Collections", which can display the collections and/or objects in the view layer. * In this display mode, collections can be excluded with the right click menu. These will then be greyed out and their objects will be excluded. * To view collections not linked to any scene, the "Blender File" display mode can be used, with the new filtering option to just see Colleciton datablocks. * The outliner right click menus for collections and objects were reorganized. * Drag and drop still needs to be improved. Like before, dragging the icon or text gives different results, we'll unify this later. LINKING AND OVERRIDES * Collections can now be linked into the scene without creating an instance, with the link/append operator or from the collections view in the outliner. * Collections can get static overrides with the right click menu in the outliner, but this is rather unreliable and not clearly communicated at the moment. * We still need to improve the make override operator to turn collection instances into collections with overrides directly in the scene. PERFORMANCE * We tried to make performance not worse than before and improve it in some cases. The main thing that's still a bit slower is multiple scenes, we have to change the layer syncing to only updated affected scenes. * Collections keep a list of their parent collections for faster incremental updates in syncing and caching. * View layer bases are now in a object -> base hash to avoid quadratic time lookups internally and in API functions like visible_get(). VERSIONING * Compatibility with 2.7 files should be improved due to the new visibility controls. Of course users may not want to set up their scenes differently now to avoid having separate layers and groups. * Compatibility with 2.8 is mostly there, and was tested on Eevee demo and Hero files. There's a few things which are know to be not quite compatible, like nested layer collections inside groups. * The versioning code for 2.8 files is quite complicated, and isolated behind #ifdef so it can be removed at the end of the release cycle. KNOWN ISSUES * The G-key group operators in the 3D viewport were left mostly as is, they need to be modified still to fit better. * Same for the groups panel in the object properties. This needs to be updated still, or perhaps replaced by something better. * Collections must all have a unique name. Less restrictive namespacing is to be done later, we'll have to see how important this is as all objects within the collections must also have a unique name anyway. * Full scene copy and delete scene are exactly doing the right thing yet. Differential Revision: https://developer.blender.org/D3383 https://code.blender.org/2018/05/collections-and-groups/
2018-04-30 15:57:22 +02:00
LayerCollection *layer_collection = BKE_layer_collection_get_active(view_layer);
BKE_collection_object_add(bmain, layer_collection->collection, obn);
Fix crash when drag&drop invisible object from outliner to viewport This is not the issue actually mentioned there. However it is the most serious one. Now if the object being dragged was not in a collection linked in the viewlayer or invisible, we add it to the active collection (or create one if necessary). This is related to T50967, which is now fully fixed.
2018-01-25 09:26:15 -02:00
}
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Cleanup: Rename ViewLayer *sl > ViewLayer *view_layer
2017-11-23 13:51:49 -02:00
basen = BKE_view_layer_base_find(view_layer, obn);
Fix T60432: Blender crashes when dragging objects from other scene from outliner.
2019-01-31 11:02:51 +01:00
if (base != NULL) {
basen->local_view_bits = base->local_view_bits;
}
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Collections and groups unification OVERVIEW * In 2.7 terminology, all layers and groups are now collection datablocks. * These collections are nestable, linkable, instanceable, overrideable, .. which opens up new ways to set up scenes and link + override data. * Viewport/render visibility and selectability are now a part of the collection and shared across all view layers and linkable. * View layers define which subset of the scene collection hierarchy is excluded for each. For many workflows one view layer can be used, these are more of an advanced feature now. OUTLINER * The outliner now has a "View Layer" display mode instead of "Collections", which can display the collections and/or objects in the view layer. * In this display mode, collections can be excluded with the right click menu. These will then be greyed out and their objects will be excluded. * To view collections not linked to any scene, the "Blender File" display mode can be used, with the new filtering option to just see Colleciton datablocks. * The outliner right click menus for collections and objects were reorganized. * Drag and drop still needs to be improved. Like before, dragging the icon or text gives different results, we'll unify this later. LINKING AND OVERRIDES * Collections can now be linked into the scene without creating an instance, with the link/append operator or from the collections view in the outliner. * Collections can get static overrides with the right click menu in the outliner, but this is rather unreliable and not clearly communicated at the moment. * We still need to improve the make override operator to turn collection instances into collections with overrides directly in the scene. PERFORMANCE * We tried to make performance not worse than before and improve it in some cases. The main thing that's still a bit slower is multiple scenes, we have to change the layer syncing to only updated affected scenes. * Collections keep a list of their parent collections for faster incremental updates in syncing and caching. * View layer bases are now in a object -> base hash to avoid quadratic time lookups internally and in API functions like visible_get(). VERSIONING * Compatibility with 2.7 files should be improved due to the new visibility controls. Of course users may not want to set up their scenes differently now to avoid having separate layers and groups. * Compatibility with 2.8 is mostly there, and was tested on Eevee demo and Hero files. There's a few things which are know to be not quite compatible, like nested layer collections inside groups. * The versioning code for 2.8 files is quite complicated, and isolated behind #ifdef so it can be removed at the end of the release cycle. KNOWN ISSUES * The G-key group operators in the 3D viewport were left mostly as is, they need to be modified still to fit better. * Same for the groups panel in the object properties. This needs to be updated still, or perhaps replaced by something better. * Collections must all have a unique name. Less restrictive namespacing is to be done later, we'll have to see how important this is as all objects within the collections must also have a unique name anyway. * Full scene copy and delete scene are exactly doing the right thing yet. Differential Revision: https://developer.blender.org/D3383 https://code.blender.org/2018/05/collections-and-groups/
2018-04-30 15:57:22 +02:00
/* 1) duplis should end up in same collection as the original
* 2) Rigid Body sim participants MUST always be part of a collection...
rigidbody: Add rigid body simulation Add operators to add/remove rigid body world and objects. Add UI scripts. The rigid body simulation works on scene level and overrides the position/orientation of rigid bodies when active. It does not deform meshes or generate data so there is no modifier. Usage: * Add rigid body world in the scene tab * Create a group * Add objects to the group * Assign group to the rigid body world * Play animation For convenience the rigid body tools operators in the tools panel of the 3d view will add a world, group and add objects to the group automatically so you only have to press one button to add/remove rigid bodies to the simulation. Part of GSoC 2010 and 2012. Authors: Joshua Leung (aligorith), Sergej Reich (sergof)
2013-01-23 05:56:44 +00:00
*/
/* XXX: is 2) really a good measure here? */
Collections and groups unification OVERVIEW * In 2.7 terminology, all layers and groups are now collection datablocks. * These collections are nestable, linkable, instanceable, overrideable, .. which opens up new ways to set up scenes and link + override data. * Viewport/render visibility and selectability are now a part of the collection and shared across all view layers and linkable. * View layers define which subset of the scene collection hierarchy is excluded for each. For many workflows one view layer can be used, these are more of an advanced feature now. OUTLINER * The outliner now has a "View Layer" display mode instead of "Collections", which can display the collections and/or objects in the view layer. * In this display mode, collections can be excluded with the right click menu. These will then be greyed out and their objects will be excluded. * To view collections not linked to any scene, the "Blender File" display mode can be used, with the new filtering option to just see Colleciton datablocks. * The outliner right click menus for collections and objects were reorganized. * Drag and drop still needs to be improved. Like before, dragging the icon or text gives different results, we'll unify this later. LINKING AND OVERRIDES * Collections can now be linked into the scene without creating an instance, with the link/append operator or from the collections view in the outliner. * Collections can get static overrides with the right click menu in the outliner, but this is rather unreliable and not clearly communicated at the moment. * We still need to improve the make override operator to turn collection instances into collections with overrides directly in the scene. PERFORMANCE * We tried to make performance not worse than before and improve it in some cases. The main thing that's still a bit slower is multiple scenes, we have to change the layer syncing to only updated affected scenes. * Collections keep a list of their parent collections for faster incremental updates in syncing and caching. * View layer bases are now in a object -> base hash to avoid quadratic time lookups internally and in API functions like visible_get(). VERSIONING * Compatibility with 2.7 files should be improved due to the new visibility controls. Of course users may not want to set up their scenes differently now to avoid having separate layers and groups. * Compatibility with 2.8 is mostly there, and was tested on Eevee demo and Hero files. There's a few things which are know to be not quite compatible, like nested layer collections inside groups. * The versioning code for 2.8 files is quite complicated, and isolated behind #ifdef so it can be removed at the end of the release cycle. KNOWN ISSUES * The G-key group operators in the 3D viewport were left mostly as is, they need to be modified still to fit better. * Same for the groups panel in the object properties. This needs to be updated still, or perhaps replaced by something better. * Collections must all have a unique name. Less restrictive namespacing is to be done later, we'll have to see how important this is as all objects within the collections must also have a unique name anyway. * Full scene copy and delete scene are exactly doing the right thing yet. Differential Revision: https://developer.blender.org/D3383 https://code.blender.org/2018/05/collections-and-groups/
2018-04-30 15:57:22 +02:00
if (ob->rigidbody_object || ob->rigidbody_constraint) {
Collection *collection;
Cleanup: use plural names for Main lists Convention was not to but after discussion on 918941483f7e we agree its best to change the convention. Names now mostly follow RNA. Some exceptions: - Use 'nodetrees' instead of 'nodegroups' since the struct is called NodeTree. - Use 'gpencils' instead of 'grease_pencil' since 'gpencil' is a common abbreviation in the C code. Other exceptions: - Leave 'wm' as it's a list of one. - Leave 'ipo' as is for versioning.
2019-03-08 09:29:17 +11:00
for (collection = bmain->collections.first; collection; collection = collection->id.next) {
Cleanup: style, use braces for editors
2019-04-22 09:19:45 +10:00
if (BKE_collection_has_object(collection, ob)) {
Collections and groups unification OVERVIEW * In 2.7 terminology, all layers and groups are now collection datablocks. * These collections are nestable, linkable, instanceable, overrideable, .. which opens up new ways to set up scenes and link + override data. * Viewport/render visibility and selectability are now a part of the collection and shared across all view layers and linkable. * View layers define which subset of the scene collection hierarchy is excluded for each. For many workflows one view layer can be used, these are more of an advanced feature now. OUTLINER * The outliner now has a "View Layer" display mode instead of "Collections", which can display the collections and/or objects in the view layer. * In this display mode, collections can be excluded with the right click menu. These will then be greyed out and their objects will be excluded. * To view collections not linked to any scene, the "Blender File" display mode can be used, with the new filtering option to just see Colleciton datablocks. * The outliner right click menus for collections and objects were reorganized. * Drag and drop still needs to be improved. Like before, dragging the icon or text gives different results, we'll unify this later. LINKING AND OVERRIDES * Collections can now be linked into the scene without creating an instance, with the link/append operator or from the collections view in the outliner. * Collections can get static overrides with the right click menu in the outliner, but this is rather unreliable and not clearly communicated at the moment. * We still need to improve the make override operator to turn collection instances into collections with overrides directly in the scene. PERFORMANCE * We tried to make performance not worse than before and improve it in some cases. The main thing that's still a bit slower is multiple scenes, we have to change the layer syncing to only updated affected scenes. * Collections keep a list of their parent collections for faster incremental updates in syncing and caching. * View layer bases are now in a object -> base hash to avoid quadratic time lookups internally and in API functions like visible_get(). VERSIONING * Compatibility with 2.7 files should be improved due to the new visibility controls. Of course users may not want to set up their scenes differently now to avoid having separate layers and groups. * Compatibility with 2.8 is mostly there, and was tested on Eevee demo and Hero files. There's a few things which are know to be not quite compatible, like nested layer collections inside groups. * The versioning code for 2.8 files is quite complicated, and isolated behind #ifdef so it can be removed at the end of the release cycle. KNOWN ISSUES * The G-key group operators in the 3D viewport were left mostly as is, they need to be modified still to fit better. * Same for the groups panel in the object properties. This needs to be updated still, or perhaps replaced by something better. * Collections must all have a unique name. Less restrictive namespacing is to be done later, we'll have to see how important this is as all objects within the collections must also have a unique name anyway. * Full scene copy and delete scene are exactly doing the right thing yet. Differential Revision: https://developer.blender.org/D3383 https://code.blender.org/2018/05/collections-and-groups/
2018-04-30 15:57:22 +02:00
BKE_collection_object_add(bmain, collection, obn);
Cleanup: style, use braces for editors
2019-04-22 09:19:45 +10: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
}
}
}
return basen;
}
Cleanup: Rename ViewLayer *sl > ViewLayer *view_layer
2017-11-23 13:51:49 -02:00
Base *ED_object_add_duplicate(
Cleanup: use explicit enum type for duplicate option of `BKE_object_duplicate` Using enum type itself in implementations, and uint in headers (as using enums types in headers is a pain when enum are not defined and used in a single same header file...).
2020-06-16 17:14:50 +02:00
Main *bmain, Scene *scene, ViewLayer *view_layer, Base *base, const eDupli_ID_Flags dupflag)
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
{
Base *basen;
Fix #19736: GLSL viewport materials are not updated on all changes.
2010-02-13 13:49:27 +00:00
Object *ob;
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
Fix T90840: Can't duplicate or copy (Ctrl-C) object from linked file. We need to separate the flag telling duplicate code to not handle remapping to new IDs etc., from the one telling the code that we are currently duplicating a 'root' ID (i.e. not a dependency of another duplicated ID). This whole duplicate code/logic is still fairly unsatisfying, think it will need further refactor, or maybe even re-design, at some point...
2021-08-24 12:23:39 +02:00
basen = object_add_duplicate_internal(bmain,
scene,
view_layer,
base->object,
dupflag,
LIB_ID_DUPLICATE_IS_SUBPROCESS |
LIB_ID_DUPLICATE_IS_ROOT_ID);
Check result of object_add_duplicate_internal() before using it. This prevents segmentation fault when object in pose mode is duplicating.
2010-03-27 10:43:04 +00:00
if (basen == NULL) {
return NULL;
}
style cleanup: editors / mesh & object
2012-04-28 15:42:27 +00:00
ob = basen->object;
Check result of object_add_duplicate_internal() before using it. This prevents segmentation fault when object in pose mode is duplicating.
2010-03-27 10:43:04 +00:00
Fix T92629: Crash on mesh separate after rB43bc494892c3. rB43bc494892c3 switched `BKE_libblock_relink_to_newid` to use new ID remapping and libquery code. However, that new code does protect by default against remapping an objects's data pointer when that object is in Edit mode, since this is not a behavior that generic BKE code can handle (due to required editing data for most obdata types when in edit mode). So specific code that does create new IDs and need remapping in Edit mode has to pass specific exception flags to remaping code. This commit adds those remapping flags to `BKE_libblock_relink_to_newid` and add said exception flag to the remapping call from `ED_object_add_duplicate` when the object is in edit mode.
2021-11-01 15:19:17 +01:00
/* Link own references to the newly duplicated data T26816.
* Note that this function can be called from edit-mode code, in which case we may have to
* enforce remapping obdata (by default this is forbidden in edit mode). */
const int remap_flag = BKE_object_is_in_editmode(ob) ? ID_REMAP_FORCE_OBDATA_IN_EDITMODE : 0;
BKE_libblock_relink_to_newid(bmain, &ob->id, remap_flag);
fix [#26816] P(separate) an object messes up logic brick links
2011-04-07 08:23:00 +00:00
Dependency Graph: some refactoring which should have no user visible impact besides performance in some cases. * DAG_scene_sort is now removed and replaced by DAG_relations_tag_update in most cases. This will clear the dependency graph, and only rebuild it right before it's needed again when the scene is re-evaluated. This is done because DAG_scene_sort is slow when called many times from python operators. Further the scene argument is not needed because most operations can potentially affect more than the current scene. * DAG_scene_relations_update will now rebuild the dependency graph if it's not there yet, and DAG_scene_relations_rebuild will force a rebuild for the rare cases that need it. * Remove various places where ob->recalc was set manually. This should go through DAG_id_tag_update() in nearly all cases instead since this is now a fast operation. Also removed DAG_ids_flush_update that goes along with such manual tagging of ob->recalc.
2013-02-21 19:33:04 +00:00
/* DAG_relations_tag_update(bmain); */ /* caller must do */
fix for separate loose parts doing full depsgraph rebuild for every object split off.
2012-07-19 10:23:25 +00:00
Depsgraph: Don't call DEG ID update functions directly There might be much more logic involved there, also we might not know proper evaluated CoW pointer there yet. So we leave this to dependency graph to decide what exactly to do here.
2017-11-28 12:13:07 +01:00
if (ob->data != NULL) {
Depsgraph: Remove duplicated sets of recalc/update flags There were at least three copies of those: - OB_RECALC* family of flags, which are rudiment of an old dependency graph system. - PSYS_RECALC* which were used by old dependency graph system as a separate set since the graph itself did not handle particle systems. - DEG_TAG_* which was used to tag IDs. Now there is a single set, which defines what can be tagged and queried for an update. It also has some aggregate flags to make queries simpler. Lets once and for all solve the madness of those flags, stick to a single set, which will not overlap with anything or require any extra conversion. Technically, shouldn't be measurable user difference, but some of the agregate flags for few dependency graph components did change. Fixes T58632: Particle don't update rotation settings
2018-12-06 17:52:37 +01:00
DEG_id_tag_update_ex(bmain, (ID *)ob->data, ID_RECALC_EDITORS);
fix for crash adding empty object
2011-11-29 01:05:26 +00:00
}
Check result of object_add_duplicate_internal() before using it. This prevents segmentation fault when object in pose mode is duplicating.
2010-03-27 10:43:04 +00:00
Cleanup: rename BKE_main_id_{clear_newpoins => newptr_and_tag_clear} It wasn't obvious this function cleared the tag as well.
2021-05-27 22:44:02 +10:00
BKE_main_id_newptr_and_tag_clear(bmain);
Cleanup id->newid usage, initial work. This aims at always ensuring that ID.newid (and relevant LIB_TAG_NEW) stay in clean (i.e. cleared) state by default. To achieve this, instead of clearing after all id copy call (would be horribly noisy, and bad for performances), we try to completely remove the setting of id->newid by default when copying a new ID. This implies that areas actually needing that info (mainly, object editing area (make single user...) and make local area) have to ensure they set it themselves as needed. This is far from simple change, many complex code paths to consider, so will need some serious testing. :/
2016-11-30 15:25:54 +01: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
return basen;
}
/* contextual operator dupli */
static int duplicate_exec(bContext *C, wmOperator *op)
{
style cleanup: editors / mesh & object
2012-04-28 15:42:27 +00:00
Main *bmain = CTX_data_main(C);
Scene *scene = CTX_data_scene(C);
Cleanup: Rename ViewLayer *sl > ViewLayer *view_layer
2017-11-23 13:51:49 -02:00
ViewLayer *view_layer = CTX_data_view_layer(C);
Code cleanup: use bools where possible
2014-02-03 18:55:59 +11:00
const bool linked = RNA_boolean_get(op->ptr, "linked");
Cleanup: use explicit enum type for duplicate option of `BKE_object_duplicate` Using enum type itself in implementations, and uint in headers (as using enums types in headers is a pain when enum are not defined and used in a single same header file...).
2020-06-16 17:14:50 +02:00
const eDupli_ID_Flags dupflag = (linked) ? 0 : (eDupli_ID_Flags)U.dupflag;
Some effect-less code cleanup...
2012-10-05 07:05:52 +00:00
Fix T78330: Duplicating parented objects does not preserve relationships. Caused by refactor of duplicate code in rBad6cccf058d0, we need to take into account the duplication of groups of objects here too...
2020-07-01 17:10:30 +02:00
/* We need to handle that here ourselves, because we may duplicate several objects, in which case
* we also want to remap pointers between those... */
Cleanup: rename BKE_main_id_{clear_newpoins => newptr_and_tag_clear} It wasn't obvious this function cleared the tag as well.
2021-05-27 22:44:02 +10:00
BKE_main_id_newptr_and_tag_clear(bmain);
Fix T78330: Duplicating parented objects does not preserve relationships. Caused by refactor of duplicate code in rBad6cccf058d0, we need to take into account the duplication of groups of objects here too...
2020-07-01 17:10:30 +02:00
fix regression since early 2.5x, there was no way to copy library linked objects.
2013-06-28 19:33:58 +00:00
CTX_DATA_BEGIN (C, Base *, base, selected_bases) {
Fix T90840: Can't duplicate or copy (Ctrl-C) object from linked file. We need to separate the flag telling duplicate code to not handle remapping to new IDs etc., from the one telling the code that we are currently duplicating a 'root' ID (i.e. not a dependency of another duplicated ID). This whole duplicate code/logic is still fairly unsatisfying, think it will need further refactor, or maybe even re-design, at some point...
2021-08-24 12:23:39 +02:00
Base *basen = object_add_duplicate_internal(bmain,
scene,
view_layer,
base->object,
dupflag,
LIB_ID_DUPLICATE_IS_SUBPROCESS |
LIB_ID_DUPLICATE_IS_ROOT_ID);
Some effect-less code cleanup...
2012-10-05 07:05: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
/* note that this is safe to do with this context iterator,
style cleanup - use aligned * prefixed blocks for descriptive comments (was already used a lot and part of proposed style guide).
2012-03-03 16:31:46 +00:00
* the list is made in advance */
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
ED_object_base_select(base, BA_DESELECT);
Fix all objects being selected when opening pre-2.80 files Caused by rBe87ddda149b. Selecting objects shouldn't be done in such a low level function anyway (IMHO). Made sure duplicating objects still works correctly.
2017-05-05 19:28:02 +02:00
ED_object_base_select(basen, BA_SELECT);
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
Check result of object_add_duplicate_internal() before using it. This prevents segmentation fault when object in pose mode is duplicating.
2010-03-27 10:43:04 +00:00
if (basen == NULL) {
continue;
}
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
/* new object becomes active */
Cleanup: style, use braces for editors
2019-04-22 09:19:45 +10:00
if (BASACT(view_layer) == base) {
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
ED_object_base_activate(C, basen);
Cleanup: style, use braces for editors
2019-04-22 09:19:45 +10:00
}
fix for crash on missing NULL check, Brecht, changed this to update the duplicate objects data rather then the old ones incase they are not linked.
2010-12-07 00:48:36 +00:00
style cleanup: follow style guide for formatting of if/for/while loops, and else if's
2012-03-24 06:38:07 +00:00
if (basen->object->data) {
Replace all old DAG calls with direct calls to new DEG and remove BKE_depsgraph.h This removes BKE_depsgraph.h and depsgraph.c
2017-06-08 10:14:53 +02:00
DEG_id_tag_update(basen->object->data, 0);
fix for crash on missing NULL check, Brecht, changed this to update the duplicate objects data rather then the old ones incase they are not linked.
2010-12-07 00:48:36 +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
}
CTX_DATA_END;
Fix T78330: Duplicating parented objects does not preserve relationships. Caused by refactor of duplicate code in rBad6cccf058d0, we need to take into account the duplication of groups of objects here too...
2020-07-01 17:10:30 +02:00
/* Note that this will also clear newid pointers and tags. */
Fix T46386: Duplicate fails updating driver links Duplicate wasn't updating links, so duplicatinvg a objects would still point to the originals for curve-taper, texmesh, drivers. Use generic id-looper to handle replacing data.
2015-10-08 20:29:49 +11:00
copy_object_set_idnew(C);
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
Fix T72449: Stale outliner selection after object duplicate
2020-01-27 16:57:48 +11:00
ED_outliner_select_sync_from_object_tag(C);
Replace all old DAG calls with direct calls to new DEG and remove BKE_depsgraph.h This removes BKE_depsgraph.h and depsgraph.c
2017-06-08 10:14:53 +02:00
DEG_relations_tag_update(bmain);
Depsgraph: Remove duplicated sets of recalc/update flags There were at least three copies of those: - OB_RECALC* family of flags, which are rudiment of an old dependency graph system. - PSYS_RECALC* which were used by old dependency graph system as a separate set since the graph itself did not handle particle systems. - DEG_TAG_* which was used to tag IDs. Now there is a single set, which defines what can be tagged and queried for an update. It also has some aggregate flags to make queries simpler. Lets once and for all solve the madness of those flags, stick to a single set, which will not overlap with anything or require any extra conversion. Technically, shouldn't be measurable user difference, but some of the agregate flags for few dependency graph components did change. Fixes T58632: Particle don't update rotation settings
2018-12-06 17:52:37 +01:00
DEG_id_tag_update(&scene->id, ID_RECALC_COPY_ON_WRITE | ID_RECALC_SELECT);
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
style cleanup: editors / mesh & object
2012-04-28 15:42:27 +00:00
WM_event_add_notifier(C, NC_SCENE | ND_OB_SELECT, scene);
Outliner: Avoid rebuilding tree on selection/active changes We can avoid the rather expensive outliner tree rebuilds and only redraw if nothing but the selection or active item changes. This should give a bit of speedup for heavy scenes. For this to work I had to correct a few notifiers, some were only sending selection/active change notifiers that actually did things like adding objects. I also added a more precise notifier type for when the active collection changes. At the notifier subtype/action level we're not even close to running out of bits, so this should be fine. Also had to correct a wrong notifier check (was using `&` rather than `==`).
2020-08-20 20:17:00 +02:00
WM_event_add_notifier(C, NC_SCENE | ND_LAYER_CONTENT, scene);
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
return OPERATOR_FINISHED;
}
void OBJECT_OT_duplicate(wmOperatorType *ot)
{
Removed non working operator options from the 'redo' user interface. This cleans up things like transform and duplicate a lot, which previously exposed lots of options that didn't work with tweaking.
2010-06-06 15:38:50 +00:00
PropertyRNA *prop;
Some effect-less code cleanup...
2012-10-05 07:05: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
/* identifiers */
style cleanup: spaces aroudn operators for operator definitions.
2012-03-22 07:26:09 +00:00
ot->name = "Duplicate Objects";
batch remove .'s used with RNA_def_struct_ui_text
2010-02-10 21:15:44 +00:00
ot->description = "Duplicate selected objects";
style cleanup: spaces aroudn operators for operator definitions.
2012-03-22 07:26:09 +00:00
ot->idname = "OBJECT_OT_duplicate";
Some effect-less code cleanup...
2012-10-05 07:05: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
/* api callbacks */
style cleanup: spaces aroudn operators for operator definitions.
2012-03-22 07:26:09 +00:00
ot->exec = duplicate_exec;
ot->poll = ED_operator_objectmode;
Some effect-less code cleanup...
2012-10-05 07:05: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
/* flags */
style cleanup: editors / mesh & object
2012-04-28 15:42:27 +00:00
ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
Some effect-less code cleanup...
2012-10-05 07:05: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
/* to give to transform */
Fix T65490: linked property in object duplicate should not persist These things are somewhat arbitrary, but since there are separate shortcuts and menu entries this seems the more expected behavior.
2019-06-06 06:37:35 +02:00
prop = RNA_def_boolean(ot->srna,
"linked",
0,
"Linked",
"Duplicate object but not object data, linking to the original data");
RNA_def_property_flag(prop, PROP_SKIP_SAVE);
Cleanup: use `rna_enum_` prefix for RNA enums Definitions could shadow local vars.
2015-11-23 13:49:52 +11:00
prop = RNA_def_enum(
ot->srna, "mode", rna_enum_transform_mode_types, TFM_TRANSLATION, "Mode", "");
Removed non working operator options from the 'redo' user interface. This cleans up things like transform and duplicate a lot, which previously exposed lots of options that didn't work with tweaking.
2010-06-06 15:38:50 +00:00
RNA_def_property_flag(prop, PROP_HIDDEN);
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
}
Cleanup: use doxy sections for object_add.c
2019-05-16 14:03:31 +10:00
/** \} */
/* -------------------------------------------------------------------- */
/** \name Add Named Object Operator
*
Cleanup: spelling, repeated words
2019-11-25 00:55:11 +11:00
* Use for drag & drop.
Cleanup: use doxy sections for object_add.c
2019-05-16 14:03:31 +10: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
Cleanup: name mesh join functions using ED_{type} prefix
2020-06-17 17:07:11 +10:00
static int object_add_named_exec(bContext *C, wmOperator *op)
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
{
style cleanup: editors / mesh & object
2012-04-28 15:42:27 +00:00
Main *bmain = CTX_data_main(C);
Scene *scene = CTX_data_scene(C);
Cleanup: Rename ViewLayer *sl > ViewLayer *view_layer
2017-11-23 13:51:49 -02:00
ViewLayer *view_layer = CTX_data_view_layer(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
Base *basen;
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
Object *ob;
Drop object assets and associated objects at the cursor location When dropping asset objects, place them under the mouse-cursor along with any other objects they link in. Ref D12935 Reviewed By: Severin
2021-10-27 04:19:45 +11:00
const bool linked = RNA_boolean_get(op->ptr, "linked");
Cleanup: use explicit enum type for duplicate option of `BKE_object_duplicate` Using enum type itself in implementations, and uint in headers (as using enums types in headers is a pain when enum are not defined and used in a single same header file...).
2020-06-16 17:14:50 +02:00
const eDupli_ID_Flags dupflag = (linked) ? 0 : (eDupli_ID_Flags)U.dupflag;
style cleanup: editors / mesh & object
2012-04-28 15:42:27 +00:00
char name[MAX_ID_NAME - 2];
Check result of object_add_duplicate_internal() before using it. This prevents segmentation fault when object in pose mode is duplicating.
2010-03-27 10:43:04 +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
/* find object, create fake base */
RNA_string_get(op->ptr, "name", name);
Cleanup: get rid of last G.main usages in BKE library code.
2018-05-31 16:04:04 +02:00
ob = (Object *)BKE_libblock_find_name(bmain, ID_OB, name);
bpy.ops.object.add_named() doesnt provide error when failed (related to T38689)
2014-02-17 19:22:43 -03:00
if (ob == NULL) {
BKE_report(op->reports, RPT_ERROR, "Object not found");
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;
bpy.ops.object.add_named() doesnt provide error when failed (related to T38689)
2014-02-17 19:22:43 -03:00
}
Check result of object_add_duplicate_internal() before using it. This prevents segmentation fault when object in pose mode is duplicating.
2010-03-27 10:43:04 +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
/* prepare dupli */
Drop object assets and associated objects at the cursor location When dropping asset objects, place them under the mouse-cursor along with any other objects they link in. Ref D12935 Reviewed By: Severin
2021-10-27 04:19:45 +11:00
basen = object_add_duplicate_internal(
bmain,
scene,
view_layer,
ob,
dupflag,
/* Sub-process flag because the new-ID remapping (#BKE_libblock_relink_to_newid()) in this
* function will only work if the object is already linked in the view layer, which is not
* the case here. So we have to do the new-ID relinking ourselves
* (#copy_object_set_idnew()).
*/
LIB_ID_DUPLICATE_IS_SUBPROCESS | LIB_ID_DUPLICATE_IS_ROOT_ID);
Check result of object_add_duplicate_internal() before using it. This prevents segmentation fault when object in pose mode is duplicating.
2010-03-27 10:43:04 +00:00
if (basen == NULL) {
Drop object assets and associated objects at the cursor location When dropping asset objects, place them under the mouse-cursor along with any other objects they link in. Ref D12935 Reviewed By: Severin
2021-10-27 04:19:45 +11:00
BKE_report(op->reports, RPT_ERROR, "Object could not be duplicated");
Check result of object_add_duplicate_internal() before using it. This prevents segmentation fault when object in pose mode is duplicating.
2010-03-27 10:43:04 +00:00
return OPERATOR_CANCELLED;
}
Cleanup: rename restrict to hide/visibility in Object, Collection, MaskLayer This makes the internal naming consistent with the public API. And also gives us a visibility_flag rather than restrictflag that can be extended with more flags.
2021-08-04 17:46:55 +02:00
basen->object->visibility_flag &= ~OB_HIDE_VIEWPORT;
Revert "BLI: Refactor vector types & functions to use templates" Includes unwanted changes This reverts commit 46e049d0ce2bce2f53ddc41a0dbbea2969d00a5d.
2022-01-12 12:49:36 +01:00
/* Do immediately, as #copy_object_set_idnew() below operates on visible objects. */
BKE_base_eval_flags(basen);
Check result of object_add_duplicate_internal() before using it. This prevents segmentation fault when object in pose mode is duplicating.
2010-03-27 10:43:04 +00:00
UI: Deselect other objects when dragging into 3D View When dragging an object into the 3D View, e.g. from the Outliner or the Asset Browser, other objects wouldn't get deselected. That differs from what other drop operations do, which create a new object. They deselect other objects in a lower-level function, which happens to not be called for just dropping objects. So I guess this is an oversight. Old behavior was also a bit annoying because users seem to expect this to deselect.
2021-01-19 18:42:49 +01:00
/* object_add_duplicate_internal() doesn't deselect other objects, unlike object_add_common() or
* BKE_view_layer_base_deselect_all(). */
Fix all objects getting selected sometimes when droppping object If no other object was selected while dragging one in (e.g. from the Outliner or an object asset from the Asset Browser), all visible objects in the active view layer would get selected. Issue was caused by a wrong enum type use. Mistake in bcdba7c34da0.
2021-04-30 12:37:26 +02:00
ED_object_base_deselect_all(view_layer, NULL, SEL_DESELECT);
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
ED_object_base_select(basen, BA_SELECT);
ED_object_base_activate(C, basen);
Check result of object_add_duplicate_internal() before using it. This prevents segmentation fault when object in pose mode is duplicating.
2010-03-27 10:43:04 +00:00
Fix T46386: Duplicate fails updating driver links Duplicate wasn't updating links, so duplicatinvg a objects would still point to the originals for curve-taper, texmesh, drivers. Use generic id-looper to handle replacing data.
2015-10-08 20:29:49 +11:00
copy_object_set_idnew(C);
Check result of object_add_duplicate_internal() before using it. This prevents segmentation fault when object in pose mode is duplicating.
2010-03-27 10:43:04 +00:00
Fix crash when drag&drop invisible object from outliner to viewport This is not the issue actually mentioned there. However it is the most serious one. Now if the object being dragged was not in a collection linked in the viewlayer or invisible, we add it to the active collection (or create one if necessary). This is related to T50967, which is now fully fixed.
2018-01-25 09:26:15 -02:00
/* TODO(sergey): Only update relations for the current scene. */
Replace all old DAG calls with direct calls to new DEG and remove BKE_depsgraph.h This removes BKE_depsgraph.h and depsgraph.c
2017-06-08 10:14:53 +02:00
DEG_relations_tag_update(bmain);
Check result of object_add_duplicate_internal() before using it. This prevents segmentation fault when object in pose mode is duplicating.
2010-03-27 10:43:04 +00:00
Depsgraph: Remove duplicated sets of recalc/update flags There were at least three copies of those: - OB_RECALC* family of flags, which are rudiment of an old dependency graph system. - PSYS_RECALC* which were used by old dependency graph system as a separate set since the graph itself did not handle particle systems. - DEG_TAG_* which was used to tag IDs. Now there is a single set, which defines what can be tagged and queried for an update. It also has some aggregate flags to make queries simpler. Lets once and for all solve the madness of those flags, stick to a single set, which will not overlap with anything or require any extra conversion. Technically, shouldn't be measurable user difference, but some of the agregate flags for few dependency graph components did change. Fixes T58632: Particle don't update rotation settings
2018-12-06 17:52:37 +01:00
DEG_id_tag_update(&scene->id, ID_RECALC_SELECT);
Fix T50967: When you move an icon from the outliner area object doesn't show up We can't have more than one NOTE_SUBTYPE in the same notifier. This is a partial revert of: cd4d5dcb468a. In particular to the part concerning "Also fixed a missing notifier of the object instancing operator". Not only this was mixed with the original reason for the commit for no reason, but it actually introduced a bug. Bad, bad developers ;) Note: Although this commit is not needed for master, blender2.8 requires it for the forementioned bug report.
2018-01-25 09:45:13 -02:00
WM_event_add_notifier(C, NC_SCENE | ND_OB_SELECT, scene);
WM_event_add_notifier(C, NC_SCENE | ND_OB_ACTIVE, scene);
Outliner: Avoid rebuilding tree on selection/active changes We can avoid the rather expensive outliner tree rebuilds and only redraw if nothing but the selection or active item changes. This should give a bit of speedup for heavy scenes. For this to work I had to correct a few notifiers, some were only sending selection/active change notifiers that actually did things like adding objects. I also added a more precise notifier type for when the active collection changes. At the notifier subtype/action level we're not even close to running out of bits, so this should be fine. Also had to correct a wrong notifier check (was using `&` rather than `==`).
2020-08-20 20:17:00 +02:00
WM_event_add_notifier(C, NC_SCENE | ND_LAYER_CONTENT, scene);
Fix: A few missing outliner selection sync tags Add selection syncing for object add named (e.g. drag and drop from outliner to 3D view), outliner right click (a sync when the context menu is cancelled), and for object selection from Python.
2020-05-26 16:41:19 -06:00
ED_outliner_select_sync_from_object_tag(C);
Check result of object_add_duplicate_internal() before using it. This prevents segmentation fault when object in pose mode is duplicating.
2010-03-27 10:43:04 +00:00
Assets: Snapping with visual feedback while dragging The drag and drop feature of objects in 3D View has been modified to include: - Snap the object being dragged. - Visual feedback through a box and the placement tool grid. Maniphest Tasks: T90198 Differential Revision: https://developer.blender.org/D12912
2021-10-25 08:02:08 -03:00
PropertyRNA *prop_matrix = RNA_struct_find_property(op->ptr, "matrix");
if (RNA_property_is_set(op->ptr, prop_matrix)) {
Object *ob_add = basen->object;
RNA_property_float_get_array(op->ptr, prop_matrix, &ob_add->obmat[0][0]);
BKE_object_apply_mat4(ob_add, ob_add->obmat, true, true);
DEG_id_tag_update(&ob_add->id, ID_RECALC_TRANSFORM);
}
else {
int mval[2];
if (object_add_drop_xy_get(C, op, &mval)) {
ED_object_location_from_view(C, basen->object->loc);
ED_view3d_cursor3d_position(C, mval, false, basen->object->loc);
}
}
Drag and drop 2.5 integration! Finally, slashdot regulars can use Blender too now! :) ** Drag works as follows: - drag-able items are defined by the standard interface ui toolkit - each button can get this feature, via uiButSetDragXXX(but, ...). There are calls to define drag-able images, ID blocks, RNA paths, file paths, and so on. By default you drag an icon, exceptionally an ImBuf - Drag items are registered centrally in the WM, it allows more drag items simultaneous too, but not implemented ** Drop works as follows: - On mouse release, and if drag items exist in the WM, it converts the mouse event to an EVT_DROP type. This event then gets the full drag info as customdata - drop regions are defined with WM_dropbox_add(), similar to keymaps you can make a "drop map" this way, which become 'drop map handlers' in the queues. - next to that the UI kit handles some common button types (like accepting ID or names) to be catching a drop event too. - Every "drop box" has two callbacks: - poll() = check if the event drag data is relevant for this box - copy() = fill in custom properties in the dropbox to initialize an operator - The dropbox handler then calls its standard Operator with its dropbox properties. ** Currently implemented Drag items: - ID icons in browse buttons - ID icons in context menu of properties region - ID icons in outliner and rna viewer - FileBrowser icons - FileBrowser preview images Drag-able icons are subtly visualized by making them brighter a bit on mouse-over. In case the icon is a button or UI element too (most cases), the drag-able feature will make the item react to mouse-release instead of mouse-press. Drop options: - UI buttons: ID and text buttons (paste name) - View3d: Object ID drop copies object - View3d: Material ID drop assigns to object under cursor - View3d: Image ID drop assigns to object UV texture under cursor - Sequencer: Path drop will add either Image or Movie strip - Image window: Path drop will open image ** Drag and drop Notes: - Dropping into another Blender window (from same application) works too. I've added code that passes on mousemoves and clicks to other windows, without activating them though. This does make using multi-window Blender a bit friendler. - Dropping a file path to an image, is not the same as dropping an Image ID... keep this in mind. Sequencer for example wants paths to be dropped, textures in 3d window wants an Image ID. - Although drop boxes could be defined via Python, I suggest they're part of the UI and editor design (= how we want an editor to work), and not default offered configurable like keymaps. - At the moment only one item can be dragged at a time. This is for several reasons.... For one, Blender doesn't have a well defined uniform way to define "what is selected" (files, outliner items, etc). Secondly there's potential conflicts on what todo when you drop mixed drag sets on spots. All undefined stuff... nice for later. - Example to bypass the above: a collection of images that form a strip, should be represented in filewindow as a single sequence anyway. This then will fit well and gets handled neatly by design. - Another option to check is to allow multiple options per drop... it could show the operator as a sort of menu, allowing arrow or scrollwheel to choose. For time being I'd prefer to try to design a singular drop though, just offer only one drop action per data type on given spots. - What does work already, but a tad slow, is to use a function that detects an object (type) under cursor, so a drag item's option can be further refined (like drop object on object = parent). (disabled) ** More notes - Added saving for Region layouts (like split points for toolbar) - Label buttons now handle mouse over - File list: added full path entry for drop feature. - Filesel bugfix: wm_operator_exec() got called there and fully handled, while WM event code tried same. Added new OPERATOR_HANDLED flag for this. Maybe python needs it too? - Cocoa: added window move event, so multi-win setups work OK (didnt save). - Interface_handlers.c: removed win->active - Severe area copy bug: area handlers were not set to NULL - Filesel bugfix: next/prev folder list was not copied on area copies ** Leftover todos - Cocoa windows seem to hang on cases still... needs check - Cocoa 'draw overlap' swap doesn't work - Cocoa window loses focus permanently on using Spotlight (for these reasons, makefile building has Carbon as default atm) - ListView templates in UI cannot become dragged yet, needs review... it consists of two overlapping UI elements, preventing handling icon clicks. - There's already Ghost library code to handle dropping from OS into Blender window. I've noticed this code is unfinished for Macs, but seems to be complete for Windows. Needs test... currently, an external drop event will print in console when succesfully delivered to Blender's WM.
2010-01-26 18:18:21 +00:00
return OPERATOR_FINISHED;
}
void OBJECT_OT_add_named(wmOperatorType *ot)
{
/* identifiers */
Assets: Snapping with visual feedback while dragging The drag and drop feature of objects in 3D View has been modified to include: - Snap the object being dragged. - Visual feedback through a box and the placement tool grid. Maniphest Tasks: T90198 Differential Revision: https://developer.blender.org/D12912
2021-10-25 08:02:08 -03:00
ot->name = "Add Object";
batch remove .'s used with RNA_def_struct_ui_text
2010-02-10 21:15:44 +00:00
ot->description = "Add named object";
style cleanup: spaces aroudn operators for operator definitions.
2012-03-22 07:26:09 +00:00
ot->idname = "OBJECT_OT_add_named";
Some effect-less code cleanup...
2012-10-05 07:05:52 +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
/* api callbacks */
Fix object moved to cursor when editing last operation after dropping object Steps to reproduce were: * Drag object icon from the Outliner into the 3D view (or an object asset from the Asset Browser) * Open the "Adjust Last Operation" panel * Edit options in there - the object would move to the mouse location The same issue happens with collection instance and object data adding (e.g. via drag & drop). This patch addresses them too. The operator used the event state stored in the window. This shouldn't be accessed from the operator execute callback generally which happened here. Especially not if the operator supports editing properties.
2021-01-05 00:57:24 +01:00
ot->invoke = object_add_drop_xy_generic_invoke;
Cleanup: name mesh join functions using ED_{type} prefix
2020-06-17 17:07:11 +10:00
ot->exec = object_add_named_exec;
UI: Let object drop operator display hint why it's disabled When dragging an object in non-object mode into a 3D View, there will now be red text explaining that this is only possible in object mode. The previous commit enabled this.
2021-10-26 18:06:10 +02:00
ot->poll = ED_operator_objectmode_poll_msg;
Some effect-less code cleanup...
2012-10-05 07:05:52 +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
/* flags */
style cleanup: editors / mesh & object
2012-04-28 15:42:27 +00:00
ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
Some effect-less code cleanup...
2012-10-05 07:05:52 +00:00
Fix object assets getting duplicated after dropping The operator run when dropping objects would duplicate the dropped object and place that in the scene, even though that was just appended. Addressed by making the duplication optional for the operator. If the duplication is not requested, the object is just added to the scene (if needed), repositioned based on the drop location and selected (deselecting other objects). This makes the operator work as expected when using it to drop assets. Reviewed as part of https://developer.blender.org/D11536. Reviewed by: Bastien Montagne
2021-06-11 16:31:57 +02:00
PropertyRNA *prop;
Changed "Convert" to "Convert to" since the first one is incorrect. Removed some dots at the end of tooltips following the standard
2011-06-04 23:02:44 +00:00
RNA_def_boolean(ot->srna,
"linked",
Fix object assets getting duplicated after dropping The operator run when dropping objects would duplicate the dropped object and place that in the scene, even though that was just appended. Addressed by making the duplication optional for the operator. If the duplication is not requested, the object is just added to the scene (if needed), repositioned based on the drop location and selected (deselecting other objects). This makes the operator work as expected when using it to drop assets. Reviewed as part of https://developer.blender.org/D11536. Reviewed by: Bastien Montagne
2021-06-11 16:31:57 +02:00
false,
Changed "Convert" to "Convert to" since the first one is incorrect. Removed some dots at the end of tooltips following the standard
2011-06-04 23:02:44 +00:00
"Linked",
Drop object assets and associated objects at the cursor location When dropping asset objects, place them under the mouse-cursor along with any other objects they link in. Ref D12935 Reviewed By: Severin
2021-10-27 04:19:45 +11:00
"Duplicate object but not object data, linking to the original data");
Fix object assets getting duplicated after dropping The operator run when dropping objects would duplicate the dropped object and place that in the scene, even though that was just appended. Addressed by making the duplication optional for the operator. If the duplication is not requested, the object is just added to the scene (if needed), repositioned based on the drop location and selected (deselecting other objects). This makes the operator work as expected when using it to drop assets. Reviewed as part of https://developer.blender.org/D11536. Reviewed by: Bastien Montagne
2021-06-11 16:31:57 +02:00
Code Cleanup: no need to pass empty strings as default values
2014-01-16 21:43:22 +11:00
RNA_def_string(ot->srna, "name", NULL, MAX_ID_NAME - 2, "Name", "Object name to add");
Fix object moved to cursor when editing last operation after dropping object Steps to reproduce were: * Drag object icon from the Outliner into the 3D view (or an object asset from the Asset Browser) * Open the "Adjust Last Operation" panel * Edit options in there - the object would move to the mouse location The same issue happens with collection instance and object data adding (e.g. via drag & drop). This patch addresses them too. The operator used the event state stored in the window. This shouldn't be accessed from the operator execute callback generally which happened here. Especially not if the operator supports editing properties.
2021-01-05 00:57:24 +01:00
Assets: Snapping with visual feedback while dragging The drag and drop feature of objects in 3D View has been modified to include: - Snap the object being dragged. - Visual feedback through a box and the placement tool grid. Maniphest Tasks: T90198 Differential Revision: https://developer.blender.org/D12912
2021-10-25 08:02:08 -03:00
prop = RNA_def_float_matrix(
ot->srna, "matrix", 4, 4, NULL, 0.0f, 0.0f, "Matrix", "", 0.0f, 0.0f);
RNA_def_property_flag(prop, PROP_HIDDEN | PROP_SKIP_SAVE);
Fix object moved to cursor when editing last operation after dropping object Steps to reproduce were: * Drag object icon from the Outliner into the 3D view (or an object asset from the Asset Browser) * Open the "Adjust Last Operation" panel * Edit options in there - the object would move to the mouse location The same issue happens with collection instance and object data adding (e.g. via drag & drop). This patch addresses them too. The operator used the event state stored in the window. This shouldn't be accessed from the operator execute callback generally which happened here. Especially not if the operator supports editing properties.
2021-01-05 00:57:24 +01:00
object_add_drop_xy_props(ot);
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
}
Cleanup: use doxy sections for object_add.c
2019-05-16 14:03:31 +10:00
/** \} */
Drop object assets and associated objects at the cursor location When dropping asset objects, place them under the mouse-cursor along with any other objects they link in. Ref D12935 Reviewed By: Severin
2021-10-27 04:19:45 +11:00
/* -------------------------------------------------------------------- */
/** \name Transform Object to Mouse Operator
* \{ */
/**
* Alternate behavior for dropping an asset that positions the appended object(s).
*/
static int object_transform_to_mouse_exec(bContext *C, wmOperator *op)
{
Main *bmain = CTX_data_main(C);
ViewLayer *view_layer = CTX_data_view_layer(C);
Object *ob;
if (RNA_struct_property_is_set(op->ptr, "name")) {
char name[MAX_ID_NAME - 2];
RNA_string_get(op->ptr, "name", name);
ob = (Object *)BKE_libblock_find_name(bmain, ID_OB, name);
}
else {
ob = OBACT(view_layer);
}
if (ob == NULL) {
BKE_report(op->reports, RPT_ERROR, "Object not found");
return OPERATOR_CANCELLED;
}
Assets: Disable snap-dragging for linking object assets The location of a linked object isn't editable, or at least it will be reset when reloading the file. So the drag & drop shouldn't even pretend like this would work, so disable the snapping of the object and the bounding-box to show the snapped object location while dragging.
2021-10-26 20:25:19 +02:00
/* Don't transform a linked object. There's just nothing to do here in this case, so return
* #OPERATOR_FINISHED. */
if (ID_IS_LINKED(ob)) {
return OPERATOR_FINISHED;
}
Drop object assets and associated objects at the cursor location When dropping asset objects, place them under the mouse-cursor along with any other objects they link in. Ref D12935 Reviewed By: Severin
2021-10-27 04:19:45 +11:00
/* Ensure the locations are updated so snap reads the evaluated active location. */
CTX_data_ensure_evaluated_depsgraph(C);
PropertyRNA *prop_matrix = RNA_struct_find_property(op->ptr, "matrix");
if (RNA_property_is_set(op->ptr, prop_matrix)) {
uint objects_len;
Fix: Build issue on windows Empty initializer is not appreciated by MSVC.
2021-10-26 13:44:26 -06:00
Object **objects = BKE_view_layer_array_selected_objects(view_layer, NULL, &objects_len, {0});
Drop object assets and associated objects at the cursor location When dropping asset objects, place them under the mouse-cursor along with any other objects they link in. Ref D12935 Reviewed By: Severin
2021-10-27 04:19:45 +11:00
float matrix[4][4];
RNA_property_float_get_array(op->ptr, prop_matrix, &matrix[0][0]);
float mat_src_unit[4][4];
float mat_dst_unit[4][4];
float final_delta[4][4];
normalize_m4_m4(mat_src_unit, ob->obmat);
normalize_m4_m4(mat_dst_unit, matrix);
invert_m4(mat_src_unit);
mul_m4_m4m4(final_delta, mat_dst_unit, mat_src_unit);
ED_object_xform_array_m4(objects, objects_len, final_delta);
MEM_freeN(objects);
}
else {
int mval[2];
if (object_add_drop_xy_get(C, op, &mval)) {
float cursor[3];
ED_object_location_from_view(C, cursor);
ED_view3d_cursor3d_position(C, mval, false, cursor);
/* Use the active objects location since this is the ID which the user selected to drop.
*
* This transforms all selected objects, so that dropping a single object which links in
* other objects will have their relative transformation preserved.
* For example a child/parent relationship or other objects used with a boolean modifier.
*
* The caller is responsible for ensuring the selection state gives useful results.
* Link/append does this using #FILE_AUTOSELECT. */
ED_view3d_snap_selected_to_location(C, cursor, V3D_AROUND_ACTIVE);
}
}
return OPERATOR_FINISHED;
}
void OBJECT_OT_transform_to_mouse(wmOperatorType *ot)
{
/* identifiers */
ot->name = "Place Object Under Mouse";
ot->description = "Snap selected item(s) to the mouse location";
ot->idname = "OBJECT_OT_transform_to_mouse";
/* api callbacks */
ot->invoke = object_add_drop_xy_generic_invoke;
ot->exec = object_transform_to_mouse_exec;
ot->poll = ED_operator_objectmode;
/* flags */
ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
PropertyRNA *prop;
RNA_def_string(ot->srna,
"name",
NULL,
MAX_ID_NAME - 2,
"Name",
"Object name to place (when unset use the active object)");
prop = RNA_def_float_matrix(
ot->srna, "matrix", 4, 4, NULL, 0.0f, 0.0f, "Matrix", "", 0.0f, 0.0f);
RNA_def_property_flag(prop, PROP_HIDDEN | PROP_SKIP_SAVE);
object_add_drop_xy_props(ot);
}
/** \} */
Cleanup: use doxy sections for object_add.c
2019-05-16 14:03:31 +10:00
/* -------------------------------------------------------------------- */
/** \name Join Object Operator
* \{ */
Some effect-less code cleanup...
2012-10-05 07:05:52 +00:00
Cleanup: name mesh join functions using ED_{type} prefix
2020-06-17 17:07:11 +10:00
static bool object_join_poll(bContext *C)
* New tool - Join as Shapes Available in object mode (Object -> Join as Shapes), only works for meshes at the present. Will merge all selected objects as shape keys on the active object, if the vertex count is the same. This does not keep references to the external objects like in some applications, rather it's a quick way to update the shapes on the active object (perhaps after importing new versions from external applications).
2009-11-28 04:04:01 +00:00
{
style cleanup: editors / mesh & object
2012-04-28 15:42:27 +00:00
Object *ob = CTX_data_active_object(C);
Some effect-less code cleanup...
2012-10-05 07:05:52 +00:00
LibOverride: Fix lots of poll functions for Object operators. Prevent operators that should not perform on override data to be callable in those cases.
2020-06-30 17:51:41 +02:00
if (ob == NULL || ob->data == NULL || ID_IS_LINKED(ob) || ID_IS_OVERRIDE_LIBRARY(ob) ||
ID_IS_OVERRIDE_LIBRARY(ob->data)) {
return false;
Cleanup: style, use braces for editors
2019-04-22 09:19:45 +10:00
}
Some effect-less code cleanup...
2012-10-05 07:05:52 +00:00
Cleanup: style, use braces for editors
2019-04-22 09:19:45 +10:00
if (ELEM(ob->type, OB_MESH, OB_CURVE, OB_SURF, OB_ARMATURE, OB_GPENCIL)) {
* New tool - Join as Shapes Available in object mode (Object -> Join as Shapes), only works for meshes at the present. Will merge all selected objects as shape keys on the active object, if the vertex count is the same. This does not keep references to the external objects like in some applications, rather it's a quick way to update the shapes on the active object (perhaps after importing new versions from external applications).
2009-11-28 04:04:01 +00:00
return ED_operator_screenactive(C);
Cleanup: style, use braces for editors
2019-04-22 09:19:45 +10:00
}
Cleanup: Editors/Object, Clang-Tidy else-after-return fixes This addresses warnings from Clang-Tidy's `readability-else-after-return` rule in the `source/blender/editors/object` module. No functional changes.
2020-07-03 15:42:22 +02:00
return false;
* New tool - Join as Shapes Available in object mode (Object -> Join as Shapes), only works for meshes at the present. Will merge all selected objects as shape keys on the active object, if the vertex count is the same. This does not keep references to the external objects like in some applications, rather it's a quick way to update the shapes on the active object (perhaps after importing new versions from external applications).
2009-11-28 04:04:01 +00:00
}
Cleanup: name mesh join functions using ED_{type} prefix
2020-06-17 17:07:11 +10:00
static int object_join_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
{
style cleanup: editors / mesh & object
2012-04-28 15:42:27 +00:00
Object *ob = CTX_data_active_object(C);
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Remove workspace object mode, reverts changes w/ 2.8 This caused too many problems syncing object modes with multiple objects/windows/workspaces, see: D3130 for details.
2018-04-05 18:20:27 +02:00
if (ob->mode & OB_MODE_EDIT) {
Big i18n commit: add "reports" from bmesh/readfile/tracking/dynapaint (and a few others), and another bunch of UI messages tweaks/fixes, as well as some BKE_report()<->BKE_reportf()...
2012-10-26 17:32:50 +00:00
BKE_report(op->reports, RPT_ERROR, "This data does not support joining in edit mode");
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
return OPERATOR_CANCELLED;
}
Cleanup: Editors/Object, Clang-Tidy else-after-return fixes This addresses warnings from Clang-Tidy's `readability-else-after-return` rule in the `source/blender/editors/object` module. No functional changes.
2020-07-03 15:42:22 +02:00
if (BKE_object_obdata_is_libdata(ob)) {
UI: Nicer report when trying to edit external libraries Rename 'libdata' to 'library data'.
2019-03-05 17:06:11 +01:00
BKE_report(op->reports, RPT_ERROR, "Cannot edit external library data");
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
return OPERATOR_CANCELLED;
}
Cleanup: Editors/Object, Clang-Tidy else-after-return fixes This addresses warnings from Clang-Tidy's `readability-else-after-return` rule in the `source/blender/editors/object` module. No functional changes.
2020-07-03 15:42:22 +02:00
if (ob->type == OB_GPENCIL) {
New Grease Pencil object for 2D animation This commit merge the full development done in greasepencil-object branch and include mainly the following features. - New grease pencil object. - New drawing engine. - New grease pencil modes Draw/Sculpt/Edit and Weight Paint. - New brushes for grease pencil. - New modifiers for grease pencil. - New shaders FX. - New material system (replace old palettes and colors). - Split of annotations (old grease pencil) and new grease pencil object. - UI adapted to blender 2.8. You can get more info here: https://code.blender.org/2017/12/drawing-2d-animation-in-blender-2-8/ https://code.blender.org/2018/07/grease-pencil-status-update/ This is the result of nearly two years of development and I want thanks firstly the other members of the grease pencil team: Daniel M. Lara, Matias Mendiola and Joshua Leung for their support, ideas and to keep working in the project all the time, without them this project had been impossible. Also, I want thanks other Blender developers for their help, advices and to be there always to help me, and specially to Clément Foucault, Dalai Felinto, Pablo Vázquez and Campbell Barton.
2018-07-31 10:22:19 +02:00
bGPdata *gpd = (bGPdata *)ob->data;
if ((!gpd) || GPENCIL_ANY_MODE(gpd)) {
BKE_report(op->reports, RPT_ERROR, "This data does not support joining in this mode");
return OPERATOR_CANCELLED;
}
}
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Fix T80077: Objects disappear when joining with a zero scaled axis Use invert_m4_m4_safe_ortho when joining objects so zero scaled axis doesn't cause all points to be scaled to zero. Instead geometry is left un-scaled on degenerate axes. Report a warning in this case since users may want to adjust the active objects scale.
2020-08-25 14:32:10 +10:00
int ret = OPERATOR_CANCELLED;
Cleanup: style, use braces for editors
2019-04-22 09:19:45 +10:00
if (ob->type == OB_MESH) {
Fix T80077: Objects disappear when joining with a zero scaled axis Use invert_m4_m4_safe_ortho when joining objects so zero scaled axis doesn't cause all points to be scaled to zero. Instead geometry is left un-scaled on degenerate axes. Report a warning in this case since users may want to adjust the active objects scale.
2020-08-25 14:32:10 +10:00
ret = ED_mesh_join_objects_exec(C, op);
}
else if (ELEM(ob->type, OB_CURVE, OB_SURF)) {
ret = ED_curve_join_objects_exec(C, op);
}
else if (ob->type == OB_ARMATURE) {
ret = ED_armature_join_objects_exec(C, op);
}
else if (ob->type == OB_GPENCIL) {
ret = ED_gpencil_join_objects_exec(C, op);
}
if (ret & OPERATOR_FINISHED) {
/* Even though internally failure to invert is accounted for with a fallback,
* show a warning since the result may not be what the user expects. See T80077.
*
* Failure to invert the matrix is typically caused by zero scaled axes
* (which can be caused by constraints, even if the input scale isn't zero).
*
* Internally the join functions use #invert_m4_m4_safe_ortho which creates
* an inevitable matrix from one that has one or more degenerate axes.
*
* In most cases we don't worry about special handling for non-inevitable matrices however for
* joining objects there may be flat 2D objects where it's not obvious the scale is zero.
* In this case, using #invert_m4_m4_safe_ortho works as well as we can expect,
* joining the contents, flattening on the axis that's zero scaled.
* If the zero scale is removed, the data on this axis remains un-scaled
* (something that wouldn't work for #invert_m4_m4_safe). */
float imat_test[4][4];
if (!invert_m4_m4(imat_test, ob->obmat)) {
BKE_report(op->reports,
RPT_WARNING,
"Active object final transform has one or more zero scaled axes");
}
}
return ret;
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
}
void OBJECT_OT_join(wmOperatorType *ot)
{
/* identifiers */
style cleanup: spaces aroudn operators for operator definitions.
2012-03-22 07:26:09 +00:00
ot->name = "Join";
batch remove .'s used with RNA_def_struct_ui_text
2010-02-10 21:15:44 +00:00
ot->description = "Join selected objects into active object";
style cleanup: spaces aroudn operators for operator definitions.
2012-03-22 07:26:09 +00:00
ot->idname = "OBJECT_OT_join";
Some effect-less code cleanup...
2012-10-05 07:05: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
/* api callbacks */
Cleanup: name mesh join functions using ED_{type} prefix
2020-06-17 17:07:11 +10:00
ot->exec = object_join_exec;
ot->poll = object_join_poll;
Some effect-less code cleanup...
2012-10-05 07:05: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
/* flags */
style cleanup: editors / mesh & object
2012-04-28 15:42:27 +00:00
ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
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
}
Cleanup: use doxy sections for object_add.c
2019-05-16 14:03:31 +10:00
/** \} */
/* -------------------------------------------------------------------- */
Revert "Rename operator 'Join Shapes' to 'Transfer Mix'." This reverts commit 741967079c393a9eb6babd60c92a716fafa5d3e9. We are in UI and API freeze, and this changes both.
2019-07-01 16:51:00 +02:00
/** \name Join as Shape Key Operator
Cleanup: use doxy sections for object_add.c
2019-05-16 14:03:31 +10:00
* \{ */
Some effect-less code cleanup...
2012-10-05 07:05:52 +00:00
Revert "Rename operator 'Join Shapes' to 'Transfer Mix'." This reverts commit 741967079c393a9eb6babd60c92a716fafa5d3e9. We are in UI and API freeze, and this changes both.
2019-07-01 16:51:00 +02:00
static bool join_shapes_poll(bContext *C)
* New tool - Join as Shapes Available in object mode (Object -> Join as Shapes), only works for meshes at the present. Will merge all selected objects as shape keys on the active object, if the vertex count is the same. This does not keep references to the external objects like in some applications, rather it's a quick way to update the shapes on the active object (perhaps after importing new versions from external applications).
2009-11-28 04:04:01 +00:00
{
style cleanup: editors / mesh & object
2012-04-28 15:42:27 +00:00
Object *ob = CTX_data_active_object(C);
Some effect-less code cleanup...
2012-10-05 07:05:52 +00:00
LibOverride: Fix lots of poll functions for Object operators. Prevent operators that should not perform on override data to be callable in those cases.
2020-06-30 17:51:41 +02:00
if (ob == NULL || ob->data == NULL || ID_IS_LINKED(ob) || ID_IS_OVERRIDE_LIBRARY(ob) ||
ID_IS_OVERRIDE_LIBRARY(ob->data)) {
return false;
Cleanup: style, use braces for editors
2019-04-22 09:19:45 +10:00
}
Some effect-less code cleanup...
2012-10-05 07:05:52 +00:00
* New tool - Join as Shapes Available in object mode (Object -> Join as Shapes), only works for meshes at the present. Will merge all selected objects as shape keys on the active object, if the vertex count is the same. This does not keep references to the external objects like in some applications, rather it's a quick way to update the shapes on the active object (perhaps after importing new versions from external applications).
2009-11-28 04:04:01 +00:00
/* only meshes supported at the moment */
Cleanup: style, use braces for editors
2019-04-22 09:19:45 +10:00
if (ob->type == OB_MESH) {
* New tool - Join as Shapes Available in object mode (Object -> Join as Shapes), only works for meshes at the present. Will merge all selected objects as shape keys on the active object, if the vertex count is the same. This does not keep references to the external objects like in some applications, rather it's a quick way to update the shapes on the active object (perhaps after importing new versions from external applications).
2009-11-28 04:04:01 +00:00
return ED_operator_screenactive(C);
Cleanup: style, use braces for editors
2019-04-22 09:19:45 +10:00
}
Cleanup: Editors/Object, Clang-Tidy else-after-return fixes This addresses warnings from Clang-Tidy's `readability-else-after-return` rule in the `source/blender/editors/object` module. No functional changes.
2020-07-03 15:42:22 +02:00
return false;
* New tool - Join as Shapes Available in object mode (Object -> Join as Shapes), only works for meshes at the present. Will merge all selected objects as shape keys on the active object, if the vertex count is the same. This does not keep references to the external objects like in some applications, rather it's a quick way to update the shapes on the active object (perhaps after importing new versions from external applications).
2009-11-28 04:04:01 +00:00
}
Revert "Rename operator 'Join Shapes' to 'Transfer Mix'." This reverts commit 741967079c393a9eb6babd60c92a716fafa5d3e9. We are in UI and API freeze, and this changes both.
2019-07-01 16:51:00 +02:00
static int join_shapes_exec(bContext *C, wmOperator *op)
* New tool - Join as Shapes Available in object mode (Object -> Join as Shapes), only works for meshes at the present. Will merge all selected objects as shape keys on the active object, if the vertex count is the same. This does not keep references to the external objects like in some applications, rather it's a quick way to update the shapes on the active object (perhaps after importing new versions from external applications).
2009-11-28 04:04:01 +00:00
{
style cleanup: editors / mesh & object
2012-04-28 15:42:27 +00:00
Object *ob = CTX_data_active_object(C);
Some effect-less code cleanup...
2012-10-05 07:05:52 +00:00
Remove workspace object mode, reverts changes w/ 2.8 This caused too many problems syncing object modes with multiple objects/windows/workspaces, see: D3130 for details.
2018-04-05 18:20:27 +02:00
if (ob->mode & OB_MODE_EDIT) {
Revert "Rename operator 'Join Shapes' to 'Transfer Mix'." This reverts commit 741967079c393a9eb6babd60c92a716fafa5d3e9. We are in UI and API freeze, and this changes both.
2019-07-01 16:51:00 +02:00
BKE_report(op->reports, RPT_ERROR, "This data does not support joining in edit mode");
* New tool - Join as Shapes Available in object mode (Object -> Join as Shapes), only works for meshes at the present. Will merge all selected objects as shape keys on the active object, if the vertex count is the same. This does not keep references to the external objects like in some applications, rather it's a quick way to update the shapes on the active object (perhaps after importing new versions from external applications).
2009-11-28 04:04:01 +00:00
return OPERATOR_CANCELLED;
}
Cleanup: Editors/Object, Clang-Tidy else-after-return fixes This addresses warnings from Clang-Tidy's `readability-else-after-return` rule in the `source/blender/editors/object` module. No functional changes.
2020-07-03 15:42:22 +02:00
if (BKE_object_obdata_is_libdata(ob)) {
UI: Nicer report when trying to edit external libraries Rename 'libdata' to 'library data'.
2019-03-05 17:06:11 +01:00
BKE_report(op->reports, RPT_ERROR, "Cannot edit external library data");
* New tool - Join as Shapes Available in object mode (Object -> Join as Shapes), only works for meshes at the present. Will merge all selected objects as shape keys on the active object, if the vertex count is the same. This does not keep references to the external objects like in some applications, rather it's a quick way to update the shapes on the active object (perhaps after importing new versions from external applications).
2009-11-28 04:04:01 +00:00
return OPERATOR_CANCELLED;
}
Some effect-less code cleanup...
2012-10-05 07:05:52 +00:00
Cleanup: style, use braces for editors
2019-04-22 09:19:45 +10:00
if (ob->type == OB_MESH) {
Cleanup: name mesh join functions using ED_{type} prefix
2020-06-17 17:07:11 +10:00
return ED_mesh_shapes_join_objects_exec(C, op);
Cleanup: style, use braces for editors
2019-04-22 09:19:45 +10:00
}
Some effect-less code cleanup...
2012-10-05 07:05:52 +00:00
* New tool - Join as Shapes Available in object mode (Object -> Join as Shapes), only works for meshes at the present. Will merge all selected objects as shape keys on the active object, if the vertex count is the same. This does not keep references to the external objects like in some applications, rather it's a quick way to update the shapes on the active object (perhaps after importing new versions from external applications).
2009-11-28 04:04:01 +00:00
return OPERATOR_CANCELLED;
}
Revert "Rename operator 'Join Shapes' to 'Transfer Mix'." This reverts commit 741967079c393a9eb6babd60c92a716fafa5d3e9. We are in UI and API freeze, and this changes both.
2019-07-01 16:51:00 +02:00
void OBJECT_OT_join_shapes(wmOperatorType *ot)
* New tool - Join as Shapes Available in object mode (Object -> Join as Shapes), only works for meshes at the present. Will merge all selected objects as shape keys on the active object, if the vertex count is the same. This does not keep references to the external objects like in some applications, rather it's a quick way to update the shapes on the active object (perhaps after importing new versions from external applications).
2009-11-28 04:04:01 +00:00
{
/* identifiers */
Revert "Rename operator 'Join Shapes' to 'Transfer Mix'." This reverts commit 741967079c393a9eb6babd60c92a716fafa5d3e9. We are in UI and API freeze, and this changes both.
2019-07-01 16:51:00 +02:00
ot->name = "Join as Shapes";
Updated tooltips for operators 'Transfer Mix' and 'Join Shapes'. Fixes typo
2019-07-01 23:06:32 +02:00
ot->description = "Copy the current resulting shape of another selected object to this one";
Revert "Rename operator 'Join Shapes' to 'Transfer Mix'." This reverts commit 741967079c393a9eb6babd60c92a716fafa5d3e9. We are in UI and API freeze, and this changes both.
2019-07-01 16:51:00 +02:00
ot->idname = "OBJECT_OT_join_shapes";
Some effect-less code cleanup...
2012-10-05 07:05:52 +00:00
* New tool - Join as Shapes Available in object mode (Object -> Join as Shapes), only works for meshes at the present. Will merge all selected objects as shape keys on the active object, if the vertex count is the same. This does not keep references to the external objects like in some applications, rather it's a quick way to update the shapes on the active object (perhaps after importing new versions from external applications).
2009-11-28 04:04:01 +00:00
/* api callbacks */
Revert "Rename operator 'Join Shapes' to 'Transfer Mix'." This reverts commit 741967079c393a9eb6babd60c92a716fafa5d3e9. We are in UI and API freeze, and this changes both.
2019-07-01 16:51:00 +02:00
ot->exec = join_shapes_exec;
ot->poll = join_shapes_poll;
Some effect-less code cleanup...
2012-10-05 07:05:52 +00:00
* New tool - Join as Shapes Available in object mode (Object -> Join as Shapes), only works for meshes at the present. Will merge all selected objects as shape keys on the active object, if the vertex count is the same. This does not keep references to the external objects like in some applications, rather it's a quick way to update the shapes on the active object (perhaps after importing new versions from external applications).
2009-11-28 04:04:01 +00:00
/* flags */
style cleanup: editors / mesh & object
2012-04-28 15:42:27 +00:00
ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
* New tool - Join as Shapes Available in object mode (Object -> Join as Shapes), only works for meshes at the present. Will merge all selected objects as shape keys on the active object, if the vertex count is the same. This does not keep references to the external objects like in some applications, rather it's a quick way to update the shapes on the active object (perhaps after importing new versions from external applications).
2009-11-28 04:04:01 +00:00
}
Cleanup: use doxy sections for object_add.c
2019-05-16 14:03:31 +10:00
/** \} */
Reference in New Issue Copy Permalink