archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity
This repository has been archived on 2023-10-09. You can view files and clone it, but cannot push or open issues or pull requests.
Files
27bbf19af827d18dc472394867cc0d6f7eca2b8d
blender-archive/source/blender/makesrna/intern/rna_object.c

2829 lines
110 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
/*
Patch to change license to GPL only, from GSR.
2008-01-07 19:13:47 +00:00
* ***** BEGIN GPL LICENSE BLOCK *****
Initial revision
2002-10-12 11:37:38 +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
Patch to change license to GPL only, from GSR.
2008-01-07 19:13:47 +00:00
* of the License, or (at your option) any later version.
Initial revision
2002-10-12 11:37:38 +00:00
*
* 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.
Initial revision
2002-10-12 11:37:38 +00:00
*
RNA / Data API This is the first code for the Data API, also known as RNA system in the 2.5 Branch. It does not include a user interface, and only wraps some Scene properties for testing. It is integrated with Scons and Makefiles, and compiles a 'makesrna' program that generates an RNA.c file. http://wiki.blender.org/index.php/BlenderDev/Blender2.5/DataAPI http://wiki.blender.org/index.php/BlenderDev/Blender2.5/RNA The changes are quite local, basically adding a makesrna module which works similar to the makesdna module. The one external change is in moving genfile.c from blenloader to the makesdna module, so that it can be reused by the RNA code. This also meant changing the DNA makefiles. It seems to be doing dependencies correct still in my tests, but if there is an issue with the DNA not being rebuilt this commit might be the one causing it. Also it seems for scons the makesdna and makesrna modules are compiling without warnings. Not a new issue but this should be fixed. The RNA code supports all types as defined in the Data API design, so in that sense it is fairly complete and I hope that aspect will not have to change much. Some obviously missing parts are context related code, notify() functions for updates and user defined / ID properties.
2008-10-31 23:50:02 +00:00
* Contributor(s): Blender Foundation (2008).
Initial revision
2002-10-12 11:37:38 +00:00
*
Patch to change license to GPL only, from GSR.
2008-01-07 19:13:47 +00:00
* ***** END GPL LICENSE BLOCK *****
Initial revision
2002-10-12 11:37:38 +00:00
*/
doxygen: blender/makesrna tagged.
2011-02-27 20:20:01 +00:00
/** \file blender/makesrna/intern/rna_object.c
* \ingroup RNA
*/
RNA: * Added a MaterialSlot collection in Object rather than giving the list of materials immediately. This should more correctly reflect how this data is organized, even though there is no equivalent C struct. * Added name properties to MaterialSlot/TextureSlot/ParticleSystem.
2009-06-03 23:22:43 +00:00
#include <stdio.h>
RNA / Data API This is the first code for the Data API, also known as RNA system in the 2.5 Branch. It does not include a user interface, and only wraps some Scene properties for testing. It is integrated with Scons and Makefiles, and compiles a 'makesrna' program that generates an RNA.c file. http://wiki.blender.org/index.php/BlenderDev/Blender2.5/DataAPI http://wiki.blender.org/index.php/BlenderDev/Blender2.5/RNA The changes are quite local, basically adding a makesrna module which works similar to the makesdna module. The one external change is in moving genfile.c from blenloader to the makesdna module, so that it can be reused by the RNA code. This also meant changing the DNA makefiles. It seems to be doing dependencies correct still in my tests, but if there is an issue with the DNA not being rebuilt this commit might be the one causing it. Also it seems for scons the makesdna and makesrna modules are compiling without warnings. Not a new issue but this should be fixed. The RNA code supports all types as defined in the Data API design, so in that sense it is fairly complete and I hope that aspect will not have to change much. Some obviously missing parts are context related code, notify() functions for updates and user defined / ID properties.
2008-10-31 23:50:02 +00:00
#include <stdlib.h>
merge with trunk/2.5 at r23876 [[Split portion of a mixed commit.]]
2009-10-22 23:22:05 +00:00
#include "DNA_action_types.h"
GP: Select color in Brush or in Properties After some artist feedback the material selection was not clear. Now, the material can be selected in the top bar or in the properties panel. 1) If the material is selected in properties panel, all Brushes except pinned will be assigned to this material. 2) If the material is selected in the brush, the properties panel is updated to set the active material. Added a new Pin icon to keep locked the material to one brush
2018-08-24 23:59:56 +02:00
#include "DNA_brush_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"
RNA * The generated code is now split into multiple files instead of a single big one. Scons, make and cmake are updated to deal with this.
2009-01-08 13:57:29 +00:00
#include "DNA_customdata_types.h"
RNA: * Added a MaterialSlot collection in Object rather than giving the list of materials immediately. This should more correctly reflect how this data is organized, even though there is no equivalent C struct. * Added name properties to MaterialSlot/TextureSlot/ParticleSystem.
2009-06-03 23:22:43 +00:00
#include "DNA_material_types.h"
RNA * The generated code is now split into multiple files instead of a single big one. Scons, make and cmake are updated to deal with this.
2009-01-08 13:57:29 +00:00
#include "DNA_mesh_types.h"
Cleanup: add _types.h suffix to DNA headers
2018-02-07 11:14:08 +11:00
#include "DNA_object_force_types.h"
RNA / Data API This is the first code for the Data API, also known as RNA system in the 2.5 Branch. It does not include a user interface, and only wraps some Scene properties for testing. It is integrated with Scons and Makefiles, and compiles a 'makesrna' program that generates an RNA.c file. http://wiki.blender.org/index.php/BlenderDev/Blender2.5/DataAPI http://wiki.blender.org/index.php/BlenderDev/Blender2.5/RNA The changes are quite local, basically adding a makesrna module which works similar to the makesdna module. The one external change is in moving genfile.c from blenloader to the makesdna module, so that it can be reused by the RNA code. This also meant changing the DNA makefiles. It seems to be doing dependencies correct still in my tests, but if there is an issue with the DNA not being rebuilt this commit might be the one causing it. Also it seems for scons the makesdna and makesrna modules are compiling without warnings. Not a new issue but this should be fixed. The RNA code supports all types as defined in the Data API design, so in that sense it is fairly complete and I hope that aspect will not have to change much. Some obviously missing parts are context related code, notify() functions for updates and user defined / ID properties.
2008-10-31 23:50:02 +00:00
#include "DNA_object_types.h"
RNA * Added skeleton code for particle/object_force/userdef. * More Object properties wrapped. * Added User Preferences display in outliner.
2009-01-02 13:47:33 +00:00
#include "DNA_scene_types.h"
fix [#24780] Metaballs are not drawn correctly in new scenes this is a can of worms, at the moment blender depends on broken behavior for metaballs: find_basis_mball() can return a metaball object that fails a is_basis_mball() check which makes this logic very confusing (added note about this in mball.c). Metaballs needs a refactor however at least make drawing fail consistently, For wire draw is_basis_mball() wasn't being checked, for solid drawing it was (hence the strange wire frame). For now the motherball needs to exist in the main scene else it wont work.
2010-11-18 04:26:50 +00:00
#include "DNA_meta_types.h"
Cleanup: use workspace for object_mode when possible
2018-02-09 22:14:17 +11:00
#include "DNA_workspace_types.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 "DNA_gpencil_modifier_types.h"
#include "DNA_shader_fx_types.h"
RNA / Data API This is the first code for the Data API, also known as RNA system in the 2.5 Branch. It does not include a user interface, and only wraps some Scene properties for testing. It is integrated with Scons and Makefiles, and compiles a 'makesrna' program that generates an RNA.c file. http://wiki.blender.org/index.php/BlenderDev/Blender2.5/DataAPI http://wiki.blender.org/index.php/BlenderDev/Blender2.5/RNA The changes are quite local, basically adding a makesrna module which works similar to the makesdna module. The one external change is in moving genfile.c from blenloader to the makesdna module, so that it can be reused by the RNA code. This also meant changing the DNA makefiles. It seems to be doing dependencies correct still in my tests, but if there is an issue with the DNA not being rebuilt this commit might be the one causing it. Also it seems for scons the makesdna and makesrna modules are compiling without warnings. Not a new issue but this should be fixed. The RNA code supports all types as defined in the Data API design, so in that sense it is fairly complete and I hope that aspect will not have to change much. Some obviously missing parts are context related code, notify() functions for updates and user defined / ID properties.
2008-10-31 23:50:02 +00:00
code cleanup: move bmesh inline funcs to headers (avoids compiling the C files).
2012-03-24 01:24:58 +00:00
#include "BLI_utildefines.h"
Game Engine: Level of detail support and tools Levels of detail can be added and modified in the object panel. The object panel also contains new tools for generating levels of detail, setting up levels of detail based on object names (useful for importing), and clearing an object's level of detail settings. This is meant as a game engine feature, though the level of details settings can be previewed in the viewport. Reviewed By: moguri, nexyon, brecht Differential Revision: http://developer.blender.org/D109
2013-12-17 14:42:47 -08:00
#include "BLI_listbase.h"
code cleanup: move bmesh inline funcs to headers (avoids compiling the C files).
2012-03-24 01:24:58 +00:00
Refactor 'fit in camera view' code, and expose it to RNA. This changes BKE's fitting code to use `BKE_camera_params_compute_viewplane` instead of `BKE_camera_view_frame`. This allows that code to work with orthographic projection too. Also, two funcs were added to rna's Object, to resp. get the projection matrix of that object (mostly useful for cameras and lamps objects), and return position this object should be to see all (to fit) a given set of points. Reviewers: campbellbarton Reviewed By: campbellbarton Differential Revision: https://developer.blender.org/D961
2015-01-03 12:05:16 +01:00
#include "BKE_camera.h"
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
#include "BKE_collection.h"
Add DNA/RNA/BKE infrastructure for dynamic-topology sculpt mode * Add a detail_size field to the Sculpt struct, two new sculpt flags, and a Mesh flag for dynamic-topology mode; that's it for file-level changes needed by dynamic topology * Add RNA for the new DNA field and flags * Add a new icon for dynamic-topology created by Julio Iglesias. TODO: update the icon for the new SVG icon format * Add a SculptSession function for converting from BMesh to Mesh, handles reordering mesh elements and setting face shading
2012-12-30 18:27:33 +00:00
#include "BKE_paint.h"
Cleanup: split lattice into own library Was mixed with object functionality.
2018-03-19 14:49:59 +01:00
#include "BKE_editlattice.h"
code cleanup: rename BKE_tessmesh -> BKE_editmesh, rename EditDerivedBMesh.tc -> em. ('tc' is odd name which isn't used elsewhere).
2013-04-13 20:31:52 +00:00
#include "BKE_editmesh.h"
Objects: restore per object restrict view/render/select. Note this is now separate from H key hiding, and meant for more persistent ways to define which objects are relevant to the viewport or render. This avoids some cases where you'd have to create collection specifically to hide objects for viewport/render.
2018-06-18 19:18:02 +02:00
#include "BKE_layer.h"
Refactor: Move part of vgroup handling code from ED_mesh/object_vgroup.c to BKE_object_deform. Along with some minor cleanup and simplifications. Reviewers: campbellbarton Subscribers: sergey Differential Revision: https://developer.blender.org/D903
2014-11-18 23:52:17 +01:00
#include "BKE_object_deform.h"
Face Maps: custom-data, UI and RNA API Add face maps, needed for face-map widgets, only data structure, widgets will be separate commit. This comes from 'custom-manipulator' branch with only minor changes.
2017-05-30 17:58:24 +10:00
#include "BKE_object_facemap.h"
Refactor: Move part of vgroup handling code from ED_mesh/object_vgroup.c to BKE_object_deform. Along with some minor cleanup and simplifications. Reviewers: campbellbarton Subscribers: sergey Differential Revision: https://developer.blender.org/D903
2014-11-18 23:52:17 +01:00
use bool for rna funcs.
2013-03-07 02:44:55 +00:00
#include "RNA_access.h"
#include "RNA_define.h"
#include "RNA_enum_types.h"
#include "rna_internal.h"
move BLO_sys_types.h -> BLI_sys_types.h (it had nothing todo with loading) remove MEM_sys_types.h which was a duplicate.
2013-05-28 19:35:26 +00:00
#include "BLI_sys_types.h" /* needed for intptr_t used in ED_mesh.h */
merge from trunk at r31523
2010-09-07 05:47:34 +00:00
#include "ED_mesh.h"
merge with 2.5/trunk at r23271
2009-09-16 17:43:09 +00:00
#include "WM_api.h"
RNA * Added support for sending notifiers and updates when setting RNA properties. Per property, there is a notifier NC_/ND_ flag, and a function that is called. Currently only used for Object.loc/rot/size. * RNA_property_update that does this is not automatically called in every _set function, it has do be done separate, and is being done by buttons with RNA data. * Perhaps for python there could be a trick to accumulate these flags rather than update each time, though for now the python RNA code could just do them everytime. Did not add these calls in the python code yet because it needs context, not sure where to get that from?
2009-01-01 15:52:51 +00:00
#include "WM_types.h"
Cleanup: Use const for RNA EnumPropertyItem args Practically all access to enum data is read-only.
2017-10-18 15:07:26 +11:00
const EnumPropertyItem rna_enum_object_mode_items[] = {
Fix for [#35224] Transform Orientation - order inconsistency Fix turned out to remove as much "manual UI" from 3D view header as possible. Mode selector and all transform manipulators/orientations stuff are now RNA-based UI (leaving basically only edit mesh select modes with custom handlers, as they have some quite specific features). To achieve this, four main modifications were done: * enum-operator-generated menus are now MENU (i.e. dropdown lists) in headers too. * All bit-flag enums expanded in ROW buttons now have a handling consistent with e.g. layers, or what we already have for transform manipulators, i.e. clicking select only one element, shift-click to select multiple ones. * Consequently, the three RNA booleans manipulators flags are merged into a single bit-flag enum (yes, this is also an API change, though I doubt many scripts use it). * Now the width of enum-based dropdown lists is computed from longest item name in enum, no more from a dummy place holder string (when no label/name is given). All this allows to remove some code from 3DView/transform areas, that was actually mostly duplicating RNA/operator one. Also done a few optimizations here and there (among others, do not pass &numitems to RNA_property_enum_items() when you do not need it, saves at least an iteration over enum items to count them). Many thanks to Brecht for the reviews!
2013-05-12 13:16:11 +00:00
{OB_MODE_OBJECT, "OBJECT", ICON_OBJECT_DATAMODE, "Object Mode", ""},
{OB_MODE_EDIT, "EDIT", ICON_EDITMODE_HLT, "Edit Mode", ""},
Pie Menus C code backend. This commit merges the code in the pie-menu branch. As per decisions taken the last few days, there are no pie menus included and there will be an official add-on including overrides of some keys with pie menus. However, people will now be able to use the new code in python. Full Documentation is in http://wiki.blender.org/index.php/Dev:Ref/ Thanks: Campbell Barton, Dalai Felinto and Ton Roosendaal for the code review and design comments Jonathan Williamson, Pawel Lyczkowski, Pablo Vazquez among others for suggestions during the development. Special Thanks to Sean Olson, for his support, suggestions, testing and merciless bugging so that I would finish the pie menu code. Without him we wouldn't be here. Also to the rest of the developers of the original python add-on, Patrick Moore and Dan Eicher and finally to Matt Ebb, who did the research and first implementation and whose code I used to get started.
2014-08-11 10:39:59 +02:00
{OB_MODE_POSE, "POSE", ICON_POSE_HLT, "Pose Mode", ""},
RNA: revert object mode re-order This was done so numbered shortcuts made sense. Now order matches master.
2018-06-09 12:55:10 +02:00
{OB_MODE_SCULPT, "SCULPT", ICON_SCULPTMODE_HLT, "Sculpt Mode", ""},
Keymap: group paint modes, reorder enum Menu now matches the keymap.
2018-05-30 13:47:24 +02:00
{OB_MODE_VERTEX_PAINT, "VERTEX_PAINT", ICON_VPAINT_HLT, "Vertex Paint", ""},
RNA: revert object mode re-order This was done so numbered shortcuts made sense. Now order matches master.
2018-06-09 12:55:10 +02:00
{OB_MODE_WEIGHT_PAINT, "WEIGHT_PAINT", ICON_WPAINT_HLT, "Weight Paint", ""},
2.5/Modes: * Added OBJECT_OT_mode_set for setting the object mode. Takes one property, "mode", which can be any of the OB_MODE_* flags. The available modes are limited based on the active object (e.g. only meshes can have sculptmode, and so forth.) * Set the icon properties in the object mode enum RNA TODO: At this point I think everything is ready to start ripping out the ugly hacks in view3d_header for setting the mode :)
2009-08-16 05:48:07 +00:00
{OB_MODE_TEXTURE_PAINT, "TEXTURE_PAINT", ICON_TPAINT_HLT, "Texture Paint", ""},
Revert particle system and point cache removal in blender2.8 branch. This reverts commit 5aa19be91263a249ffae75573e3b32f24269d890 and b4a721af694817fa921b119df83d33ede7d7fed0. Due to postponement of particle system rewrite it was decided to put particle code back into the 2.8 branch for the time being.
2016-12-28 17:30:58 +01:00
{OB_MODE_PARTICLE_EDIT, "PARTICLE_EDIT", ICON_PARTICLEMODE, "Particle Edit", ""},
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
{OB_MODE_GPENCIL_EDIT, "GPENCIL_EDIT", ICON_EDITMODE_HLT, "Edit Mode", "Edit Grease Pencil Strokes"},
{OB_MODE_GPENCIL_SCULPT, "GPENCIL_SCULPT", ICON_SCULPTMODE_HLT, "Sculpt Mode", "Sculpt Grease Pencil Strokes"},
{OB_MODE_GPENCIL_PAINT, "GPENCIL_PAINT", ICON_GREASEPENCIL, "Draw", "Paint Grease Pencil Strokes"},
{OB_MODE_GPENCIL_WEIGHT, "GPENCIL_WEIGHT", ICON_WPAINT_HLT, "Weight Paint", "Grease Pencil Weight Paint Strokes" },
style cleanup: mostly whitespace in rna
2012-05-12 11:01:29 +00:00
{0, NULL, 0, NULL, NULL}
};
2.5/Modes: * Added OBJECT_OT_mode_set for setting the object mode. Takes one property, "mode", which can be any of the OB_MODE_* flags. The available modes are limited based on the active object (e.g. only meshes can have sculptmode, and so forth.) * Set the icon properties in the object mode enum RNA TODO: At this point I think everything is ready to start ripping out the ugly hacks in view3d_header for setting the mode :)
2009-08-16 05:48:07 +00:00
Workspaces: switch object mode when switching workspaces. In the workspace properties a mode can now be configured that is automatically enabled when switching to the workspace. This is a test to validate how well it works. The weak point is that if you don't have an appropriate object already select it will not switch modes. See T56475.
2018-08-21 15:27:29 +02:00
/* Same as above, but with names that distinguish grease pencil. */
const EnumPropertyItem rna_enum_workspace_object_mode_items[] = {
{OB_MODE_OBJECT, "OBJECT", ICON_OBJECT_DATAMODE, "Object Mode", ""},
{OB_MODE_EDIT, "EDIT", ICON_EDITMODE_HLT, "Edit Mode", ""},
{OB_MODE_POSE, "POSE", ICON_POSE_HLT, "Pose Mode", ""},
{OB_MODE_SCULPT, "SCULPT", ICON_SCULPTMODE_HLT, "Sculpt Mode", ""},
{OB_MODE_VERTEX_PAINT, "VERTEX_PAINT", ICON_VPAINT_HLT, "Vertex Paint", ""},
{OB_MODE_WEIGHT_PAINT, "WEIGHT_PAINT", ICON_WPAINT_HLT, "Weight Paint", ""},
{OB_MODE_TEXTURE_PAINT, "TEXTURE_PAINT", ICON_TPAINT_HLT, "Texture Paint", ""},
{OB_MODE_PARTICLE_EDIT, "PARTICLE_EDIT", ICON_PARTICLEMODE, "Particle Edit", ""},
{OB_MODE_GPENCIL_EDIT, "GPENCIL_EDIT", ICON_EDITMODE_HLT, "Grease Pencil Edit Mode", "Edit Grease Pencil Strokes"},
{OB_MODE_GPENCIL_SCULPT, "GPENCIL_SCULPT", ICON_SCULPTMODE_HLT, "Grease Pencil Sculpt Mode", "Sculpt Grease Pencil Strokes"},
{OB_MODE_GPENCIL_PAINT, "GPENCIL_PAINT", ICON_GREASEPENCIL, "Grease Pencil Draw", "Paint Grease Pencil Strokes"},
{OB_MODE_GPENCIL_WEIGHT, "GPENCIL_WEIGHT", ICON_WPAINT_HLT, "Grease Pencil Weight Paint", "Grease Pencil Weight Paint Strokes" },
{0, NULL, 0, NULL, NULL}
};
Cleanup: Use const for RNA EnumPropertyItem args Practically all access to enum data is read-only.
2017-10-18 15:07:26 +11:00
const EnumPropertyItem rna_enum_object_empty_drawtype_items[] = {
code cleanup: de-duplicate enum.
2012-10-05 15:48:39 +00:00
{OB_PLAINAXES, "PLAIN_AXES", 0, "Plain Axes", ""},
{OB_ARROWS, "ARROWS", 0, "Arrows", ""},
{OB_SINGLE_ARROW, "SINGLE_ARROW", 0, "Single Arrow", ""},
{OB_CIRCLE, "CIRCLE", 0, "Circle", ""},
{OB_CUBE, "CUBE", 0, "Cube", ""},
{OB_EMPTY_SPHERE, "SPHERE", 0, "Sphere", ""},
{OB_EMPTY_CONE, "CONE", 0, "Cone", ""},
{OB_EMPTY_IMAGE, "IMAGE", 0, "Image", ""},
{0, NULL, 0, NULL, NULL}
};
Image Empties: More visibility settings Support for showing images in background/foreground and only in perspective/orthographic view. Internally the depth of the image is modified in the fragment shader by setting `gl_FragDepth` explicitly. The UI still needs some work to improve usability, see D3863 for details. Currently there is one duplicated function, not sure how to best deduplicate it yet. (`is_image_empty_visible`) Reviewer: fclem, brecht, campbellbarton Differential Revision: https://developer.blender.org/D3863
2018-10-31 13:35:53 +01:00
const EnumPropertyItem rna_enum_object_empty_image_depth_items[] = {
{OB_EMPTY_IMAGE_DEPTH_DEFAULT, "DEFAULT", 0, "Default", ""},
{OB_EMPTY_IMAGE_DEPTH_FRONT, "FRONT", 0, "Front", ""},
{OB_EMPTY_IMAGE_DEPTH_BACK, "BACK", 0, "Back", ""},
{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
const EnumPropertyItem rna_enum_object_gpencil_type_items[] = {
Cleanup: indentation
2018-10-31 14:43:25 +11:00
{GP_EMPTY, "EMPTY", ICON_GP_EMPTY, "Blank", "Create an empty grease pencil object"},
{GP_STROKE, "STROKE", ICON_GP_STROKE, "Stroke", "Create a simple stroke with basic colors"},
{GP_MONKEY, "MONKEY", ICON_MONKEY, "Monkey", "Construct a Suzanne grease pencil object"},
{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
};
code cleanup: de-duplicate enum.
2012-10-05 15:48:39 +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 parent_type_items[] = {
Patch [#27344] 300+ New/changed tooltips by Davis Sorenson (dsavi). Thanks a lot! Reviewed by Tom Musgrove and myself. From the patch description: ValterVB on #blendercoders submitted a long list of missing tooltips in Blender, and I went through the list and added all I knew. After that I crowdsourced the rest by putting a spreadsheet on Google docs and having people fill in the missing ones that I didn't know. So if there's some weird tooltip in there that doesn't make sense, that's why. Thanks to Wolter, spacetug and others on BlenderArtists for contributing tooltips.
2011-05-15 17:59:48 +00:00
{PAROBJECT, "OBJECT", 0, "Object", "The object is parented to an object"},
2.5: Objects * Added Relations panel with layers, pass_index, parent. * Groups panel now can do add to group/remove from group. * Parent, parent type, track are now editable. * Separate constraint add operator for object and bones.
2009-07-14 20:27:28 +00:00
{PARSKEL, "ARMATURE", 0, "Armature", ""},
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
{PARSKEL, "LATTICE", 0, "Lattice", "The object is parented to a lattice"}, /* PARSKEL reuse will give issues */
Patch [#27344] 300+ New/changed tooltips by Davis Sorenson (dsavi). Thanks a lot! Reviewed by Tom Musgrove and myself. From the patch description: ValterVB on #blendercoders submitted a long list of missing tooltips in Blender, and I went through the list and added all I knew. After that I crowdsourced the rest by putting a spreadsheet on Google docs and having people fill in the missing ones that I didn't know. So if there's some weird tooltip in there that doesn't make sense, that's why. Thanks to Wolter, spacetug and others on BlenderArtists for contributing tooltips.
2011-05-15 17:59:48 +00:00
{PARVERT1, "VERTEX", 0, "Vertex", "The object is parented to a vertex"},
2.5: Objects * Added Relations panel with layers, pass_index, parent. * Groups panel now can do add to group/remove from group. * Parent, parent type, track are now editable. * Separate constraint add operator for object and bones.
2009-07-14 20:27:28 +00:00
{PARVERT3, "VERTEX_3", 0, "3 Vertices", ""},
Patch [#27344] 300+ New/changed tooltips by Davis Sorenson (dsavi). Thanks a lot! Reviewed by Tom Musgrove and myself. From the patch description: ValterVB on #blendercoders submitted a long list of missing tooltips in Blender, and I went through the list and added all I knew. After that I crowdsourced the rest by putting a spreadsheet on Google docs and having people fill in the missing ones that I didn't know. So if there's some weird tooltip in there that doesn't make sense, that's why. Thanks to Wolter, spacetug and others on BlenderArtists for contributing tooltips.
2011-05-15 17:59:48 +00:00
{PARBONE, "BONE", 0, "Bone", "The object is parented to a bone"},
style cleanup: mostly whitespace in rna
2012-05-12 11:01:29 +00:00
{0, NULL, 0, NULL, NULL}
};
code cleanup: de-duplicate enum.
2012-10-05 15:48:39 +00:00
Remove dupli-group support for non-empty objects Behavior for mixing object-data & dupli data was confusing, exporters and render engines often got it wrong.
2017-06-29 23:22:05 +10:00
#define DUPLI_ITEMS_SHARED \
{0, "NONE", 0, "None", ""}, \
{OB_DUPLIFRAMES, "FRAMES", 0, "Frames", "Make copy of object for every frame"}, \
{OB_DUPLIVERTS, "VERTS", 0, "Verts", "Duplicate child objects on all vertices"}, \
{OB_DUPLIFACES, "FACES", 0, "Faces", "Duplicate child objects on all faces"}
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
#define DUPLI_ITEM_COLLECTION \
{OB_DUPLICOLLECTION, "COLLECTION", 0, "Collection", "Enable collection instancing"}
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 dupli_items[] = {
Remove dupli-group support for non-empty objects Behavior for mixing object-data & dupli data was confusing, exporters and render engines often got it wrong.
2017-06-29 23:22:05 +10:00
DUPLI_ITEMS_SHARED,
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
DUPLI_ITEM_COLLECTION,
Remove dupli-group support for non-empty objects Behavior for mixing object-data & dupli data was confusing, exporters and render engines often got it wrong.
2017-06-29 23:22:05 +10:00
{0, NULL, 0, NULL, NULL}
};
#ifdef RNA_RUNTIME
static EnumPropertyItem dupli_items_nogroup[] = {
DUPLI_ITEMS_SHARED,
Fix #33454: cycles wasn't hiding the original object used for dupliverts or duplifaces like blender internal.
2012-12-09 12:43:40 +00:00
{0, NULL, 0, NULL, NULL}
};
fix another crash from missing update in Auto-Merge from r52911
2012-12-13 00:41:23 +00:00
#endif
Remove dupli-group support for non-empty objects Behavior for mixing object-data & dupli data was confusing, exporters and render engines often got it wrong.
2017-06-29 23:22:05 +10:00
#undef DUPLI_ITEMS_SHARED
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
#undef DUPLI_ITEM_COLLECTION
Fix #33454: cycles wasn't hiding the original object used for dupliverts or duplifaces like blender internal.
2012-12-09 12:43:40 +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
const EnumPropertyItem rna_enum_metaelem_type_items[] = {
fix [#24780] Metaballs are not drawn correctly in new scenes this is a can of worms, at the moment blender depends on broken behavior for metaballs: find_basis_mball() can return a metaball object that fails a is_basis_mball() check which makes this logic very confusing (added note about this in mball.c). Metaballs needs a refactor however at least make drawing fail consistently, For wire draw is_basis_mball() wasn't being checked, for solid drawing it was (hence the strange wire frame). For now the motherball needs to exist in the main scene else it wont work.
2010-11-18 04:26:50 +00:00
{MB_BALL, "BALL", ICON_META_BALL, "Ball", ""},
{MB_TUBE, "CAPSULE", ICON_META_CAPSULE, "Capsule", ""},
{MB_PLANE, "PLANE", ICON_META_PLANE, "Plane", ""},
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
{MB_ELIPSOID, "ELLIPSOID", ICON_META_ELLIPSOID, "Ellipsoid", ""}, /* NOTE: typo at original definition! */
fix [#24780] Metaballs are not drawn correctly in new scenes this is a can of worms, at the moment blender depends on broken behavior for metaballs: find_basis_mball() can return a metaball object that fails a is_basis_mball() check which makes this logic very confusing (added note about this in mball.c). Metaballs needs a refactor however at least make drawing fail consistently, For wire draw is_basis_mball() wasn't being checked, for solid drawing it was (hence the strange wire frame). For now the motherball needs to exist in the main scene else it wont work.
2010-11-18 04:26:50 +00:00
{MB_CUBE, "CUBE", ICON_META_CUBE, "Cube", ""},
style cleanup: mostly whitespace in rna
2012-05-12 11:01:29 +00:00
{0, NULL, 0, NULL, NULL}
};
fix [#24780] Metaballs are not drawn correctly in new scenes this is a can of worms, at the moment blender depends on broken behavior for metaballs: find_basis_mball() can return a metaball object that fails a is_basis_mball() check which makes this logic very confusing (added note about this in mball.c). Metaballs needs a refactor however at least make drawing fail consistently, For wire draw is_basis_mball() wasn't being checked, for solid drawing it was (hence the strange wire frame). For now the motherball needs to exist in the main scene else it wont work.
2010-11-18 04:26:50 +00:00
py/rna functions for adding and removing curve data. (commit 27666 by Campbell from render25 branch)
2010-03-23 14:58:36 +00:00
/* used for 2 enums */
#define OBTYPE_CU_CURVE {OB_CURVE, "CURVE", 0, "Curve", ""}
#define OBTYPE_CU_SURF {OB_SURF, "SURFACE", 0, "Surface", ""}
missed this file before (de-duplicating enum).
2010-12-16 09:51:55 +00:00
#define OBTYPE_CU_FONT {OB_FONT, "FONT", 0, "Font", ""}
whitespace only, no functional change mixed tabs/spaces --> tabs.
2011-04-21 13:11:51 +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
const EnumPropertyItem rna_enum_object_type_items[] = {
merge with 2.5/trunk at r23271
2009-09-16 17:43:09 +00:00
{OB_MESH, "MESH", 0, "Mesh", ""},
py/rna functions for adding and removing curve data. (commit 27666 by Campbell from render25 branch)
2010-03-23 14:58:36 +00:00
OBTYPE_CU_CURVE,
OBTYPE_CU_SURF,
merge with 2.5/trunk at r23271
2009-09-16 17:43:09 +00:00
{OB_MBALL, "META", 0, "Meta", ""},
missed this file before (de-duplicating enum).
2010-12-16 09:51:55 +00:00
OBTYPE_CU_FONT,
merge with 2.5/trunk at r23271
2009-09-16 17:43:09 +00:00
{0, "", 0, NULL, NULL},
{OB_ARMATURE, "ARMATURE", 0, "Armature", ""},
{OB_LATTICE, "LATTICE", 0, "Lattice", ""},
{OB_EMPTY, "EMPTY", 0, "Empty", ""},
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
{OB_GPENCIL, "GPENCIL", 0, "GPencil", ""},
merge with 2.5/trunk at r23271
2009-09-16 17:43:09 +00:00
{0, "", 0, NULL, NULL},
{OB_CAMERA, "CAMERA", 0, "Camera", ""},
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
{OB_LAMP, "LIGHT", 0, "Light", ""},
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
{OB_SPEAKER, "SPEAKER", 0, "Speaker", ""},
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
{OB_LIGHTPROBE, "LIGHT_PROBE", 0, "Probe", ""},
style cleanup: mostly whitespace in rna
2012-05-12 11:01:29 +00:00
{0, NULL, 0, NULL, NULL}
};
merge with 2.5/trunk at r23271
2009-09-16 17:43:09 +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
const EnumPropertyItem rna_enum_object_type_curve_items[] = {
py/rna functions for adding and removing curve data. (commit 27666 by Campbell from render25 branch)
2010-03-23 14:58:36 +00:00
OBTYPE_CU_CURVE,
OBTYPE_CU_SURF,
missed this file before (de-duplicating enum).
2010-12-16 09:51:55 +00:00
OBTYPE_CU_FONT,
style cleanup: mostly whitespace in rna
2012-05-12 11:01:29 +00:00
{0, NULL, 0, NULL, NULL}
};
minor rna changes - set matrix values not to be animatable - some matrix values were still accessed as 1d arrays.
2010-11-30 20:22:26 +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
const EnumPropertyItem rna_enum_object_axis_items[] = {
mesh-cache deform modifier, supports MDD and PC2 formats. see wiki docs: http://wiki.blender.org/index.php/Doc:2.6/Manual/Modifiers/Deform/Mesh_Cache
2013-01-21 15:41:00 +00:00
{OB_POSX, "POS_X", 0, "+X", ""},
{OB_POSY, "POS_Y", 0, "+Y", ""},
{OB_POSZ, "POS_Z", 0, "+Z", ""},
{OB_NEGX, "NEG_X", 0, "-X", ""},
{OB_NEGY, "NEG_Y", 0, "-Y", ""},
{OB_NEGZ, "NEG_Z", 0, "-Z", ""},
{0, NULL, 0, NULL, NULL}
};
minor rna changes - set matrix values not to be animatable - some matrix values were still accessed as 1d arrays.
2010-11-30 20:22:26 +00:00
RNA / Data API This is the first code for the Data API, also known as RNA system in the 2.5 Branch. It does not include a user interface, and only wraps some Scene properties for testing. It is integrated with Scons and Makefiles, and compiles a 'makesrna' program that generates an RNA.c file. http://wiki.blender.org/index.php/BlenderDev/Blender2.5/DataAPI http://wiki.blender.org/index.php/BlenderDev/Blender2.5/RNA The changes are quite local, basically adding a makesrna module which works similar to the makesdna module. The one external change is in moving genfile.c from blenloader to the makesdna module, so that it can be reused by the RNA code. This also meant changing the DNA makefiles. It seems to be doing dependencies correct still in my tests, but if there is an issue with the DNA not being rebuilt this commit might be the one causing it. Also it seems for scons the makesdna and makesrna modules are compiling without warnings. Not a new issue but this should be fixed. The RNA code supports all types as defined in the Data API design, so in that sense it is fairly complete and I hope that aspect will not have to change much. Some obviously missing parts are context related code, notify() functions for updates and user defined / ID properties.
2008-10-31 23:50:02 +00:00
#ifdef RNA_RUNTIME
RNA: review of commits in the past days, check the diffs for the many small changes, but the two bigger ones are: * Sensors and controllers now use inheritance, rather than pointing to the data in a separate struct. Had to add some new RNA define functionality to support this better. * DNA_meta_types.h was marked as done but still missing many things, now completed.
2008-12-02 23:45:11 +00:00
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"
merge with trunk/2.5 at r23876 [[Split portion of a mixed commit.]]
2009-10-22 23:22:05 +00:00
NLA SoC: Merge from 2.5 21210 to 21300 Note to self: the next merge will be messy again, since 2 commits occurred this one was complete
2009-07-02 03:32:57 +00:00
#include "DNA_key_types.h"
object.constraints.add()/remove()/active, same for PoseChannel modified internal api for minimal rna wrapper functions. TODO - missing updates for pose channels - typecheck for pose/object constraints
2009-11-11 19:58:30 +00:00
#include "DNA_constraint_types.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 "DNA_gpencil_types.h"
Static Override: Add proper 'apply' callback for object constraints insertion. Seems to be working fine, still need to figure out how to make inserted constraints fully overridable... ;)
2018-05-02 11:35:24 +02:00
#include "DNA_ID.h"
patch [#25440] Object.vertex_group fixin' from Dan Eicher (dna) From the tracker (with minor edits) ======================== cube = bpy.data.objects['Cube'] foo = cube.vertex_groups.new('foo') foo.add([1,3,5,7], 1.0, 'ADD') for i in range(len(cube.data.vertices)): try: weight = foo.weight(i) print('vert: %i weight: %f' % (i, weight)) except: pass foo.remove([1,3]) cube.vertex_groups.remove(foo)
2011-01-07 09:50:23 +00:00
#include "DNA_lattice_types.h"
Merged the particles-2010 branch with node improvements into trunk. This branch adds mostly organizational improvements to the node system by renaming the node folders and files. A couple of internal features have been added too. Detailed information can be found on the wiki page: http://wiki.blender.org/index.php/User:Phonybone/Particles2010
2011-09-05 21:01:50 +00:00
#include "DNA_node_types.h"
NLA SoC: Merge from 2.5 21210 to 21300 Note to self: the next merge will be messy again, since 2 commits occurred this one was complete
2009-07-02 03:32:57 +00:00
RNA: * Accept None as NULL pointers through python function calls. * Added type callback for pointers back, it's useful still in some cases. Made Object.data editable using this, the pointer type varying based on object type. * Wrap pin ID pointer in buttons space. * Added subclasses for text and surface curve ID blocks, to organize data better and get proper icons. * Added RNA_type_to_ID_code and ID_code_to_RNA_type functions. * Update RNA_access.h with new RNA types.
2009-06-07 13:09:18 +00:00
#include "BKE_armature.h"
GP: Select color in Brush or in Properties After some artist feedback the material selection was not clear. Now, the material can be selected in the top bar or in the properties panel. 1) If the material is selected in properties panel, all Brushes except pinned will be assigned to this material. 2) If the material is selected in the brush, the properties panel is updated to set the active material. Added a new Pin icon to keep locked the material to one brush
2018-08-24 23:59:56 +02:00
#include "BKE_brush.h"
arbitrary property and function support for rna properties (arrays and collections), this means functions can be easily added. eg. scene.objects.link() object.constraints.new() mesh.verts.transform(...) mesh.faces.active PropertyRNA stores an StructRNA pointer where these can be defined.
2009-11-13 16:08:03 +00:00
#include "BKE_constraint.h"
RNA * Added support for sending notifiers and updates when setting RNA properties. Per property, there is a notifier NC_/ND_ flag, and a function that is called. Currently only used for Object.loc/rot/size. * RNA_property_update that does this is not automatically called in every _set function, it has do be done separate, and is being done by buttons with RNA data. * Perhaps for python there could be a trick to accumulate these flags rather than update each time, though for now the python RNA code could just do them everytime. Did not add these calls in the python code yet because it needs context, not sure where to get that from?
2009-01-01 15:52:51 +00:00
#include "BKE_context.h"
RNA: * Accept None as NULL pointers through python function calls. * Added type callback for pointers back, it's useful still in some cases. Made Object.data editable using this, the pointer type varying based on object type. * Wrap pin ID pointer in buttons space. * Added subclasses for text and surface curve ID blocks, to organize data better and get proper icons. * Added RNA_type_to_ID_code and ID_code_to_RNA_type functions. * Update RNA_access.h with new RNA types.
2009-06-07 13:09:18 +00:00
#include "BKE_curve.h"
2.5: Physics Buttons All kinds of changes to get it ready for UI layouts. This means RNA and operators should be working correct, but most buttons are still not actually there yet. * Added near empty soft body, fluid, field and collision panels, tweaks to cloth panels. * Fluid bake works, but without escape or showing any progress. * Fluid/Softbody/Cloth/Collision can now be both added as modifiers or in the physics panels. * Missing: fields & soft body for particles. * Missing: proper updating softbodies, guess this code still needs updates after pointcache refactor?
2009-07-02 19:41:31 +00:00
#include "BKE_effect.h"
Make freestyle use local Main for temporary objects This means main database is no longer pollutes with temporary scene and objects needed for freestyle render. Actually, there're few of separated temporary mains now. Ideally it's better to use single one, but it's not so much trivial to pass it to all classes. Not so big deal actually. Required some changes to blender kernel, to make it possible to add object to a given main, also to check on mesh materials for objects in given main. This is all straightforward changes. As an additional, solved issue with main database being infinitely polluted with text blocks created by create_lineset_handler function. This fixes: - #35003: Freestyle crashes if user expands objects in FRS1_Scene - #35012: ctrl+f12 rendering crashes when using Freestyle
2013-04-18 08:58:21 +00:00
#include "BKE_global.h"
NLA SoC: Merge from 2.5 21210 to 21300 Note to self: the next merge will be messy again, since 2 commits occurred this one was complete
2009-07-02 03:32:57 +00:00
#include "BKE_key.h"
* Partial fix for bug [#19734] N panel's transform doesn't display the units Converted the Object transform properties to use rna/rna buttons. This has the advantage of not only displaying/editing units, but also RMB menu, keyframing, drivers, etc too. Part of this was to convert 'Dimensions' to an rna property, converting to and from scale. This also allows you to set the object's dimensions via fcurves or python, but note that it's driving the object scale setting internally so if you animate both dimension and scale at the same time one will override the other (i don't expect many people to attempt this).
2009-11-04 23:14:20 +00:00
#include "BKE_object.h"
RNA * DNA_cloth_types.h, patch by Roelf de Kock. The gravity[3] member is not being parsed correct by makesdna.c and will give issues even when trying to fix it. Worked around it for now in RNA by wrapping it manually, but this should really be fixed in the DNA genetics code, added a comment about it in DNA_cloth_types.h. * Handle vertex groups and uv layers more consistent now. They are all exposed as strings now. Reason is that indices don't really say much, and a direct pointer is not always possible because for example a uv layer in a material can be used for multiple objects and so there is no single pointer. In python it is not too hard to use either since the strings works as a key for lookups. For the user interface we can later think of some method to generate popup menus in a way that works for vertex groups, uv layers, bones etc. * This also fixes the XXX's in rna_modifier.c, I think that can be marked done.
2009-01-04 19:25:24 +00:00
#include "BKE_material.h"
RNA: * Accept None as NULL pointers through python function calls. * Added type callback for pointers back, it's useful still in some cases. Made Object.data editable using this, the pointer type varying based on object type. * Wrap pin ID pointer in buttons space. * Added subclasses for text and surface curve ID blocks, to organize data better and get proper icons. * Added RNA_type_to_ID_code and ID_code_to_RNA_type functions. * Update RNA_access.h with new RNA types.
2009-06-07 13:09:18 +00:00
#include "BKE_mesh.h"
Static Override: add insertion for modifiers and one constraints, fix editing of inserted items in collections. Now insertable collection items have a flag to say they are 'local' (and hence can be freely edited).
2018-05-02 18:13:15 +02:00
#include "BKE_modifier.h"
Revert particle system and point cache removal in blender2.8 branch. This reverts commit 5aa19be91263a249ffae75573e3b32f24269d890 and b4a721af694817fa921b119df83d33ede7d7fed0. Due to postponement of particle system rewrite it was decided to put particle code back into the 2.8 branch for the time being.
2016-12-28 17:30:58 +01:00
#include "BKE_particle.h"
2.5: Objects * Added Relations panel with layers, pass_index, parent. * Groups panel now can do add to group/remove from group. * Parent, parent type, track are now editable. * Separate constraint add operator for object and bones.
2009-07-14 20:27:28 +00:00
#include "BKE_scene.h"
remove inline loops in a few places replace with defgroup_find_name() and BLI_findstring()
2010-08-22 14:15:28 +00:00
#include "BKE_deform.h"
2.5: Objects * Added Relations panel with layers, pass_index, parent. * Groups panel now can do add to group/remove from group. * Parent, parent type, track are now editable. * Separate constraint add operator for object and bones.
2009-07-14 20:27:28 +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"
2.5: Objects * Added Relations panel with layers, pass_index, parent. * Groups panel now can do add to group/remove from group. * Parent, parent type, track are now editable. * Separate constraint add operator for object and bones.
2009-07-14 20:27:28 +00:00
#include "ED_object.h"
Revert particle system and point cache removal in blender2.8 branch. This reverts commit 5aa19be91263a249ffae75573e3b32f24269d890 and b4a721af694817fa921b119df83d33ede7d7fed0. Due to postponement of particle system rewrite it was decided to put particle code back into the 2.8 branch for the time being.
2016-12-28 17:30:58 +01:00
#include "ED_particle.h"
- Enable shape key switching in edit mode for curves, surfaces and latticies - Disable changing of lattice size if there are shape keys
2010-08-10 06:36:42 +00:00
#include "ED_curve.h"
#include "ED_lattice.h"
RNA * Added support for sending notifiers and updates when setting RNA properties. Per property, there is a notifier NC_/ND_ flag, and a function that is called. Currently only used for Object.loc/rot/size. * RNA_property_update that does this is not automatically called in every _set function, it has do be done separate, and is being done by buttons with RNA data. * Perhaps for python there could be a trick to accumulate these flags rather than update each time, though for now the python RNA code could just do them everytime. Did not add these calls in the python code yet because it needs context, not sure where to get that from?
2009-01-01 15:52:51 +00:00
tag unused rna args.
2011-05-31 02:14:25 +00:00
static void rna_Object_internal_update(Main *UNUSED(bmain), Scene *UNUSED(scene), PointerRNA *ptr)
RNA * Added support for sending notifiers and updates when setting RNA properties. Per property, there is a notifier NC_/ND_ flag, and a function that is called. Currently only used for Object.loc/rot/size. * RNA_property_update that does this is not automatically called in every _set function, it has do be done separate, and is being done by buttons with RNA data. * Perhaps for python there could be a trick to accumulate these flags rather than update each time, though for now the python RNA code could just do them everytime. Did not add these calls in the python code yet because it needs context, not sure where to get that from?
2009-01-01 15:52:51 +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
DEG_id_tag_update(ptr->id.data, OB_RECALC_OB);
RNA * Added support for sending notifiers and updates when setting RNA properties. Per property, there is a notifier NC_/ND_ flag, and a function that is called. Currently only used for Object.loc/rot/size. * RNA_property_update that does this is not automatically called in every _set function, it has do be done separate, and is being done by buttons with RNA data. * Perhaps for python there could be a trick to accumulate these flags rather than update each time, though for now the python RNA code could just do them everytime. Did not add these calls in the python code yet because it needs context, not sure where to get that from?
2009-01-01 15:52:51 +00:00
}
Fix T54089: missing GLSL material draw update when changing object pass index.
2018-02-18 19:28:14 +01:00
static void rna_Object_internal_update_draw(Main *UNUSED(bmain), Scene *UNUSED(scene), PointerRNA *ptr)
{
Merge branch 'master' into blender2.8
2018-02-18 19:29:17 +01:00
DEG_id_tag_update(ptr->id.data, OB_RECALC_OB);
Fix T54089: missing GLSL material draw update when changing object pass index.
2018-02-18 19:28:14 +01:00
WM_main_add_notifier(NC_OBJECT | ND_DRAW, ptr->id.data);
}
pointer poll functions for object's, mainly for modifiers, constraints. Lattice modifier only shows lattices types, Shrink wrap only meshes etc.
2010-08-03 06:51:36 +00:00
static void rna_Object_matrix_world_update(Main *bmain, Scene *scene, PointerRNA *ptr)
- 3ds importer working (without the "scale to size" option) - changing object.matrix now updates object.loc/rot/scale - added bpy.data.add_lamp()
2009-08-13 11:14:06 +00:00
{
spelling cleanup
2012-03-18 07:38:51 +00:00
/* don't use compat so we get predictable rotation */
Code cleanup: remove TRUE/FALSE & WITH_BOOL_COMPAT define
2014-04-01 11:34:00 +11:00
BKE_object_apply_mat4(ptr->id.data, ((Object *)ptr->id.data)->obmat, false, true);
rename rna function obj.make_display_list(scene) --> obj.update(scene) also added 3 optional bool arguments, 'object', 'data' & 'time', matching the object recalc flags.
2010-06-09 08:24:31 +00:00
rna_Object_internal_update(bmain, scene, ptr);
- 3ds importer working (without the "scale to size" option) - changing object.matrix now updates object.loc/rot/scale - added bpy.data.add_lamp()
2009-08-13 11:14:06 +00:00
}
Objects: restore per object restrict view/render/select. Note this is now separate from H key hiding, and meant for more persistent ways to define which objects are relevant to the viewport or render. This avoids some cases where you'd have to create collection specifically to hide objects for viewport/render.
2018-06-18 19:18:02 +02:00
static void rna_Object_hide_update(Main *bmain, Scene *UNUSED(scene), PointerRNA *ptr)
Fix cycles not working in 3d local view, and missing update when toggling hiding in the outliner.
2012-06-25 11:43:22 +00:00
{
Objects: restore per object restrict view/render/select. Note this is now separate from H key hiding, and meant for more persistent ways to define which objects are relevant to the viewport or render. This avoids some cases where you'd have to create collection specifically to hide objects for viewport/render.
2018-06-18 19:18:02 +02:00
Object *ob = ptr->id.data;
BKE_main_collection_sync(bmain);
Depsgraph: add some missing depsgraph tags when relations change.
2018-06-20 17:43:56 +02:00
DEG_id_tag_update(&ob->id, DEG_TAG_COPY_ON_WRITE);
Objects: restore per object restrict view/render/select. Note this is now separate from H key hiding, and meant for more persistent ways to define which objects are relevant to the viewport or render. This avoids some cases where you'd have to create collection specifically to hide objects for viewport/render.
2018-06-18 19:18:02 +02:00
DEG_relations_tag_update(bmain);
WM_main_add_notifier(NC_OBJECT | ND_DRAW, &ob->id);
Fix cycles not working in 3d local view, and missing update when toggling hiding in the outliner.
2012-06-25 11:43:22 +00:00
}
GP: Select color in Brush or in Properties After some artist feedback the material selection was not clear. Now, the material can be selected in the top bar or in the properties panel. 1) If the material is selected in properties panel, all Brushes except pinned will be assigned to this material. 2) If the material is selected in the brush, the properties panel is updated to set the active material. Added a new Pin icon to keep locked the material to one brush
2018-08-24 23:59:56 +02:00
static void rna_MaterialIndex_update(Main *bmain, Scene *UNUSED(scene), PointerRNA *ptr)
{
/* update the material of all brushes not pinned */
Object *ob = (Object *)ptr->id.data;
if (ob && ob->type == OB_GPENCIL) {
Material *ma = give_current_material(ob, ob->actcol);
if (ma != NULL) {
BKE_brush_update_material(bmain, ma, NULL);
WM_main_add_notifier(NC_SPACE | ND_SPACE_VIEW3D, NULL);
}
}
}
pointer poll functions for object's, mainly for modifiers, constraints. Lattice modifier only shows lattices types, Shrink wrap only meshes etc.
2010-08-03 06:51:36 +00:00
static void rna_Object_matrix_local_get(PointerRNA *ptr, float values[16])
rna api: rename object.matrix --> matrix_world added object.matrix_local (parent relative matrix)
2010-07-03 17:39:29 +00:00
{
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
Object *ob = ptr->id.data;
Moved code for calculating local_matrix to BKE funtion for reuse
2013-07-12 12:58:01 +00:00
BKE_object_matrix_local_get(ob, (float(*)[4])values);
rna api: rename object.matrix --> matrix_world added object.matrix_local (parent relative matrix)
2010-07-03 17:39:29 +00:00
}
pointer poll functions for object's, mainly for modifiers, constraints. Lattice modifier only shows lattices types, Shrink wrap only meshes etc.
2010-08-03 06:51:36 +00:00
static void rna_Object_matrix_local_set(PointerRNA *ptr, const float values[16])
merge with trunk/2.5 at r23876 [[Split portion of a mixed commit.]]
2009-10-22 23:22:05 +00:00
{
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
Object *ob = ptr->id.data;
Fix stupid handling of 'Object.matrix_local' in RNA. The getter of this matrix (actually, `BKE_object_matrix_local_get()`) was only correct in case of pure-object parenting, bone parenting and such did not gave valid results. Also cleaned up a bit setter code, was using as temp storage ob->obmat itself, which is supposed to be a world matrix! Reviewers: campbellbarton Reviewed By: campbellbarton Differential Revision: https://developer.blender.org/D958
2014-12-29 15:23:12 +01:00
float local_mat[4][4];
rna api: rename object.matrix --> matrix_world added object.matrix_local (parent relative matrix)
2010-07-03 17:39:29 +00:00
Fix stupid handling of 'Object.matrix_local' in RNA. The getter of this matrix (actually, `BKE_object_matrix_local_get()`) was only correct in case of pure-object parenting, bone parenting and such did not gave valid results. Also cleaned up a bit setter code, was using as temp storage ob->obmat itself, which is supposed to be a world matrix! Reviewers: campbellbarton Reviewed By: campbellbarton Differential Revision: https://developer.blender.org/D958
2014-12-29 15:23:12 +01:00
/* localspace matrix is truly relative to the parent, but parameters stored in object are
* relative to parentinv matrix. Undo the parent inverse part before applying it as local matrix. */
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
if (ob->parent) {
rna api: rename object.matrix --> matrix_world added object.matrix_local (parent relative matrix)
2010-07-03 17:39:29 +00:00
float invmat[4][4];
invert_m4_m4(invmat, ob->parentinv);
Fix stupid handling of 'Object.matrix_local' in RNA. The getter of this matrix (actually, `BKE_object_matrix_local_get()`) was only correct in case of pure-object parenting, bone parenting and such did not gave valid results. Also cleaned up a bit setter code, was using as temp storage ob->obmat itself, which is supposed to be a world matrix! Reviewers: campbellbarton Reviewed By: campbellbarton Differential Revision: https://developer.blender.org/D958
2014-12-29 15:23:12 +01:00
mul_m4_m4m4(local_mat, invmat, (float(*)[4])values);
rna api: rename object.matrix --> matrix_world added object.matrix_local (parent relative matrix)
2010-07-03 17:39:29 +00:00
}
else {
Fix stupid handling of 'Object.matrix_local' in RNA. The getter of this matrix (actually, `BKE_object_matrix_local_get()`) was only correct in case of pure-object parenting, bone parenting and such did not gave valid results. Also cleaned up a bit setter code, was using as temp storage ob->obmat itself, which is supposed to be a world matrix! Reviewers: campbellbarton Reviewed By: campbellbarton Differential Revision: https://developer.blender.org/D958
2014-12-29 15:23:12 +01:00
copy_m4_m4(local_mat, (float(*)[4])values);
rna api: rename object.matrix --> matrix_world added object.matrix_local (parent relative matrix)
2010-07-03 17:39:29 +00:00
}
Fix stupid handling of 'Object.matrix_local' in RNA. The getter of this matrix (actually, `BKE_object_matrix_local_get()`) was only correct in case of pure-object parenting, bone parenting and such did not gave valid results. Also cleaned up a bit setter code, was using as temp storage ob->obmat itself, which is supposed to be a world matrix! Reviewers: campbellbarton Reviewed By: campbellbarton Differential Revision: https://developer.blender.org/D958
2014-12-29 15:23:12 +01:00
/* don't use compat so we get predictable rotation, and do not use parenting either, because it's a local matrix! */
BKE_object_apply_mat4(ob, local_mat, false, false);
rna api: rename object.matrix --> matrix_world added object.matrix_local (parent relative matrix)
2010-07-03 17:39:29 +00:00
}
- 'matrix_basis' for objects and pose bones, this is an alternative access to directly adjusting the loc/scale/rot. - pose bone 'matrix_local' wasn't well named since it didn't work like object or regular bones. - pose bone matrix values for rna had array access rather then 4x4 matrix access. note: for pose bones update scripts by renaming 'matrix_local' --> 'matrix_basis'
2010-11-15 06:38:07 +00:00
static void rna_Object_matrix_basis_get(PointerRNA *ptr, float values[16])
{
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
Object *ob = ptr->id.data;
code cleanup: function naming, use BKE_*type* prefix.
2012-05-05 14:03:12 +00:00
BKE_object_to_mat4(ob, (float(*)[4])values);
- 'matrix_basis' for objects and pose bones, this is an alternative access to directly adjusting the loc/scale/rot. - pose bone 'matrix_local' wasn't well named since it didn't work like object or regular bones. - pose bone matrix values for rna had array access rather then 4x4 matrix access. note: for pose bones update scripts by renaming 'matrix_local' --> 'matrix_basis'
2010-11-15 06:38:07 +00:00
}
static void rna_Object_matrix_basis_set(PointerRNA *ptr, const float values[16])
{
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
Object *ob = ptr->id.data;
Code cleanup: remove TRUE/FALSE & WITH_BOOL_COMPAT define
2014-04-01 11:34:00 +11:00
BKE_object_apply_mat4(ob, (float(*)[4])values, false, false);
merge with trunk/2.5 at r23876 [[Split portion of a mixed commit.]]
2009-10-22 23:22:05 +00:00
}
tag unused rna args.
2011-05-31 02:14:25 +00:00
void rna_Object_internal_update_data(Main *UNUSED(bmain), Scene *UNUSED(scene), PointerRNA *ptr)
RNA: * Accept None as NULL pointers through python function calls. * Added type callback for pointers back, it's useful still in some cases. Made Object.data editable using this, the pointer type varying based on object type. * Wrap pin ID pointer in buttons space. * Added subclasses for text and surface curve ID blocks, to organize data better and get proper icons. * Added RNA_type_to_ID_code and ID_code_to_RNA_type functions. * Update RNA_access.h with new RNA types.
2009-06-07 13:09:18 +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
DEG_id_tag_update(ptr->id.data, OB_RECALC_DATA);
style cleanup: mostly whitespace in rna
2012-05-12 11:01:29 +00:00
WM_main_add_notifier(NC_OBJECT | ND_DRAW, ptr->id.data);
RNA: * Accept None as NULL pointers through python function calls. * Added type callback for pointers back, it's useful still in some cases. Made Object.data editable using this, the pointer type varying based on object type. * Wrap pin ID pointer in buttons space. * Added subclasses for text and surface curve ID blocks, to organize data better and get proper icons. * Added RNA_type_to_ID_code and ID_code_to_RNA_type functions. * Update RNA_access.h with new RNA types.
2009-06-07 13:09:18 +00:00
}
Fix (unreported) crash when changing active shapekey in Edit mode. Looks like someone changed the signature of some RNA update callback, and for some reason that 'change skey' update function was not updated (or later got merged from master)... We'll need RNA to check for its func signatures, some day...
2018-03-13 14:08:17 +01:00
static void rna_Object_active_shape_update(bContext *C, PointerRNA *ptr)
commit before doing some hefty shapekey change, will break compilation
2009-11-01 00:06:53 +00:00
{
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
Object *ob = ptr->id.data;
Fix (unreported) crash when changing active shapekey in Edit mode. Looks like someone changed the signature of some RNA update callback, and for some reason that 'change skey' update function was not updated (or later got merged from master)... We'll need RNA to check for its func signatures, some day...
2018-03-13 14:08:17 +01:00
Main *bmain = CTX_data_main(C);
Scene *scene = CTX_data_scene(C);
commit before doing some hefty shapekey change, will break compilation
2009-11-01 00:06:53 +00:00
Object Mode: remove Scene.obedit for RNA
2018-02-13 21:06:51 +11:00
if (CTX_data_edit_object(C) == ob) {
commit before doing some hefty shapekey change, will break compilation
2009-11-01 00:06:53 +00:00
/* exit/enter editmode to get new shape */
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
switch (ob->type) {
- Enable shape key switching in edit mode for curves, surfaces and latticies - Disable changing of lattice size if there are shape keys
2010-08-10 06:36:42 +00:00
case OB_MESH:
Cleanup: get rid of last G.main in BMesh code.
2018-06-13 16:29:12 +02:00
EDBM_mesh_load(bmain, ob);
Cleanup: pass selectmode directly Pass instead of editmesh or toolsettings. Needed for multi edit-mode
2018-03-14 02:02:05 +11:00
EDBM_mesh_make(ob, scene->toolsettings->selectmode, true);
Fix T46913: Crash adding hook to linked mesh dupli Follow up to T46738, we need to tag the object data for recalculation.
2015-12-03 10:44:27 +11: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_id_tag_update(ob->data, 0);
Fix T46913: Crash adding hook to linked mesh dupli Follow up to T46738, we need to tag the object data for recalculation.
2015-12-03 10:44:27 +11:00
style cleanup: mostly whitespace in rna
2012-05-12 11:01:29 +00:00
EDBM_mesh_normals_update(((Mesh *)ob->data)->edit_btmesh);
code cleanup: use BKE naming conventions for functions in BKE_editmesh.h and BKE_editmesh_bvh.h
2013-04-16 05:59:48 +00:00
BKE_editmesh_tessface_calc(((Mesh *)ob->data)->edit_btmesh);
- Enable shape key switching in edit mode for curves, surfaces and latticies - Disable changing of lattice size if there are shape keys
2010-08-10 06:36:42 +00:00
break;
case OB_CURVE:
case OB_SURF:
Cleanup: Nuke moar G.main usages...
2018-06-06 15:50:24 +02:00
ED_curve_editnurb_load(bmain, ob);
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
ED_curve_editnurb_make(ob);
- Enable shape key switching in edit mode for curves, surfaces and latticies - Disable changing of lattice size if there are shape keys
2010-08-10 06:36:42 +00:00
break;
case OB_LATTICE:
Cleanup: split lattice into own library Was mixed with object functionality.
2018-03-19 14:49:59 +01:00
BKE_editlattice_load(ob);
BKE_editlattice_make(ob);
- Enable shape key switching in edit mode for curves, surfaces and latticies - Disable changing of lattice size if there are shape keys
2010-08-10 06:36:42 +00:00
break;
}
commit before doing some hefty shapekey change, will break compilation
2009-11-01 00:06:53 +00:00
}
rename rna function obj.make_display_list(scene) --> obj.update(scene) also added 3 optional bool arguments, 'object', 'data' & 'time', matching the object recalc flags.
2010-06-09 08:24:31 +00:00
rna_Object_internal_update_data(bmain, scene, ptr);
commit before doing some hefty shapekey change, will break compilation
2009-11-01 00:06:53 +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
static void rna_Object_dependency_update(Main *bmain, Scene *UNUSED(scene), PointerRNA *ptr)
RNA: * Added REQUIRED flag for function parameters. * Made dupliframes/verts/faces/groups an enum, and make it editable. * Enum bitflags were broken, fixed.
2009-04-11 01:43:50 +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
DEG_id_tag_update(ptr->id.data, OB_RECALC_OB);
DEG_relations_tag_update(bmain);
style cleanup: mostly whitespace in rna
2012-05-12 11:01:29 +00:00
WM_main_add_notifier(NC_OBJECT | ND_PARENT, ptr->id.data);
RNA: * Added REQUIRED flag for function parameters. * Made dupliframes/verts/faces/groups an enum, and make it editable. * Enum bitflags were broken, fixed.
2009-04-11 01:43:50 +00:00
}
RNA: * Accept None as NULL pointers through python function calls. * Added type callback for pointers back, it's useful still in some cases. Made Object.data editable using this, the pointer type varying based on object type. * Wrap pin ID pointer in buttons space. * Added subclasses for text and surface curve ID blocks, to organize data better and get proper icons. * Added RNA_type_to_ID_code and ID_code_to_RNA_type functions. * Update RNA_access.h with new RNA types.
2009-06-07 13:09:18 +00:00
static void rna_Object_data_set(PointerRNA *ptr, PointerRNA value)
{
style cleanup: mostly whitespace in rna
2012-05-12 11:01:29 +00:00
Object *ob = (Object *)ptr->data;
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
ID *id = value.data;
RNA: * Accept None as NULL pointers through python function calls. * Added type callback for pointers back, it's useful still in some cases. Made Object.data editable using this, the pointer type varying based on object type. * Wrap pin ID pointer in buttons space. * Added subclasses for text and surface curve ID blocks, to organize data better and get proper icons. * Added RNA_type_to_ID_code and ID_code_to_RNA_type functions. * Update RNA_access.h with new RNA types.
2009-06-07 13:09:18 +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) {
RNA: * Accept None as NULL pointers through python function calls. * Added type callback for pointers back, it's useful still in some cases. Made Object.data editable using this, the pointer type varying based on object type. * Wrap pin ID pointer in buttons space. * Added subclasses for text and surface curve ID blocks, to organize data better and get proper icons. * Added RNA_type_to_ID_code and ID_code_to_RNA_type functions. * Update RNA_access.h with new RNA types.
2009-06-07 13:09:18 +00:00
return;
Fix T41507: Empty prevents image deletion Also allow assigning `Object.data = None` from Python
2014-08-21 17:00:35 +10:00
}
/* assigning NULL only for empties */
if ((id == NULL) && (ob->type != OB_EMPTY)) {
return;
}
patch [#21740] Image support for Empty Objects from Andy Braham (andybraham) This adds support for empties to reference images and draw in the 3D view. Modifications from the original patch. - use an empty draw 'image' type - use image aspect ratio for non-square-pixels - when the image is not found, still draw the frame.
2011-05-09 16:31:54 +00:00
BKE_id_is_in_gobal_main > BKE_id_is_in_global_main
2018-11-09 10:44:02 -02:00
BLI_assert(BKE_id_is_in_global_main(&ob->id));
BLI_assert(BKE_id_is_in_global_main(id));
Cleanup: remove last G.main from RNA. Again, we cannot actually get rid of G_MAIN global access here, so in most case just 'marked' them as valid, and added assert checks to ensure we do only work with IDs in G_MAIN in those cases.
2018-06-22 12:35:41 +02:00
patch [#21740] Image support for Empty Objects from Andy Braham (andybraham) This adds support for empties to reference images and draw in the 3D view. Modifications from the original patch. - use an empty draw 'image' type - use image aspect ratio for non-square-pixels - when the image is not found, still draw the frame.
2011-05-09 16:31:54 +00:00
if (ob->type == OB_EMPTY) {
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
if (ob->data) {
style cleanup: mostly whitespace in rna
2012-05-12 11:01:29 +00:00
id_us_min((ID *)ob->data);
patch [#21740] Image support for Empty Objects from Andy Braham (andybraham) This adds support for empties to reference images and draw in the 3D view. Modifications from the original patch. - use an empty draw 'image' type - use image aspect ratio for non-square-pixels - when the image is not found, still draw the frame.
2011-05-09 16:31:54 +00:00
ob->data = NULL;
}
Fix T41507: Empty prevents image deletion Also allow assigning `Object.data = None` from Python
2014-08-21 17:00:35 +10:00
if (!id || GS(id->name) == ID_IM) {
patch [#21740] Image support for Empty Objects from Andy Braham (andybraham) This adds support for empties to reference images and draw in the 3D view. Modifications from the original patch. - use an empty draw 'image' type - use image aspect ratio for non-square-pixels - when the image is not found, still draw the frame.
2011-05-09 16:31:54 +00:00
id_us_plus(id);
ob->data = id;
}
}
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
else if (ob->type == OB_MESH) {
Cleanup: remove last G.main from RNA. Again, we cannot actually get rid of G_MAIN global access here, so in most case just 'marked' them as valid, and added assert checks to ensure we do only work with IDs in G_MAIN in those cases.
2018-06-22 12:35:41 +02:00
BKE_mesh_assign_object(G_MAIN, ob, (Mesh *)id);
RNA: * Accept None as NULL pointers through python function calls. * Added type callback for pointers back, it's useful still in some cases. Made Object.data editable using this, the pointer type varying based on object type. * Wrap pin ID pointer in buttons space. * Added subclasses for text and surface curve ID blocks, to organize data better and get proper icons. * Added RNA_type_to_ID_code and ID_code_to_RNA_type functions. * Update RNA_access.h with new RNA types.
2009-06-07 13:09:18 +00:00
}
else {
replace ELEM8(gs, ID_ME, ID_CU, ID_MB, ID_LT, ID_LA, ID_CA, ID_TXT, ID_SPK) with macro: OB_DATA_SUPPORT_ID()
2012-08-12 14:57:19 +00:00
if (ob->data) {
style cleanup: mostly whitespace in rna
2012-05-12 11:01:29 +00:00
id_us_min((ID *)ob->data);
replace ELEM8(gs, ID_ME, ID_CU, ID_MB, ID_LT, ID_LA, ID_CA, ID_TXT, ID_SPK) with macro: OB_DATA_SUPPORT_ID()
2012-08-12 14:57:19 +00:00
}
Fix T41507: Empty prevents image deletion Also allow assigning `Object.data = None` from Python
2014-08-21 17:00:35 +10:00
/* no need to type-check here ID. this is done in the _typef() function */
BLI_assert(OB_DATA_SUPPORT_ID(GS(id->name)));
id_us_plus(id);
RNA: * Accept None as NULL pointers through python function calls. * Added type callback for pointers back, it's useful still in some cases. Made Object.data editable using this, the pointer type varying based on object type. * Wrap pin ID pointer in buttons space. * Added subclasses for text and surface curve ID blocks, to organize data better and get proper icons. * Added RNA_type_to_ID_code and ID_code_to_RNA_type functions. * Update RNA_access.h with new RNA types.
2009-06-07 13:09:18 +00:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
ob->data = id;
Cleanup: remove last G.main from RNA. Again, we cannot actually get rid of G_MAIN global access here, so in most case just 'marked' them as valid, and added assert checks to ensure we do only work with IDs in G_MAIN in those cases.
2018-06-22 12:35:41 +02:00
test_object_materials(G_MAIN, ob, id);
RNA: * Accept None as NULL pointers through python function calls. * Added type callback for pointers back, it's useful still in some cases. Made Object.data editable using this, the pointer type varying based on object type. * Wrap pin ID pointer in buttons space. * Added subclasses for text and surface curve ID blocks, to organize data better and get proper icons. * Added RNA_type_to_ID_code and ID_code_to_RNA_type functions. * Update RNA_access.h with new RNA types.
2009-06-07 13:09:18 +00:00
Fix T55973: [2.8] Crash when 'apply pose as rest pose' when bone scale is 0,0,0. `BKE_pose_rebuild()` should (ideally) always trigger a rebuild of the depsgraph, since it can add or remove posechannels. This function now takes a Main parameter to ensure that related depsgraphes are tagged as dirty (kept it optional, for some corner cases). We should also probably double-check calls to that function, think in theory it should only be called from depsgraph itself? But for now...
2018-07-19 16:48:21 +02:00
if (GS(id->name) == ID_CU) {
Code and style cleanup in own modules in BKE and also mball module - Make sure functions are named in way BKE_<object>_<action> (same way as RNA callbacks) - Make functions which are used by mball.c only static and remove their prototypes from public header file. Further cleanup is coming.
2012-04-28 16:49:00 +00:00
BKE_curve_type_test(ob);
Fix T55973: [2.8] Crash when 'apply pose as rest pose' when bone scale is 0,0,0. `BKE_pose_rebuild()` should (ideally) always trigger a rebuild of the depsgraph, since it can add or remove posechannels. This function now takes a Main parameter to ensure that related depsgraphes are tagged as dirty (kept it optional, for some corner cases). We should also probably double-check calls to that function, think in theory it should only be called from depsgraph itself? But for now...
2018-07-19 16:48:21 +02:00
}
else if (ob->type == OB_ARMATURE) {
Respect ID user count when creating pose on object copy This solves wrong user counter of custom shape when duplicating bone few times and then undoing all the duplications.
2018-07-31 11:38:10 +02:00
BKE_pose_rebuild(G_MAIN, ob, ob->data, true);
Fix T55973: [2.8] Crash when 'apply pose as rest pose' when bone scale is 0,0,0. `BKE_pose_rebuild()` should (ideally) always trigger a rebuild of the depsgraph, since it can add or remove posechannels. This function now takes a Main parameter to ensure that related depsgraphes are tagged as dirty (kept it optional, for some corner cases). We should also probably double-check calls to that function, think in theory it should only be called from depsgraph itself? But for now...
2018-07-19 16:48:21 +02:00
}
RNA: * Accept None as NULL pointers through python function calls. * Added type callback for pointers back, it's useful still in some cases. Made Object.data editable using this, the pointer type varying based on object type. * Wrap pin ID pointer in buttons space. * Added subclasses for text and surface curve ID blocks, to organize data better and get proper icons. * Added RNA_type_to_ID_code and ID_code_to_RNA_type functions. * Update RNA_access.h with new RNA types.
2009-06-07 13:09:18 +00:00
}
}
static StructRNA *rna_Object_data_typef(PointerRNA *ptr)
{
style cleanup: mostly whitespace in rna
2012-05-12 11:01:29 +00:00
Object *ob = (Object *)ptr->data;
RNA: * Accept None as NULL pointers through python function calls. * Added type callback for pointers back, it's useful still in some cases. Made Object.data editable using this, the pointer type varying based on object type. * Wrap pin ID pointer in buttons space. * Added subclasses for text and surface curve ID blocks, to organize data better and get proper icons. * Added RNA_type_to_ID_code and ID_code_to_RNA_type functions. * Update RNA_access.h with new RNA types.
2009-06-07 13:09:18 +00:00
replace ELEM8(gs, ID_ME, ID_CU, ID_MB, ID_LT, ID_LA, ID_CA, ID_TXT, ID_SPK) with macro: OB_DATA_SUPPORT_ID()
2012-08-12 14:57:19 +00:00
/* keep in sync with OB_DATA_SUPPORT_ID() macro */
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
switch (ob->type) {
patch [#21740] Image support for Empty Objects from Andy Braham (andybraham) This adds support for empties to reference images and draw in the 3D view. Modifications from the original patch. - use an empty draw 'image' type - use image aspect ratio for non-square-pixels - when the image is not found, still draw the frame.
2011-05-09 16:31:54 +00:00
case OB_EMPTY: return &RNA_Image;
RNA: * Accept None as NULL pointers through python function calls. * Added type callback for pointers back, it's useful still in some cases. Made Object.data editable using this, the pointer type varying based on object type. * Wrap pin ID pointer in buttons space. * Added subclasses for text and surface curve ID blocks, to organize data better and get proper icons. * Added RNA_type_to_ID_code and ID_code_to_RNA_type functions. * Update RNA_access.h with new RNA types.
2009-06-07 13:09:18 +00:00
case OB_MESH: return &RNA_Mesh;
case OB_CURVE: return &RNA_Curve;
case OB_SURF: return &RNA_Curve;
case OB_FONT: return &RNA_Curve;
case OB_MBALL: return &RNA_MetaBall;
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
case OB_LAMP: return &RNA_Light;
RNA: * Accept None as NULL pointers through python function calls. * Added type callback for pointers back, it's useful still in some cases. Made Object.data editable using this, the pointer type varying based on object type. * Wrap pin ID pointer in buttons space. * Added subclasses for text and surface curve ID blocks, to organize data better and get proper icons. * Added RNA_type_to_ID_code and ID_code_to_RNA_type functions. * Update RNA_access.h with new RNA types.
2009-06-07 13:09:18 +00:00
case OB_CAMERA: return &RNA_Camera;
case OB_LATTICE: return &RNA_Lattice;
case OB_ARMATURE: return &RNA_Armature;
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
case OB_SPEAKER: return &RNA_Speaker;
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
case OB_LIGHTPROBE: return &RNA_LightProbe;
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 OB_GPENCIL: return &RNA_GreasePencil;
RNA: * Accept None as NULL pointers through python function calls. * Added type callback for pointers back, it's useful still in some cases. Made Object.data editable using this, the pointer type varying based on object type. * Wrap pin ID pointer in buttons space. * Added subclasses for text and surface curve ID blocks, to organize data better and get proper icons. * Added RNA_type_to_ID_code and ID_code_to_RNA_type functions. * Update RNA_access.h with new RNA types.
2009-06-07 13:09:18 +00:00
default: return &RNA_ID;
}
}
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 bool rna_Object_data_poll(PointerRNA *ptr, const PointerRNA value)
{
Object *ob = (Object *)ptr->data;
if (ob->type == OB_GPENCIL) {
/* GP Object - Don't allow using "Annotation" GP datablocks here */
bGPdata *gpd = value.data;
return (gpd->flag & GP_DATA_ANNOTATIONS) == 0;
}
return true;
}
2.5: Objects * Added Relations panel with layers, pass_index, parent. * Groups panel now can do add to group/remove from group. * Parent, parent type, track are now editable. * Separate constraint add operator for object and bones.
2009-07-14 20:27:28 +00:00
static void rna_Object_parent_set(PointerRNA *ptr, PointerRNA value)
{
style cleanup: mostly whitespace in rna
2012-05-12 11:01:29 +00:00
Object *ob = (Object *)ptr->data;
Object *par = (Object *)value.data;
Remove MinGW support The Issue ======= For a long time now MinGW has been unsupported and unmaintained and at this point, it looks like something that we should just leave behind and move on. Why Remove ========== One of the big motivations for MinGW back in the day is that it was free compared to MSVC which was licensed based. However, now that this is no longer true we have basically stopped updating the need CMake files. Along with the CMake files, there are several patches to the extern libs needed to make this work. For example, see: https://developer.blender.org/diffusion/B/browse/master/extern/carve/patches/mingw_w64.patch If we wanted to keep MinGW then we would need to make more custom patches to the external libs and this is not something our platform maintainers are willing to do. For example, here is the patches needed to build python: https://github.com/Alexpux/MINGW-packages/tree/master/mingw-w64-python3 Fixes T51301 Differential Revision: https://developer.blender.org/D2648
2017-05-27 15:34:55 -04:00
add back pose specials menu, also add back the ability to clear user transforms on all bones (not just selected - mango request - was possible in 2.4x). - rename only_select op property to only_selected (both were used). - only do mingw workaround when building with FREE_WINDOWS defined.
2012-05-06 12:13:45 +00:00
{
Bugfix: While testing the other my previous commit (removing deformflag stuff), I noticed that trying to change set a parent object for the current object (via the Object Properties) would cause the current object to "blow up", and for cyclic dependency warnings to be spewed to the console. Adding a dummy usage of one of the vars here seems to solve it. Perhaps a case of weirdo compiler optimisations?
2012-05-06 05:03:58 +00:00
ED_object_parent(ob, par, ob->partype, ob->parsubstr);
}
2.5: Objects * Added Relations panel with layers, pass_index, parent. * Groups panel now can do add to group/remove from group. * Parent, parent type, track are now editable. * Separate constraint add operator for object and bones.
2009-07-14 20:27:28 +00:00
}
static void rna_Object_parent_type_set(PointerRNA *ptr, int value)
{
style cleanup: mostly whitespace in rna
2012-05-12 11:01:29 +00:00
Object *ob = (Object *)ptr->data;
2.5: Objects * Added Relations panel with layers, pass_index, parent. * Groups panel now can do add to group/remove from group. * Parent, parent type, track are now editable. * Separate constraint add operator for object and bones.
2009-07-14 20:27:28 +00:00
ED_object_parent(ob, ob->parent, value, ob->parsubstr);
}
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 *rna_Object_parent_type_itemf(bContext *UNUSED(C), PointerRNA *ptr,
RNA API: use bool's for enum itemf callbacks.
2014-01-04 18:08:43 +11:00
PropertyRNA *UNUSED(prop), bool *r_free)
2.5: Objects * Added Relations panel with layers, pass_index, parent. * Groups panel now can do add to group/remove from group. * Parent, parent type, track are now editable. * Separate constraint add operator for object and bones.
2009-07-14 20:27:28 +00:00
{
style cleanup: mostly whitespace in rna
2012-05-12 11:01:29 +00:00
Object *ob = (Object *)ptr->data;
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
EnumPropertyItem *item = NULL;
int totitem = 0;
2.5: Objects * Added Relations panel with layers, pass_index, parent. * Groups panel now can do add to group/remove from group. * Parent, parent type, track are now editable. * Separate constraint add operator for object and bones.
2009-07-14 20:27:28 +00:00
RNA_enum_items_add_value(&item, &totitem, parent_type_items, PAROBJECT);
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
if (ob->parent) {
Object *par = ob->parent;
Cleanup: trailing space in RNA
2018-06-09 14:40:09 +02:00
Fix T45051: Curve parent bug. PARCURVE is deprecated parting type, should never have been exposed to user! Not a regression, but safe enough for final 2.75 imho.
2015-06-23 17:35:55 +02:00
if (par->type == OB_LATTICE) {
Code style edits (mostly spliting long lines, and removing trailing spaces). Note about long lines: I did not touch to two pieces of code (because I don’t see any way to keep a nicely formated, compact code, with shorter lines): * The node types definitions into rna_nodetree_types.h * The vgroup name functions into rna_particle.c
2012-03-18 09:27:36 +00:00
/* special hack: prevents this overriding others */
Fix T45553: Object parent_type 'ARMATURE' disappeared in Blender 2.75. Own stupid mistake in rBb318795c3b3d (ideally we should really not have that kind of ugly hacks :/ ).
2015-07-25 10:39:04 +02:00
RNA_enum_items_add_value(&item, &totitem, &parent_type_items[2], PARSKEL);
fix [#36004] Vertex parent on curve point results in blank 'parent_type' on child object
2013-07-09 13:50:22 +00:00
}
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
else if (par->type == OB_ARMATURE) {
Spelling fixes in comments and descriptions, patch by luzpaz. Differential Revision: https://developer.blender.org/D3719
2018-09-24 17:27:41 +02:00
/* special hack: prevents this being overridden */
Fix T45553: Object parent_type 'ARMATURE' disappeared in Blender 2.75. Own stupid mistake in rBb318795c3b3d (ideally we should really not have that kind of ugly hacks :/ ).
2015-07-25 10:39:04 +02:00
RNA_enum_items_add_value(&item, &totitem, &parent_type_items[1], PARSKEL);
2.5: Objects * Added Relations panel with layers, pass_index, parent. * Groups panel now can do add to group/remove from group. * Parent, parent type, track are now editable. * Separate constraint add operator for object and bones.
2009-07-14 20:27:28 +00:00
RNA_enum_items_add_value(&item, &totitem, parent_type_items, PARBONE);
}
fix [#36004] Vertex parent on curve point results in blank 'parent_type' on child object
2013-07-09 13:50:22 +00:00
fix odd (intentional) behavior with vertex parent, curve children of a triangle vertex parent would only display their relationship line to the first vertex. (confusing) also added OB_TYPE_SUPPORT_PARVERT macro.
2013-09-01 22:38:41 +00:00
if (OB_TYPE_SUPPORT_PARVERT(par->type)) {
2.5: Objects * Added Relations panel with layers, pass_index, parent. * Groups panel now can do add to group/remove from group. * Parent, parent type, track are now editable. * Separate constraint add operator for object and bones.
2009-07-14 20:27:28 +00:00
RNA_enum_items_add_value(&item, &totitem, parent_type_items, PARVERT1);
RNA_enum_items_add_value(&item, &totitem, parent_type_items, PARVERT3);
}
}
RNA_enum_item_end(&item, &totitem);
RNA API: use bool's for enum itemf callbacks.
2014-01-04 18:08:43 +11:00
*r_free = true;
2.5: Objects * Added Relations panel with layers, pass_index, parent. * Groups panel now can do add to group/remove from group. * Parent, parent type, track are now editable. * Separate constraint add operator for object and bones.
2009-07-14 20:27:28 +00:00
return item;
}
UI / Python: rename X-Ray to In Front, Draw to Display. See T56648.
2018-09-03 18:58:41 +02:00
static void rna_Object_empty_display_type_set(PointerRNA *ptr, int value)
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
{
Code cleanup: white space and cmake was broken on all platforms
2014-02-03 13:55:26 +11:00
Object *ob = (Object *)ptr->data;
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
Code cleanup: white space and cmake was broken on all platforms
2014-02-03 13:55:26 +11:00
BKE_object_empty_draw_type_set(ob, value);
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
}
2.5: Objects * Added Relations panel with layers, pass_index, parent. * Groups panel now can do add to group/remove from group. * Parent, parent type, track are now editable. * Separate constraint add operator for object and bones.
2009-07-14 20:27:28 +00:00
static void rna_Object_parent_bone_set(PointerRNA *ptr, const char *value)
{
style cleanup: mostly whitespace in rna
2012-05-12 11:01:29 +00:00
Object *ob = (Object *)ptr->data;
2.5: Objects * Added Relations panel with layers, pass_index, parent. * Groups panel now can do add to group/remove from group. * Parent, parent type, track are now editable. * Separate constraint add operator for object and bones.
2009-07-14 20:27:28 +00:00
ED_object_parent(ob, ob->parent, ob->partype, value);
}
Merge branch 'master' into blender2.8
2017-10-18 17:09:41 +11:00
static const EnumPropertyItem *rna_Object_dupli_type_itemf(
Remove dupli-group support for non-empty objects Behavior for mixing object-data & dupli data was confusing, exporters and render engines often got it wrong.
2017-06-29 23:22:05 +10:00
bContext *UNUSED(C), PointerRNA *ptr,
PropertyRNA *UNUSED(prop), bool *UNUSED(r_free))
{
Object *ob = (Object *)ptr->data;
Merge branch 'master' into blender2.8
2017-10-18 17:09:41 +11:00
const EnumPropertyItem *item;
Remove dupli-group support for non-empty objects Behavior for mixing object-data & dupli data was confusing, exporters and render engines often got it wrong.
2017-06-29 23:22:05 +10:00
if (ob->type == OB_EMPTY) {
item = dupli_items;
}
else {
item = dupli_items_nogroup;
}
return item;
}
Bugfix [#25298] Nasty group cycle that creates crash blend files is allowed Infinite recursion (manisfesting as a crash) occurred when trying to set the dupli-group setting on an object, when the object is a member of the group being set. Added a check and warning for this in RNA to prevent such setups from occurring in future. Todo: The warning report is currently only printed to console as I can't quite remember how to grab reports pointer without context/operator pointer available.
2010-12-19 10:38:02 +00:00
static void rna_Object_dup_group_set(PointerRNA *ptr, PointerRNA value)
{
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
Object *ob = (Object *)ptr->data;
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 *grp = (Collection *)value.data;
Cleanup: trailing space in RNA
2018-06-09 14:40:09 +02:00
Bugfix [#25298] Nasty group cycle that creates crash blend files is allowed Infinite recursion (manisfesting as a crash) occurred when trying to set the dupli-group setting on an object, when the object is a member of the group being set. Added a check and warning for this in RNA to prevent such setups from occurring in future. Todo: The warning report is currently only printed to console as I can't quite remember how to grab reports pointer without context/operator pointer available.
2010-12-19 10:38:02 +00:00
/* must not let this be set if the object belongs in this group already,
* thus causing a cycle/infinite-recursion leading to crashes on load [#25298]
*/
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 (BKE_collection_has_object_recursive(grp, ob) == 0) {
Remove dupli-group support for non-empty objects Behavior for mixing object-data & dupli data was confusing, exporters and render engines often got it wrong.
2017-06-29 23:22:05 +10:00
if (ob->type == OB_EMPTY) {
id_us_min(&ob->dup_group->id);
ob->dup_group = grp;
id_us_plus(&ob->dup_group->id);
}
else {
BKE_report(NULL, RPT_ERROR,
"Only empty objects support group instances");
}
Fix T46502: Linked dupli-group lost on reload
2015-10-16 20:55:23 +11:00
}
else {
Code style edits (mostly spliting long lines, and removing trailing spaces). Note about long lines: I did not touch to two pieces of code (because I don’t see any way to keep a nicely formated, compact code, with shorter lines): * The node types definitions into rna_nodetree_types.h * The vgroup name functions into rna_particle.c
2012-03-18 09:27:36 +00:00
BKE_report(NULL, RPT_ERROR,
A final bunch of UI messages fixes and tweaks, and some BKE_report()<->BKE_reportf() fixes.
2012-10-21 14:02:30 +00:00
"Cannot set dupli-group as object belongs in group being instanced, thus causing a cycle");
Fix T46502: Linked dupli-group lost on reload
2015-10-16 20:55:23 +11:00
}
Bugfix [#25298] Nasty group cycle that creates crash blend files is allowed Infinite recursion (manisfesting as a crash) occurred when trying to set the dupli-group setting on an object, when the object is a member of the group being set. Added a check and warning for this in RNA to prevent such setups from occurring in future. Todo: The warning report is currently only printed to console as I can't quite remember how to grab reports pointer without context/operator pointer available.
2010-12-19 10:38:02 +00:00
}
code cleanup: make many functions static
2012-09-22 14:07:55 +00:00
static void rna_VertexGroup_name_set(PointerRNA *ptr, const char *value)
fix [#27554] vertex group names - duplicate vertex group names were not being checked for. - also made the first duplicate end with .001 rather than .000
2011-06-05 04:52:32 +00:00
{
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
Object *ob = (Object *)ptr->id.data;
bDeformGroup *dg = (bDeformGroup *)ptr->data;
replace BLI_strncpy with BLI_strncpy_utf8 where input isnt ensured to be valid. also replace strcpy's which copy using "" with str[0]='\0'
2011-09-15 12:26:48 +00:00
BLI_strncpy_utf8(dg->name, value, sizeof(dg->name));
fix [#27554] vertex group names - duplicate vertex group names were not being checked for. - also made the first duplicate end with .001 rather than .000
2011-06-05 04:52:32 +00:00
defgroup_unique_name(dg, ob);
}
RNA * Object has some more properties wrapped, mostly game related. * Scene frame changes now send a notifier. * Added functions to create/free operator properties for calling operators. This also simplifies some duplicated code that did this. Ideally though this kind of thing should use the properties pointer provided by buttons and keymap items. Example code: PointerRNA ptr; WM_operator_properties_create(&ptr, "SOME_OT_name"); RNA_int_set(&ptr, "value", 42); WM_operator_name_call(C, "SOME_OT_name", WM_OP_EXEC_DEFAULT, &ptr); WM_operator_properties_free(&ptr);
2009-01-01 20:44:40 +00:00
static int rna_VertexGroup_index_get(PointerRNA *ptr)
{
style cleanup: mostly whitespace in rna
2012-05-12 11:01:29 +00:00
Object *ob = (Object *)ptr->id.data;
RNA * Object has some more properties wrapped, mostly game related. * Scene frame changes now send a notifier. * Added functions to create/free operator properties for calling operators. This also simplifies some duplicated code that did this. Ideally though this kind of thing should use the properties pointer provided by buttons and keymap items. Example code: PointerRNA ptr; WM_operator_properties_create(&ptr, "SOME_OT_name"); RNA_int_set(&ptr, "value", 42); WM_operator_name_call(C, "SOME_OT_name", WM_OP_EXEC_DEFAULT, &ptr); WM_operator_properties_free(&ptr);
2009-01-01 20:44:40 +00:00
return BLI_findindex(&ob->defbase, ptr->data);
}
RNA: C API * RNA_blender.h is now generated along with the other files. It is not used anywhere yet, and still located quite hidden next to the other rna_*_gen.c files. Read only access for now. * Inherited properties are not copied from the base anymore but iterated over. Patch by Vekoon, thanks! * Array get/set callbacks now do the whole array instead of getting an index. This is needed for some layers for example so python can set the array as a whole, otherwise the check that one layer has to be enabled at all times gets in the way. Also nicer for the C API. * Also some changes to returning pointers to make the API cleaner, got rid of the type() callback and instead let get() return PointerRNA with the type included. The C API looks like this currently: http://users.pandora.be/blendix/RNA_blender.h
2009-02-02 19:57:57 +00:00
static PointerRNA rna_Object_active_vertex_group_get(PointerRNA *ptr)
RNA * Object has some more properties wrapped, mostly game related. * Scene frame changes now send a notifier. * Added functions to create/free operator properties for calling operators. This also simplifies some duplicated code that did this. Ideally though this kind of thing should use the properties pointer provided by buttons and keymap items. Example code: PointerRNA ptr; WM_operator_properties_create(&ptr, "SOME_OT_name"); RNA_int_set(&ptr, "value", 42); WM_operator_name_call(C, "SOME_OT_name", WM_OP_EXEC_DEFAULT, &ptr); WM_operator_properties_free(&ptr);
2009-01-01 20:44:40 +00:00
{
style cleanup: mostly whitespace in rna
2012-05-12 11:01:29 +00:00
Object *ob = (Object *)ptr->id.data;
return rna_pointer_inherit_refine(ptr, &RNA_VertexGroup, BLI_findlink(&ob->defbase, ob->actdef - 1));
RNA * Object has some more properties wrapped, mostly game related. * Scene frame changes now send a notifier. * Added functions to create/free operator properties for calling operators. This also simplifies some duplicated code that did this. Ideally though this kind of thing should use the properties pointer provided by buttons and keymap items. Example code: PointerRNA ptr; WM_operator_properties_create(&ptr, "SOME_OT_name"); RNA_int_set(&ptr, "value", 42); WM_operator_name_call(C, "SOME_OT_name", WM_OP_EXEC_DEFAULT, &ptr); WM_operator_properties_free(&ptr);
2009-01-01 20:44:40 +00:00
}
NLA SoC: Merge from 2.5 21210 to 21300 Note to self: the next merge will be messy again, since 2 commits occurred this one was complete
2009-07-02 03:32:57 +00:00
static int rna_Object_active_vertex_group_index_get(PointerRNA *ptr)
{
style cleanup: mostly whitespace in rna
2012-05-12 11:01:29 +00:00
Object *ob = (Object *)ptr->id.data;
return ob->actdef - 1;
NLA SoC: Merge from 2.5 21210 to 21300 Note to self: the next merge will be messy again, since 2 commits occurred this one was complete
2009-07-02 03:32:57 +00:00
}
static void rna_Object_active_vertex_group_index_set(PointerRNA *ptr, int value)
{
style cleanup: mostly whitespace in rna
2012-05-12 11:01:29 +00:00
Object *ob = (Object *)ptr->id.data;
ob->actdef = value + 1;
NLA SoC: Merge from 2.5 21210 to 21300 Note to self: the next merge will be messy again, since 2 commits occurred this one was complete
2009-07-02 03:32:57 +00:00
}
code cleanup: quiet rna warnings, remove remove_strict_flags() for cmake/rna. also set_source_files_properties() wasn't working for rna_*_gen.c files, set dna.c and generated data files with generated property too.
2013-09-20 06:35:28 +00:00
static void rna_Object_active_vertex_group_index_range(PointerRNA *ptr, int *min, int *max,
int *UNUSED(softmin), int *UNUSED(softmax))
NLA SoC: Merge from 2.5 21210 to 21300 Note to self: the next merge will be messy again, since 2 commits occurred this one was complete
2009-07-02 03:32:57 +00:00
{
style cleanup: mostly whitespace in rna
2012-05-12 11:01:29 +00:00
Object *ob = (Object *)ptr->id.data;
NLA SoC: Merge from 2.5 21210 to 21300 Note to self: the next merge will be messy again, since 2 commits occurred this one was complete
2009-07-02 03:32:57 +00:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
*min = 0;
Cleanup: use BLI_listbase_*** prefix for count,sort,sort_r
2014-11-16 13:57:58 +01:00
*max = max_ii(0, BLI_listbase_count(&ob->defbase) - 1);
NLA SoC: Merge from 2.5 21210 to 21300 Note to self: the next merge will be messy again, since 2 commits occurred this one was complete
2009-07-02 03:32:57 +00:00
}
RNA * DNA_cloth_types.h, patch by Roelf de Kock. The gravity[3] member is not being parsed correct by makesdna.c and will give issues even when trying to fix it. Worked around it for now in RNA by wrapping it manually, but this should really be fixed in the DNA genetics code, added a comment about it in DNA_cloth_types.h. * Handle vertex groups and uv layers more consistent now. They are all exposed as strings now. Reason is that indices don't really say much, and a direct pointer is not always possible because for example a uv layer in a material can be used for multiple objects and so there is no single pointer. In python it is not too hard to use either since the strings works as a key for lookups. For the user interface we can later think of some method to generate popup menus in a way that works for vertex groups, uv layers, bones etc. * This also fixes the XXX's in rna_modifier.c, I think that can be marked done.
2009-01-04 19:25:24 +00:00
void rna_object_vgroup_name_index_get(PointerRNA *ptr, char *value, int index)
{
style cleanup: mostly whitespace in rna
2012-05-12 11:01:29 +00:00
Object *ob = (Object *)ptr->id.data;
RNA * DNA_cloth_types.h, patch by Roelf de Kock. The gravity[3] member is not being parsed correct by makesdna.c and will give issues even when trying to fix it. Worked around it for now in RNA by wrapping it manually, but this should really be fixed in the DNA genetics code, added a comment about it in DNA_cloth_types.h. * Handle vertex groups and uv layers more consistent now. They are all exposed as strings now. Reason is that indices don't really say much, and a direct pointer is not always possible because for example a uv layer in a material can be used for multiple objects and so there is no single pointer. In python it is not too hard to use either since the strings works as a key for lookups. For the user interface we can later think of some method to generate popup menus in a way that works for vertex groups, uv layers, bones etc. * This also fixes the XXX's in rna_modifier.c, I think that can be marked done.
2009-01-04 19:25:24 +00:00
bDeformGroup *dg;
style cleanup: mostly whitespace in rna
2012-05-12 11:01:29 +00:00
dg = BLI_findlink(&ob->defbase, index - 1);
RNA * DNA_cloth_types.h, patch by Roelf de Kock. The gravity[3] member is not being parsed correct by makesdna.c and will give issues even when trying to fix it. Worked around it for now in RNA by wrapping it manually, but this should really be fixed in the DNA genetics code, added a comment about it in DNA_cloth_types.h. * Handle vertex groups and uv layers more consistent now. They are all exposed as strings now. Reason is that indices don't really say much, and a direct pointer is not always possible because for example a uv layer in a material can be used for multiple objects and so there is no single pointer. In python it is not too hard to use either since the strings works as a key for lookups. For the user interface we can later think of some method to generate popup menus in a way that works for vertex groups, uv layers, bones etc. * This also fixes the XXX's in rna_modifier.c, I think that can be marked done.
2009-01-04 19:25:24 +00:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
if (dg) BLI_strncpy(value, dg->name, sizeof(dg->name));
else value[0] = '\0';
RNA * DNA_cloth_types.h, patch by Roelf de Kock. The gravity[3] member is not being parsed correct by makesdna.c and will give issues even when trying to fix it. Worked around it for now in RNA by wrapping it manually, but this should really be fixed in the DNA genetics code, added a comment about it in DNA_cloth_types.h. * Handle vertex groups and uv layers more consistent now. They are all exposed as strings now. Reason is that indices don't really say much, and a direct pointer is not always possible because for example a uv layer in a material can be used for multiple objects and so there is no single pointer. In python it is not too hard to use either since the strings works as a key for lookups. For the user interface we can later think of some method to generate popup menus in a way that works for vertex groups, uv layers, bones etc. * This also fixes the XXX's in rna_modifier.c, I think that can be marked done.
2009-01-04 19:25:24 +00:00
}
int rna_object_vgroup_name_index_length(PointerRNA *ptr, int index)
{
style cleanup: mostly whitespace in rna
2012-05-12 11:01:29 +00:00
Object *ob = (Object *)ptr->id.data;
RNA * DNA_cloth_types.h, patch by Roelf de Kock. The gravity[3] member is not being parsed correct by makesdna.c and will give issues even when trying to fix it. Worked around it for now in RNA by wrapping it manually, but this should really be fixed in the DNA genetics code, added a comment about it in DNA_cloth_types.h. * Handle vertex groups and uv layers more consistent now. They are all exposed as strings now. Reason is that indices don't really say much, and a direct pointer is not always possible because for example a uv layer in a material can be used for multiple objects and so there is no single pointer. In python it is not too hard to use either since the strings works as a key for lookups. For the user interface we can later think of some method to generate popup menus in a way that works for vertex groups, uv layers, bones etc. * This also fixes the XXX's in rna_modifier.c, I think that can be marked done.
2009-01-04 19:25:24 +00:00
bDeformGroup *dg;
style cleanup: mostly whitespace in rna
2012-05-12 11:01:29 +00:00
dg = BLI_findlink(&ob->defbase, index - 1);
return (dg) ? strlen(dg->name) : 0;
RNA * DNA_cloth_types.h, patch by Roelf de Kock. The gravity[3] member is not being parsed correct by makesdna.c and will give issues even when trying to fix it. Worked around it for now in RNA by wrapping it manually, but this should really be fixed in the DNA genetics code, added a comment about it in DNA_cloth_types.h. * Handle vertex groups and uv layers more consistent now. They are all exposed as strings now. Reason is that indices don't really say much, and a direct pointer is not always possible because for example a uv layer in a material can be used for multiple objects and so there is no single pointer. In python it is not too hard to use either since the strings works as a key for lookups. For the user interface we can later think of some method to generate popup menus in a way that works for vertex groups, uv layers, bones etc. * This also fixes the XXX's in rna_modifier.c, I think that can be marked done.
2009-01-04 19:25:24 +00:00
}
void rna_object_vgroup_name_index_set(PointerRNA *ptr, const char *value, short *index)
{
style cleanup: mostly whitespace in rna
2012-05-12 11:01:29 +00:00
Object *ob = (Object *)ptr->id.data;
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
*index = defgroup_name_index(ob, value) + 1;
RNA * DNA_cloth_types.h, patch by Roelf de Kock. The gravity[3] member is not being parsed correct by makesdna.c and will give issues even when trying to fix it. Worked around it for now in RNA by wrapping it manually, but this should really be fixed in the DNA genetics code, added a comment about it in DNA_cloth_types.h. * Handle vertex groups and uv layers more consistent now. They are all exposed as strings now. Reason is that indices don't really say much, and a direct pointer is not always possible because for example a uv layer in a material can be used for multiple objects and so there is no single pointer. In python it is not too hard to use either since the strings works as a key for lookups. For the user interface we can later think of some method to generate popup menus in a way that works for vertex groups, uv layers, bones etc. * This also fixes the XXX's in rna_modifier.c, I think that can be marked done.
2009-01-04 19:25:24 +00:00
}
void rna_object_vgroup_name_set(PointerRNA *ptr, const char *value, char *result, int maxlen)
{
style cleanup: mostly whitespace in rna
2012-05-12 11:01:29 +00:00
Object *ob = (Object *)ptr->id.data;
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
bDeformGroup *dg = defgroup_find_name(ob, value);
if (dg) {
replace BLI_strncpy with BLI_strncpy_utf8 where input isnt ensured to be valid. also replace strcpy's which copy using "" with str[0]='\0'
2011-09-15 12:26:48 +00:00
BLI_strncpy(result, value, maxlen); /* no need for BLI_strncpy_utf8, since this matches an existing group */
remove inline loops in a few places replace with defgroup_find_name() and BLI_findstring()
2010-08-22 14:15:28 +00:00
return;
RNA * DNA_cloth_types.h, patch by Roelf de Kock. The gravity[3] member is not being parsed correct by makesdna.c and will give issues even when trying to fix it. Worked around it for now in RNA by wrapping it manually, but this should really be fixed in the DNA genetics code, added a comment about it in DNA_cloth_types.h. * Handle vertex groups and uv layers more consistent now. They are all exposed as strings now. Reason is that indices don't really say much, and a direct pointer is not always possible because for example a uv layer in a material can be used for multiple objects and so there is no single pointer. In python it is not too hard to use either since the strings works as a key for lookups. For the user interface we can later think of some method to generate popup menus in a way that works for vertex groups, uv layers, bones etc. * This also fixes the XXX's in rna_modifier.c, I think that can be marked done.
2009-01-04 19:25:24 +00:00
}
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
result[0] = '\0';
RNA * DNA_cloth_types.h, patch by Roelf de Kock. The gravity[3] member is not being parsed correct by makesdna.c and will give issues even when trying to fix it. Worked around it for now in RNA by wrapping it manually, but this should really be fixed in the DNA genetics code, added a comment about it in DNA_cloth_types.h. * Handle vertex groups and uv layers more consistent now. They are all exposed as strings now. Reason is that indices don't really say much, and a direct pointer is not always possible because for example a uv layer in a material can be used for multiple objects and so there is no single pointer. In python it is not too hard to use either since the strings works as a key for lookups. For the user interface we can later think of some method to generate popup menus in a way that works for vertex groups, uv layers, bones etc. * This also fixes the XXX's in rna_modifier.c, I think that can be marked done.
2009-01-04 19:25:24 +00:00
}
Face Maps: custom-data, UI and RNA API Add face maps, needed for face-map widgets, only data structure, widgets will be separate commit. This comes from 'custom-manipulator' branch with only minor changes.
2017-05-30 17:58:24 +10:00
static void rna_FaceMap_name_set(PointerRNA *ptr, const char *value)
{
Object *ob = (Object *)ptr->id.data;
bFaceMap *fmap = (bFaceMap *)ptr->data;
BLI_strncpy_utf8(fmap->name, value, sizeof(fmap->name));
BKE_object_facemap_unique_name(ob, fmap);
}
static int rna_FaceMap_index_get(PointerRNA *ptr)
{
Object *ob = (Object *)ptr->id.data;
return BLI_findindex(&ob->fmaps, ptr->data);
}
static PointerRNA rna_Object_active_face_map_get(PointerRNA *ptr)
{
Object *ob = (Object *)ptr->id.data;
return rna_pointer_inherit_refine(ptr, &RNA_FaceMap, BLI_findlink(&ob->fmaps, ob->actfmap - 1));
}
static int rna_Object_active_face_map_index_get(PointerRNA *ptr)
{
Object *ob = (Object *)ptr->id.data;
return ob->actfmap - 1;
}
static void rna_Object_active_face_map_index_set(PointerRNA *ptr, int value)
{
Object *ob = (Object *)ptr->id.data;
ob->actfmap = value + 1;
}
static void rna_Object_active_face_map_index_range(PointerRNA *ptr, int *min, int *max,
int *UNUSED(softmin), int *UNUSED(softmax))
{
Object *ob = (Object *)ptr->id.data;
*min = 0;
*max = max_ii(0, BLI_listbase_count(&ob->fmaps) - 1);
}
void rna_object_BKE_object_facemap_name_index_get(PointerRNA *ptr, char *value, int index)
{
Object *ob = (Object *)ptr->id.data;
bFaceMap *fmap;
fmap = BLI_findlink(&ob->fmaps, index - 1);
if (fmap) BLI_strncpy(value, fmap->name, sizeof(fmap->name));
else value[0] = '\0';
}
int rna_object_BKE_object_facemap_name_index_length(PointerRNA *ptr, int index)
{
Object *ob = (Object *)ptr->id.data;
bFaceMap *fmap;
fmap = BLI_findlink(&ob->fmaps, index - 1);
return (fmap) ? strlen(fmap->name) : 0;
}
void rna_object_BKE_object_facemap_name_index_set(PointerRNA *ptr, const char *value, short *index)
{
Object *ob = (Object *)ptr->id.data;
*index = BKE_object_facemap_name_index(ob, value) + 1;
}
void rna_object_fmap_name_set(PointerRNA *ptr, const char *value, char *result, int maxlen)
{
Object *ob = (Object *)ptr->id.data;
bFaceMap *fmap = BKE_object_facemap_find_name(ob, value);
if (fmap) {
BLI_strncpy(result, value, maxlen); /* no need for BLI_strncpy_utf8, since this matches an existing group */
return;
}
result[0] = '\0';
}
RNA * DNA_cloth_types.h, patch by Roelf de Kock. The gravity[3] member is not being parsed correct by makesdna.c and will give issues even when trying to fix it. Worked around it for now in RNA by wrapping it manually, but this should really be fixed in the DNA genetics code, added a comment about it in DNA_cloth_types.h. * Handle vertex groups and uv layers more consistent now. They are all exposed as strings now. Reason is that indices don't really say much, and a direct pointer is not always possible because for example a uv layer in a material can be used for multiple objects and so there is no single pointer. In python it is not too hard to use either since the strings works as a key for lookups. For the user interface we can later think of some method to generate popup menus in a way that works for vertex groups, uv layers, bones etc. * This also fixes the XXX's in rna_modifier.c, I think that can be marked done.
2009-01-04 19:25:24 +00:00
void rna_object_uvlayer_name_set(PointerRNA *ptr, const char *value, char *result, int maxlen)
{
style cleanup: mostly whitespace in rna
2012-05-12 11:01:29 +00:00
Object *ob = (Object *)ptr->id.data;
RNA * DNA_cloth_types.h, patch by Roelf de Kock. The gravity[3] member is not being parsed correct by makesdna.c and will give issues even when trying to fix it. Worked around it for now in RNA by wrapping it manually, but this should really be fixed in the DNA genetics code, added a comment about it in DNA_cloth_types.h. * Handle vertex groups and uv layers more consistent now. They are all exposed as strings now. Reason is that indices don't really say much, and a direct pointer is not always possible because for example a uv layer in a material can be used for multiple objects and so there is no single pointer. In python it is not too hard to use either since the strings works as a key for lookups. For the user interface we can later think of some method to generate popup menus in a way that works for vertex groups, uv layers, bones etc. * This also fixes the XXX's in rna_modifier.c, I think that can be marked done.
2009-01-04 19:25:24 +00:00
Mesh *me;
CustomDataLayer *layer;
int a;
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
if (ob->type == OB_MESH && ob->data) {
style cleanup: mostly whitespace in rna
2012-05-12 11:01:29 +00:00
me = (Mesh *)ob->data;
RNA * DNA_cloth_types.h, patch by Roelf de Kock. The gravity[3] member is not being parsed correct by makesdna.c and will give issues even when trying to fix it. Worked around it for now in RNA by wrapping it manually, but this should really be fixed in the DNA genetics code, added a comment about it in DNA_cloth_types.h. * Handle vertex groups and uv layers more consistent now. They are all exposed as strings now. Reason is that indices don't really say much, and a direct pointer is not always possible because for example a uv layer in a material can be used for multiple objects and so there is no single pointer. In python it is not too hard to use either since the strings works as a key for lookups. For the user interface we can later think of some method to generate popup menus in a way that works for vertex groups, uv layers, bones etc. * This also fixes the XXX's in rna_modifier.c, I think that can be marked done.
2009-01-04 19:25:24 +00:00
TexFace removal part 3 - MTexPoly structure & layer type. - The 'Mesh.uv_textures' layers. - DerivedMesh TexFace drawing. - Scripts & UI.
2017-05-25 15:11:00 +10:00
for (a = 0; a < me->ldata.totlayer; a++) {
layer = &me->ldata.layers[a];
RNA * DNA_cloth_types.h, patch by Roelf de Kock. The gravity[3] member is not being parsed correct by makesdna.c and will give issues even when trying to fix it. Worked around it for now in RNA by wrapping it manually, but this should really be fixed in the DNA genetics code, added a comment about it in DNA_cloth_types.h. * Handle vertex groups and uv layers more consistent now. They are all exposed as strings now. Reason is that indices don't really say much, and a direct pointer is not always possible because for example a uv layer in a material can be used for multiple objects and so there is no single pointer. In python it is not too hard to use either since the strings works as a key for lookups. For the user interface we can later think of some method to generate popup menus in a way that works for vertex groups, uv layers, bones etc. * This also fixes the XXX's in rna_modifier.c, I think that can be marked done.
2009-01-04 19:25:24 +00:00
TexFace removal part 3 - MTexPoly structure & layer type. - The 'Mesh.uv_textures' layers. - DerivedMesh TexFace drawing. - Scripts & UI.
2017-05-25 15:11:00 +10:00
if (layer->type == CD_MLOOPUV && STREQ(layer->name, value)) {
RNA * DNA_cloth_types.h, patch by Roelf de Kock. The gravity[3] member is not being parsed correct by makesdna.c and will give issues even when trying to fix it. Worked around it for now in RNA by wrapping it manually, but this should really be fixed in the DNA genetics code, added a comment about it in DNA_cloth_types.h. * Handle vertex groups and uv layers more consistent now. They are all exposed as strings now. Reason is that indices don't really say much, and a direct pointer is not always possible because for example a uv layer in a material can be used for multiple objects and so there is no single pointer. In python it is not too hard to use either since the strings works as a key for lookups. For the user interface we can later think of some method to generate popup menus in a way that works for vertex groups, uv layers, bones etc. * This also fixes the XXX's in rna_modifier.c, I think that can be marked done.
2009-01-04 19:25:24 +00:00
BLI_strncpy(result, value, maxlen);
return;
}
}
}
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
result[0] = '\0';
RNA * DNA_cloth_types.h, patch by Roelf de Kock. The gravity[3] member is not being parsed correct by makesdna.c and will give issues even when trying to fix it. Worked around it for now in RNA by wrapping it manually, but this should really be fixed in the DNA genetics code, added a comment about it in DNA_cloth_types.h. * Handle vertex groups and uv layers more consistent now. They are all exposed as strings now. Reason is that indices don't really say much, and a direct pointer is not always possible because for example a uv layer in a material can be used for multiple objects and so there is no single pointer. In python it is not too hard to use either since the strings works as a key for lookups. For the user interface we can later think of some method to generate popup menus in a way that works for vertex groups, uv layers, bones etc. * This also fixes the XXX's in rna_modifier.c, I think that can be marked done.
2009-01-04 19:25:24 +00:00
}
void rna_object_vcollayer_name_set(PointerRNA *ptr, const char *value, char *result, int maxlen)
{
style cleanup: mostly whitespace in rna
2012-05-12 11:01:29 +00:00
Object *ob = (Object *)ptr->id.data;
RNA * DNA_cloth_types.h, patch by Roelf de Kock. The gravity[3] member is not being parsed correct by makesdna.c and will give issues even when trying to fix it. Worked around it for now in RNA by wrapping it manually, but this should really be fixed in the DNA genetics code, added a comment about it in DNA_cloth_types.h. * Handle vertex groups and uv layers more consistent now. They are all exposed as strings now. Reason is that indices don't really say much, and a direct pointer is not always possible because for example a uv layer in a material can be used for multiple objects and so there is no single pointer. In python it is not too hard to use either since the strings works as a key for lookups. For the user interface we can later think of some method to generate popup menus in a way that works for vertex groups, uv layers, bones etc. * This also fixes the XXX's in rna_modifier.c, I think that can be marked done.
2009-01-04 19:25:24 +00:00
Mesh *me;
CustomDataLayer *layer;
int a;
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
if (ob->type == OB_MESH && ob->data) {
style cleanup: mostly whitespace in rna
2012-05-12 11:01:29 +00:00
me = (Mesh *)ob->data;
RNA * DNA_cloth_types.h, patch by Roelf de Kock. The gravity[3] member is not being parsed correct by makesdna.c and will give issues even when trying to fix it. Worked around it for now in RNA by wrapping it manually, but this should really be fixed in the DNA genetics code, added a comment about it in DNA_cloth_types.h. * Handle vertex groups and uv layers more consistent now. They are all exposed as strings now. Reason is that indices don't really say much, and a direct pointer is not always possible because for example a uv layer in a material can be used for multiple objects and so there is no single pointer. In python it is not too hard to use either since the strings works as a key for lookups. For the user interface we can later think of some method to generate popup menus in a way that works for vertex groups, uv layers, bones etc. * This also fixes the XXX's in rna_modifier.c, I think that can be marked done.
2009-01-04 19:25:24 +00:00
style cleanup: mostly whitespace in rna
2012-05-12 11:01:29 +00:00
for (a = 0; a < me->fdata.totlayer; a++) {
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
layer = &me->fdata.layers[a];
RNA * DNA_cloth_types.h, patch by Roelf de Kock. The gravity[3] member is not being parsed correct by makesdna.c and will give issues even when trying to fix it. Worked around it for now in RNA by wrapping it manually, but this should really be fixed in the DNA genetics code, added a comment about it in DNA_cloth_types.h. * Handle vertex groups and uv layers more consistent now. They are all exposed as strings now. Reason is that indices don't really say much, and a direct pointer is not always possible because for example a uv layer in a material can be used for multiple objects and so there is no single pointer. In python it is not too hard to use either since the strings works as a key for lookups. For the user interface we can later think of some method to generate popup menus in a way that works for vertex groups, uv layers, bones etc. * This also fixes the XXX's in rna_modifier.c, I think that can be marked done.
2009-01-04 19:25:24 +00:00
Cleanup: strcmp/strncmp -> STREQ/STREQLEN (in boolean usage). Makes usage of those funcs much more clear, we even had mixed '!strcmp(foo, bar)' and 'strcmp(foo, bar) == 0' in several places...
2015-01-26 16:03:11 +01:00
if (layer->type == CD_MCOL && STREQ(layer->name, value)) {
RNA * DNA_cloth_types.h, patch by Roelf de Kock. The gravity[3] member is not being parsed correct by makesdna.c and will give issues even when trying to fix it. Worked around it for now in RNA by wrapping it manually, but this should really be fixed in the DNA genetics code, added a comment about it in DNA_cloth_types.h. * Handle vertex groups and uv layers more consistent now. They are all exposed as strings now. Reason is that indices don't really say much, and a direct pointer is not always possible because for example a uv layer in a material can be used for multiple objects and so there is no single pointer. In python it is not too hard to use either since the strings works as a key for lookups. For the user interface we can later think of some method to generate popup menus in a way that works for vertex groups, uv layers, bones etc. * This also fixes the XXX's in rna_modifier.c, I think that can be marked done.
2009-01-04 19:25:24 +00:00
BLI_strncpy(result, value, maxlen);
return;
}
}
}
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
result[0] = '\0';
RNA * DNA_cloth_types.h, patch by Roelf de Kock. The gravity[3] member is not being parsed correct by makesdna.c and will give issues even when trying to fix it. Worked around it for now in RNA by wrapping it manually, but this should really be fixed in the DNA genetics code, added a comment about it in DNA_cloth_types.h. * Handle vertex groups and uv layers more consistent now. They are all exposed as strings now. Reason is that indices don't really say much, and a direct pointer is not always possible because for example a uv layer in a material can be used for multiple objects and so there is no single pointer. In python it is not too hard to use either since the strings works as a key for lookups. For the user interface we can later think of some method to generate popup menus in a way that works for vertex groups, uv layers, bones etc. * This also fixes the XXX's in rna_modifier.c, I think that can be marked done.
2009-01-04 19:25:24 +00:00
}
NLA SoC: Merge from 2.5 21210 to 21300 Note to self: the next merge will be messy again, since 2 commits occurred this one was complete
2009-07-02 03:32:57 +00:00
static int rna_Object_active_material_index_get(PointerRNA *ptr)
{
style cleanup: mostly whitespace in rna
2012-05-12 11:01:29 +00:00
Object *ob = (Object *)ptr->id.data;
corrections from an article about using PVS-Studio static checker with blender - http://www.viva64.com/en/b/0145/
2012-04-23 15:54:43 +00:00
return MAX2(ob->actcol - 1, 0);
NLA SoC: Merge from 2.5 21210 to 21300 Note to self: the next merge will be messy again, since 2 commits occurred this one was complete
2009-07-02 03:32:57 +00:00
}
static void rna_Object_active_material_index_set(PointerRNA *ptr, int value)
{
style cleanup: mostly whitespace in rna
2012-05-12 11:01:29 +00:00
Object *ob = (Object *)ptr->id.data;
ob->actcol = value + 1;
merge with trunk/2.5 at r23876 [[Split portion of a mixed commit.]]
2009-10-22 23:22:05 +00:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
if (ob->type == OB_MESH) {
Mesh *me = ob->data;
merge with trunk/2.5 at r23876 [[Split portion of a mixed commit.]]
2009-10-22 23:22:05 +00:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
if (me->edit_btmesh)
me->edit_btmesh->mat_nr = value;
merge with trunk/2.5 at r23876 [[Split portion of a mixed commit.]]
2009-10-22 23:22:05 +00:00
}
NLA SoC: Merge from 2.5 21210 to 21300 Note to self: the next merge will be messy again, since 2 commits occurred this one was complete
2009-07-02 03:32:57 +00:00
}
code cleanup: quiet rna warnings, remove remove_strict_flags() for cmake/rna. also set_source_files_properties() wasn't working for rna_*_gen.c files, set dna.c and generated data files with generated property too.
2013-09-20 06:35:28 +00:00
static void rna_Object_active_material_index_range(PointerRNA *ptr, int *min, int *max,
int *UNUSED(softmin), int *UNUSED(softmax))
RNA * Added skeleton code for particle/object_force/userdef. * More Object properties wrapped. * Added User Preferences display in outliner.
2009-01-02 13:47:33 +00:00
{
style cleanup: mostly whitespace in rna
2012-05-12 11:01:29 +00:00
Object *ob = (Object *)ptr->id.data;
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
*min = 0;
code cleanup: use min/max functions rather then macros.
2012-11-07 12:31:05 +00:00
*max = max_ii(ob->totcol - 1, 0);
RNA * Added skeleton code for particle/object_force/userdef. * More Object properties wrapped. * Added User Preferences display in outliner.
2009-01-02 13:47:33 +00:00
}
Bugfix #25301 Material Node trees: SSS wasn't displaying in Nodes. Implementation notes: - Currently copying local data for preview render, only copies the base material. Node materials are re-used. - This causes data to be in 2 "main" databases... complex. - To make it work for preview, I had to add another loop in the SSS code that checks the original Main dbase. That's marked as warning in code to be fixed up. Another bug: - Material properties "SSS presets" copied settings to the active material, not to the displayed one. Added RNA call to retrieve this from Objects. (Next commit will fix preset scripts)
2010-12-20 13:02:33 +00:00
/* returns active base material */
RNA: C API * RNA_blender.h is now generated along with the other files. It is not used anywhere yet, and still located quite hidden next to the other rna_*_gen.c files. Read only access for now. * Inherited properties are not copied from the base anymore but iterated over. Patch by Vekoon, thanks! * Array get/set callbacks now do the whole array instead of getting an index. This is needed for some layers for example so python can set the array as a whole, otherwise the check that one layer has to be enabled at all times gets in the way. Also nicer for the C API. * Also some changes to returning pointers to make the API cleaner, got rid of the type() callback and instead let get() return PointerRNA with the type included. The C API looks like this currently: http://users.pandora.be/blendix/RNA_blender.h
2009-02-02 19:57:57 +00:00
static PointerRNA rna_Object_active_material_get(PointerRNA *ptr)
RNA * DNA_cloth_types.h, patch by Roelf de Kock. The gravity[3] member is not being parsed correct by makesdna.c and will give issues even when trying to fix it. Worked around it for now in RNA by wrapping it manually, but this should really be fixed in the DNA genetics code, added a comment about it in DNA_cloth_types.h. * Handle vertex groups and uv layers more consistent now. They are all exposed as strings now. Reason is that indices don't really say much, and a direct pointer is not always possible because for example a uv layer in a material can be used for multiple objects and so there is no single pointer. In python it is not too hard to use either since the strings works as a key for lookups. For the user interface we can later think of some method to generate popup menus in a way that works for vertex groups, uv layers, bones etc. * This also fixes the XXX's in rna_modifier.c, I think that can be marked done.
2009-01-04 19:25:24 +00:00
{
style cleanup: mostly whitespace in rna
2012-05-12 11:01:29 +00:00
Object *ob = (Object *)ptr->id.data;
2.5: Materials and textures can now be assigned again even if not slot for them is available.
2009-07-28 18:54:02 +00:00
Material *ma;
Cleanup: trailing space in RNA
2018-06-09 14:40:09 +02:00
style cleanup: mostly whitespace in rna
2012-05-12 11:01:29 +00:00
ma = (ob->totcol) ? give_current_material(ob, ob->actcol) : NULL;
2.5: Materials and textures can now be assigned again even if not slot for them is available.
2009-07-28 18:54:02 +00:00
return rna_pointer_inherit_refine(ptr, &RNA_Material, ma);
}
static void rna_Object_active_material_set(PointerRNA *ptr, PointerRNA value)
{
style cleanup: mostly whitespace in rna
2012-05-12 11:01:29 +00:00
Object *ob = (Object *)ptr->id.data;
2.5: Materials and textures can now be assigned again even if not slot for them is available.
2009-07-28 18:54:02 +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
DEG_id_tag_update(value.data, 0);
BKE_id_is_in_gobal_main > BKE_id_is_in_global_main
2018-11-09 10:44:02 -02:00
BLI_assert(BKE_id_is_in_global_main(&ob->id));
BLI_assert(BKE_id_is_in_global_main(value.data));
Cleanup: remove last G.main from RNA. Again, we cannot actually get rid of G_MAIN global access here, so in most case just 'marked' them as valid, and added assert checks to ensure we do only work with IDs in G_MAIN in those cases.
2018-06-22 12:35:41 +02:00
assign_material(G_MAIN, ob, value.data, ob->actcol, BKE_MAT_ASSIGN_EXISTING);
RNA * DNA_cloth_types.h, patch by Roelf de Kock. The gravity[3] member is not being parsed correct by makesdna.c and will give issues even when trying to fix it. Worked around it for now in RNA by wrapping it manually, but this should really be fixed in the DNA genetics code, added a comment about it in DNA_cloth_types.h. * Handle vertex groups and uv layers more consistent now. They are all exposed as strings now. Reason is that indices don't really say much, and a direct pointer is not always possible because for example a uv layer in a material can be used for multiple objects and so there is no single pointer. In python it is not too hard to use either since the strings works as a key for lookups. For the user interface we can later think of some method to generate popup menus in a way that works for vertex groups, uv layers, bones etc. * This also fixes the XXX's in rna_modifier.c, I think that can be marked done.
2009-01-04 19:25:24 +00:00
}
RNA/UI: Allow displaying in tooltip why RNA property isn't editable This commit allows RNA properties to return additional info on their editable state which may then be displayed in tooltips. To show how it works, it also adds some info for the editable check of proxies. For generally un-editable properties or properties of a linked data-block, RNA returns default strings. | {F362785} | {F362786} | {F362787} | Reviewed by brecht, thanks! Differential Revision: https://developer.blender.org/D2243
2016-09-22 00:10:53 +02:00
static int rna_Object_active_material_editable(PointerRNA *ptr, const char **UNUSED(r_info))
Fix T40411: UI incorrectly permits changing materal_slots on linked obdata
2014-05-29 16:16:31 +10:00
{
Object *ob = (Object *)ptr->id.data;
bool is_editable;
if ((ob->matbits == NULL) || (ob->actcol == 0) || ob->matbits[ob->actcol - 1]) {
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
is_editable = !ID_IS_LINKED(ob);
Fix T40411: UI incorrectly permits changing materal_slots on linked obdata
2014-05-29 16:16:31 +10:00
}
else {
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
is_editable = ob->data ? !ID_IS_LINKED(ob->data) : false;
Fix T40411: UI incorrectly permits changing materal_slots on linked obdata
2014-05-29 16:16:31 +10:00
}
return is_editable ? PROP_EDITABLE : 0;
}
Revert particle system and point cache removal in blender2.8 branch. This reverts commit 5aa19be91263a249ffae75573e3b32f24269d890 and b4a721af694817fa921b119df83d33ede7d7fed0. Due to postponement of particle system rewrite it was decided to put particle code back into the 2.8 branch for the time being.
2016-12-28 17:30:58 +01:00
static void rna_Object_active_particle_system_index_range(PointerRNA *ptr, int *min, int *max,
int *UNUSED(softmin), int *UNUSED(softmax))
{
Object *ob = (Object *)ptr->id.data;
*min = 0;
*max = max_ii(0, BLI_listbase_count(&ob->particlesystem) - 1);
}
static int rna_Object_active_particle_system_index_get(PointerRNA *ptr)
{
Object *ob = (Object *)ptr->id.data;
return psys_get_current_num(ob);
}
static void rna_Object_active_particle_system_index_set(PointerRNA *ptr, int value)
{
Object *ob = (Object *)ptr->id.data;
psys_set_current_num(ob, value);
}
static void rna_Object_particle_update(Main *UNUSED(bmain), Scene *scene, PointerRNA *ptr)
{
Pass EvaluationContext argument everywhere Note that some little parts of code have been dissabled because eval_ctx was not available there. This should be resolved once DerivedMesh is replaced.
2017-07-21 11:53:13 +02:00
/* TODO: Disabled for now, because bContext is not available. */
#if 0
Revert particle system and point cache removal in blender2.8 branch. This reverts commit 5aa19be91263a249ffae75573e3b32f24269d890 and b4a721af694817fa921b119df83d33ede7d7fed0. Due to postponement of particle system rewrite it was decided to put particle code back into the 2.8 branch for the time being.
2016-12-28 17:30:58 +01:00
Object *ob = (Object *)ptr->id.data;
Pass EvaluationContext argument everywhere Note that some little parts of code have been dissabled because eval_ctx was not available there. This should be resolved once DerivedMesh is replaced.
2017-07-21 11:53:13 +02:00
PE_current_changed(NULL, scene, ob);
Fix function declaration of some modifiers Those functions did not use evaluation context. Also fixed lots of unused variables warnings caused by commented out code which needs to be ported away from DerivedMesh and to evaluation context.
2017-07-21 15:54:42 +02:00
#else
(void) scene;
(void) ptr;
Pass EvaluationContext argument everywhere Note that some little parts of code have been dissabled because eval_ctx was not available there. This should be resolved once DerivedMesh is replaced.
2017-07-21 11:53:13 +02:00
#endif
Revert particle system and point cache removal in blender2.8 branch. This reverts commit 5aa19be91263a249ffae75573e3b32f24269d890 and b4a721af694817fa921b119df83d33ede7d7fed0. Due to postponement of particle system rewrite it was decided to put particle code back into the 2.8 branch for the time being.
2016-12-28 17:30:58 +01:00
}
merge with trunk/2.5 at r23876 [[Split portion of a mixed commit.]]
2009-10-22 23:22:05 +00:00
/* rotation - axis-angle */
static void rna_Object_rotation_axis_angle_get(PointerRNA *ptr, float *value)
{
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
Object *ob = ptr->data;
Cleanup: trailing space in RNA
2018-06-09 14:40:09 +02:00
merge with trunk/2.5 at r23876 [[Split portion of a mixed commit.]]
2009-10-22 23:22:05 +00:00
/* for now, assume that rotation mode is axis-angle */
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
value[0] = ob->rotAngle;
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
copy_v3_v3(&value[1], ob->rotAxis);
merge with trunk/2.5 at r23876 [[Split portion of a mixed commit.]]
2009-10-22 23:22:05 +00:00
}
/* rotation - axis-angle */
static void rna_Object_rotation_axis_angle_set(PointerRNA *ptr, const float *value)
{
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
Object *ob = ptr->data;
Cleanup: trailing space in RNA
2018-06-09 14:40:09 +02:00
merge with trunk/2.5 at r23876 [[Split portion of a mixed commit.]]
2009-10-22 23:22:05 +00:00
/* for now, assume that rotation mode is axis-angle */
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
ob->rotAngle = value[0];
cleanup: redundant casts & const cast correctness
2015-01-01 23:26:03 +11:00
copy_v3_v3(ob->rotAxis, &value[1]);
Cleanup: trailing space in RNA
2018-06-09 14:40:09 +02:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
/* TODO: validate axis? */
merge with trunk/2.5 at r23876 [[Split portion of a mixed commit.]]
2009-10-22 23:22:05 +00:00
}
static void rna_Object_rotation_mode_set(PointerRNA *ptr, int value)
{
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
Object *ob = ptr->data;
Cleanup: trailing space in RNA
2018-06-09 14:40:09 +02:00
merge with trunk/2.5 at r23876 [[Split portion of a mixed commit.]]
2009-10-22 23:22:05 +00:00
/* use API Method for conversions... */
BKE_rotMode_change_values(ob->quat, ob->rot, ob->rotAxis, &ob->rotAngle, ob->rotmode, (short)value);
Cleanup: trailing space in RNA
2018-06-09 14:40:09 +02:00
merge with trunk/2.5 at r23876 [[Split portion of a mixed commit.]]
2009-10-22 23:22:05 +00:00
/* finally, set the new rotation type */
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
ob->rotmode = value;
merge with trunk/2.5 at r23876 [[Split portion of a mixed commit.]]
2009-10-22 23:22:05 +00:00
}
* Partial fix for bug [#19734] N panel's transform doesn't display the units Converted the Object transform properties to use rna/rna buttons. This has the advantage of not only displaying/editing units, but also RMB menu, keyframing, drivers, etc too. Part of this was to convert 'Dimensions' to an rna property, converting to and from scale. This also allows you to set the object's dimensions via fcurves or python, but note that it's driving the object scale setting internally so if you animate both dimension and scale at the same time one will override the other (i don't expect many people to attempt this).
2009-11-04 23:14:20 +00:00
static void rna_Object_dimensions_get(PointerRNA *ptr, float *value)
merge with trunk/2.5 at r23876 [[Split portion of a mixed commit.]]
2009-10-22 23:22:05 +00:00
{
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
Object *ob = ptr->data;
code cleanup: function naming, use BKE_*type* prefix.
2012-05-05 14:03:12 +00:00
BKE_object_dimensions_get(ob, value);
merge with trunk/2.5 at r23876 [[Split portion of a mixed commit.]]
2009-10-22 23:22:05 +00:00
}
* Partial fix for bug [#19734] N panel's transform doesn't display the units Converted the Object transform properties to use rna/rna buttons. This has the advantage of not only displaying/editing units, but also RMB menu, keyframing, drivers, etc too. Part of this was to convert 'Dimensions' to an rna property, converting to and from scale. This also allows you to set the object's dimensions via fcurves or python, but note that it's driving the object scale setting internally so if you animate both dimension and scale at the same time one will override the other (i don't expect many people to attempt this).
2009-11-04 23:14:20 +00:00
static void rna_Object_dimensions_set(PointerRNA *ptr, const float *value)
merge with trunk/2.5 at r23876 [[Split portion of a mixed commit.]]
2009-10-22 23:22:05 +00:00
{
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
Object *ob = ptr->data;
code cleanup: function naming, use BKE_*type* prefix.
2012-05-05 14:03:12 +00:00
BKE_object_dimensions_set(ob, value);
merge with trunk/2.5 at r23876 [[Split portion of a mixed commit.]]
2009-10-22 23:22:05 +00:00
}
AnimSys - Transform Locks + RNA: The Animation System now respects the Transform Locks too (i.e. lock x-location, etc.) when writing settings. This means that it is no longer necessary to set up "constant drivers" to make sure some values don't get accidentally animated. Internally, added a new callback for properties in RNA, which is responsible for checking if the item at some array-index is editable. This needs to be manually called for each place which uses rna to set settings for arrays (see the code changes in anim_sys.c for changes how to do this; the same thing needs to be done in the UI code too, and probably in py-api too)
2009-11-25 12:00:31 +00:00
static int rna_Object_location_editable(PointerRNA *ptr, int index)
{
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
Object *ob = (Object *)ptr->data;
Cleanup: trailing space in RNA
2018-06-09 14:40:09 +02:00
AnimSys - Transform Locks + RNA: The Animation System now respects the Transform Locks too (i.e. lock x-location, etc.) when writing settings. This means that it is no longer necessary to set up "constant drivers" to make sure some values don't get accidentally animated. Internally, added a new callback for properties in RNA, which is responsible for checking if the item at some array-index is editable. This needs to be manually called for each place which uses rna to set settings for arrays (see the code changes in anim_sys.c for changes how to do this; the same thing needs to be done in the UI code too, and probably in py-api too)
2009-11-25 12:00:31 +00:00
/* only if the axis in question is locked, not editable... */
if ((index == 0) && (ob->protectflag & OB_LOCK_LOCX))
return 0;
else if ((index == 1) && (ob->protectflag & OB_LOCK_LOCY))
return 0;
else if ((index == 2) && (ob->protectflag & OB_LOCK_LOCZ))
return 0;
else
return PROP_EDITABLE;
}
static int rna_Object_scale_editable(PointerRNA *ptr, int index)
{
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
Object *ob = (Object *)ptr->data;
Cleanup: trailing space in RNA
2018-06-09 14:40:09 +02:00
AnimSys - Transform Locks + RNA: The Animation System now respects the Transform Locks too (i.e. lock x-location, etc.) when writing settings. This means that it is no longer necessary to set up "constant drivers" to make sure some values don't get accidentally animated. Internally, added a new callback for properties in RNA, which is responsible for checking if the item at some array-index is editable. This needs to be manually called for each place which uses rna to set settings for arrays (see the code changes in anim_sys.c for changes how to do this; the same thing needs to be done in the UI code too, and probably in py-api too)
2009-11-25 12:00:31 +00:00
/* only if the axis in question is locked, not editable... */
if ((index == 0) && (ob->protectflag & OB_LOCK_SCALEX))
return 0;
else if ((index == 1) && (ob->protectflag & OB_LOCK_SCALEY))
return 0;
else if ((index == 2) && (ob->protectflag & OB_LOCK_SCALEZ))
return 0;
else
return PROP_EDITABLE;
}
static int rna_Object_rotation_euler_editable(PointerRNA *ptr, int index)
{
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
Object *ob = (Object *)ptr->data;
Cleanup: trailing space in RNA
2018-06-09 14:40:09 +02:00
AnimSys - Transform Locks + RNA: The Animation System now respects the Transform Locks too (i.e. lock x-location, etc.) when writing settings. This means that it is no longer necessary to set up "constant drivers" to make sure some values don't get accidentally animated. Internally, added a new callback for properties in RNA, which is responsible for checking if the item at some array-index is editable. This needs to be manually called for each place which uses rna to set settings for arrays (see the code changes in anim_sys.c for changes how to do this; the same thing needs to be done in the UI code too, and probably in py-api too)
2009-11-25 12:00:31 +00:00
/* only if the axis in question is locked, not editable... */
if ((index == 0) && (ob->protectflag & OB_LOCK_ROTX))
return 0;
else if ((index == 1) && (ob->protectflag & OB_LOCK_ROTY))
return 0;
else if ((index == 2) && (ob->protectflag & OB_LOCK_ROTZ))
return 0;
else
return PROP_EDITABLE;
}
static int rna_Object_rotation_4d_editable(PointerRNA *ptr, int index)
{
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
Object *ob = (Object *)ptr->data;
Cleanup: trailing space in RNA
2018-06-09 14:40:09 +02:00
AnimSys - Transform Locks + RNA: The Animation System now respects the Transform Locks too (i.e. lock x-location, etc.) when writing settings. This means that it is no longer necessary to set up "constant drivers" to make sure some values don't get accidentally animated. Internally, added a new callback for properties in RNA, which is responsible for checking if the item at some array-index is editable. This needs to be manually called for each place which uses rna to set settings for arrays (see the code changes in anim_sys.c for changes how to do this; the same thing needs to be done in the UI code too, and probably in py-api too)
2009-11-25 12:00:31 +00:00
/* only consider locks if locking components individually... */
if (ob->protectflag & OB_LOCK_ROT4D) {
/* only if the axis in question is locked, not editable... */
if ((index == 0) && (ob->protectflag & OB_LOCK_ROTW))
return 0;
else if ((index == 1) && (ob->protectflag & OB_LOCK_ROTX))
return 0;
else if ((index == 2) && (ob->protectflag & OB_LOCK_ROTY))
return 0;
else if ((index == 3) && (ob->protectflag & OB_LOCK_ROTZ))
return 0;
}
Cleanup: trailing space in RNA
2018-06-09 14:40:09 +02:00
AnimSys - Transform Locks + RNA: The Animation System now respects the Transform Locks too (i.e. lock x-location, etc.) when writing settings. This means that it is no longer necessary to set up "constant drivers" to make sure some values don't get accidentally animated. Internally, added a new callback for properties in RNA, which is responsible for checking if the item at some array-index is editable. This needs to be manually called for each place which uses rna to set settings for arrays (see the code changes in anim_sys.c for changes how to do this; the same thing needs to be done in the UI code too, and probably in py-api too)
2009-11-25 12:00:31 +00:00
return PROP_EDITABLE;
}
Improve/partially fix overriding of Object material pointers. Basic workflow shall now work, still lots to do in the UI (ID template needs some love to reflect overriden status ;) ).
2018-06-11 19:28:12 +02:00
static int rna_MaterialSlot_material_editable(PointerRNA *ptr, const char **UNUSED(r_info))
{
Object *ob = (Object *)ptr->id.data;
const int index = (Material **)ptr->data - ob->mat;
bool is_editable;
if ((ob->matbits == NULL) || ob->matbits[index]) {
is_editable = !ID_IS_LINKED(ob);
}
else {
is_editable = ob->data ? !ID_IS_LINKED(ob->data) : false;
}
return is_editable ? PROP_EDITABLE : 0;
}
merge with trunk/2.5 at r23876 [[Split portion of a mixed commit.]]
2009-10-22 23:22:05 +00:00
RNA: * Added a MaterialSlot collection in Object rather than giving the list of materials immediately. This should more correctly reflect how this data is organized, even though there is no equivalent C struct. * Added name properties to MaterialSlot/TextureSlot/ParticleSystem.
2009-06-03 23:22:43 +00:00
static PointerRNA rna_MaterialSlot_material_get(PointerRNA *ptr)
RNA * DNA_object_types.h done. * Scriptlink skeleton added. * Fix cmake compile.
2009-01-02 16:58:09 +00:00
{
style cleanup: mostly whitespace in rna
2012-05-12 11:01:29 +00:00
Object *ob = (Object *)ptr->id.data;
RNA: * Added a MaterialSlot collection in Object rather than giving the list of materials immediately. This should more correctly reflect how this data is organized, even though there is no equivalent C struct. * Added name properties to MaterialSlot/TextureSlot/ParticleSystem.
2009-06-03 23:22:43 +00:00
Material *ma;
Improve/partially fix overriding of Object material pointers. Basic workflow shall now work, still lots to do in the UI (ID template needs some love to reflect overriden status ;) ).
2018-06-11 19:28:12 +02:00
const int index = (Material **)ptr->data - ob->mat;
RNA: * Added a MaterialSlot collection in Object rather than giving the list of materials immediately. This should more correctly reflect how this data is organized, even though there is no equivalent C struct. * Added name properties to MaterialSlot/TextureSlot/ParticleSystem.
2009-06-03 23:22:43 +00:00
style cleanup: mostly whitespace in rna
2012-05-12 11:01:29 +00:00
ma = give_current_material(ob, index + 1);
RNA: * Added a MaterialSlot collection in Object rather than giving the list of materials immediately. This should more correctly reflect how this data is organized, even though there is no equivalent C struct. * Added name properties to MaterialSlot/TextureSlot/ParticleSystem.
2009-06-03 23:22:43 +00:00
return rna_pointer_inherit_refine(ptr, &RNA_Material, ma);
RNA * DNA_object_types.h done. * Scriptlink skeleton added. * Fix cmake compile.
2009-01-02 16:58:09 +00:00
}
RNA: * Added a MaterialSlot collection in Object rather than giving the list of materials immediately. This should more correctly reflect how this data is organized, even though there is no equivalent C struct. * Added name properties to MaterialSlot/TextureSlot/ParticleSystem.
2009-06-03 23:22:43 +00:00
static void rna_MaterialSlot_material_set(PointerRNA *ptr, PointerRNA value)
RNA * DNA_object_types.h done. * Scriptlink skeleton added. * Fix cmake compile.
2009-01-02 16:58:09 +00:00
{
style cleanup: mostly whitespace in rna
2012-05-12 11:01:29 +00:00
Object *ob = (Object *)ptr->id.data;
int index = (Material **)ptr->data - ob->mat;
RNA: * Added a MaterialSlot collection in Object rather than giving the list of materials immediately. This should more correctly reflect how this data is organized, even though there is no equivalent C struct. * Added name properties to MaterialSlot/TextureSlot/ParticleSystem.
2009-06-03 23:22:43 +00:00
BKE_id_is_in_gobal_main > BKE_id_is_in_global_main
2018-11-09 10:44:02 -02:00
BLI_assert(BKE_id_is_in_global_main(&ob->id));
BLI_assert(BKE_id_is_in_global_main(value.data));
Cleanup: remove last G.main from RNA. Again, we cannot actually get rid of G_MAIN global access here, so in most case just 'marked' them as valid, and added assert checks to ensure we do only work with IDs in G_MAIN in those cases.
2018-06-22 12:35:41 +02:00
assign_material(G_MAIN, ob, value.data, index + 1, BKE_MAT_ASSIGN_EXISTING);
RNA: * Added a MaterialSlot collection in Object rather than giving the list of materials immediately. This should more correctly reflect how this data is organized, even though there is no equivalent C struct. * Added name properties to MaterialSlot/TextureSlot/ParticleSystem.
2009-06-03 23:22:43 +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
static bool rna_MaterialSlot_material_poll(PointerRNA *ptr, PointerRNA value)
{
Object *ob = (Object *)ptr->id.data;
Material *ma = (Material *)value.data;
if (ob->type == OB_GPENCIL) {
/* GP Materials only */
return (ma->gp_style != NULL);
}
else {
/* Everything except GP materials */
return (ma->gp_style == NULL);
}
}
RNA: * Added a MaterialSlot collection in Object rather than giving the list of materials immediately. This should more correctly reflect how this data is organized, even though there is no equivalent C struct. * Added name properties to MaterialSlot/TextureSlot/ParticleSystem.
2009-06-03 23:22:43 +00:00
static int rna_MaterialSlot_link_get(PointerRNA *ptr)
{
style cleanup: mostly whitespace in rna
2012-05-12 11:01:29 +00:00
Object *ob = (Object *)ptr->id.data;
int index = (Material **)ptr->data - ob->mat;
RNA: * Added a MaterialSlot collection in Object rather than giving the list of materials immediately. This should more correctly reflect how this data is organized, even though there is no equivalent C struct. * Added name properties to MaterialSlot/TextureSlot/ParticleSystem.
2009-06-03 23:22:43 +00:00
2.5 * Objects now support up to 32767 material slots. It's easy to increase this further, but I prefer not to increase the memory usage of mesh faces, it seems unlikely that someone would create 32767 distinct materials? * Forward compatibility: the only thing you can potentially lose reading a 2.5 file in 2.4 is object linking (instead of default data), though usually that will go fine too. Reading files with > 32 material slots in 2.4 can start giving issues. * The ob->colbits variable is deprecated by the array ob->matbits but I didn't remove the ob->colbits updates in very few places it is set. * I hope I changed all the relevant things, various places just hardcoded the number 16 instead of using the MAXMAT define. * Join Objects operator back. This is using the version from the animsys2 branch coded by Joshua, which means it now supports joining of shape keys. * Fix for crash reading file saved during render.
2009-07-13 00:40:20 +00:00
return ob->matbits[index] != 0;
RNA: * Added a MaterialSlot collection in Object rather than giving the list of materials immediately. This should more correctly reflect how this data is organized, even though there is no equivalent C struct. * Added name properties to MaterialSlot/TextureSlot/ParticleSystem.
2009-06-03 23:22:43 +00:00
}
static void rna_MaterialSlot_link_set(PointerRNA *ptr, int value)
{
style cleanup: mostly whitespace in rna
2012-05-12 11:01:29 +00:00
Object *ob = (Object *)ptr->id.data;
int index = (Material **)ptr->data - ob->mat;
Cleanup: trailing space in RNA
2018-06-09 14:40:09 +02:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
if (value) {
ob->matbits[index] = 1;
style cleanup & re-use DNA pad var with new collision group object settings.
2012-10-30 16:33:40 +00:00
/* ob->colbits |= (1 << index); */ /* DEPRECATED */
2.5 * Objects now support up to 32767 material slots. It's easy to increase this further, but I prefer not to increase the memory usage of mesh faces, it seems unlikely that someone would create 32767 distinct materials? * Forward compatibility: the only thing you can potentially lose reading a 2.5 file in 2.4 is object linking (instead of default data), though usually that will go fine too. Reading files with > 32 material slots in 2.4 can start giving issues. * The ob->colbits variable is deprecated by the array ob->matbits but I didn't remove the ob->colbits updates in very few places it is set. * I hope I changed all the relevant things, various places just hardcoded the number 16 instead of using the MAXMAT define. * Join Objects operator back. This is using the version from the animsys2 branch coded by Joshua, which means it now supports joining of shape keys. * Fix for crash reading file saved during render.
2009-07-13 00:40:20 +00:00
}
else {
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
ob->matbits[index] = 0;
style cleanup & re-use DNA pad var with new collision group object settings.
2012-10-30 16:33:40 +00:00
/* ob->colbits &= ~(1 << index); */ /* DEPRECATED */
2.5 * Objects now support up to 32767 material slots. It's easy to increase this further, but I prefer not to increase the memory usage of mesh faces, it seems unlikely that someone would create 32767 distinct materials? * Forward compatibility: the only thing you can potentially lose reading a 2.5 file in 2.4 is object linking (instead of default data), though usually that will go fine too. Reading files with > 32 material slots in 2.4 can start giving issues. * The ob->colbits variable is deprecated by the array ob->matbits but I didn't remove the ob->colbits updates in very few places it is set. * I hope I changed all the relevant things, various places just hardcoded the number 16 instead of using the MAXMAT define. * Join Objects operator back. This is using the version from the animsys2 branch coded by Joshua, which means it now supports joining of shape keys. * Fix for crash reading file saved during render.
2009-07-13 00:40:20 +00:00
}
RNA: * Added a MaterialSlot collection in Object rather than giving the list of materials immediately. This should more correctly reflect how this data is organized, even though there is no equivalent C struct. * Added name properties to MaterialSlot/TextureSlot/ParticleSystem.
2009-06-03 23:22:43 +00:00
}
static int rna_MaterialSlot_name_length(PointerRNA *ptr)
{
style cleanup: mostly whitespace in rna
2012-05-12 11:01:29 +00:00
Object *ob = (Object *)ptr->id.data;
RNA: * Added a MaterialSlot collection in Object rather than giving the list of materials immediately. This should more correctly reflect how this data is organized, even though there is no equivalent C struct. * Added name properties to MaterialSlot/TextureSlot/ParticleSystem.
2009-06-03 23:22:43 +00:00
Material *ma;
style cleanup: mostly whitespace in rna
2012-05-12 11:01:29 +00:00
int index = (Material **)ptr->data - ob->mat;
RNA: * Added a MaterialSlot collection in Object rather than giving the list of materials immediately. This should more correctly reflect how this data is organized, even though there is no equivalent C struct. * Added name properties to MaterialSlot/TextureSlot/ParticleSystem.
2009-06-03 23:22:43 +00:00
style cleanup: mostly whitespace in rna
2012-05-12 11:01:29 +00:00
ma = give_current_material(ob, index + 1);
RNA: * Added a MaterialSlot collection in Object rather than giving the list of materials immediately. This should more correctly reflect how this data is organized, even though there is no equivalent C struct. * Added name properties to MaterialSlot/TextureSlot/ParticleSystem.
2009-06-03 23:22:43 +00:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
if (ma)
style cleanup: mostly whitespace in rna
2012-05-12 11:01:29 +00:00
return strlen(ma->id.name + 2);
Cleanup: trailing space in RNA
2018-06-09 14:40:09 +02:00
RNA: * Accept None as NULL pointers through python function calls. * Added type callback for pointers back, it's useful still in some cases. Made Object.data editable using this, the pointer type varying based on object type. * Wrap pin ID pointer in buttons space. * Added subclasses for text and surface curve ID blocks, to organize data better and get proper icons. * Added RNA_type_to_ID_code and ID_code_to_RNA_type functions. * Update RNA_access.h with new RNA types.
2009-06-07 13:09:18 +00:00
return 0;
RNA: * Added a MaterialSlot collection in Object rather than giving the list of materials immediately. This should more correctly reflect how this data is organized, even though there is no equivalent C struct. * Added name properties to MaterialSlot/TextureSlot/ParticleSystem.
2009-06-03 23:22:43 +00:00
}
static void rna_MaterialSlot_name_get(PointerRNA *ptr, char *str)
{
style cleanup: mostly whitespace in rna
2012-05-12 11:01:29 +00:00
Object *ob = (Object *)ptr->id.data;
RNA: * Added a MaterialSlot collection in Object rather than giving the list of materials immediately. This should more correctly reflect how this data is organized, even though there is no equivalent C struct. * Added name properties to MaterialSlot/TextureSlot/ParticleSystem.
2009-06-03 23:22:43 +00:00
Material *ma;
style cleanup: mostly whitespace in rna
2012-05-12 11:01:29 +00:00
int index = (Material **)ptr->data - ob->mat;
RNA: * Added a MaterialSlot collection in Object rather than giving the list of materials immediately. This should more correctly reflect how this data is organized, even though there is no equivalent C struct. * Added name properties to MaterialSlot/TextureSlot/ParticleSystem.
2009-06-03 23:22:43 +00:00
style cleanup: mostly whitespace in rna
2012-05-12 11:01:29 +00:00
ma = give_current_material(ob, index + 1);
RNA: * Accept None as NULL pointers through python function calls. * Added type callback for pointers back, it's useful still in some cases. Made Object.data editable using this, the pointer type varying based on object type. * Wrap pin ID pointer in buttons space. * Added subclasses for text and surface curve ID blocks, to organize data better and get proper icons. * Added RNA_type_to_ID_code and ID_code_to_RNA_type functions. * Update RNA_access.h with new RNA types.
2009-06-07 13:09:18 +00:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
if (ma)
style cleanup: mostly whitespace in rna
2012-05-12 11:01:29 +00:00
strcpy(str, ma->id.name + 2);
RNA: * Accept None as NULL pointers through python function calls. * Added type callback for pointers back, it's useful still in some cases. Made Object.data editable using this, the pointer type varying based on object type. * Wrap pin ID pointer in buttons space. * Added subclasses for text and surface curve ID blocks, to organize data better and get proper icons. * Added RNA_type_to_ID_code and ID_code_to_RNA_type functions. * Update RNA_access.h with new RNA types.
2009-06-07 13:09:18 +00:00
else
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
str[0] = '\0';
RNA * DNA_object_types.h done. * Scriptlink skeleton added. * Fix cmake compile.
2009-01-02 16:58:09 +00:00
}
Fix #24135: Material modification not immediately updated in Outliner Also fixed outliner update when changing active_material_index from Py and when selecting texture from UI
2010-10-05 11:55:54 +00:00
static void rna_MaterialSlot_update(Main *bmain, Scene *scene, PointerRNA *ptr)
{
rna_Object_internal_update(bmain, scene, ptr);
Fix T42561 (semi feature request/comeback) UVs in image editor can get too crowded. UVs in the same layer can be used for many images. It used to be possible to filter UV faces based on the image, but this is impossible now due to the way the system works, so I added an option to allow filtering UVs based on active material index. Rationale on using option and not being smart here (options are bad tm) is that for some workflows, such as preserving image space by using the same image for many materials, people might want to turn this off.
2014-11-14 13:50:10 +01:00
style cleanup: mostly whitespace in rna
2012-05-12 11:01:29 +00:00
WM_main_add_notifier(NC_OBJECT | ND_OB_SHADING, ptr->id.data);
Fix #36555: preview render in properties editor did not get cancelled and restarted fast enough on resizing the editor, especially noticeable with e.g. luxrender which does a progressive refining render.
2013-08-28 19:22:48 +00:00
WM_main_add_notifier(NC_MATERIAL | ND_SHADING_LINKS, NULL);
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);
Fix #24135: Material modification not immediately updated in Outliner Also fixed outliner update when changing active_material_index from Py and when selecting texture from UI
2010-10-05 11:55:54 +00:00
}
add rna path callback for material slots but disable animation. without this - the info space would report an invalid rna-path when showing the string to change a value.
2013-10-01 04:49:47 +00:00
static char *rna_MaterialSlot_path(PointerRNA *ptr)
{
Object *ob = (Object *)ptr->id.data;
int index = (Material **)ptr->data - ob->mat;
return BLI_sprintfN("material_slots[%d]", index);
}
- allow changing game engine physics types in RNA - allow appending with a NULL scene (only used to add object bases into the current scene)
2009-08-04 09:20:48 +00:00
/* why does this have to be so complicated?, can't all this crap be
* moved to in BGE conversion function? - Campbell *
*
* logic from check_body_type()
* */
Fix missing path callback for new Object.display struct.
2018-05-13 19:06:37 +02:00
static char *rna_ObjectDisplay_path(PointerRNA *UNUSED(ptr))
{
return BLI_strdup("display");
}
Revert particle system and point cache removal in blender2.8 branch. This reverts commit 5aa19be91263a249ffae75573e3b32f24269d890 and b4a721af694817fa921b119df83d33ede7d7fed0. Due to postponement of particle system rewrite it was decided to put particle code back into the 2.8 branch for the time being.
2016-12-28 17:30:58 +01:00
static PointerRNA rna_Object_active_particle_system_get(PointerRNA *ptr)
{
Object *ob = (Object *)ptr->id.data;
ParticleSystem *psys = psys_get_current(ob);
return rna_pointer_inherit_refine(ptr, &RNA_ParticleSystem, psys);
}
code cleanup: quiet rna warnings, remove remove_strict_flags() for cmake/rna. also set_source_files_properties() wasn't working for rna_*_gen.c files, set dna.c and generated data files with generated property too.
2013-09-20 06:35:28 +00:00
static void rna_Object_active_shape_key_index_range(PointerRNA *ptr, int *min, int *max,
int *UNUSED(softmin), int *UNUSED(softmax))
NLA SoC: Merge from 2.5 21210 to 21300 Note to self: the next merge will be messy again, since 2 commits occurred this one was complete
2009-07-02 03:32:57 +00:00
{
style cleanup: mostly whitespace in rna
2012-05-12 11:01:29 +00:00
Object *ob = (Object *)ptr->id.data;
code cleanup: make shape key api names consistent with our new convention.
2012-09-19 10:12:07 +00:00
Key *key = BKE_key_from_object(ob);
NLA SoC: Merge from 2.5 21210 to 21300 Note to self: the next merge will be messy again, since 2 commits occurred this one was complete
2009-07-02 03:32:57 +00:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
*min = 0;
if (key) {
Cleanup: use BLI_listbase_*** prefix for count,sort,sort_r
2014-11-16 13:57:58 +01:00
*max = BLI_listbase_count(&key->block) - 1;
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
if (*max < 0) *max = 0;
checks in rna range functions that the max value cant be less than the min. also fix for invalid rage for FILE_OT_filenum.
2011-06-23 06:13:21 +00:00
}
else {
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
*max = 0;
checks in rna range functions that the max value cant be less than the min. also fix for invalid rage for FILE_OT_filenum.
2011-06-23 06:13:21 +00:00
}
NLA SoC: Merge from 2.5 21210 to 21300 Note to self: the next merge will be messy again, since 2 commits occurred this one was complete
2009-07-02 03:32:57 +00:00
}
static int rna_Object_active_shape_key_index_get(PointerRNA *ptr)
{
style cleanup: mostly whitespace in rna
2012-05-12 11:01:29 +00:00
Object *ob = (Object *)ptr->id.data;
NLA SoC: Merge from 2.5 21210 to 21300 Note to self: the next merge will be messy again, since 2 commits occurred this one was complete
2009-07-02 03:32:57 +00:00
style cleanup: mostly whitespace in rna
2012-05-12 11:01:29 +00:00
return MAX2(ob->shapenr - 1, 0);
NLA SoC: Merge from 2.5 21210 to 21300 Note to self: the next merge will be messy again, since 2 commits occurred this one was complete
2009-07-02 03:32:57 +00:00
}
static void rna_Object_active_shape_key_index_set(PointerRNA *ptr, int value)
{
style cleanup: mostly whitespace in rna
2012-05-12 11:01:29 +00:00
Object *ob = (Object *)ptr->id.data;
NLA SoC: Merge from 2.5 21210 to 21300 Note to self: the next merge will be messy again, since 2 commits occurred this one was complete
2009-07-02 03:32:57 +00:00
style cleanup: mostly whitespace in rna
2012-05-12 11:01:29 +00:00
ob->shapenr = value + 1;
NLA SoC: Merge from 2.5 21210 to 21300 Note to self: the next merge will be messy again, since 2 commits occurred this one was complete
2009-07-02 03:32:57 +00:00
}
2.5 * Lattices: properties editable, editmode operators, menus working again. As a bonus you can now edit u/v/w in editmode. * Shape Keys: some code cleanup, and added more buttons. The value/min/max buttons don't work correct yet though. * Fix issue with uv textures, vertex colors not being visible outside editmode, and a few other issue. Mesh.edit_mesh is now NULL when not in editmode.
2009-07-03 15:23:33 +00:00
static PointerRNA rna_Object_active_shape_key_get(PointerRNA *ptr)
{
style cleanup: mostly whitespace in rna
2012-05-12 11:01:29 +00:00
Object *ob = (Object *)ptr->id.data;
code cleanup: make shape key api names consistent with our new convention.
2012-09-19 10:12:07 +00:00
Key *key = BKE_key_from_object(ob);
2.5 * Lattices: properties editable, editmode operators, menus working again. As a bonus you can now edit u/v/w in editmode. * Shape Keys: some code cleanup, and added more buttons. The value/min/max buttons don't work correct yet though. * Fix issue with uv textures, vertex colors not being visible outside editmode, and a few other issue. Mesh.edit_mesh is now NULL when not in editmode.
2009-07-03 15:23:33 +00:00
KeyBlock *kb;
PointerRNA keyptr;
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
if (key == NULL)
2.5 * Lattices: properties editable, editmode operators, menus working again. As a bonus you can now edit u/v/w in editmode. * Shape Keys: some code cleanup, and added more buttons. The value/min/max buttons don't work correct yet though. * Fix issue with uv textures, vertex colors not being visible outside editmode, and a few other issue. Mesh.edit_mesh is now NULL when not in editmode.
2009-07-03 15:23:33 +00:00
return PointerRNA_NULL;
Cleanup: trailing space in RNA
2018-06-09 14:40:09 +02:00
style cleanup: mostly whitespace in rna
2012-05-12 11:01:29 +00:00
kb = BLI_findlink(&key->block, ob->shapenr - 1);
fix for shape key value not updating.
2010-02-03 10:27:31 +00:00
RNA_pointer_create((ID *)key, &RNA_ShapeKey, kb, &keyptr);
2.5 * Lattices: properties editable, editmode operators, menus working again. As a bonus you can now edit u/v/w in editmode. * Shape Keys: some code cleanup, and added more buttons. The value/min/max buttons don't work correct yet though. * Fix issue with uv textures, vertex colors not being visible outside editmode, and a few other issue. Mesh.edit_mesh is now NULL when not in editmode.
2009-07-03 15:23:33 +00:00
return keyptr;
}
2.5: Physics Buttons All kinds of changes to get it ready for UI layouts. This means RNA and operators should be working correct, but most buttons are still not actually there yet. * Added near empty soft body, fluid, field and collision panels, tweaks to cloth panels. * Fluid bake works, but without escape or showing any progress. * Fluid/Softbody/Cloth/Collision can now be both added as modifiers or in the physics panels. * Missing: fields & soft body for particles. * Missing: proper updating softbodies, guess this code still needs updates after pointcache refactor?
2009-07-02 19:41:31 +00:00
static PointerRNA rna_Object_field_get(PointerRNA *ptr)
{
style cleanup: mostly whitespace in rna
2012-05-12 11:01:29 +00:00
Object *ob = (Object *)ptr->id.data;
2.5: Physics Buttons All kinds of changes to get it ready for UI layouts. This means RNA and operators should be working correct, but most buttons are still not actually there yet. * Added near empty soft body, fluid, field and collision panels, tweaks to cloth panels. * Fluid bake works, but without escape or showing any progress. * Fluid/Softbody/Cloth/Collision can now be both added as modifiers or in the physics panels. * Missing: fields & soft body for particles. * Missing: proper updating softbodies, guess this code still needs updates after pointcache refactor?
2009-07-02 19:41:31 +00:00
/* weak */
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
if (!ob->pd)
ob->pd = object_add_collision_fields(0);
Cleanup: trailing space in RNA
2018-06-09 14:40:09 +02:00
2.5: Physics Buttons All kinds of changes to get it ready for UI layouts. This means RNA and operators should be working correct, but most buttons are still not actually there yet. * Added near empty soft body, fluid, field and collision panels, tweaks to cloth panels. * Fluid bake works, but without escape or showing any progress. * Fluid/Softbody/Cloth/Collision can now be both added as modifiers or in the physics panels. * Missing: fields & soft body for particles. * Missing: proper updating softbodies, guess this code still needs updates after pointcache refactor?
2009-07-02 19:41:31 +00:00
return rna_pointer_inherit_refine(ptr, &RNA_FieldSettings, ob->pd);
}
static PointerRNA rna_Object_collision_get(PointerRNA *ptr)
{
style cleanup: mostly whitespace in rna
2012-05-12 11:01:29 +00:00
Object *ob = (Object *)ptr->id.data;
2.5: Physics Buttons All kinds of changes to get it ready for UI layouts. This means RNA and operators should be working correct, but most buttons are still not actually there yet. * Added near empty soft body, fluid, field and collision panels, tweaks to cloth panels. * Fluid bake works, but without escape or showing any progress. * Fluid/Softbody/Cloth/Collision can now be both added as modifiers or in the physics panels. * Missing: fields & soft body for particles. * Missing: proper updating softbodies, guess this code still needs updates after pointcache refactor?
2009-07-02 19:41:31 +00:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
if (ob->type != OB_MESH)
object.collision was allocating on access for all object types - camera could get collision data for eg. now check for mesh types only. any other type will return None.
2011-04-18 01:45:28 +00:00
return PointerRNA_NULL;
2.5: Physics Buttons All kinds of changes to get it ready for UI layouts. This means RNA and operators should be working correct, but most buttons are still not actually there yet. * Added near empty soft body, fluid, field and collision panels, tweaks to cloth panels. * Fluid bake works, but without escape or showing any progress. * Fluid/Softbody/Cloth/Collision can now be both added as modifiers or in the physics panels. * Missing: fields & soft body for particles. * Missing: proper updating softbodies, guess this code still needs updates after pointcache refactor?
2009-07-02 19:41:31 +00:00
/* weak */
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
if (!ob->pd)
ob->pd = object_add_collision_fields(0);
Cleanup: trailing space in RNA
2018-06-09 14:40:09 +02:00
2.5: Physics Buttons All kinds of changes to get it ready for UI layouts. This means RNA and operators should be working correct, but most buttons are still not actually there yet. * Added near empty soft body, fluid, field and collision panels, tweaks to cloth panels. * Fluid bake works, but without escape or showing any progress. * Fluid/Softbody/Cloth/Collision can now be both added as modifiers or in the physics panels. * Missing: fields & soft body for particles. * Missing: proper updating softbodies, guess this code still needs updates after pointcache refactor?
2009-07-02 19:41:31 +00:00
return rna_pointer_inherit_refine(ptr, &RNA_CollisionSettings, ob->pd);
}
object.constraints.add()/remove()/active, same for PoseChannel modified internal api for minimal rna wrapper functions. TODO - missing updates for pose channels - typecheck for pose/object constraints
2009-11-11 19:58:30 +00:00
static PointerRNA rna_Object_active_constraint_get(PointerRNA *ptr)
{
style cleanup: mostly whitespace in rna
2012-05-12 11:01:29 +00:00
Object *ob = (Object *)ptr->id.data;
API Cleanup: Use BKE_constraint prefix for constraint api
2014-04-11 11:47:07 +10:00
bConstraint *con = BKE_constraints_active_get(&ob->constraints);
object.constraints.add()/remove()/active, same for PoseChannel modified internal api for minimal rna wrapper functions. TODO - missing updates for pose channels - typecheck for pose/object constraints
2009-11-11 19:58:30 +00:00
return rna_pointer_inherit_refine(ptr, &RNA_Constraint, con);
}
static void rna_Object_active_constraint_set(PointerRNA *ptr, PointerRNA value)
{
style cleanup: mostly whitespace in rna
2012-05-12 11:01:29 +00:00
Object *ob = (Object *)ptr->id.data;
API Cleanup: Use BKE_constraint prefix for constraint api
2014-04-11 11:47:07 +10:00
BKE_constraints_active_set(&ob->constraints, (bConstraint *)value.data);
object.constraints.add()/remove()/active, same for PoseChannel modified internal api for minimal rna wrapper functions. TODO - missing updates for pose channels - typecheck for pose/object constraints
2009-11-11 19:58:30 +00:00
}
Cleanup: remove G.main from BKE object Had to add some G.main to modifiers, but in 2.8 we do not need that anymore, so it's not that bad! ;)
2018-05-31 12:27:47 +02:00
static bConstraint *rna_Object_constraints_new(Object *object, Main *bmain, int type)
arbitrary property and function support for rna properties (arrays and collections), this means functions can be easily added. eg. scene.objects.link() object.constraints.new() mesh.verts.transform(...) mesh.faces.active PropertyRNA stores an StructRNA pointer where these can be defined.
2009-11-13 16:08:03 +00:00
{
Fix (unreported) missing update when adding constraint from RNA.
2017-02-25 11:27:11 +01:00
bConstraint *new_con = BKE_constraint_add_for_object(object, NULL, type);
Cleanup: remove G.main from BKE object Had to add some G.main to modifiers, but in 2.8 we do not need that anymore, so it's not that bad! ;)
2018-05-31 12:27:47 +02:00
ED_object_constraint_tag_update(bmain, object, new_con);
style cleanup: mostly whitespace in rna
2012-05-12 11:01:29 +00:00
WM_main_add_notifier(NC_OBJECT | ND_CONSTRAINT | NA_ADDED, object);
Fix (unreported) missing update when adding constraint from RNA.
2017-02-25 11:27:11 +01:00
return new_con;
arbitrary property and function support for rna properties (arrays and collections), this means functions can be easily added. eg. scene.objects.link() object.constraints.new() mesh.verts.transform(...) mesh.faces.active PropertyRNA stores an StructRNA pointer where these can be defined.
2009-11-13 16:08:03 +00:00
}
Cleanup: remove G.main from BKE object Had to add some G.main to modifiers, but in 2.8 we do not need that anymore, so it's not that bad! ;)
2018-05-31 12:27:47 +02:00
static void rna_Object_constraints_remove(Object *object, Main *bmain, ReportList *reports, PointerRNA *con_ptr)
arbitrary property and function support for rna properties (arrays and collections), this means functions can be easily added. eg. scene.objects.link() object.constraints.new() mesh.verts.transform(...) mesh.faces.active PropertyRNA stores an StructRNA pointer where these can be defined.
2009-11-13 16:08:03 +00:00
{
all remove functions now invalidate the RNA objects passed, to help script authors to avoid bugs with accessing removed data.
2012-11-02 09:41:26 +00:00
bConstraint *con = con_ptr->data;
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
if (BLI_findindex(&object->constraints, con) == -1) {
style cleanup: mostly whitespace in rna
2012-05-12 11:01:29 +00:00
BKE_reportf(reports, RPT_ERROR, "Constraint '%s' not found in object '%s'", con->name, object->id.name + 2);
merge from trunk at r31523
2010-09-07 05:47:34 +00:00
return;
}
API Cleanup: Use BKE_constraint prefix for constraint api
2014-04-11 11:47:07 +10:00
BKE_constraint_remove(&object->constraints, con);
all remove functions now invalidate the RNA objects passed, to help script authors to avoid bugs with accessing removed data.
2012-11-02 09:41:26 +00:00
RNA_POINTER_INVALIDATE(con_ptr);
Cleanup: remove G.main from BKE object Had to add some G.main to modifiers, but in 2.8 we do not need that anymore, so it's not that bad! ;)
2018-05-31 12:27:47 +02:00
ED_object_constraint_update(bmain, object);
py/rna remove functions now all work in a similar way. - some remove() functions took an int argument rather then the item to remove. - disallow None argument. - raise an error if the item isnt in the collection.
2010-08-24 06:40:28 +00:00
ED_object_constraint_set_active(object, NULL);
style cleanup: mostly whitespace in rna
2012-05-12 11:01:29 +00:00
WM_main_add_notifier(NC_OBJECT | ND_CONSTRAINT | NA_REMOVED, object);
arbitrary property and function support for rna properties (arrays and collections), this means functions can be easily added. eg. scene.objects.link() object.constraints.new() mesh.verts.transform(...) mesh.faces.active PropertyRNA stores an StructRNA pointer where these can be defined.
2009-11-13 16:08:03 +00:00
}
- fcurve modifiers.new()/remove()/active - renamed .add() to .new() for rna collection functions since they dont add an existing item. - remove 'name' as an argument from the new driver target function, better to keep the api minimal and let scripters use the data api for editing values after. - added some api functions to keep rna api from becoming a mess.
2009-11-16 11:11:16 +00:00
Cleanup: remove G.main from BKE object Had to add some G.main to modifiers, but in 2.8 we do not need that anymore, so it's not that bad! ;)
2018-05-31 12:27:47 +02:00
static void rna_Object_constraints_clear(Object *object, Main *bmain)
Added method clear to most of collections which supports new/remove. This method not added to animation-specific structures yet/
2011-11-23 16:12:11 +00:00
{
API Cleanup: Use BKE_constraint prefix for constraint api
2014-04-11 11:47:07 +10:00
BKE_constraints_free(&object->constraints);
Added method clear to most of collections which supports new/remove. This method not added to animation-specific structures yet/
2011-11-23 16:12:11 +00:00
Cleanup: remove G.main from BKE object Had to add some G.main to modifiers, but in 2.8 we do not need that anymore, so it's not that bad! ;)
2018-05-31 12:27:47 +02:00
ED_object_constraint_update(bmain, object);
Added method clear to most of collections which supports new/remove. This method not added to animation-specific structures yet/
2011-11-23 16:12:11 +00:00
ED_object_constraint_set_active(object, NULL);
style cleanup: mostly whitespace in rna
2012-05-12 11:01:29 +00:00
WM_main_add_notifier(NC_OBJECT | ND_CONSTRAINT | NA_REMOVED, object);
Added method clear to most of collections which supports new/remove. This method not added to animation-specific structures yet/
2011-11-23 16:12:11 +00:00
}
Static override: Add basic two-passes system needed for apply insert op. And a dummy placeholder for object constraints... All this is WIP of course!
2018-05-01 17:41:44 +02:00
bool rna_Object_constraints_override_apply(
Refactor static override code to pass Main around. Access to main database is actually rarely needed, but some custom 'apply' functions do need it (like Collections' overriding of objects or children collections).
2018-06-29 12:46:54 +02:00
Main *UNUSED(bmain),
Static override: Add basic two-passes system needed for apply insert op. And a dummy placeholder for object constraints... All this is WIP of course!
2018-05-01 17:41:44 +02:00
PointerRNA *ptr_dst, PointerRNA *ptr_src, PointerRNA *UNUSED(ptr_storage),
PropertyRNA *UNUSED(prop_dst), PropertyRNA *UNUSED(prop_src), PropertyRNA *UNUSED(prop_storage),
const int UNUSED(len_dst), const int UNUSED(len_src), const int UNUSED(len_storage),
Static Override: RNA apply code: pass extra 'item_ptr' to apply callbacks. This is unused currently, but is mandatory for incomming support to Collections objects and children items override support.
2018-06-28 14:23:00 +02:00
PointerRNA *UNUSED(ptr_item_dst), PointerRNA *UNUSED(ptr_item_src), PointerRNA *UNUSED(ptr_item_storage),
Static override: Add basic two-passes system needed for apply insert op. And a dummy placeholder for object constraints... All this is WIP of course!
2018-05-01 17:41:44 +02:00
IDOverrideStaticPropertyOperation *opop)
{
BLI_assert(opop->operation == IDOVERRIDESTATIC_OP_INSERT_AFTER &&
"Unsupported RNA override operation on constraints collection");
Static Override: Add proper 'apply' callback for object constraints insertion. Seems to be working fine, still need to figure out how to make inserted constraints fully overridable... ;)
2018-05-02 11:35:24 +02:00
Object *ob_dst = (Object *)ptr_dst->id.data;
Object *ob_src = (Object *)ptr_src->id.data;
/* Remember that insertion operations are defined and stored in correct order, which means that
* even if we insert several items in a row, we alays insert first one, then second one, etc.
* So we should always find 'anchor' constraint in both _src *and* _dst> */
bConstraint *con_anchor = NULL;
if (opop->subitem_local_name && opop->subitem_local_name[0]) {
con_anchor = BLI_findstring(&ob_dst->constraints, opop->subitem_local_name, offsetof(bConstraint, name));
}
if (con_anchor == NULL && opop->subitem_local_index >= 0) {
con_anchor = BLI_findlink(&ob_dst->constraints, opop->subitem_local_index);
}
/* Otherwise we just insert in first position. */
bConstraint *con_src = NULL;
if (opop->subitem_local_name && opop->subitem_local_name[0]) {
con_src = BLI_findstring(&ob_src->constraints, opop->subitem_local_name, offsetof(bConstraint, name));
}
if (con_src == NULL && opop->subitem_local_index >= 0) {
con_src = BLI_findlink(&ob_src->constraints, opop->subitem_local_index);
}
con_src = con_src ? con_src->next : ob_src->constraints.first;
BLI_assert(con_src != NULL);
bConstraint *con_dst = BKE_constraint_duplicate_ex(con_src, 0, true);
/* This handles NULL anchor as expected by adding at head of list. */
BLI_insertlinkafter(&ob_dst->constraints, con_anchor, con_dst);
/* This should actually *not* be needed in typical cases. However, if overridden source was edited,
* we *may* have some new conflicting names. */
BKE_constraint_unique_name(con_dst, &ob_dst->constraints);
// printf("%s: We inserted a constraint...\n", __func__);
return true;
Static override: Add basic two-passes system needed for apply insert op. And a dummy placeholder for object constraints... All this is WIP of course!
2018-05-01 17:41:44 +02:00
}
Code style edits (mostly spliting long lines, and removing trailing spaces). Note about long lines: I did not touch to two pieces of code (because I don’t see any way to keep a nicely formated, compact code, with shorter lines): * The node types definitions into rna_nodetree_types.h * The vgroup name functions into rna_particle.c
2012-03-18 09:27:36 +00:00
static ModifierData *rna_Object_modifier_new(Object *object, bContext *C, ReportList *reports,
const char *name, int type)
py/rna api - object.modifiers.add()/remove() - armature.edit_bones.active wasnt named correctly
2009-11-28 13:33: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
return ED_object_modifier_add(reports, CTX_data_main(C), CTX_data_scene(C), object, name, type);
py/rna api - object.modifiers.add()/remove() - armature.edit_bones.active wasnt named correctly
2009-11-28 13:33:56 +00:00
}
all remove functions now invalidate the RNA objects passed, to help script authors to avoid bugs with accessing removed data.
2012-11-02 09:41:26 +00:00
static void rna_Object_modifier_remove(Object *object, bContext *C, ReportList *reports, PointerRNA *md_ptr)
py/rna api - object.modifiers.add()/remove() - armature.edit_bones.active wasnt named correctly
2009-11-28 13:33:56 +00:00
{
all remove functions now invalidate the RNA objects passed, to help script authors to avoid bugs with accessing removed data.
2012-11-02 09:41:26 +00:00
ModifierData *md = md_ptr->data;
Code cleanup: remove TRUE/FALSE & WITH_BOOL_COMPAT define
2014-04-01 11:34:00 +11:00
if (ED_object_modifier_remove(reports, CTX_data_main(C), object, md) == false) {
all remove functions now invalidate the RNA objects passed, to help script authors to avoid bugs with accessing removed data.
2012-11-02 09:41:26 +00:00
/* error is already set */
return;
}
RNA_POINTER_INVALIDATE(md_ptr);
Added method clear to most of collections which supports new/remove. This method not added to animation-specific structures yet/
2011-11-23 16:12:11 +00:00
style cleanup: mostly whitespace in rna
2012-05-12 11:01:29 +00:00
WM_main_add_notifier(NC_OBJECT | ND_MODIFIER | NA_REMOVED, object);
Added method clear to most of collections which supports new/remove. This method not added to animation-specific structures yet/
2011-11-23 16:12:11 +00:00
}
static void rna_Object_modifier_clear(Object *object, bContext *C)
{
code cleanup: remove unused arg
2013-02-22 00:51:58 +00:00
ED_object_modifier_clear(CTX_data_main(C), object);
Added method clear to most of collections which supports new/remove. This method not added to animation-specific structures yet/
2011-11-23 16:12:11 +00:00
style cleanup: mostly whitespace in rna
2012-05-12 11:01:29 +00:00
WM_main_add_notifier(NC_OBJECT | ND_MODIFIER | NA_REMOVED, object);
py/rna api - object.modifiers.add()/remove() - armature.edit_bones.active wasnt named correctly
2009-11-28 13:33:56 +00:00
}
Static Override: add insertion for modifiers and one constraints, fix editing of inserted items in collections. Now insertable collection items have a flag to say they are 'local' (and hence can be freely edited).
2018-05-02 18:13:15 +02:00
bool rna_Object_modifiers_override_apply(
Refactor static override code to pass Main around. Access to main database is actually rarely needed, but some custom 'apply' functions do need it (like Collections' overriding of objects or children collections).
2018-06-29 12:46:54 +02:00
Main *UNUSED(bmain),
Static Override: add insertion for modifiers and one constraints, fix editing of inserted items in collections. Now insertable collection items have a flag to say they are 'local' (and hence can be freely edited).
2018-05-02 18:13:15 +02:00
PointerRNA *ptr_dst, PointerRNA *ptr_src, PointerRNA *UNUSED(ptr_storage),
PropertyRNA *UNUSED(prop_dst), PropertyRNA *UNUSED(prop_src), PropertyRNA *UNUSED(prop_storage),
const int UNUSED(len_dst), const int UNUSED(len_src), const int UNUSED(len_storage),
Static Override: RNA apply code: pass extra 'item_ptr' to apply callbacks. This is unused currently, but is mandatory for incomming support to Collections objects and children items override support.
2018-06-28 14:23:00 +02:00
PointerRNA *UNUSED(ptr_item_dst), PointerRNA *UNUSED(ptr_item_src), PointerRNA *UNUSED(ptr_item_storage),
Static Override: add insertion for modifiers and one constraints, fix editing of inserted items in collections. Now insertable collection items have a flag to say they are 'local' (and hence can be freely edited).
2018-05-02 18:13:15 +02:00
IDOverrideStaticPropertyOperation *opop)
{
BLI_assert(opop->operation == IDOVERRIDESTATIC_OP_INSERT_AFTER &&
"Unsupported RNA override operation on modifiers collection");
Object *ob_dst = (Object *)ptr_dst->id.data;
Object *ob_src = (Object *)ptr_src->id.data;
/* Remember that insertion operations are defined and stored in correct order, which means that
* even if we insert several items in a row, we alays insert first one, then second one, etc.
* So we should always find 'anchor' constraint in both _src *and* _dst> */
ModifierData *mod_anchor = NULL;
if (opop->subitem_local_name && opop->subitem_local_name[0]) {
mod_anchor = BLI_findstring(&ob_dst->modifiers, opop->subitem_local_name, offsetof(ModifierData, name));
}
if (mod_anchor == NULL && opop->subitem_local_index >= 0) {
mod_anchor = BLI_findlink(&ob_dst->modifiers, opop->subitem_local_index);
}
/* Otherwise we just insert in first position. */
ModifierData *mod_src = NULL;
if (opop->subitem_local_name && opop->subitem_local_name[0]) {
mod_src = BLI_findstring(&ob_src->modifiers, opop->subitem_local_name, offsetof(ModifierData, name));
}
if (mod_src == NULL && opop->subitem_local_index >= 0) {
mod_src = BLI_findlink(&ob_src->modifiers, opop->subitem_local_index);
}
mod_src = mod_src ? mod_src->next : ob_src->modifiers.first;
BLI_assert(mod_src != NULL);
ModifierData *mod_dst = modifier_new(mod_src->type);
modifier_copyData(mod_src, mod_dst);
/* This handles NULL anchor as expected by adding at head of list. */
BLI_insertlinkafter(&ob_dst->modifiers, mod_anchor, mod_dst);
/* This should actually *not* be needed in typical cases. However, if overridden source was edited,
* we *may* have some new conflicting names. */
modifier_unique_name(&ob_dst->modifiers, mod_dst);
// printf("%s: We inserted a modifier...\n", __func__);
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 GpencilModifierData *rna_Object_greasepencil_modifier_new(
Object *object, bContext *C, ReportList *reports,
const char *name, int type)
{
return ED_object_gpencil_modifier_add(reports, CTX_data_main(C), CTX_data_scene(C), object, name, type);
}
static void rna_Object_greasepencil_modifier_remove(
Object *object, bContext *C, ReportList *reports, PointerRNA *gmd_ptr)
{
GpencilModifierData *gmd = gmd_ptr->data;
if (ED_object_gpencil_modifier_remove(reports, CTX_data_main(C), object, gmd) == false) {
/* error is already set */
return;
}
RNA_POINTER_INVALIDATE(gmd_ptr);
WM_main_add_notifier(NC_OBJECT | ND_MODIFIER | NA_REMOVED, object);
}
static void rna_Object_greasepencil_modifier_clear(Object *object, bContext *C)
{
ED_object_gpencil_modifier_clear(CTX_data_main(C), object);
WM_main_add_notifier(NC_OBJECT | ND_MODIFIER | NA_REMOVED, object);
}
/* shader fx */
static ShaderFxData *rna_Object_shaderfx_new(
Object *object, bContext *C, ReportList *reports,
const char *name, int type)
{
return ED_object_shaderfx_add(reports, CTX_data_main(C), CTX_data_scene(C), object, name, type);
}
static void rna_Object_shaderfx_remove(
Object *object, bContext *C, ReportList *reports, PointerRNA *gmd_ptr)
{
ShaderFxData *gmd = gmd_ptr->data;
if (ED_object_shaderfx_remove(reports, CTX_data_main(C), object, gmd) == false) {
/* error is already set */
return;
}
RNA_POINTER_INVALIDATE(gmd_ptr);
WM_main_add_notifier(NC_OBJECT | ND_MODIFIER | NA_REMOVED, object);
}
static void rna_Object_shaderfx_clear(Object *object, bContext *C)
{
ED_object_shaderfx_clear(CTX_data_main(C), object);
WM_main_add_notifier(NC_OBJECT | ND_MODIFIER | NA_REMOVED, object);
}
object bound box access from rna
2010-02-10 20:29:40 +00:00
static void rna_Object_boundbox_get(PointerRNA *ptr, float *values)
{
style cleanup: mostly whitespace in rna
2012-05-12 11:01:29 +00:00
Object *ob = (Object *)ptr->id.data;
code cleanup: function naming, use BKE_*type* prefix.
2012-05-05 14:03:12 +00:00
BoundBox *bb = BKE_object_boundbox_get(ob);
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
if (bb) {
object bound box access from rna
2010-02-10 20:29:40 +00:00
memcpy(values, bb->vec, sizeof(bb->vec));
}
else {
Math Lib: rename fill_*, to copy_* matching convention for fixed length api, eg: copy_v3_fl
2015-05-05 17:08:29 +10:00
copy_vn_fl(values, sizeof(bb->vec) / sizeof(float), 0.0f);
object bound box access from rna
2010-02-10 20:29:40 +00:00
}
}
patch [#25440] Object.vertex_group fixin' from Dan Eicher (dna) From the tracker (with minor edits) ======================== cube = bpy.data.objects['Cube'] foo = cube.vertex_groups.new('foo') foo.add([1,3,5,7], 1.0, 'ADD') for i in range(len(cube.data.vertices)): try: weight = foo.weight(i) print('vert: %i weight: %f' % (i, weight)) except: pass foo.remove([1,3]) cube.vertex_groups.remove(foo)
2011-01-07 09:50:23 +00:00
static bDeformGroup *rna_Object_vgroup_new(Object *ob, const char *name)
rna api obj.add_vertex_group() --> obj.vertex_groups.new() obj.add_vertex_to_group() --> obj.vertex_groups.assign() note: obj.vertex_groups.assign() will be very slow, need to have this take a list rather then 1 vertex at a time.
2010-08-27 02:33:35 +00:00
{
Refactor: Move part of vgroup handling code from ED_mesh/object_vgroup.c to BKE_object_deform. Along with some minor cleanup and simplifications. Reviewers: campbellbarton Subscribers: sergey Differential Revision: https://developer.blender.org/D903
2014-11-18 23:52:17 +01:00
bDeformGroup *defgroup = BKE_object_defgroup_add_name(ob, name);
patch [#25440] Object.vertex_group fixin' from Dan Eicher (dna) From the tracker (with minor edits) ======================== cube = bpy.data.objects['Cube'] foo = cube.vertex_groups.new('foo') foo.add([1,3,5,7], 1.0, 'ADD') for i in range(len(cube.data.vertices)): try: weight = foo.weight(i) print('vert: %i weight: %f' % (i, weight)) except: pass foo.remove([1,3]) cube.vertex_groups.remove(foo)
2011-01-07 09:50:23 +00:00
style cleanup: mostly whitespace in rna
2012-05-12 11:01:29 +00:00
WM_main_add_notifier(NC_OBJECT | ND_DRAW, ob);
patch [#25440] Object.vertex_group fixin' from Dan Eicher (dna) From the tracker (with minor edits) ======================== cube = bpy.data.objects['Cube'] foo = cube.vertex_groups.new('foo') foo.add([1,3,5,7], 1.0, 'ADD') for i in range(len(cube.data.vertices)): try: weight = foo.weight(i) print('vert: %i weight: %f' % (i, weight)) except: pass foo.remove([1,3]) cube.vertex_groups.remove(foo)
2011-01-07 09:50:23 +00:00
return defgroup;
}
all remove functions now invalidate the RNA objects passed, to help script authors to avoid bugs with accessing removed data.
2012-11-02 09:41:26 +00:00
static void rna_Object_vgroup_remove(Object *ob, ReportList *reports, PointerRNA *defgroup_ptr)
merge from trunk at r31523
2010-09-07 05:47:34 +00:00
{
all remove functions now invalidate the RNA objects passed, to help script authors to avoid bugs with accessing removed data.
2012-11-02 09:41:26 +00:00
bDeformGroup *defgroup = defgroup_ptr->data;
if (BLI_findindex(&ob->defbase, defgroup) == -1) {
BKE_reportf(reports, RPT_ERROR, "DeformGroup '%s' not in object '%s'", defgroup->name, ob->id.name + 2);
return;
}
Refactor: Move part of vgroup handling code from ED_mesh/object_vgroup.c to BKE_object_deform. Along with some minor cleanup and simplifications. Reviewers: campbellbarton Subscribers: sergey Differential Revision: https://developer.blender.org/D903
2014-11-18 23:52:17 +01:00
BKE_object_defgroup_remove(ob, defgroup);
all remove functions now invalidate the RNA objects passed, to help script authors to avoid bugs with accessing removed data.
2012-11-02 09:41:26 +00:00
RNA_POINTER_INVALIDATE(defgroup_ptr);
patch [#25440] Object.vertex_group fixin' from Dan Eicher (dna) From the tracker (with minor edits) ======================== cube = bpy.data.objects['Cube'] foo = cube.vertex_groups.new('foo') foo.add([1,3,5,7], 1.0, 'ADD') for i in range(len(cube.data.vertices)): try: weight = foo.weight(i) print('vert: %i weight: %f' % (i, weight)) except: pass foo.remove([1,3]) cube.vertex_groups.remove(foo)
2011-01-07 09:50:23 +00:00
style cleanup: mostly whitespace in rna
2012-05-12 11:01:29 +00:00
WM_main_add_notifier(NC_OBJECT | ND_DRAW, ob);
patch [#25440] Object.vertex_group fixin' from Dan Eicher (dna) From the tracker (with minor edits) ======================== cube = bpy.data.objects['Cube'] foo = cube.vertex_groups.new('foo') foo.add([1,3,5,7], 1.0, 'ADD') for i in range(len(cube.data.vertices)): try: weight = foo.weight(i) print('vert: %i weight: %f' % (i, weight)) except: pass foo.remove([1,3]) cube.vertex_groups.remove(foo)
2011-01-07 09:50:23 +00:00
}
Added method clear to most of collections which supports new/remove. This method not added to animation-specific structures yet/
2011-11-23 16:12:11 +00:00
static void rna_Object_vgroup_clear(Object *ob)
{
Refactor: Move part of vgroup handling code from ED_mesh/object_vgroup.c to BKE_object_deform. Along with some minor cleanup and simplifications. Reviewers: campbellbarton Subscribers: sergey Differential Revision: https://developer.blender.org/D903
2014-11-18 23:52:17 +01:00
BKE_object_defgroup_remove_all(ob);
Added method clear to most of collections which supports new/remove. This method not added to animation-specific structures yet/
2011-11-23 16:12:11 +00:00
style cleanup: mostly whitespace in rna
2012-05-12 11:01:29 +00:00
WM_main_add_notifier(NC_OBJECT | ND_DRAW, ob);
Added method clear to most of collections which supports new/remove. This method not added to animation-specific structures yet/
2011-11-23 16:12:11 +00:00
}
Minor: Other UI strings typos and tweaks. Also updated french po & mo.
2011-09-25 09:55:13 +00:00
static void rna_VertexGroup_vertex_add(ID *id, bDeformGroup *def, ReportList *reports, int index_len,
int *index, float weight, int assignmode)
patch [#25440] Object.vertex_group fixin' from Dan Eicher (dna) From the tracker (with minor edits) ======================== cube = bpy.data.objects['Cube'] foo = cube.vertex_groups.new('foo') foo.add([1,3,5,7], 1.0, 'ADD') for i in range(len(cube.data.vertices)): try: weight = foo.weight(i) print('vert: %i weight: %f' % (i, weight)) except: pass foo.remove([1,3]) cube.vertex_groups.remove(foo)
2011-01-07 09:50:23 +00:00
{
Object *ob = (Object *)id;
Cleanup: Shapekey: get rid of `ED_vgroup_object_is_edit_mode()` It was doing exactly the same thing as `BKE_object_is_in_editmode_vgroup()`, tsst...
2014-11-17 20:33:25 +01:00
if (BKE_object_is_in_editmode_vgroup(ob)) {
A final bunch of UI messages fixes and tweaks, and some BKE_report()<->BKE_reportf() fixes.
2012-10-21 14:02:30 +00:00
BKE_report(reports, RPT_ERROR, "VertexGroup.add(): cannot be called while object is in edit mode");
patch [#25440] Object.vertex_group fixin' from Dan Eicher (dna) From the tracker (with minor edits) ======================== cube = bpy.data.objects['Cube'] foo = cube.vertex_groups.new('foo') foo.add([1,3,5,7], 1.0, 'ADD') for i in range(len(cube.data.vertices)): try: weight = foo.weight(i) print('vert: %i weight: %f' % (i, weight)) except: pass foo.remove([1,3]) cube.vertex_groups.remove(foo)
2011-01-07 09:50:23 +00:00
return;
}
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
while (index_len--)
style cleanup: mostly whitespace in rna
2012-05-12 11:01:29 +00:00
ED_vgroup_vert_add(ob, def, *index++, weight, assignmode); /* XXX, not efficient calling within loop*/
patch [#25440] Object.vertex_group fixin' from Dan Eicher (dna) From the tracker (with minor edits) ======================== cube = bpy.data.objects['Cube'] foo = cube.vertex_groups.new('foo') foo.add([1,3,5,7], 1.0, 'ADD') for i in range(len(cube.data.vertices)): try: weight = foo.weight(i) print('vert: %i weight: %f' % (i, weight)) except: pass foo.remove([1,3]) cube.vertex_groups.remove(foo)
2011-01-07 09:50:23 +00:00
style cleanup: mostly whitespace in rna
2012-05-12 11:01:29 +00:00
WM_main_add_notifier(NC_GEOM | ND_DATA, (ID *)ob->data);
patch [#25440] Object.vertex_group fixin' from Dan Eicher (dna) From the tracker (with minor edits) ======================== cube = bpy.data.objects['Cube'] foo = cube.vertex_groups.new('foo') foo.add([1,3,5,7], 1.0, 'ADD') for i in range(len(cube.data.vertices)): try: weight = foo.weight(i) print('vert: %i weight: %f' % (i, weight)) except: pass foo.remove([1,3]) cube.vertex_groups.remove(foo)
2011-01-07 09:50:23 +00:00
}
static void rna_VertexGroup_vertex_remove(ID *id, bDeformGroup *dg, ReportList *reports, int index_len, int *index)
{
Object *ob = (Object *)id;
Cleanup: Shapekey: get rid of `ED_vgroup_object_is_edit_mode()` It was doing exactly the same thing as `BKE_object_is_in_editmode_vgroup()`, tsst...
2014-11-17 20:33:25 +01:00
if (BKE_object_is_in_editmode_vgroup(ob)) {
A final bunch of UI messages fixes and tweaks, and some BKE_report()<->BKE_reportf() fixes.
2012-10-21 14:02:30 +00:00
BKE_report(reports, RPT_ERROR, "VertexGroup.remove(): cannot be called while object is in edit mode");
patch [#25440] Object.vertex_group fixin' from Dan Eicher (dna) From the tracker (with minor edits) ======================== cube = bpy.data.objects['Cube'] foo = cube.vertex_groups.new('foo') foo.add([1,3,5,7], 1.0, 'ADD') for i in range(len(cube.data.vertices)): try: weight = foo.weight(i) print('vert: %i weight: %f' % (i, weight)) except: pass foo.remove([1,3]) cube.vertex_groups.remove(foo)
2011-01-07 09:50:23 +00:00
return;
}
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
while (index_len--)
patch [#25440] Object.vertex_group fixin' from Dan Eicher (dna) From the tracker (with minor edits) ======================== cube = bpy.data.objects['Cube'] foo = cube.vertex_groups.new('foo') foo.add([1,3,5,7], 1.0, 'ADD') for i in range(len(cube.data.vertices)): try: weight = foo.weight(i) print('vert: %i weight: %f' % (i, weight)) except: pass foo.remove([1,3]) cube.vertex_groups.remove(foo)
2011-01-07 09:50:23 +00:00
ED_vgroup_vert_remove(ob, dg, *index++);
style cleanup: mostly whitespace in rna
2012-05-12 11:01:29 +00:00
WM_main_add_notifier(NC_GEOM | ND_DATA, (ID *)ob->data);
patch [#25440] Object.vertex_group fixin' from Dan Eicher (dna) From the tracker (with minor edits) ======================== cube = bpy.data.objects['Cube'] foo = cube.vertex_groups.new('foo') foo.add([1,3,5,7], 1.0, 'ADD') for i in range(len(cube.data.vertices)): try: weight = foo.weight(i) print('vert: %i weight: %f' % (i, weight)) except: pass foo.remove([1,3]) cube.vertex_groups.remove(foo)
2011-01-07 09:50:23 +00:00
}
static float rna_VertexGroup_weight(ID *id, bDeformGroup *dg, ReportList *reports, int index)
{
float weight = ED_vgroup_vert_weight((Object *)id, dg, index);
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
if (weight < 0) {
A final bunch of UI messages fixes and tweaks, and some BKE_report()<->BKE_reportf() fixes.
2012-10-21 14:02:30 +00:00
BKE_report(reports, RPT_ERROR, "Vertex not in group");
patch [#25440] Object.vertex_group fixin' from Dan Eicher (dna) From the tracker (with minor edits) ======================== cube = bpy.data.objects['Cube'] foo = cube.vertex_groups.new('foo') foo.add([1,3,5,7], 1.0, 'ADD') for i in range(len(cube.data.vertices)): try: weight = foo.weight(i) print('vert: %i weight: %f' % (i, weight)) except: pass foo.remove([1,3]) cube.vertex_groups.remove(foo)
2011-01-07 09:50:23 +00:00
}
Code style edits (mostly spliting long lines, and removing trailing spaces). Note about long lines: I did not touch to two pieces of code (because I don’t see any way to keep a nicely formated, compact code, with shorter lines): * The node types definitions into rna_nodetree_types.h * The vgroup name functions into rna_particle.c
2012-03-18 09:27:36 +00:00
return weight;
merge from trunk at r31523
2010-09-07 05:47:34 +00:00
}
Face Maps: custom-data, UI and RNA API Add face maps, needed for face-map widgets, only data structure, widgets will be separate commit. This comes from 'custom-manipulator' branch with only minor changes.
2017-05-30 17:58:24 +10:00
static bFaceMap *rna_Object_fmap_new(Object *ob, const char *name)
{
bFaceMap *fmap = BKE_object_facemap_add_name(ob, name);
WM_main_add_notifier(NC_OBJECT | ND_DRAW, ob);
return fmap;
}
static void rna_Object_fmap_remove(Object *ob, ReportList *reports, PointerRNA *fmap_ptr)
{
bFaceMap *fmap = fmap_ptr->data;
if (BLI_findindex(&ob->fmaps, fmap) == -1) {
BKE_reportf(reports, RPT_ERROR, "FaceMap '%s' not in object '%s'", fmap->name, ob->id.name + 2);
return;
}
BKE_object_facemap_remove(ob, fmap);
RNA_POINTER_INVALIDATE(fmap_ptr);
WM_main_add_notifier(NC_OBJECT | ND_DRAW, ob);
}
static void rna_Object_fmap_clear(Object *ob)
{
BKE_object_facemap_clear(ob);
WM_main_add_notifier(NC_OBJECT | ND_DRAW, ob);
}
static void rna_FaceMap_face_add(ID *id, bFaceMap *fmap, ReportList *reports, int index_len,
int *index)
{
Object *ob = (Object *)id;
if (BKE_object_is_in_editmode(ob)) {
BKE_report(reports, RPT_ERROR, "FaceMap.add(): cannot be called while object is in edit mode");
return;
}
while (index_len--)
ED_object_facemap_face_add(ob, fmap, *index++);
WM_main_add_notifier(NC_GEOM | ND_DATA, (ID *)ob->data);
}
static void rna_FaceMap_face_remove(ID *id, bFaceMap *fmap, ReportList *reports, int index_len, int *index)
{
Object *ob = (Object *)id;
if (BKE_object_is_in_editmode(ob)) {
BKE_report(reports, RPT_ERROR, "FaceMap.add(): cannot be called while object is in edit mode");
return;
}
while (index_len--)
ED_object_facemap_face_remove(ob, fmap, *index++);
WM_main_add_notifier(NC_GEOM | ND_DATA, (ID *)ob->data);
}
pointer poll functions for object's, mainly for modifiers, constraints. Lattice modifier only shows lattices types, Shrink wrap only meshes etc.
2010-08-03 06:51:36 +00:00
/* generic poll functions */
Cleanup: use bool for poll functions
2018-07-02 11:47:00 +02:00
bool rna_Lattice_object_poll(PointerRNA *UNUSED(ptr), PointerRNA value)
pointer poll functions for object's, mainly for modifiers, constraints. Lattice modifier only shows lattices types, Shrink wrap only meshes etc.
2010-08-03 06:51:36 +00:00
{
return ((Object *)value.id.data)->type == OB_LATTICE;
}
Cleanup: use bool for poll functions
2018-07-02 11:47:00 +02:00
bool rna_Curve_object_poll(PointerRNA *UNUSED(ptr), PointerRNA value)
pointer poll functions for object's, mainly for modifiers, constraints. Lattice modifier only shows lattices types, Shrink wrap only meshes etc.
2010-08-03 06:51:36 +00:00
{
return ((Object *)value.id.data)->type == OB_CURVE;
}
Cleanup: use bool for poll functions
2018-07-02 11:47:00 +02:00
bool rna_Armature_object_poll(PointerRNA *UNUSED(ptr), PointerRNA value)
pointer poll functions for object's, mainly for modifiers, constraints. Lattice modifier only shows lattices types, Shrink wrap only meshes etc.
2010-08-03 06:51:36 +00:00
{
return ((Object *)value.id.data)->type == OB_ARMATURE;
}
Cleanup: use bool for poll functions
2018-07-02 11:47:00 +02:00
bool rna_Mesh_object_poll(PointerRNA *UNUSED(ptr), PointerRNA value)
pointer poll functions for object's, mainly for modifiers, constraints. Lattice modifier only shows lattices types, Shrink wrap only meshes etc.
2010-08-03 06:51:36 +00:00
{
return ((Object *)value.id.data)->type == OB_MESH;
}
Cleanup: use bool for poll functions
2018-07-02 11:47:00 +02:00
bool rna_Camera_object_poll(PointerRNA *UNUSED(ptr), PointerRNA value)
pointer poll functions for object's, mainly for modifiers, constraints. Lattice modifier only shows lattices types, Shrink wrap only meshes etc.
2010-08-03 06:51:36 +00:00
{
return ((Object *)value.id.data)->type == OB_CAMERA;
}
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
bool rna_Light_object_poll(PointerRNA *UNUSED(ptr), PointerRNA value)
Blender Internal: Add "Lamp Data" shader node that allows shaders to acquire information such as light vector from specified Lamp. For now this provides the following outputs: - Color - Light Vector - Distance - Shadow - Visibility Factor Note: Color output is multiplied by the lamp energy. Multiplication of color*max(dot(light_vector,normal_vector),0)*shadow*visibility_factor produces the exact same result as the Lambert shader. Many thanks to Brecht for code review and discussion!
2013-11-25 20:58:23 +09:00
{
return ((Object *)value.id.data)->type == OB_LAMP;
}
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
bool rna_GPencil_object_poll(PointerRNA *UNUSED(ptr), PointerRNA value)
{
return ((Object *)value.id.data)->type == OB_GPENCIL;
}
Add DNA/RNA/BKE infrastructure for dynamic-topology sculpt mode * Add a detail_size field to the Sculpt struct, two new sculpt flags, and a Mesh flag for dynamic-topology mode; that's it for file-level changes needed by dynamic topology * Add RNA for the new DNA field and flags * Add a new icon for dynamic-topology created by Julio Iglesias. TODO: update the icon for the new SVG icon format * Add a SculptSession function for converting from BMesh to Mesh, handles reordering mesh elements and setting face shading
2012-12-30 18:27:33 +00:00
int rna_Object_use_dynamic_topology_sculpting_get(PointerRNA *ptr)
{
style cleanup
2012-12-31 02:37:28 +00:00
SculptSession *ss = ((Object *)ptr->id.data)->sculpt;
Add DNA/RNA/BKE infrastructure for dynamic-topology sculpt mode * Add a detail_size field to the Sculpt struct, two new sculpt flags, and a Mesh flag for dynamic-topology mode; that's it for file-level changes needed by dynamic topology * Add RNA for the new DNA field and flags * Add a new icon for dynamic-topology created by Julio Iglesias. TODO: update the icon for the new SVG icon format * Add a SculptSession function for converting from BMesh to Mesh, handles reordering mesh elements and setting face shading
2012-12-30 18:27:33 +00:00
return (ss && ss->bm);
}
RNA / Data API This is the first code for the Data API, also known as RNA system in the 2.5 Branch. It does not include a user interface, and only wraps some Scene properties for testing. It is integrated with Scons and Makefiles, and compiles a 'makesrna' program that generates an RNA.c file. http://wiki.blender.org/index.php/BlenderDev/Blender2.5/DataAPI http://wiki.blender.org/index.php/BlenderDev/Blender2.5/RNA The changes are quite local, basically adding a makesrna module which works similar to the makesdna module. The one external change is in moving genfile.c from blenloader to the makesdna module, so that it can be reused by the RNA code. This also meant changing the DNA makefiles. It seems to be doing dependencies correct still in my tests, but if there is an issue with the DNA not being rebuilt this commit might be the one causing it. Also it seems for scons the makesdna and makesrna modules are compiling without warnings. Not a new issue but this should be fixed. The RNA code supports all types as defined in the Data API design, so in that sense it is fairly complete and I hope that aspect will not have to change much. Some obviously missing parts are context related code, notify() functions for updates and user defined / ID properties.
2008-10-31 23:50:02 +00:00
#else
RNA * Object has some more properties wrapped, mostly game related. * Scene frame changes now send a notifier. * Added functions to create/free operator properties for calling operators. This also simplifies some duplicated code that did this. Ideally though this kind of thing should use the properties pointer provided by buttons and keymap items. Example code: PointerRNA ptr; WM_operator_properties_create(&ptr, "SOME_OT_name"); RNA_int_set(&ptr, "value", 42); WM_operator_name_call(C, "SOME_OT_name", WM_OP_EXEC_DEFAULT, &ptr); WM_operator_properties_free(&ptr);
2009-01-01 20:44:40 +00:00
static void rna_def_vertex_group(BlenderRNA *brna)
{
StructRNA *srna;
PropertyRNA *prop;
patch [#25440] Object.vertex_group fixin' from Dan Eicher (dna) From the tracker (with minor edits) ======================== cube = bpy.data.objects['Cube'] foo = cube.vertex_groups.new('foo') foo.add([1,3,5,7], 1.0, 'ADD') for i in range(len(cube.data.vertices)): try: weight = foo.weight(i) print('vert: %i weight: %f' % (i, weight)) except: pass foo.remove([1,3]) cube.vertex_groups.remove(foo)
2011-01-07 09:50:23 +00:00
FunctionRNA *func;
Refactor RNA property: split flags in property flags, parameter flags, and internal flags. This gives us 9 flags available again for properties (we had none anymore), and also makes things slightly cleaner. To simplify (and make more clear the differences between mere properties and function parameters), also added RNA_def_parameter_flags function (and its clear counterpart), to be used instead of RNA_def_property_flag for function parameters. This patch is also a big cleanup (some RNA function definitions were still using 'prop' PropertyRNA pointer, etc.). And yes, am aware this will be annoying for all branches, but we really need to get new flags available for properties (will need at least one for override, etc.). Reviewers: sergey, Severin Subscribers: dfelinto, brecht Differential Revision: https://developer.blender.org/D2400
2016-12-12 15:23:55 +01:00
PropertyRNA *parm;
patch [#25440] Object.vertex_group fixin' from Dan Eicher (dna) From the tracker (with minor edits) ======================== cube = bpy.data.objects['Cube'] foo = cube.vertex_groups.new('foo') foo.add([1,3,5,7], 1.0, 'ADD') for i in range(len(cube.data.vertices)): try: weight = foo.weight(i) print('vert: %i weight: %f' % (i, weight)) except: pass foo.remove([1,3]) cube.vertex_groups.remove(foo)
2011-01-07 09:50:23 +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 assign_mode_items[] = {
patch [#25440] Object.vertex_group fixin' from Dan Eicher (dna) From the tracker (with minor edits) ======================== cube = bpy.data.objects['Cube'] foo = cube.vertex_groups.new('foo') foo.add([1,3,5,7], 1.0, 'ADD') for i in range(len(cube.data.vertices)): try: weight = foo.weight(i) print('vert: %i weight: %f' % (i, weight)) except: pass foo.remove([1,3]) cube.vertex_groups.remove(foo)
2011-01-07 09:50:23 +00:00
{WEIGHT_REPLACE, "REPLACE", 0, "Replace", "Replace"},
{WEIGHT_ADD, "ADD", 0, "Add", "Add"},
{WEIGHT_SUBTRACT, "SUBTRACT", 0, "Subtract", "Subtract"},
{0, NULL, 0, NULL, NULL}
};
RNA * Object has some more properties wrapped, mostly game related. * Scene frame changes now send a notifier. * Added functions to create/free operator properties for calling operators. This also simplifies some duplicated code that did this. Ideally though this kind of thing should use the properties pointer provided by buttons and keymap items. Example code: PointerRNA ptr; WM_operator_properties_create(&ptr, "SOME_OT_name"); RNA_int_set(&ptr, "value", 42); WM_operator_name_call(C, "SOME_OT_name", WM_OP_EXEC_DEFAULT, &ptr); WM_operator_properties_free(&ptr);
2009-01-01 20:44:40 +00:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
srna = RNA_def_struct(brna, "VertexGroup", NULL);
RNA * Object has some more properties wrapped, mostly game related. * Scene frame changes now send a notifier. * Added functions to create/free operator properties for calling operators. This also simplifies some duplicated code that did this. Ideally though this kind of thing should use the properties pointer provided by buttons and keymap items. Example code: PointerRNA ptr; WM_operator_properties_create(&ptr, "SOME_OT_name"); RNA_int_set(&ptr, "value", 42); WM_operator_name_call(C, "SOME_OT_name", WM_OP_EXEC_DEFAULT, &ptr); WM_operator_properties_free(&ptr);
2009-01-01 20:44:40 +00:00
RNA_def_struct_sdna(srna, "bDeformGroup");
batch remove .'s used with RNA_def_struct_ui_text
2010-02-10 21:15:44 +00:00
RNA_def_struct_ui_text(srna, "Vertex Group", "Group of vertices, used for armature deform and other purposes");
UI/RNA: * Added an icon entry to RNA structs, instead of the UI_GetIconRNA function, to keep code together a bit more and make the lookup faster.
2009-06-03 23:16:51 +00:00
RNA_def_struct_ui_icon(srna, ICON_GROUP_VERTEX);
RNA * Object has some more properties wrapped, mostly game related. * Scene frame changes now send a notifier. * Added functions to create/free operator properties for calling operators. This also simplifies some duplicated code that did this. Ideally though this kind of thing should use the properties pointer provided by buttons and keymap items. Example code: PointerRNA ptr; WM_operator_properties_create(&ptr, "SOME_OT_name"); RNA_int_set(&ptr, "value", 42); WM_operator_name_call(C, "SOME_OT_name", WM_OP_EXEC_DEFAULT, &ptr); WM_operator_properties_free(&ptr);
2009-01-01 20:44:40 +00:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "name", PROP_STRING, PROP_NONE);
batch remove .'s used with RNA_def_struct_ui_text
2010-02-10 21:15:44 +00:00
RNA_def_property_ui_text(prop, "Name", "Vertex group name");
RNA * Object has some more properties wrapped, mostly game related. * Scene frame changes now send a notifier. * Added functions to create/free operator properties for calling operators. This also simplifies some duplicated code that did this. Ideally though this kind of thing should use the properties pointer provided by buttons and keymap items. Example code: PointerRNA ptr; WM_operator_properties_create(&ptr, "SOME_OT_name"); RNA_int_set(&ptr, "value", 42); WM_operator_name_call(C, "SOME_OT_name", WM_OP_EXEC_DEFAULT, &ptr); WM_operator_properties_free(&ptr);
2009-01-01 20:44:40 +00:00
RNA_def_struct_name_property(srna, prop);
fix [#27554] vertex group names - duplicate vertex group names were not being checked for. - also made the first duplicate end with .001 rather than .000
2011-06-05 04:52:32 +00:00
RNA_def_property_string_funcs(prop, NULL, NULL, "rna_VertexGroup_name_set");
style cleanup: mostly whitespace in rna
2012-05-12 11:01:29 +00:00
/* update data because modifiers may use [#24761] */
RNA_def_property_update(prop, NC_GEOM | ND_DATA | NA_RENAME, "rna_Object_internal_update_data");
Cleanup: trailing space in RNA
2018-06-09 14:40:09 +02:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "lock_weight", PROP_BOOLEAN, PROP_NONE);
2011-05-27 19:13:54 +00:00
RNA_def_property_ui_text(prop, "", "Maintain the relative weights for the group");
- use a flag define for bDeformGroup->flag rather than setting TRUE/FALSE - rename RNA bDeformGroup.flag to "lock_weight"
2011-09-14 07:07:17 +00:00
RNA_def_property_boolean_sdna(prop, NULL, "flag", 0);
style cleanup: mostly whitespace in rna
2012-05-12 11:01:29 +00:00
/* update data because modifiers may use [#24761] */
RNA_def_property_update(prop, NC_GEOM | ND_DATA | NA_RENAME, "rna_Object_internal_update_data");
RNA * Object has some more properties wrapped, mostly game related. * Scene frame changes now send a notifier. * Added functions to create/free operator properties for calling operators. This also simplifies some duplicated code that did this. Ideally though this kind of thing should use the properties pointer provided by buttons and keymap items. Example code: PointerRNA ptr; WM_operator_properties_create(&ptr, "SOME_OT_name"); RNA_int_set(&ptr, "value", 42); WM_operator_name_call(C, "SOME_OT_name", WM_OP_EXEC_DEFAULT, &ptr); WM_operator_properties_free(&ptr);
2009-01-01 20:44:40 +00:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "index", PROP_INT, PROP_UNSIGNED);
RNA: * Allow pointers to be editable, did SpaceTextEditor.text as a test. * Changed PROP_NOT_EDITABLE to PROP_EDITABLE, and added RNA_def_property_clear_flag. * Removed rna_dependency.c test code.
2009-03-23 13:24:48 +00:00
RNA_def_property_clear_flag(prop, PROP_EDITABLE);
RNA * Object has some more properties wrapped, mostly game related. * Scene frame changes now send a notifier. * Added functions to create/free operator properties for calling operators. This also simplifies some duplicated code that did this. Ideally though this kind of thing should use the properties pointer provided by buttons and keymap items. Example code: PointerRNA ptr; WM_operator_properties_create(&ptr, "SOME_OT_name"); RNA_int_set(&ptr, "value", 42); WM_operator_name_call(C, "SOME_OT_name", WM_OP_EXEC_DEFAULT, &ptr); WM_operator_properties_free(&ptr);
2009-01-01 20:44:40 +00:00
RNA_def_property_int_funcs(prop, "rna_VertexGroup_index_get", NULL, NULL);
batch remove .'s used with RNA_def_struct_ui_text
2010-02-10 21:15:44 +00:00
RNA_def_property_ui_text(prop, "Index", "Index number of the vertex group");
patch [#25440] Object.vertex_group fixin' from Dan Eicher (dna) From the tracker (with minor edits) ======================== cube = bpy.data.objects['Cube'] foo = cube.vertex_groups.new('foo') foo.add([1,3,5,7], 1.0, 'ADD') for i in range(len(cube.data.vertices)): try: weight = foo.weight(i) print('vert: %i weight: %f' % (i, weight)) except: pass foo.remove([1,3]) cube.vertex_groups.remove(foo)
2011-01-07 09:50:23 +00:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
func = RNA_def_function(srna, "add", "rna_VertexGroup_vertex_add");
/blender/makesrna: Removed final points in UI strings and messages. Plus a few splits of very long lines…
2011-09-19 13:23:58 +00:00
RNA_def_function_ui_description(func, "Add vertices to the group");
style cleanup: mostly whitespace in rna
2012-05-12 11:01:29 +00:00
RNA_def_function_flag(func, FUNC_USE_REPORTS | FUNC_USE_SELF_ID);
patch [#25440] Object.vertex_group fixin' from Dan Eicher (dna) From the tracker (with minor edits) ======================== cube = bpy.data.objects['Cube'] foo = cube.vertex_groups.new('foo') foo.add([1,3,5,7], 1.0, 'ADD') for i in range(len(cube.data.vertices)): try: weight = foo.weight(i) print('vert: %i weight: %f' % (i, weight)) except: pass foo.remove([1,3]) cube.vertex_groups.remove(foo)
2011-01-07 09:50:23 +00:00
/* TODO, see how array size of 0 works, this shouldnt be used */
Refactor RNA property: split flags in property flags, parameter flags, and internal flags. This gives us 9 flags available again for properties (we had none anymore), and also makes things slightly cleaner. To simplify (and make more clear the differences between mere properties and function parameters), also added RNA_def_parameter_flags function (and its clear counterpart), to be used instead of RNA_def_property_flag for function parameters. This patch is also a big cleanup (some RNA function definitions were still using 'prop' PropertyRNA pointer, etc.). And yes, am aware this will be annoying for all branches, but we really need to get new flags available for properties (will need at least one for override, etc.). Reviewers: sergey, Severin Subscribers: dfelinto, brecht Differential Revision: https://developer.blender.org/D2400
2016-12-12 15:23:55 +01:00
parm = RNA_def_int_array(func, "index", 1, NULL, 0, 0, "", "Index List", 0, 0);
RNA_def_parameter_flags(parm, PROP_DYNAMIC, PARM_REQUIRED);
parm = RNA_def_float(func, "weight", 0, 0.0f, 1.0f, "", "Vertex weight", 0.0f, 1.0f);
RNA_def_parameter_flags(parm, 0, PARM_REQUIRED);
parm = RNA_def_enum(func, "type", assign_mode_items, 0, "", "Vertex assign mode");
RNA_def_parameter_flags(parm, 0, PARM_REQUIRED);
patch [#25440] Object.vertex_group fixin' from Dan Eicher (dna) From the tracker (with minor edits) ======================== cube = bpy.data.objects['Cube'] foo = cube.vertex_groups.new('foo') foo.add([1,3,5,7], 1.0, 'ADD') for i in range(len(cube.data.vertices)): try: weight = foo.weight(i) print('vert: %i weight: %f' % (i, weight)) except: pass foo.remove([1,3]) cube.vertex_groups.remove(foo)
2011-01-07 09:50:23 +00:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
func = RNA_def_function(srna, "remove", "rna_VertexGroup_vertex_remove");
/blender/makesrna: Removed final points in UI strings and messages. Plus a few splits of very long lines…
2011-09-19 13:23:58 +00:00
RNA_def_function_ui_description(func, "Remove a vertex from the group");
style cleanup: mostly whitespace in rna
2012-05-12 11:01:29 +00:00
RNA_def_function_flag(func, FUNC_USE_REPORTS | FUNC_USE_SELF_ID);
patch [#25440] Object.vertex_group fixin' from Dan Eicher (dna) From the tracker (with minor edits) ======================== cube = bpy.data.objects['Cube'] foo = cube.vertex_groups.new('foo') foo.add([1,3,5,7], 1.0, 'ADD') for i in range(len(cube.data.vertices)): try: weight = foo.weight(i) print('vert: %i weight: %f' % (i, weight)) except: pass foo.remove([1,3]) cube.vertex_groups.remove(foo)
2011-01-07 09:50:23 +00:00
/* TODO, see how array size of 0 works, this shouldnt be used */
Refactor RNA property: split flags in property flags, parameter flags, and internal flags. This gives us 9 flags available again for properties (we had none anymore), and also makes things slightly cleaner. To simplify (and make more clear the differences between mere properties and function parameters), also added RNA_def_parameter_flags function (and its clear counterpart), to be used instead of RNA_def_property_flag for function parameters. This patch is also a big cleanup (some RNA function definitions were still using 'prop' PropertyRNA pointer, etc.). And yes, am aware this will be annoying for all branches, but we really need to get new flags available for properties (will need at least one for override, etc.). Reviewers: sergey, Severin Subscribers: dfelinto, brecht Differential Revision: https://developer.blender.org/D2400
2016-12-12 15:23:55 +01:00
parm = RNA_def_int_array(func, "index", 1, NULL, 0, 0, "", "Index List", 0, 0);
RNA_def_parameter_flags(parm, PROP_DYNAMIC, PARM_REQUIRED);
patch [#25440] Object.vertex_group fixin' from Dan Eicher (dna) From the tracker (with minor edits) ======================== cube = bpy.data.objects['Cube'] foo = cube.vertex_groups.new('foo') foo.add([1,3,5,7], 1.0, 'ADD') for i in range(len(cube.data.vertices)): try: weight = foo.weight(i) print('vert: %i weight: %f' % (i, weight)) except: pass foo.remove([1,3]) cube.vertex_groups.remove(foo)
2011-01-07 09:50:23 +00:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
func = RNA_def_function(srna, "weight", "rna_VertexGroup_weight");
/blender/makesrna: Removed final points in UI strings and messages. Plus a few splits of very long lines…
2011-09-19 13:23:58 +00:00
RNA_def_function_ui_description(func, "Get a vertex weight from the group");
style cleanup: mostly whitespace in rna
2012-05-12 11:01:29 +00:00
RNA_def_function_flag(func, FUNC_USE_REPORTS | FUNC_USE_SELF_ID);
Refactor RNA property: split flags in property flags, parameter flags, and internal flags. This gives us 9 flags available again for properties (we had none anymore), and also makes things slightly cleaner. To simplify (and make more clear the differences between mere properties and function parameters), also added RNA_def_parameter_flags function (and its clear counterpart), to be used instead of RNA_def_property_flag for function parameters. This patch is also a big cleanup (some RNA function definitions were still using 'prop' PropertyRNA pointer, etc.). And yes, am aware this will be annoying for all branches, but we really need to get new flags available for properties (will need at least one for override, etc.). Reviewers: sergey, Severin Subscribers: dfelinto, brecht Differential Revision: https://developer.blender.org/D2400
2016-12-12 15:23:55 +01:00
parm = RNA_def_int(func, "index", 0, 0, INT_MAX, "Index", "The index of the vertex", 0, INT_MAX);
RNA_def_parameter_flags(parm, 0, PARM_REQUIRED);
parm = RNA_def_float(func, "weight", 0, 0.0f, 1.0f, "", "Vertex weight", 0.0f, 1.0f);
RNA_def_function_return(func, parm);
RNA * Object has some more properties wrapped, mostly game related. * Scene frame changes now send a notifier. * Added functions to create/free operator properties for calling operators. This also simplifies some duplicated code that did this. Ideally though this kind of thing should use the properties pointer provided by buttons and keymap items. Example code: PointerRNA ptr; WM_operator_properties_create(&ptr, "SOME_OT_name"); RNA_int_set(&ptr, "value", 42); WM_operator_name_call(C, "SOME_OT_name", WM_OP_EXEC_DEFAULT, &ptr); WM_operator_properties_free(&ptr);
2009-01-01 20:44:40 +00:00
}
Face Maps: custom-data, UI and RNA API Add face maps, needed for face-map widgets, only data structure, widgets will be separate commit. This comes from 'custom-manipulator' branch with only minor changes.
2017-05-30 17:58:24 +10:00
static void rna_def_face_map(BlenderRNA *brna)
{
StructRNA *srna;
PropertyRNA *prop;
FunctionRNA *func;
srna = RNA_def_struct(brna, "FaceMap", NULL);
RNA_def_struct_sdna(srna, "bFaceMap");
RNA_def_struct_ui_text(srna, "Face Map", "Group of faces, each face can only be part of one map");
RNA_def_struct_ui_icon(srna, ICON_MOD_TRIANGULATE);
prop = RNA_def_property(srna, "name", PROP_STRING, PROP_NONE);
RNA_def_property_ui_text(prop, "Name", "Face map name");
RNA_def_struct_name_property(srna, prop);
RNA_def_property_string_funcs(prop, NULL, NULL, "rna_FaceMap_name_set");
/* update data because modifiers may use [#24761] */
RNA_def_property_update(prop, NC_GEOM | ND_DATA | NA_RENAME, "rna_Object_internal_update_data");
Merge branch 'master' into blender2.8
2018-06-09 14:42:01 +02:00
FaceMaps: add select flag For use by manipulators since they don't have their own persistent data in the blend file.
2017-07-26 05:21:38 +10:00
prop = RNA_def_property(srna, "select", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "flag", SELECT);
RNA_def_property_ui_text(prop, "Select", "Face-map selection state (for tools to use)");
/* important not to use a notifier here, creates a feedback loop! */
Face Maps: custom-data, UI and RNA API Add face maps, needed for face-map widgets, only data structure, widgets will be separate commit. This comes from 'custom-manipulator' branch with only minor changes.
2017-05-30 17:58:24 +10:00
prop = RNA_def_property(srna, "index", PROP_INT, PROP_UNSIGNED);
RNA_def_property_clear_flag(prop, PROP_EDITABLE);
RNA_def_property_int_funcs(prop, "rna_FaceMap_index_get", NULL, NULL);
RNA_def_property_ui_text(prop, "Index", "Index number of the face map");
func = RNA_def_function(srna, "add", "rna_FaceMap_face_add");
RNA_def_function_ui_description(func, "Add vertices to the group");
RNA_def_function_flag(func, FUNC_USE_REPORTS | FUNC_USE_SELF_ID);
/* TODO, see how array size of 0 works, this shouldnt be used */
prop = RNA_def_int_array(func, "index", 1, NULL, 0, 0, "", "Index List", 0, 0);
RNA_def_parameter_flags(prop, PROP_DYNAMIC, PARM_REQUIRED);
func = RNA_def_function(srna, "remove", "rna_FaceMap_face_remove");
RNA_def_function_ui_description(func, "Remove a vertex from the group");
RNA_def_function_flag(func, FUNC_USE_REPORTS | FUNC_USE_SELF_ID);
/* TODO, see how array size of 0 works, this shouldnt be used */
prop = RNA_def_int_array(func, "index", 1, NULL, 0, 0, "", "Index List", 0, 0);
RNA_def_parameter_flags(prop, PROP_DYNAMIC, PARM_REQUIRED);
}
RNA: * Added a MaterialSlot collection in Object rather than giving the list of materials immediately. This should more correctly reflect how this data is organized, even though there is no equivalent C struct. * Added name properties to MaterialSlot/TextureSlot/ParticleSystem.
2009-06-03 23:22:43 +00:00
static void rna_def_material_slot(BlenderRNA *brna)
{
StructRNA *srna;
PropertyRNA *prop;
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 link_items[] = {
RNA * Added icon to property and enum property items. The latter is responsible for the large number of files changed. * For RNA functions, added PROP_RNAPTR flag to ask for a PointerRNA as argument instead of a C pointer, instead of doing it implicitly with the AnyType type. * Material: properly wrap diffuse/specular param variables, and rename some things for consistency. * MaterialTextureSlot: added "enabled" property (ma->septex). * Image: make animated property editable. * Image Editor: make some things editable, notifiers, respect state. * Context: fix issue with screen not being set as ID.
2009-06-16 00:52:21 +00:00
{1, "OBJECT", 0, "Object", ""},
2.5 * Objects now support up to 32767 material slots. It's easy to increase this further, but I prefer not to increase the memory usage of mesh faces, it seems unlikely that someone would create 32767 distinct materials? * Forward compatibility: the only thing you can potentially lose reading a 2.5 file in 2.4 is object linking (instead of default data), though usually that will go fine too. Reading files with > 32 material slots in 2.4 can start giving issues. * The ob->colbits variable is deprecated by the array ob->matbits but I didn't remove the ob->colbits updates in very few places it is set. * I hope I changed all the relevant things, various places just hardcoded the number 16 instead of using the MAXMAT define. * Join Objects operator back. This is using the version from the animsys2 branch coded by Joshua, which means it now supports joining of shape keys. * Fix for crash reading file saved during render.
2009-07-13 00:40:20 +00:00
{0, "DATA", 0, "Data", ""},
style cleanup: mostly whitespace in rna
2012-05-12 11:01:29 +00:00
{0, NULL, 0, NULL, NULL}
};
Cleanup: trailing space in RNA
2018-06-09 14:40:09 +02:00
RNA: * Added a MaterialSlot collection in Object rather than giving the list of materials immediately. This should more correctly reflect how this data is organized, even though there is no equivalent C struct. * Added name properties to MaterialSlot/TextureSlot/ParticleSystem.
2009-06-03 23:22:43 +00:00
/* NOTE: there is no MaterialSlot equivalent in DNA, so the internal
* pointer data points to ob->mat + index, and we manually implement
* get/set for the properties. */
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
srna = RNA_def_struct(brna, "MaterialSlot", NULL);
batch remove .'s used with RNA_def_struct_ui_text
2010-02-10 21:15:44 +00:00
RNA_def_struct_ui_text(srna, "Material Slot", "Material slot in an object");
RNA: * Added a MaterialSlot collection in Object rather than giving the list of materials immediately. This should more correctly reflect how this data is organized, even though there is no equivalent C struct. * Added name properties to MaterialSlot/TextureSlot/ParticleSystem.
2009-06-03 23:22:43 +00:00
RNA_def_struct_ui_icon(srna, ICON_MATERIAL_DATA);
Static Override: Fix order of operations issue in material slots. *Really* not happy with that kind of constraint, but no choice for now...
2018-06-05 12:07:20 +02:00
/* WARNING! Order is crucial for override to work properly here... :/
* 'link' must come before material pointer, since it defines where (in object or obdata) that one is set! */
prop = RNA_def_property(srna, "link", PROP_ENUM, PROP_NONE);
RNA_def_property_enum_items(prop, link_items);
RNA_def_property_enum_funcs(prop, "rna_MaterialSlot_link_get", "rna_MaterialSlot_link_set", NULL);
RNA_def_property_override_flag(prop, PROPOVERRIDE_OVERRIDABLE_STATIC);
RNA_def_property_ui_text(prop, "Link", "Link material to object or the object's data");
RNA_def_property_update(prop, NC_OBJECT | ND_DRAW, "rna_MaterialSlot_update");
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "material", PROP_POINTER, PROP_NONE);
RNA: * Added a MaterialSlot collection in Object rather than giving the list of materials immediately. This should more correctly reflect how this data is organized, even though there is no equivalent C struct. * Added name properties to MaterialSlot/TextureSlot/ParticleSystem.
2009-06-03 23:22:43 +00:00
RNA_def_property_struct_type(prop, "Material");
RNA/Override: Move override-related property flags to own variable. We are already running out of available flags in main, generic int, and everytime I work on static override I find new special cases that will need new specific propflag, so...
2018-06-05 11:10:05 +02:00
RNA_def_property_flag(prop, PROP_EDITABLE);
Improve/partially fix overriding of Object material pointers. Basic workflow shall now work, still lots to do in the UI (ID template needs some love to reflect overriden status ;) ).
2018-06-11 19:28:12 +02:00
RNA_def_property_editable_func(prop, "rna_MaterialSlot_material_editable");
RNA/Override: Move override-related property flags to own variable. We are already running out of available flags in main, generic int, and everytime I work on static override I find new special cases that will need new specific propflag, so...
2018-06-05 11:10:05 +02:00
RNA_def_property_override_flag(prop, PROPOVERRIDE_OVERRIDABLE_STATIC);
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
RNA_def_property_pointer_funcs(prop, "rna_MaterialSlot_material_get", "rna_MaterialSlot_material_set", NULL, "rna_MaterialSlot_material_poll");
Cleanup: rename 'datablocks' -> 'data-blocks' Similar to addons -> add-ons, for reading it fits better to hyphenate.
2015-10-24 02:44:43 +11:00
RNA_def_property_ui_text(prop, "Material", "Material data-block used by this material slot");
style cleanup: mostly whitespace in rna
2012-05-12 11:01:29 +00:00
RNA_def_property_update(prop, NC_OBJECT | ND_DRAW, "rna_MaterialSlot_update");
RNA: * Added a MaterialSlot collection in Object rather than giving the list of materials immediately. This should more correctly reflect how this data is organized, even though there is no equivalent C struct. * Added name properties to MaterialSlot/TextureSlot/ParticleSystem.
2009-06-03 23:22:43 +00:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "name", PROP_STRING, PROP_NONE);
RNA: * Added a MaterialSlot collection in Object rather than giving the list of materials immediately. This should more correctly reflect how this data is organized, even though there is no equivalent C struct. * Added name properties to MaterialSlot/TextureSlot/ParticleSystem.
2009-06-03 23:22:43 +00:00
RNA_def_property_string_funcs(prop, "rna_MaterialSlot_name_get", "rna_MaterialSlot_name_length", NULL);
batch remove .'s used with RNA_def_struct_ui_text
2010-02-10 21:15:44 +00:00
RNA_def_property_ui_text(prop, "Name", "Material slot name");
RNA: * Added a MaterialSlot collection in Object rather than giving the list of materials immediately. This should more correctly reflect how this data is organized, even though there is no equivalent C struct. * Added name properties to MaterialSlot/TextureSlot/ParticleSystem.
2009-06-03 23:22:43 +00:00
RNA_def_property_clear_flag(prop, PROP_EDITABLE);
RNA_def_struct_name_property(srna, prop);
add rna path callback for material slots but disable animation. without this - the info space would report an invalid rna-path when showing the string to change a value.
2013-10-01 04:49:47 +00:00
RNA_def_struct_path_func(srna, "rna_MaterialSlot_path");
RNA: * Added a MaterialSlot collection in Object rather than giving the list of materials immediately. This should more correctly reflect how this data is organized, even though there is no equivalent C struct. * Added name properties to MaterialSlot/TextureSlot/ParticleSystem.
2009-06-03 23:22:43 +00:00
}
arbitrary property and function support for rna properties (arrays and collections), this means functions can be easily added. eg. scene.objects.link() object.constraints.new() mesh.verts.transform(...) mesh.faces.active PropertyRNA stores an StructRNA pointer where these can be defined.
2009-11-13 16:08:03 +00:00
static void rna_def_object_constraints(BlenderRNA *brna, PropertyRNA *cprop)
{
StructRNA *srna;
* Compile fix. prop was declared in the middle of scope.
2009-11-14 08:50:02 +00:00
PropertyRNA *prop;
arbitrary property and function support for rna properties (arrays and collections), this means functions can be easily added. eg. scene.objects.link() object.constraints.new() mesh.verts.transform(...) mesh.faces.active PropertyRNA stores an StructRNA pointer where these can be defined.
2009-11-13 16:08:03 +00:00
FunctionRNA *func;
PropertyRNA *parm;
- fcurve modifiers.new()/remove()/active - renamed .add() to .new() for rna collection functions since they dont add an existing item. - remove 'name' as an argument from the new driver target function, better to keep the api minimal and let scripters use the data api for editing values after. - added some api functions to keep rna api from becoming a mess.
2009-11-16 11:11:16 +00:00
RNA_def_property_srna(cprop, "ObjectConstraints");
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
srna = RNA_def_struct(brna, "ObjectConstraints", NULL);
arbitrary property and function support for rna properties (arrays and collections), this means functions can be easily added. eg. scene.objects.link() object.constraints.new() mesh.verts.transform(...) mesh.faces.active PropertyRNA stores an StructRNA pointer where these can be defined.
2009-11-13 16:08:03 +00:00
RNA_def_struct_sdna(srna, "Object");
batch remove .'s used with RNA_def_struct_ui_text
2010-02-10 21:15:44 +00:00
RNA_def_struct_ui_text(srna, "Object Constraints", "Collection of object constraints");
arbitrary property and function support for rna properties (arrays and collections), this means functions can be easily added. eg. scene.objects.link() object.constraints.new() mesh.verts.transform(...) mesh.faces.active PropertyRNA stores an StructRNA pointer where these can be defined.
2009-11-13 16:08:03 +00:00
/* Collection active property */
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "active", PROP_POINTER, PROP_NONE);
report this broke MSVC
2009-11-13 18:47:20 +00:00
RNA_def_property_struct_type(prop, "Constraint");
Code style edits (mostly spliting long lines, and removing trailing spaces). Note about long lines: I did not touch to two pieces of code (because I don’t see any way to keep a nicely formated, compact code, with shorter lines): * The node types definitions into rna_nodetree_types.h * The vgroup name functions into rna_particle.c
2012-03-18 09:27:36 +00:00
RNA_def_property_pointer_funcs(prop, "rna_Object_active_constraint_get",
"rna_Object_active_constraint_set", NULL, NULL);
report this broke MSVC
2009-11-13 18:47:20 +00:00
RNA_def_property_flag(prop, PROP_EDITABLE);
batch remove .'s used with RNA_def_struct_ui_text
2010-02-10 21:15:44 +00:00
RNA_def_property_ui_text(prop, "Active Constraint", "Active Object constraint");
arbitrary property and function support for rna properties (arrays and collections), this means functions can be easily added. eg. scene.objects.link() object.constraints.new() mesh.verts.transform(...) mesh.faces.active PropertyRNA stores an StructRNA pointer where these can be defined.
2009-11-13 16:08:03 +00:00
/* Constraint collection */
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
func = RNA_def_function(srna, "new", "rna_Object_constraints_new");
- fcurve modifiers.new()/remove()/active - renamed .add() to .new() for rna collection functions since they dont add an existing item. - remove 'name' as an argument from the new driver target function, better to keep the api minimal and let scripters use the data api for editing values after. - added some api functions to keep rna api from becoming a mess.
2009-11-16 11:11:16 +00:00
RNA_def_function_ui_description(func, "Add a new constraint to this object");
Cleanup: remove G.main from BKE object Had to add some G.main to modifiers, but in 2.8 we do not need that anymore, so it's not that bad! ;)
2018-05-31 12:27:47 +02:00
RNA_def_function_flag(func, FUNC_USE_MAIN);
arbitrary property and function support for rna properties (arrays and collections), this means functions can be easily added. eg. scene.objects.link() object.constraints.new() mesh.verts.transform(...) mesh.faces.active PropertyRNA stores an StructRNA pointer where these can be defined.
2009-11-13 16:08:03 +00:00
/* object to add */
Cleanup: use `rna_enum_` prefix for RNA enums Definitions could shadow local vars.
2015-11-23 13:49:52 +11:00
parm = RNA_def_enum(func, "type", rna_enum_constraint_type_items, 1, "", "Constraint type to add");
Refactor RNA property: split flags in property flags, parameter flags, and internal flags. This gives us 9 flags available again for properties (we had none anymore), and also makes things slightly cleaner. To simplify (and make more clear the differences between mere properties and function parameters), also added RNA_def_parameter_flags function (and its clear counterpart), to be used instead of RNA_def_property_flag for function parameters. This patch is also a big cleanup (some RNA function definitions were still using 'prop' PropertyRNA pointer, etc.). And yes, am aware this will be annoying for all branches, but we really need to get new flags available for properties (will need at least one for override, etc.). Reviewers: sergey, Severin Subscribers: dfelinto, brecht Differential Revision: https://developer.blender.org/D2400
2016-12-12 15:23:55 +01:00
RNA_def_parameter_flags(parm, 0, PARM_REQUIRED);
arbitrary property and function support for rna properties (arrays and collections), this means functions can be easily added. eg. scene.objects.link() object.constraints.new() mesh.verts.transform(...) mesh.faces.active PropertyRNA stores an StructRNA pointer where these can be defined.
2009-11-13 16:08:03 +00:00
/* return type */
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
parm = RNA_def_pointer(func, "constraint", "Constraint", "", "New constraint");
arbitrary property and function support for rna properties (arrays and collections), this means functions can be easily added. eg. scene.objects.link() object.constraints.new() mesh.verts.transform(...) mesh.faces.active PropertyRNA stores an StructRNA pointer where these can be defined.
2009-11-13 16:08:03 +00:00
RNA_def_function_return(func, parm);
merge from trunk at r31523
2010-09-07 05:47:34 +00:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
func = RNA_def_function(srna, "remove", "rna_Object_constraints_remove");
/blender/makesrna: Removed final points in UI strings and messages. Plus a few splits of very long lines…
2011-09-19 13:23:58 +00:00
RNA_def_function_ui_description(func, "Remove a constraint from this object");
Cleanup: remove G.main from BKE object Had to add some G.main to modifiers, but in 2.8 we do not need that anymore, so it's not that bad! ;)
2018-05-31 12:27:47 +02:00
RNA_def_function_flag(func, FUNC_USE_MAIN | FUNC_USE_REPORTS);
merge from trunk at r31523
2010-09-07 05:47:34 +00:00
/* constraint to remove */
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
parm = RNA_def_pointer(func, "constraint", "Constraint", "", "Removed constraint");
Refactor RNA property: split flags in property flags, parameter flags, and internal flags. This gives us 9 flags available again for properties (we had none anymore), and also makes things slightly cleaner. To simplify (and make more clear the differences between mere properties and function parameters), also added RNA_def_parameter_flags function (and its clear counterpart), to be used instead of RNA_def_property_flag for function parameters. This patch is also a big cleanup (some RNA function definitions were still using 'prop' PropertyRNA pointer, etc.). And yes, am aware this will be annoying for all branches, but we really need to get new flags available for properties (will need at least one for override, etc.). Reviewers: sergey, Severin Subscribers: dfelinto, brecht Differential Revision: https://developer.blender.org/D2400
2016-12-12 15:23:55 +01:00
RNA_def_parameter_flags(parm, PROP_NEVER_NULL, PARM_REQUIRED | PARM_RNAPTR);
RNA_def_parameter_clear_flags(parm, PROP_THICK_WRAP, 0);
Added method clear to most of collections which supports new/remove. This method not added to animation-specific structures yet/
2011-11-23 16:12:11 +00:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
func = RNA_def_function(srna, "clear", "rna_Object_constraints_clear");
Cleanup: remove G.main from BKE object Had to add some G.main to modifiers, but in 2.8 we do not need that anymore, so it's not that bad! ;)
2018-05-31 12:27:47 +02:00
RNA_def_function_flag(func, FUNC_USE_MAIN);
Added method clear to most of collections which supports new/remove. This method not added to animation-specific structures yet/
2011-11-23 16:12:11 +00:00
RNA_def_function_ui_description(func, "Remove all constraint from this object");
arbitrary property and function support for rna properties (arrays and collections), this means functions can be easily added. eg. scene.objects.link() object.constraints.new() mesh.verts.transform(...) mesh.faces.active PropertyRNA stores an StructRNA pointer where these can be defined.
2009-11-13 16:08:03 +00:00
}
merge from trunk at r31523
2010-09-07 05:47:34 +00:00
/* object.modifiers */
py/rna api - object.modifiers.add()/remove() - armature.edit_bones.active wasnt named correctly
2009-11-28 13:33:56 +00:00
static void rna_def_object_modifiers(BlenderRNA *brna, PropertyRNA *cprop)
{
StructRNA *srna;
FunctionRNA *func;
PropertyRNA *parm;
RNA_def_property_srna(cprop, "ObjectModifiers");
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
srna = RNA_def_struct(brna, "ObjectModifiers", NULL);
py/rna api - object.modifiers.add()/remove() - armature.edit_bones.active wasnt named correctly
2009-11-28 13:33:56 +00:00
RNA_def_struct_sdna(srna, "Object");
batch remove .'s used with RNA_def_struct_ui_text
2010-02-10 21:15:44 +00:00
RNA_def_struct_ui_text(srna, "Object Modifiers", "Collection of object modifiers");
py/rna api - object.modifiers.add()/remove() - armature.edit_bones.active wasnt named correctly
2009-11-28 13:33:56 +00:00
#if 0
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "active", PROP_POINTER, PROP_NONE);
py/rna api - object.modifiers.add()/remove() - armature.edit_bones.active wasnt named correctly
2009-11-28 13:33:56 +00:00
RNA_def_property_struct_type(prop, "EditBone");
RNA_def_property_pointer_sdna(prop, NULL, "act_edbone");
RNA_def_property_flag(prop, PROP_EDITABLE);
batch remove .'s used with RNA_def_struct_ui_text
2010-02-10 21:15:44 +00:00
RNA_def_property_ui_text(prop, "Active EditBone", "Armatures active edit bone");
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
/*RNA_def_property_update(prop, 0, "rna_Armature_act_editbone_update"); */
rna pointer poll function, not used yet.
2010-08-03 05:14:59 +00:00
RNA_def_property_pointer_funcs(prop, NULL, "rna_Armature_act_edit_bone_set", NULL, NULL);
py/rna api - object.modifiers.add()/remove() - armature.edit_bones.active wasnt named correctly
2009-11-28 13:33:56 +00:00
/* todo, redraw */
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
/* RNA_def_property_collection_active(prop, prop_act); */
py/rna api - object.modifiers.add()/remove() - armature.edit_bones.active wasnt named correctly
2009-11-28 13:33:56 +00:00
#endif
mask layer rna api: add exception when removing incorrect masklayer from mask, add mask.layers.clear()
2012-07-23 21:47:11 +00:00
/* add modifier */
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
func = RNA_def_function(srna, "new", "rna_Object_modifier_new");
style cleanup: mostly whitespace in rna
2012-05-12 11:01:29 +00:00
RNA_def_function_flag(func, FUNC_USE_CONTEXT | FUNC_USE_REPORTS);
/blender/makesrna: Removed final points in UI strings and messages. Plus a few splits of very long lines…
2011-09-19 13:23:58 +00:00
RNA_def_function_ui_description(func, "Add a new modifier");
Sequencer: Python API for sequence modifiers
2012-08-20 10:15:32 +00:00
parm = RNA_def_string(func, "name", "Name", 0, "", "New name for the modifier");
Refactor RNA property: split flags in property flags, parameter flags, and internal flags. This gives us 9 flags available again for properties (we had none anymore), and also makes things slightly cleaner. To simplify (and make more clear the differences between mere properties and function parameters), also added RNA_def_parameter_flags function (and its clear counterpart), to be used instead of RNA_def_property_flag for function parameters. This patch is also a big cleanup (some RNA function definitions were still using 'prop' PropertyRNA pointer, etc.). And yes, am aware this will be annoying for all branches, but we really need to get new flags available for properties (will need at least one for override, etc.). Reviewers: sergey, Severin Subscribers: dfelinto, brecht Differential Revision: https://developer.blender.org/D2400
2016-12-12 15:23:55 +01:00
RNA_def_parameter_flags(parm, 0, PARM_REQUIRED);
py/rna api - object.modifiers.add()/remove() - armature.edit_bones.active wasnt named correctly
2009-11-28 13:33:56 +00:00
/* modifier to add */
Cleanup: use `rna_enum_` prefix for RNA enums Definitions could shadow local vars.
2015-11-23 13:49:52 +11:00
parm = RNA_def_enum(func, "type", rna_enum_object_modifier_type_items, 1, "", "Modifier type to add");
Refactor RNA property: split flags in property flags, parameter flags, and internal flags. This gives us 9 flags available again for properties (we had none anymore), and also makes things slightly cleaner. To simplify (and make more clear the differences between mere properties and function parameters), also added RNA_def_parameter_flags function (and its clear counterpart), to be used instead of RNA_def_property_flag for function parameters. This patch is also a big cleanup (some RNA function definitions were still using 'prop' PropertyRNA pointer, etc.). And yes, am aware this will be annoying for all branches, but we really need to get new flags available for properties (will need at least one for override, etc.). Reviewers: sergey, Severin Subscribers: dfelinto, brecht Differential Revision: https://developer.blender.org/D2400
2016-12-12 15:23:55 +01:00
RNA_def_parameter_flags(parm, 0, PARM_REQUIRED);
py/rna api - object.modifiers.add()/remove() - armature.edit_bones.active wasnt named correctly
2009-11-28 13:33:56 +00:00
/* return type */
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
parm = RNA_def_pointer(func, "modifier", "Modifier", "", "Newly created modifier");
py/rna api - object.modifiers.add()/remove() - armature.edit_bones.active wasnt named correctly
2009-11-28 13:33:56 +00:00
RNA_def_function_return(func, parm);
mask layer rna api: add exception when removing incorrect masklayer from mask, add mask.layers.clear()
2012-07-23 21:47:11 +00:00
/* remove modifier */
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
func = RNA_def_function(srna, "remove", "rna_Object_modifier_remove");
style cleanup: mostly whitespace in rna
2012-05-12 11:01:29 +00:00
RNA_def_function_flag(func, FUNC_USE_CONTEXT | FUNC_USE_REPORTS);
/blender/makesrna: Removed final points in UI strings and messages. Plus a few splits of very long lines…
2011-09-19 13:23:58 +00:00
RNA_def_function_ui_description(func, "Remove an existing modifier from the object");
mask layer rna api: add exception when removing incorrect masklayer from mask, add mask.layers.clear()
2012-07-23 21:47:11 +00:00
/* modifier to remove */
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
parm = RNA_def_pointer(func, "modifier", "Modifier", "", "Modifier to remove");
Refactor RNA property: split flags in property flags, parameter flags, and internal flags. This gives us 9 flags available again for properties (we had none anymore), and also makes things slightly cleaner. To simplify (and make more clear the differences between mere properties and function parameters), also added RNA_def_parameter_flags function (and its clear counterpart), to be used instead of RNA_def_property_flag for function parameters. This patch is also a big cleanup (some RNA function definitions were still using 'prop' PropertyRNA pointer, etc.). And yes, am aware this will be annoying for all branches, but we really need to get new flags available for properties (will need at least one for override, etc.). Reviewers: sergey, Severin Subscribers: dfelinto, brecht Differential Revision: https://developer.blender.org/D2400
2016-12-12 15:23:55 +01:00
RNA_def_parameter_flags(parm, PROP_NEVER_NULL, PARM_REQUIRED | PARM_RNAPTR);
RNA_def_parameter_clear_flags(parm, PROP_THICK_WRAP, 0);
Added method clear to most of collections which supports new/remove. This method not added to animation-specific structures yet/
2011-11-23 16:12:11 +00:00
/* clear all modifiers */
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
func = RNA_def_function(srna, "clear", "rna_Object_modifier_clear");
Added method clear to most of collections which supports new/remove. This method not added to animation-specific structures yet/
2011-11-23 16:12:11 +00:00
RNA_def_function_flag(func, FUNC_USE_CONTEXT);
RNA_def_function_ui_description(func, "Remove all modifiers from the object");
merge from trunk at r31523
2010-09-07 05:47:34 +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
/* object.grease_pencil_modifiers */
static void rna_def_object_grease_pencil_modifiers(BlenderRNA *brna, PropertyRNA *cprop)
{
StructRNA *srna;
FunctionRNA *func;
PropertyRNA *parm;
RNA_def_property_srna(cprop, "ObjectGpencilModifiers");
srna = RNA_def_struct(brna, "ObjectGpencilModifiers", NULL);
RNA_def_struct_sdna(srna, "Object");
RNA_def_struct_ui_text(srna, "Object Grease Pencil Modifiers", "Collection of object grease pencil modifiers");
/* add greasepencil modifier */
func = RNA_def_function(srna, "new", "rna_Object_greasepencil_modifier_new");
RNA_def_function_flag(func, FUNC_USE_CONTEXT | FUNC_USE_REPORTS);
RNA_def_function_ui_description(func, "Add a new greasepencil_modifier");
parm = RNA_def_string(func, "name", "Name", 0, "", "New name for the greasepencil_modifier");
RNA_def_parameter_flags(parm, 0, PARM_REQUIRED);
/* greasepencil_modifier to add */
parm = RNA_def_enum(func, "type", rna_enum_object_greasepencil_modifier_type_items, 1, "", "Modifier type to add");
RNA_def_parameter_flags(parm, 0, PARM_REQUIRED);
/* return type */
parm = RNA_def_pointer(func, "greasepencil_modifier", "GpencilModifier", "", "Newly created modifier");
RNA_def_function_return(func, parm);
/* remove greasepencil_modifier */
func = RNA_def_function(srna, "remove", "rna_Object_greasepencil_modifier_remove");
RNA_def_function_flag(func, FUNC_USE_CONTEXT | FUNC_USE_REPORTS);
RNA_def_function_ui_description(func, "Remove an existing greasepencil_modifier from the object");
/* greasepencil_modifier to remove */
parm = RNA_def_pointer(func, "greasepencil_modifier", "GpencilModifier", "", "Modifier to remove");
RNA_def_parameter_flags(parm, PROP_NEVER_NULL, PARM_REQUIRED | PARM_RNAPTR);
RNA_def_parameter_clear_flags(parm, PROP_THICK_WRAP, 0);
/* clear all greasepencil modifiers */
func = RNA_def_function(srna, "clear", "rna_Object_greasepencil_modifier_clear");
RNA_def_function_flag(func, FUNC_USE_CONTEXT);
RNA_def_function_ui_description(func, "Remove all grease pencil modifiers from the object");
}
/* object.shaderfxs */
static void rna_def_object_shaderfxs(BlenderRNA *brna, PropertyRNA *cprop)
{
StructRNA *srna;
FunctionRNA *func;
PropertyRNA *parm;
RNA_def_property_srna(cprop, "ObjectShaderFx");
srna = RNA_def_struct(brna, "ObjectShaderFx", NULL);
RNA_def_struct_sdna(srna, "Object");
RNA_def_struct_ui_text(srna, "Object Shader Effects", "Collection of object effects");
/* add shader_fx */
func = RNA_def_function(srna, "new", "rna_Object_shaderfx_new");
RNA_def_function_flag(func, FUNC_USE_CONTEXT | FUNC_USE_REPORTS);
RNA_def_function_ui_description(func, "Add a new shader fx");
parm = RNA_def_string(func, "name", "Name", 0, "", "New name for the effect");
RNA_def_parameter_flags(parm, 0, PARM_REQUIRED);
/* shader to add */
parm = RNA_def_enum(func, "type", rna_enum_object_shaderfx_type_items, 1, "", "Effect type to add");
RNA_def_parameter_flags(parm, 0, PARM_REQUIRED);
/* return type */
parm = RNA_def_pointer(func, "shader_fx", "ShaderFx", "", "Newly created effect");
RNA_def_function_return(func, parm);
/* remove shader_fx */
func = RNA_def_function(srna, "remove", "rna_Object_shaderfx_remove");
RNA_def_function_flag(func, FUNC_USE_CONTEXT | FUNC_USE_REPORTS);
RNA_def_function_ui_description(func, "Remove an existing effect from the object");
/* shader to remove */
parm = RNA_def_pointer(func, "shader_fx", "ShaderFx", "", "Effect to remove");
RNA_def_parameter_flags(parm, PROP_NEVER_NULL, PARM_REQUIRED | PARM_RNAPTR);
RNA_def_parameter_clear_flags(parm, PROP_THICK_WRAP, 0);
/* clear all shader fx */
func = RNA_def_function(srna, "clear", "rna_Object_shaderfx_clear");
RNA_def_function_flag(func, FUNC_USE_CONTEXT);
RNA_def_function_ui_description(func, "Remove all effects from the object");
}
Revert particle system and point cache removal in blender2.8 branch. This reverts commit 5aa19be91263a249ffae75573e3b32f24269d890 and b4a721af694817fa921b119df83d33ede7d7fed0. Due to postponement of particle system rewrite it was decided to put particle code back into the 2.8 branch for the time being.
2016-12-28 17:30:58 +01:00
/* object.particle_systems */
static void rna_def_object_particle_systems(BlenderRNA *brna, PropertyRNA *cprop)
{
StructRNA *srna;
Cleanup: trailing space in RNA
2018-06-09 14:40:09 +02:00
Revert particle system and point cache removal in blender2.8 branch. This reverts commit 5aa19be91263a249ffae75573e3b32f24269d890 and b4a721af694817fa921b119df83d33ede7d7fed0. Due to postponement of particle system rewrite it was decided to put particle code back into the 2.8 branch for the time being.
2016-12-28 17:30:58 +01:00
PropertyRNA *prop;
/* FunctionRNA *func; */
/* PropertyRNA *parm; */
RNA_def_property_srna(cprop, "ParticleSystems");
srna = RNA_def_struct(brna, "ParticleSystems", NULL);
RNA_def_struct_sdna(srna, "Object");
RNA_def_struct_ui_text(srna, "Particle Systems", "Collection of particle systems");
prop = RNA_def_property(srna, "active", PROP_POINTER, PROP_NONE);
RNA_def_property_struct_type(prop, "ParticleSystem");
RNA_def_property_pointer_funcs(prop, "rna_Object_active_particle_system_get", NULL, NULL, NULL);
RNA_def_property_ui_text(prop, "Active Particle System", "Active particle system being displayed");
RNA_def_property_update(prop, NC_OBJECT | ND_DRAW, NULL);
Cleanup: trailing space in RNA
2018-06-09 14:40:09 +02:00
Revert particle system and point cache removal in blender2.8 branch. This reverts commit 5aa19be91263a249ffae75573e3b32f24269d890 and b4a721af694817fa921b119df83d33ede7d7fed0. Due to postponement of particle system rewrite it was decided to put particle code back into the 2.8 branch for the time being.
2016-12-28 17:30:58 +01:00
prop = RNA_def_property(srna, "active_index", PROP_INT, PROP_UNSIGNED);
RNA_def_property_clear_flag(prop, PROP_ANIMATABLE);
RNA_def_property_int_funcs(prop, "rna_Object_active_particle_system_index_get",
"rna_Object_active_particle_system_index_set",
"rna_Object_active_particle_system_index_range");
RNA_def_property_ui_text(prop, "Active Particle System Index", "Index of active particle system slot");
RNA_def_property_update(prop, NC_OBJECT | ND_DRAW, "rna_Object_particle_update");
}
merge from trunk at r31523
2010-09-07 05:47:34 +00:00
/* object.vertex_groups */
static void rna_def_object_vertex_groups(BlenderRNA *brna, PropertyRNA *cprop)
{
StructRNA *srna;
Cleanup: trailing space in RNA
2018-06-09 14:40:09 +02:00
merge from trunk at r31523
2010-09-07 05:47:34 +00:00
PropertyRNA *prop;
FunctionRNA *func;
PropertyRNA *parm;
RNA_def_property_srna(cprop, "VertexGroups");
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
srna = RNA_def_struct(brna, "VertexGroups", NULL);
merge from trunk at r31523
2010-09-07 05:47:34 +00:00
RNA_def_struct_sdna(srna, "Object");
RNA_def_struct_ui_text(srna, "Vertex Groups", "Collection of vertex groups");
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "active", PROP_POINTER, PROP_NONE);
merge from trunk at r31523
2010-09-07 05:47:34 +00:00
RNA_def_property_struct_type(prop, "VertexGroup");
Minor: Other UI strings typos and tweaks. Also updated french po & mo.
2011-09-25 09:55:13 +00:00
RNA_def_property_pointer_funcs(prop, "rna_Object_active_vertex_group_get",
"rna_Object_active_vertex_group_set", NULL, NULL);
merge from trunk at r31523
2010-09-07 05:47:34 +00:00
RNA_def_property_ui_text(prop, "Active Vertex Group", "Vertex groups of the object");
style cleanup: mostly whitespace in rna
2012-05-12 11:01:29 +00:00
RNA_def_property_update(prop, NC_GEOM | ND_DATA, "rna_Object_internal_update_data");
merge from trunk at r31523
2010-09-07 05:47:34 +00:00
Fix some RNA subtypes for collections' active/active_index props (some PROP_POINTER had PROP_UNSIGNED!). Harmless, but stupid ;)
2012-12-11 14:11:46 +00:00
prop = RNA_def_property(srna, "active_index", PROP_INT, PROP_UNSIGNED);
fixed filename overwrite red highlight not updating when +/- pressed. also made some vars not animateable.
2010-09-21 10:59:53 +00:00
RNA_def_property_clear_flag(prop, PROP_ANIMATABLE);
merge from trunk at r31523
2010-09-07 05:47:34 +00:00
RNA_def_property_int_sdna(prop, NULL, "actdef");
Code style edits (mostly spliting long lines, and removing trailing spaces). Note about long lines: I did not touch to two pieces of code (because I don’t see any way to keep a nicely formated, compact code, with shorter lines): * The node types definitions into rna_nodetree_types.h * The vgroup name functions into rna_particle.c
2012-03-18 09:27:36 +00:00
RNA_def_property_int_funcs(prop, "rna_Object_active_vertex_group_index_get",
"rna_Object_active_vertex_group_index_set",
Minor: Other UI strings typos and tweaks. Also updated french po & mo.
2011-09-25 09:55:13 +00:00
"rna_Object_active_vertex_group_index_range");
merge from trunk at r31523
2010-09-07 05:47:34 +00:00
RNA_def_property_ui_text(prop, "Active Vertex Group Index", "Active index in vertex group array");
style cleanup: mostly whitespace in rna
2012-05-12 11:01:29 +00:00
RNA_def_property_update(prop, NC_GEOM | ND_DATA, "rna_Object_internal_update_data");
Cleanup: trailing space in RNA
2018-06-09 14:40:09 +02:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
/* vertex groups */ /* add_vertex_group */
func = RNA_def_function(srna, "new", "rna_Object_vgroup_new");
/blender/makesrna: Removed final points in UI strings and messages. Plus a few splits of very long lines…
2011-09-19 13:23:58 +00:00
RNA_def_function_ui_description(func, "Add vertex group to object");
RNA_def_string(func, "name", "Group", 0, "", "Vertex group name"); /* optional */
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
parm = RNA_def_pointer(func, "group", "VertexGroup", "", "New vertex group");
merge from trunk at r31523
2010-09-07 05:47:34 +00:00
RNA_def_function_return(func, parm);
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
func = RNA_def_function(srna, "remove", "rna_Object_vgroup_remove");
all remove functions now invalidate the RNA objects passed, to help script authors to avoid bugs with accessing removed data.
2012-11-02 09:41:26 +00:00
RNA_def_function_flag(func, FUNC_USE_REPORTS);
/blender/makesrna: Removed final points in UI strings and messages. Plus a few splits of very long lines…
2011-09-19 13:23:58 +00:00
RNA_def_function_ui_description(func, "Delete vertex group from object");
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
parm = RNA_def_pointer(func, "group", "VertexGroup", "", "Vertex group to remove");
Refactor RNA property: split flags in property flags, parameter flags, and internal flags. This gives us 9 flags available again for properties (we had none anymore), and also makes things slightly cleaner. To simplify (and make more clear the differences between mere properties and function parameters), also added RNA_def_parameter_flags function (and its clear counterpart), to be used instead of RNA_def_property_flag for function parameters. This patch is also a big cleanup (some RNA function definitions were still using 'prop' PropertyRNA pointer, etc.). And yes, am aware this will be annoying for all branches, but we really need to get new flags available for properties (will need at least one for override, etc.). Reviewers: sergey, Severin Subscribers: dfelinto, brecht Differential Revision: https://developer.blender.org/D2400
2016-12-12 15:23:55 +01:00
RNA_def_parameter_flags(parm, PROP_NEVER_NULL, PARM_REQUIRED | PARM_RNAPTR);
RNA_def_parameter_clear_flags(parm, PROP_THICK_WRAP, 0);
Added method clear to most of collections which supports new/remove. This method not added to animation-specific structures yet/
2011-11-23 16:12:11 +00:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
func = RNA_def_function(srna, "clear", "rna_Object_vgroup_clear");
Added method clear to most of collections which supports new/remove. This method not added to animation-specific structures yet/
2011-11-23 16:12:11 +00:00
RNA_def_function_ui_description(func, "Delete all vertex groups from object");
py/rna api - object.modifiers.add()/remove() - armature.edit_bones.active wasnt named correctly
2009-11-28 13:33:56 +00:00
}
Face Maps: custom-data, UI and RNA API Add face maps, needed for face-map widgets, only data structure, widgets will be separate commit. This comes from 'custom-manipulator' branch with only minor changes.
2017-05-30 17:58:24 +10:00
/* object.face_maps */
static void rna_def_object_face_maps(BlenderRNA *brna, PropertyRNA *cprop)
{
StructRNA *srna;
Merge branch 'master' into blender2.8
2018-06-09 14:42:01 +02:00
Face Maps: custom-data, UI and RNA API Add face maps, needed for face-map widgets, only data structure, widgets will be separate commit. This comes from 'custom-manipulator' branch with only minor changes.
2017-05-30 17:58:24 +10:00
PropertyRNA *prop;
FunctionRNA *func;
PropertyRNA *parm;
RNA_def_property_srna(cprop, "FaceMaps");
srna = RNA_def_struct(brna, "FaceMaps", NULL);
RNA_def_struct_sdna(srna, "Object");
RNA_def_struct_ui_text(srna, "Face Maps", "Collection of face maps");
prop = RNA_def_property(srna, "active", PROP_POINTER, PROP_NONE);
RNA_def_property_struct_type(prop, "FaceMap");
RNA_def_property_pointer_funcs(prop, "rna_Object_active_face_map_get",
"rna_Object_active_face_map_set", NULL, NULL);
RNA_def_property_ui_text(prop, "Active Face Map", "Face maps of the object");
RNA_def_property_update(prop, NC_GEOM | ND_DATA, "rna_Object_internal_update_data");
prop = RNA_def_property(srna, "active_index", PROP_INT, PROP_UNSIGNED);
RNA_def_property_clear_flag(prop, PROP_ANIMATABLE);
RNA_def_property_int_sdna(prop, NULL, "actfmap");
RNA_def_property_int_funcs(prop, "rna_Object_active_face_map_index_get",
"rna_Object_active_face_map_index_set",
"rna_Object_active_face_map_index_range");
RNA_def_property_ui_text(prop, "Active Face Map Index", "Active index in face map array");
RNA_def_property_update(prop, NC_GEOM | ND_DATA, "rna_Object_internal_update_data");
Merge branch 'master' into blender2.8
2018-06-09 14:42:01 +02:00
Face Maps: custom-data, UI and RNA API Add face maps, needed for face-map widgets, only data structure, widgets will be separate commit. This comes from 'custom-manipulator' branch with only minor changes.
2017-05-30 17:58:24 +10:00
/* face maps */ /* add_face_map */
func = RNA_def_function(srna, "new", "rna_Object_fmap_new");
RNA_def_function_ui_description(func, "Add face map to object");
RNA_def_string(func, "name", "Map", 0, "", "face map name"); /* optional */
parm = RNA_def_pointer(func, "fmap", "FaceMap", "", "New face map");
RNA_def_function_return(func, parm);
func = RNA_def_function(srna, "remove", "rna_Object_fmap_remove");
RNA_def_function_flag(func, FUNC_USE_REPORTS);
RNA_def_function_ui_description(func, "Delete vertex group from object");
parm = RNA_def_pointer(func, "group", "FaceMap", "", "Face map to remove");
RNA_def_parameter_flags(parm, PROP_NEVER_NULL, PARM_REQUIRED | PARM_RNAPTR);
RNA_def_property_clear_flag(parm, PROP_THICK_WRAP);
func = RNA_def_function(srna, "clear", "rna_Object_fmap_clear");
RNA_def_function_ui_description(func, "Delete all vertex groups from object");
}
merge from trunk at r31523
2010-09-07 05:47:34 +00:00
T55014: Optionally: objects not cast shadows in workbench
2018-05-09 15:13:12 +02:00
static void rna_def_object_display(BlenderRNA *brna)
{
StructRNA *srna;
PropertyRNA *prop;
srna = RNA_def_struct(brna, "ObjectDisplay", NULL);
RNA_def_struct_ui_text(srna, "Object Display", "Object display settings for 3d viewport");
RNA_def_struct_sdna(srna, "ObjectDisplay");
Fix missing path callback for new Object.display struct.
2018-05-13 19:06:37 +02:00
RNA_def_struct_path_func(srna, "rna_ObjectDisplay_path");
T55014: Optionally: objects not cast shadows in workbench
2018-05-09 15:13:12 +02:00
prop = RNA_def_property(srna, "show_shadows", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "flag", OB_SHOW_SHADOW);
RNA_def_property_boolean_default(prop, true);
RNA_def_property_ui_text(prop, "Shadow", "Object cast shadows in the 3d viewport");
RNA_def_property_update(prop, NC_OBJECT | ND_DRAW, NULL);
}
RNA Merging changes made by Arystanbek in the soc-2009-kazanbas branch, plus some things modified and added by me. * The API files now all in the makesrna module, convention is to call them e.g. rna_mesh_api.c for rna_mesh.c. Note for visual studio build maintainers, the rna_*_api.c files are compiled as part of "makesrna", but do not have rna_*_gen.c generated as part of the library. SCons/cmake/make were updated. * Added function flags FUNC_USE_CONTEXT and FUNC_USE_REPORTS, to allow RNA functions to get context and error reporting parameters optionally. Renamed FUNC_TYPESTATIC to FUNC_NO_SELF. * RNA collections now have a pointer to add/remove FunctionRNA's, this isn't actually used anywhere yet, purpose is to make an alias main.meshes.add() for main.add_mesh() in python. * Fixes to make autogenerating property set/get for multidimensional arrays work, though a 4x4 matrix will be exposed as a length 16 one dimensional RNA array. * Functions and properties added: * Main.add_mesh() * Main.remove_mesh() * Object.matrix * Object.create_render_mesh() * WindowManager.add_fileselect()
2009-06-18 19:48:55 +00:00
static void rna_def_object(BlenderRNA *brna)
RNA / Data API This is the first code for the Data API, also known as RNA system in the 2.5 Branch. It does not include a user interface, and only wraps some Scene properties for testing. It is integrated with Scons and Makefiles, and compiles a 'makesrna' program that generates an RNA.c file. http://wiki.blender.org/index.php/BlenderDev/Blender2.5/DataAPI http://wiki.blender.org/index.php/BlenderDev/Blender2.5/RNA The changes are quite local, basically adding a makesrna module which works similar to the makesdna module. The one external change is in moving genfile.c from blenloader to the makesdna module, so that it can be reused by the RNA code. This also meant changing the DNA makefiles. It seems to be doing dependencies correct still in my tests, but if there is an issue with the DNA not being rebuilt this commit might be the one causing it. Also it seems for scons the makesdna and makesrna modules are compiling without warnings. Not a new issue but this should be fixed. The RNA code supports all types as defined in the Data API design, so in that sense it is fairly complete and I hope that aspect will not have to change much. Some obviously missing parts are context related code, notify() functions for updates and user defined / ID properties.
2008-10-31 23:50:02 +00:00
{
RNA * Added more error prints for wrong definitions, for cases that would laters cause problems compiling or crash at runtime, and also made messages more clear. * Added some skeleton code for main/ID/mesh/vertex types for testing. * Added support for automatic arrays as collections using SDNA. * Changed how pointers to data work. Now they are always wrapped in a PointerRNA struct, which contains the data pointer and type, and also the data pointer and type of the ID datablock that this belongs to, since for example a vertex on it's own may not have enough information for some operations, it also needs the mesh. * Added some code for defining dependencies with RNA, and looking up data with paths like: scenes[0].objects["Cube"].data.verts[7].co. Note sure either will end up being used, this is experimental. http://wiki.blender.org/index.php/BlenderDev/Blender2.5/RNA
2008-11-07 02:58:25 +00:00
StructRNA *srna;
RNA / Data API This is the first code for the Data API, also known as RNA system in the 2.5 Branch. It does not include a user interface, and only wraps some Scene properties for testing. It is integrated with Scons and Makefiles, and compiles a 'makesrna' program that generates an RNA.c file. http://wiki.blender.org/index.php/BlenderDev/Blender2.5/DataAPI http://wiki.blender.org/index.php/BlenderDev/Blender2.5/RNA The changes are quite local, basically adding a makesrna module which works similar to the makesdna module. The one external change is in moving genfile.c from blenloader to the makesdna module, so that it can be reused by the RNA code. This also meant changing the DNA makefiles. It seems to be doing dependencies correct still in my tests, but if there is an issue with the DNA not being rebuilt this commit might be the one causing it. Also it seems for scons the makesdna and makesrna modules are compiling without warnings. Not a new issue but this should be fixed. The RNA code supports all types as defined in the Data API design, so in that sense it is fairly complete and I hope that aspect will not have to change much. Some obviously missing parts are context related code, notify() functions for updates and user defined / ID properties.
2008-10-31 23:50:02 +00:00
PropertyRNA *prop;
RNA * DNA_object_types.h done. * Scriptlink skeleton added. * Fix cmake compile.
2009-01-02 16:58:09 +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 up_items[] = {
RNA * Added icon to property and enum property items. The latter is responsible for the large number of files changed. * For RNA functions, added PROP_RNAPTR flag to ask for a PointerRNA as argument instead of a C pointer, instead of doing it implicitly with the AnyType type. * Material: properly wrap diffuse/specular param variables, and rename some things for consistency. * MaterialTextureSlot: added "enabled" property (ma->septex). * Image: make animated property editable. * Image Editor: make some things editable, notifiers, respect state. * Context: fix issue with screen not being set as ID.
2009-06-16 00:52:21 +00:00
{OB_POSX, "X", 0, "X", ""},
{OB_POSY, "Y", 0, "Y", ""},
{OB_POSZ, "Z", 0, "Z", ""},
style cleanup: mostly whitespace in rna
2012-05-12 11:01:29 +00:00
{0, NULL, 0, NULL, NULL}
};
RNA * DNA_object_types.h done. * Scriptlink skeleton added. * Fix cmake compile.
2009-01-02 16:58:09 +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 drawtype_items[] = {
UI / Python: rename X-Ray to In Front, Draw to Display. See T56648.
2018-09-03 18:58:41 +02:00
{OB_BOUNDBOX, "BOUNDS", 0, "Bounds", "Display the bounds of the object"},
{OB_WIRE, "WIRE", 0, "Wire", "Display the object as a wireframe"},
{OB_SOLID, "SOLID", 0, "Solid", "Display the object as a solid (if solid drawing is enabled in the viewport)"},
Code style edits (mostly spliting long lines, and removing trailing spaces). Note about long lines: I did not touch to two pieces of code (because I don’t see any way to keep a nicely formated, compact code, with shorter lines): * The node types definitions into rna_nodetree_types.h * The vgroup name functions into rna_particle.c
2012-03-18 09:27:36 +00:00
{OB_TEXTURE, "TEXTURED", 0, "Textured",
UI / Python: rename X-Ray to In Front, Draw to Display. See T56648.
2018-09-03 18:58:41 +02:00
"Display the object with textures (if textures are enabled in the viewport)"},
style cleanup: mostly whitespace in rna
2012-05-12 11:01:29 +00:00
{0, NULL, 0, NULL, NULL}
};
RNA * Added skeleton code for particle/object_force/userdef. * More Object properties wrapped. * Added User Preferences display in outliner.
2009-01-02 13:47:33 +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 boundtype_items[] = {
UI / Python: rename X-Ray to In Front, Draw to Display. See T56648.
2018-09-03 18:58:41 +02:00
{OB_BOUND_BOX, "BOX", 0, "Box", "Display bounds as box"},
{OB_BOUND_SPHERE, "SPHERE", 0, "Sphere", "Display bounds as sphere"},
{OB_BOUND_CYLINDER, "CYLINDER", 0, "Cylinder", "Display bounds as cylinder"},
{OB_BOUND_CONE, "CONE", 0, "Cone", "Display bounds as cone"},
{OB_BOUND_CAPSULE, "CAPSULE", 0, "Capsule", "Display bounds as capsule"},
style cleanup: mostly whitespace in rna
2012-05-12 11:01:29 +00:00
{0, NULL, 0, NULL, NULL}
};
RNA * DNA_object_types.h done. * Scriptlink skeleton added. * Fix cmake compile.
2009-01-02 16:58:09 +00:00
Cleanup: trailing space in RNA
2018-06-09 14:40:09 +02:00
Code style edits (mostly spliting long lines, and removing trailing spaces). Note about long lines: I did not touch to two pieces of code (because I don’t see any way to keep a nicely formated, compact code, with shorter lines): * The node types definitions into rna_nodetree_types.h * The vgroup name functions into rna_particle.c
2012-03-18 09:27:36 +00:00
/* XXX: this RNA enum define is currently duplicated for objects,
* since there is some text here which is not applicable */
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 prop_rotmode_items[] = {
Operation Dot-Kill finished
2010-02-11 01:11:52 +00:00
{ROT_MODE_QUAT, "QUATERNION", 0, "Quaternion (WXYZ)", "No Gimbal Lock"},
Minor: Other UI strings typos and tweaks. Also updated french po & mo
2011-09-24 09:57:47 +00:00
{ROT_MODE_XYZ, "XYZ", 0, "XYZ Euler", "XYZ Rotation Order - prone to Gimbal Lock (default)"},
{ROT_MODE_XZY, "XZY", 0, "XZY Euler", "XZY Rotation Order - prone to Gimbal Lock"},
{ROT_MODE_YXZ, "YXZ", 0, "YXZ Euler", "YXZ Rotation Order - prone to Gimbal Lock"},
{ROT_MODE_YZX, "YZX", 0, "YZX Euler", "YZX Rotation Order - prone to Gimbal Lock"},
{ROT_MODE_ZXY, "ZXY", 0, "ZXY Euler", "ZXY Rotation Order - prone to Gimbal Lock"},
{ROT_MODE_ZYX, "ZYX", 0, "ZYX Euler", "ZYX Rotation Order - prone to Gimbal Lock"},
Minor: Other UI strings typos and tweaks. Also updated french po & mo.
2011-09-25 09:55:13 +00:00
{ROT_MODE_AXISANGLE, "AXIS_ANGLE", 0, "Axis Angle",
"Axis Angle (W+XYZ), defines a rotation around some axis defined by 3D-Vector"},
style cleanup: mostly whitespace in rna
2012-05-12 11:01:29 +00:00
{0, NULL, 0, NULL, NULL}
};
Cleanup: trailing space in RNA
2018-06-09 14:40:09 +02:00
style cleanup: mostly whitespace in rna
2012-05-12 11:01:29 +00:00
static float default_quat[4] = {1, 0, 0, 0}; /* default quaternion values */
static float default_axisAngle[4] = {0, 0, 1, 0}; /* default axis-angle rotation values */
style cleanup: whitespace / commas
2012-04-29 15:47:02 +00:00
static float default_scale[3] = {1, 1, 1}; /* default scale values */
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
static int boundbox_dimsize[] = {8, 3};
Implemented dynamic and multidimensional array support in RNA. Example code: http://www.pasteall.org/7332/c. New API functions: http://www.pasteall.org/7330/c. Maximum number of dimensions is currently limited to 3, but can be increased arbitrarily if needed. What this means for ID property access: * MeshFace.verts - dynamic array, size 3 or 4 depending on MFace.v4 * MeshTextureFace.uv - dynamic, 2-dimensional array, size depends on MFace.v4 * Object.matrix - 2-dimensional array What this means for functions: * more intuitive API possibility, for example: Mesh.add_vertices([(x, y, z), (x, y, z), ...]) Mesh.add_faces([(1, 2, 3), (4, 5, 6), ...]) Python part is not complete yet, e.g. it is possible to: MeshFace.verts = (1, 2, 3) # even if Mesh.verts is (1, 2, 3, 4) and vice-versa MeshTextureFace.uv = [(0.0, 0.0)] * 4 # only if a corresponding MFace is a quad but the following won't work: MeshTextureFace.uv[3] = (0.0, 0.0) # setting uv[3] modifies MTFace.uv[1][0] instead of MTFace.uv[3]
2009-08-25 17:06:36 +00:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
srna = RNA_def_struct(brna, "Object", "ID");
Cleanup: rename 'datablocks' -> 'data-blocks' Similar to addons -> add-ons, for reading it fits better to hyphenate.
2015-10-24 02:44:43 +11:00
RNA_def_struct_ui_text(srna, "Object", "Object data-block defining an object in a scene");
RNA: * Added PROP_ID_REFCOUNT flag to control if refcounting should be done on ID pointer properties. All ID pointers are refcounted, by default, with the exception of Object, Scene and Text. * Also made TextureFace image pointer editable, with the special refcounting behavior.
2009-05-29 15:12:31 +00:00
RNA_def_struct_clear_flag(srna, STRUCT_ID_REFCOUNT);
UI/RNA: * Added an icon entry to RNA structs, instead of the UI_GetIconRNA function, to keep code together a bit more and make the lookup faster.
2009-06-03 23:16:51 +00:00
RNA_def_struct_ui_icon(srna, ICON_OBJECT_DATA);
RNA * Added more error prints for wrong definitions, for cases that would laters cause problems compiling or crash at runtime, and also made messages more clear. * Added some skeleton code for main/ID/mesh/vertex types for testing. * Added support for automatic arrays as collections using SDNA. * Changed how pointers to data work. Now they are always wrapped in a PointerRNA struct, which contains the data pointer and type, and also the data pointer and type of the ID datablock that this belongs to, since for example a vertex on it's own may not have enough information for some operations, it also needs the mesh. * Added some code for defining dependencies with RNA, and looking up data with paths like: scenes[0].objects["Cube"].data.verts[7].co. Note sure either will end up being used, this is experimental. http://wiki.blender.org/index.php/BlenderDev/Blender2.5/RNA
2008-11-07 02:58:25 +00:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "data", PROP_POINTER, PROP_NONE);
RNA * More ID property support. What was already possible was showing ID properties as RNA properties. Now it is possible to define RNA properties and have an ID property automatically created the first time it is set (if not set it retuns the default). * Added support for defining RNA structs and properties at runtime. This is useful for python and plugins, and could also be used for operators, not sure yet what is best there, they could be done in preprocess for speed, but not sure how to do that while keeping operator registration a single function. * Added quick functions to get/set properties based on names, to be used for operators. * Added some simple support for inheritance, was already doing this but having it as a feature simplifies things. Two things were added for this: when defining a struct you can give a 'from' struct whose properties will be copied, and structs like ID, operator, modifier, can define a refine callback that will return the more specific type of the struct like ID -> Object, Mesh, .. . * Added simple windowmanager wrap with only the registered operators list, used for testing RNA for operators.
2008-11-21 02:23:46 +00:00
RNA_def_property_struct_type(prop, "ID");
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
RNA_def_property_pointer_funcs(prop, NULL, "rna_Object_data_set", "rna_Object_data_typef", "rna_Object_data_poll");
RNA/Override: Move override-related property flags to own variable. We are already running out of available flags in main, generic int, and everytime I work on static override I find new special cases that will need new specific propflag, so...
2018-06-05 11:10:05 +02:00
RNA_def_property_flag(prop, PROP_EDITABLE | PROP_NEVER_UNLINK);
RNA_def_property_override_flag(prop, PROPOVERRIDE_OVERRIDABLE_STATIC);
batch remove .'s used with RNA_def_struct_ui_text
2010-02-10 21:15:44 +00:00
RNA_def_property_ui_text(prop, "Data", "Object data");
rename rna function obj.make_display_list(scene) --> obj.update(scene) also added 3 optional bool arguments, 'object', 'data' & 'time', matching the object recalc flags.
2010-06-09 08:24:31 +00:00
RNA_def_property_update(prop, 0, "rna_Object_internal_update_data");
RNA / Data API This is the first code for the Data API, also known as RNA system in the 2.5 Branch. It does not include a user interface, and only wraps some Scene properties for testing. It is integrated with Scons and Makefiles, and compiles a 'makesrna' program that generates an RNA.c file. http://wiki.blender.org/index.php/BlenderDev/Blender2.5/DataAPI http://wiki.blender.org/index.php/BlenderDev/Blender2.5/RNA The changes are quite local, basically adding a makesrna module which works similar to the makesdna module. The one external change is in moving genfile.c from blenloader to the makesdna module, so that it can be reused by the RNA code. This also meant changing the DNA makefiles. It seems to be doing dependencies correct still in my tests, but if there is an issue with the DNA not being rebuilt this commit might be the one causing it. Also it seems for scons the makesdna and makesrna modules are compiling without warnings. Not a new issue but this should be fixed. The RNA code supports all types as defined in the Data API design, so in that sense it is fairly complete and I hope that aspect will not have to change much. Some obviously missing parts are context related code, notify() functions for updates and user defined / ID properties.
2008-10-31 23:50:02 +00:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "type", PROP_ENUM, PROP_NONE);
2.5: Objects * Added Relations panel with layers, pass_index, parent. * Groups panel now can do add to group/remove from group. * Parent, parent type, track are now editable. * Separate constraint add operator for object and bones.
2009-07-14 20:27:28 +00:00
RNA_def_property_enum_sdna(prop, NULL, "type");
Cleanup: use `rna_enum_` prefix for RNA enums Definitions could shadow local vars.
2015-11-23 13:49:52 +11:00
RNA_def_property_enum_items(prop, rna_enum_object_type_items);
2.5: Objects * Added Relations panel with layers, pass_index, parent. * Groups panel now can do add to group/remove from group. * Parent, parent type, track are now editable. * Separate constraint add operator for object and bones.
2009-07-14 20:27:28 +00:00
RNA_def_property_clear_flag(prop, PROP_EDITABLE);
batch remove .'s used with RNA_def_struct_ui_text
2010-02-10 21:15:44 +00:00
RNA_def_property_ui_text(prop, "Type", "Type of Object");
2.5: Objects * Added Relations panel with layers, pass_index, parent. * Groups panel now can do add to group/remove from group. * Parent, parent type, track are now editable. * Separate constraint add operator for object and bones.
2009-07-14 20:27:28 +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
prop = RNA_def_property(srna, "mode", PROP_ENUM, PROP_NONE);
RNA_def_property_enum_sdna(prop, NULL, "mode");
RNA_def_property_enum_items(prop, rna_enum_object_mode_items);
RNA_def_property_clear_flag(prop, PROP_EDITABLE);
RNA_def_property_ui_text(prop, "Mode", "Object interaction mode");
object bound box access from rna
2010-02-10 20:29:40 +00:00
/* for data access */
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "bound_box", PROP_FLOAT, PROP_NONE);
object bound box access from rna
2010-02-10 20:29:40 +00:00
RNA_def_property_multi_array(prop, 2, boundbox_dimsize);
RNA_def_property_clear_flag(prop, PROP_EDITABLE);
RNA_def_property_float_funcs(prop, "rna_Object_boundbox_get", NULL, NULL);
Minor: Other UI strings typos and tweaks. Also updated french po & mo
2011-09-24 09:57:47 +00:00
RNA_def_property_ui_text(prop, "Bounding Box",
Code style edits (mostly spliting long lines, and removing trailing spaces). Note about long lines: I did not touch to two pieces of code (because I don’t see any way to keep a nicely formated, compact code, with shorter lines): * The node types definitions into rna_nodetree_types.h * The vgroup name functions into rna_particle.c
2012-03-18 09:27:36 +00:00
"Object's bounding box in object-space coordinates, all values are -1.0 when "
"not available");
object bound box access from rna
2010-02-10 20:29:40 +00:00
4 Devs in Agreement - End of the Road for Old Track This commit removes the Old Track method (used to be found under Object -> Animation -> Track), with all existing instances of this being converted to Track To Constraints. In fact, while performing this removal, I found that this was supposed to have happened in version 2.27 already, but for some reason the options were left in, and this function managed to survive for a further decade. I've left the tracking axes around still, since it seems some curve tools still use that. However, that usage should probably get faded out in future too? Misc notes: * Fixed compiling error with constaints from harkyman's Maintain Volume patch. * Subversion of 2.52 now bumped up to .2
2010-03-26 02:57:49 +00:00
/* parent */
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "parent", PROP_POINTER, PROP_NONE);
rna pointer poll function, not used yet.
2010-08-03 05:14:59 +00:00
RNA_def_property_pointer_funcs(prop, NULL, "rna_Object_parent_set", NULL, NULL);
RNA/Override: Move override-related property flags to own variable. We are already running out of available flags in main, generic int, and everytime I work on static override I find new special cases that will need new specific propflag, so...
2018-06-05 11:10:05 +02:00
RNA_def_property_flag(prop, PROP_EDITABLE | PROP_ID_SELF_CHECK);
RNA_def_property_override_flag(prop, PROPOVERRIDE_OVERRIDABLE_STATIC);
RNA * Added RNA list viewer. This is currently drawn in the outliner window, the UI is limited but it is just intended to test RNA at the moment. * Added UI names for currently wrapped properties. * Made iterating collections a bit more convenient.
2008-11-14 17:05:25 +00:00
RNA_def_property_ui_text(prop, "Parent", "Parent Object");
style cleanup: mostly whitespace in rna
2012-05-12 11:01:29 +00:00
RNA_def_property_update(prop, NC_OBJECT | ND_DRAW, "rna_Object_dependency_update");
Cleanup: trailing space in RNA
2018-06-09 14:40:09 +02:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "parent_type", PROP_ENUM, PROP_NONE);
2.5: Objects * Added Relations panel with layers, pass_index, parent. * Groups panel now can do add to group/remove from group. * Parent, parent type, track are now editable. * Separate constraint add operator for object and bones.
2009-07-14 20:27:28 +00:00
RNA_def_property_enum_bitflag_sdna(prop, NULL, "partype");
RNA * Added skeleton code for particle/object_force/userdef. * More Object properties wrapped. * Added User Preferences display in outliner.
2009-01-02 13:47:33 +00:00
RNA_def_property_enum_items(prop, parent_type_items);
2.5: Objects * Added Relations panel with layers, pass_index, parent. * Groups panel now can do add to group/remove from group. * Parent, parent type, track are now editable. * Separate constraint add operator for object and bones.
2009-07-14 20:27:28 +00:00
RNA_def_property_enum_funcs(prop, NULL, "rna_Object_parent_type_set", "rna_Object_parent_type_itemf");
batch remove .'s used with RNA_def_struct_ui_text
2010-02-10 21:15:44 +00:00
RNA_def_property_ui_text(prop, "Parent Type", "Type of parent relation");
style cleanup: mostly whitespace in rna
2012-05-12 11:01:29 +00:00
RNA_def_property_update(prop, NC_OBJECT | ND_DRAW, "rna_Object_dependency_update");
RNA * Added skeleton code for particle/object_force/userdef. * More Object properties wrapped. * Added User Preferences display in outliner.
2009-01-02 13:47:33 +00:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "parent_vertices", PROP_INT, PROP_UNSIGNED);
RNA * Added skeleton code for particle/object_force/userdef. * More Object properties wrapped. * Added User Preferences display in outliner.
2009-01-02 13:47:33 +00:00
RNA_def_property_int_sdna(prop, NULL, "par1");
RNA_def_property_array(prop, 3);
Minor: Other UI strings typos and tweaks. Also updated french po & mo
2011-09-24 09:57:47 +00:00
RNA_def_property_ui_text(prop, "Parent Vertices", "Indices of vertices in case of a vertex parenting relation");
style cleanup: mostly whitespace in rna
2012-05-12 11:01:29 +00:00
RNA_def_property_update(prop, NC_OBJECT | ND_DRAW, "rna_Object_internal_update");
RNA * Added skeleton code for particle/object_force/userdef. * More Object properties wrapped. * Added User Preferences display in outliner.
2009-01-02 13:47:33 +00:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "parent_bone", PROP_STRING, PROP_NONE);
RNA * Added skeleton code for particle/object_force/userdef. * More Object properties wrapped. * Added User Preferences display in outliner.
2009-01-02 13:47:33 +00:00
RNA_def_property_string_sdna(prop, NULL, "parsubstr");
2.5: Objects * Added Relations panel with layers, pass_index, parent. * Groups panel now can do add to group/remove from group. * Parent, parent type, track are now editable. * Separate constraint add operator for object and bones.
2009-07-14 20:27:28 +00:00
RNA_def_property_string_funcs(prop, NULL, NULL, "rna_Object_parent_bone_set");
batch remove .'s used with RNA_def_struct_ui_text
2010-02-10 21:15:44 +00:00
RNA_def_property_ui_text(prop, "Parent Bone", "Name of parent bone in case of a bone parenting relation");
style cleanup: mostly whitespace in rna
2012-05-12 11:01:29 +00:00
RNA_def_property_update(prop, NC_OBJECT | ND_DRAW, "rna_Object_dependency_update");
Cleanup: trailing space in RNA
2018-06-09 14:40:09 +02:00
4 Devs in Agreement - End of the Road for Old Track This commit removes the Old Track method (used to be found under Object -> Animation -> Track), with all existing instances of this being converted to Track To Constraints. In fact, while performing this removal, I found that this was supposed to have happened in version 2.27 already, but for some reason the options were left in, and this function managed to survive for a further decade. I've left the tracking axes around still, since it seems some curve tools still use that. However, that usage should probably get faded out in future too? Misc notes: * Fixed compiling error with constaints from harkyman's Maintain Volume patch. * Subversion of 2.52 now bumped up to .2
2010-03-26 02:57:49 +00:00
/* Track and Up flags */
Code style edits (mostly spliting long lines, and removing trailing spaces). Note about long lines: I did not touch to two pieces of code (because I don’t see any way to keep a nicely formated, compact code, with shorter lines): * The node types definitions into rna_nodetree_types.h * The vgroup name functions into rna_particle.c
2012-03-18 09:27:36 +00:00
/* XXX: these have been saved here for a bit longer (after old track was removed),
* since some other tools still refer to this */
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "track_axis", PROP_ENUM, PROP_NONE);
RNA * DNA_object_types.h done. * Scriptlink skeleton added. * Fix cmake compile.
2009-01-02 16:58:09 +00:00
RNA_def_property_enum_sdna(prop, NULL, "trackflag");
Cleanup: use `rna_enum_` prefix for RNA enums Definitions could shadow local vars.
2015-11-23 13:49:52 +11:00
RNA_def_property_enum_items(prop, rna_enum_object_axis_items);
Minor: Other UI strings typos and tweaks. Also updated french po & mo.
2011-09-25 09:55:13 +00:00
RNA_def_property_ui_text(prop, "Track Axis",
"Axis that points in 'forward' direction (applies to DupliFrame when "
"parent 'Follow' is enabled)");
style cleanup: mostly whitespace in rna
2012-05-12 11:01:29 +00:00
RNA_def_property_update(prop, NC_OBJECT | ND_DRAW, "rna_Object_internal_update");
RNA * DNA_object_types.h done. * Scriptlink skeleton added. * Fix cmake compile.
2009-01-02 16:58:09 +00:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "up_axis", PROP_ENUM, PROP_NONE);
RNA * DNA_object_types.h done. * Scriptlink skeleton added. * Fix cmake compile.
2009-01-02 16:58:09 +00:00
RNA_def_property_enum_sdna(prop, NULL, "upflag");
RNA_def_property_enum_items(prop, up_items);
Minor: Other UI strings typos and tweaks. Also updated french po & mo.
2011-09-25 09:55:13 +00:00
RNA_def_property_ui_text(prop, "Up Axis",
"Axis that points in the upward direction (applies to DupliFrame when "
"parent 'Follow' is enabled)");
style cleanup: mostly whitespace in rna
2012-05-12 11:01:29 +00:00
RNA_def_property_update(prop, NC_OBJECT | ND_DRAW, "rna_Object_internal_update");
Cleanup: trailing space in RNA
2018-06-09 14:40:09 +02:00
RNA * Added skeleton code for particle/object_force/userdef. * More Object properties wrapped. * Added User Preferences display in outliner.
2009-01-02 13:47:33 +00:00
/* proxy */
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "proxy", PROP_POINTER, PROP_NONE);
batch remove .'s used with RNA_def_struct_ui_text
2010-02-10 21:15:44 +00:00
RNA_def_property_ui_text(prop, "Proxy", "Library object this proxy object controls");
RNA * Added skeleton code for particle/object_force/userdef. * More Object properties wrapped. * Added User Preferences display in outliner.
2009-01-02 13:47:33 +00:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "proxy_group", PROP_POINTER, PROP_NONE);
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_property_ui_text(prop, "Proxy Collection", "Library collection duplicator object this proxy object controls");
RNA * Added skeleton code for particle/object_force/userdef. * More Object properties wrapped. * Added User Preferences display in outliner.
2009-01-02 13:47:33 +00:00
/* materials */
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "material_slots", PROP_COLLECTION, PROP_NONE);
RNA * Added skeleton code for particle/object_force/userdef. * More Object properties wrapped. * Added User Preferences display in outliner.
2009-01-02 13:47:33 +00:00
RNA_def_property_collection_sdna(prop, NULL, "mat", "totcol");
RNA: * Added a MaterialSlot collection in Object rather than giving the list of materials immediately. This should more correctly reflect how this data is organized, even though there is no equivalent C struct. * Added name properties to MaterialSlot/TextureSlot/ParticleSystem.
2009-06-03 23:22:43 +00:00
RNA_def_property_struct_type(prop, "MaterialSlot");
Static Override: progresses towards full support for material slots. Material slots are a real pain to get working, due to all the black magic they do to hide object vs. obdata storage of the material... Currently hitting an order problem - we need to always set 'link' (to object or obdata) property of the slot first, before we set its material... *super-sigh*
2018-06-05 11:58:56 +02:00
RNA_def_property_override_flag(prop, PROPOVERRIDE_OVERRIDABLE_STATIC | PROPOVERRIDE_NO_PROP_NAME);
style cleanup: mostly whitespace in rna
2012-05-12 11:01:29 +00:00
/* don't dereference pointer! */
Code style edits (mostly spliting long lines, and removing trailing spaces). Note about long lines: I did not touch to two pieces of code (because I don’t see any way to keep a nicely formated, compact code, with shorter lines): * The node types definitions into rna_nodetree_types.h * The vgroup name functions into rna_particle.c
2012-03-18 09:27:36 +00:00
RNA_def_property_collection_funcs(prop, NULL, NULL, NULL, "rna_iterator_array_get", NULL, NULL, NULL, NULL);
batch remove .'s used with RNA_def_struct_ui_text
2010-02-10 21:15:44 +00:00
RNA_def_property_ui_text(prop, "Material Slots", "Material slots in the object");
RNA * Added skeleton code for particle/object_force/userdef. * More Object properties wrapped. * Added User Preferences display in outliner.
2009-01-02 13:47:33 +00:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "active_material", PROP_POINTER, PROP_NONE);
2.5: Materials and textures can now be assigned again even if not slot for them is available.
2009-07-28 18:54:02 +00:00
RNA_def_property_struct_type(prop, "Material");
Code style edits (mostly spliting long lines, and removing trailing spaces). Note about long lines: I did not touch to two pieces of code (because I don’t see any way to keep a nicely formated, compact code, with shorter lines): * The node types definitions into rna_nodetree_types.h * The vgroup name functions into rna_particle.c
2012-03-18 09:27:36 +00:00
RNA_def_property_pointer_funcs(prop, "rna_Object_active_material_get",
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
"rna_Object_active_material_set", NULL,
"rna_MaterialSlot_material_poll");
Fix stupid mistake in previous commit.
2018-06-05 11:22:43 +02:00
RNA_def_property_flag(prop, PROP_EDITABLE);
Improve/partially fix overriding of Object material pointers. Basic workflow shall now work, still lots to do in the UI (ID template needs some love to reflect overriden status ;) ).
2018-06-11 19:28:12 +02:00
RNA_def_property_override_flag(prop, PROPOVERRIDE_OVERRIDABLE_STATIC);
Fix T40411: UI incorrectly permits changing materal_slots on linked obdata
2014-05-29 16:16:31 +10:00
RNA_def_property_editable_func(prop, "rna_Object_active_material_editable");
batch remove .'s used with RNA_def_struct_ui_text
2010-02-10 21:15:44 +00:00
RNA_def_property_ui_text(prop, "Active Material", "Active material being displayed");
style cleanup: mostly whitespace in rna
2012-05-12 11:01:29 +00:00
RNA_def_property_update(prop, NC_OBJECT | ND_DRAW, "rna_MaterialSlot_update");
RNA * DNA_cloth_types.h, patch by Roelf de Kock. The gravity[3] member is not being parsed correct by makesdna.c and will give issues even when trying to fix it. Worked around it for now in RNA by wrapping it manually, but this should really be fixed in the DNA genetics code, added a comment about it in DNA_cloth_types.h. * Handle vertex groups and uv layers more consistent now. They are all exposed as strings now. Reason is that indices don't really say much, and a direct pointer is not always possible because for example a uv layer in a material can be used for multiple objects and so there is no single pointer. In python it is not too hard to use either since the strings works as a key for lookups. For the user interface we can later think of some method to generate popup menus in a way that works for vertex groups, uv layers, bones etc. * This also fixes the XXX's in rna_modifier.c, I think that can be marked done.
2009-01-04 19:25:24 +00:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "active_material_index", PROP_INT, PROP_UNSIGNED);
RNA * Added skeleton code for particle/object_force/userdef. * More Object properties wrapped. * Added User Preferences display in outliner.
2009-01-02 13:47:33 +00:00
RNA_def_property_int_sdna(prop, NULL, "actcol");
fixed filename overwrite red highlight not updating when +/- pressed. also made some vars not animateable.
2010-09-21 10:59:53 +00:00
RNA_def_property_clear_flag(prop, PROP_ANIMATABLE);
Static Override: progresses towards full support for material slots. Material slots are a real pain to get working, due to all the black magic they do to hide object vs. obdata storage of the material... Currently hitting an order problem - we need to always set 'link' (to object or obdata) property of the slot first, before we set its material... *super-sigh*
2018-06-05 11:58:56 +02:00
RNA_def_property_override_flag(prop, PROPOVERRIDE_OVERRIDABLE_STATIC);
Minor: Other UI strings typos and tweaks. Also updated french po & mo.
2011-09-25 09:55:13 +00:00
RNA_def_property_int_funcs(prop, "rna_Object_active_material_index_get", "rna_Object_active_material_index_set",
"rna_Object_active_material_index_range");
batch remove .'s used with RNA_def_struct_ui_text
2010-02-10 21:15:44 +00:00
RNA_def_property_ui_text(prop, "Active Material Index", "Index of active material slot");
GP: Select color in Brush or in Properties After some artist feedback the material selection was not clear. Now, the material can be selected in the top bar or in the properties panel. 1) If the material is selected in properties panel, all Brushes except pinned will be assigned to this material. 2) If the material is selected in the brush, the properties panel is updated to set the active material. Added a new Pin icon to keep locked the material to one brush
2018-08-24 23:59:56 +02:00
RNA_def_property_update(prop, NC_MATERIAL | ND_SHADING_LINKS, "rna_MaterialIndex_update");
Cleanup: trailing space in RNA
2018-06-09 14:40:09 +02:00
RNA * Object has some more properties wrapped, mostly game related. * Scene frame changes now send a notifier. * Added functions to create/free operator properties for calling operators. This also simplifies some duplicated code that did this. Ideally though this kind of thing should use the properties pointer provided by buttons and keymap items. Example code: PointerRNA ptr; WM_operator_properties_create(&ptr, "SOME_OT_name"); RNA_int_set(&ptr, "value", 42); WM_operator_name_call(C, "SOME_OT_name", WM_OP_EXEC_DEFAULT, &ptr); WM_operator_properties_free(&ptr);
2009-01-01 20:44:40 +00:00
/* transform */
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "location", PROP_FLOAT, PROP_TRANSLATION);
RNA * Object has some more properties wrapped, mostly game related. * Scene frame changes now send a notifier. * Added functions to create/free operator properties for calling operators. This also simplifies some duplicated code that did this. Ideally though this kind of thing should use the properties pointer provided by buttons and keymap items. Example code: PointerRNA ptr; WM_operator_properties_create(&ptr, "SOME_OT_name"); RNA_int_set(&ptr, "value", 42); WM_operator_name_call(C, "SOME_OT_name", WM_OP_EXEC_DEFAULT, &ptr); WM_operator_properties_free(&ptr);
2009-01-01 20:44:40 +00:00
RNA_def_property_float_sdna(prop, NULL, "loc");
AnimSys - Transform Locks + RNA: The Animation System now respects the Transform Locks too (i.e. lock x-location, etc.) when writing settings. This means that it is no longer necessary to set up "constant drivers" to make sure some values don't get accidentally animated. Internally, added a new callback for properties in RNA, which is responsible for checking if the item at some array-index is editable. This needs to be manually called for each place which uses rna to set settings for arrays (see the code changes in anim_sys.c for changes how to do this; the same thing needs to be done in the UI code too, and probably in py-api too)
2009-11-25 12:00:31 +00:00
RNA_def_property_editable_array_func(prop, "rna_Object_location_editable");
RNA/Override: Move override-related property flags to own variable. We are already running out of available flags in main, generic int, and everytime I work on static override I find new special cases that will need new specific propflag, so...
2018-06-05 11:10:05 +02:00
RNA_def_property_override_flag(prop, PROPOVERRIDE_OVERRIDABLE_STATIC);
batch remove .'s used with RNA_def_struct_ui_text
2010-02-10 21:15:44 +00:00
RNA_def_property_ui_text(prop, "Location", "Location of the object");
Address [#30842] Blenders Measurement Units set to Metric, makes some Precision Flaws. use the same precision for location all over (2-5 was used), use define as 5. also disallow boolean to have any subtype besides PROP_LAYER_MEMBER, some booleans had TRANSLATION / XYZ subtypes which don't make sense.
2012-04-10 08:33:30 +00:00
RNA_def_property_ui_range(prop, -FLT_MAX, FLT_MAX, 1, RNA_TRANSLATION_PREC_DEFAULT);
style cleanup: mostly whitespace in rna
2012-05-12 11:01:29 +00:00
RNA_def_property_update(prop, NC_OBJECT | ND_TRANSFORM, "rna_Object_internal_update");
Cleanup: trailing space in RNA
2018-06-09 14:40:09 +02:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "rotation_quaternion", PROP_FLOAT, PROP_QUATERNION);
merge with trunk/2.5 at r23876 [[Split portion of a mixed commit.]]
2009-10-22 23:22:05 +00:00
RNA_def_property_float_sdna(prop, NULL, "quat");
AnimSys - Transform Locks + RNA: The Animation System now respects the Transform Locks too (i.e. lock x-location, etc.) when writing settings. This means that it is no longer necessary to set up "constant drivers" to make sure some values don't get accidentally animated. Internally, added a new callback for properties in RNA, which is responsible for checking if the item at some array-index is editable. This needs to be manually called for each place which uses rna to set settings for arrays (see the code changes in anim_sys.c for changes how to do this; the same thing needs to be done in the UI code too, and probably in py-api too)
2009-11-25 12:00:31 +00:00
RNA_def_property_editable_array_func(prop, "rna_Object_rotation_4d_editable");
RNA/Override: Move override-related property flags to own variable. We are already running out of available flags in main, generic int, and everytime I work on static override I find new special cases that will need new specific propflag, so...
2018-06-05 11:10:05 +02:00
RNA_def_property_override_flag(prop, PROPOVERRIDE_OVERRIDABLE_STATIC);
Assorted Animation/RNA fixes: * Fix for compiler warning in mesh.c from previous commit * Fix for wrong name for dopesheet filter button used for meshes * Added RNA defines for the default values for quaternion and axis-angle rotations, so that clearing these to their default values "does the right thing (TM)"
2009-12-28 03:45:24 +00:00
RNA_def_property_float_array_default(prop, default_quat);
batch remove .'s used with RNA_def_struct_ui_text
2010-02-10 21:15:44 +00:00
RNA_def_property_ui_text(prop, "Quaternion Rotation", "Rotation in Quaternions");
style cleanup: mostly whitespace in rna
2012-05-12 11:01:29 +00:00
RNA_def_property_update(prop, NC_OBJECT | ND_TRANSFORM, "rna_Object_internal_update");
Cleanup: trailing space in RNA
2018-06-09 14:40:09 +02:00
style cleanup: mostly whitespace in rna
2012-05-12 11:01:29 +00:00
/* XXX: for axis-angle, it would have been nice to have 2 separate fields for UI purposes, but
* having a single one is better for Keyframing and other property-management situations...
*/
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "rotation_axis_angle", PROP_FLOAT, PROP_AXISANGLE);
Animation Visualisation Cleanups - Part 2: * Finished baking code for motion paths, generalising it so that it works for both Objects and Bones. It is based on the old code for baking bones, although I have modified the updating code to use a more 'correct' method of updating dependencies. However, this may turn out to be too slow, and another API method should be added for that... * Moved some of the old version-patching code for animviz settings out of the drawing functions, instead doing this on the version patching proper. * Added RNA support for the new AnimViz types, and included RNA access via their users too. The old settings have still been left in for now, since there are still some things not ready to use yet. ---- * F-Curve's with sample points (i.e. sounds to F-Curves) now perform linear interpolation between sample points instead of using constant interpolation.
2010-01-07 22:54:05 +00:00
RNA_def_property_array(prop, 4);
Code style edits (mostly spliting long lines, and removing trailing spaces). Note about long lines: I did not touch to two pieces of code (because I don’t see any way to keep a nicely formated, compact code, with shorter lines): * The node types definitions into rna_nodetree_types.h * The vgroup name functions into rna_particle.c
2012-03-18 09:27:36 +00:00
RNA_def_property_float_funcs(prop, "rna_Object_rotation_axis_angle_get",
"rna_Object_rotation_axis_angle_set", NULL);
AnimSys - Transform Locks + RNA: The Animation System now respects the Transform Locks too (i.e. lock x-location, etc.) when writing settings. This means that it is no longer necessary to set up "constant drivers" to make sure some values don't get accidentally animated. Internally, added a new callback for properties in RNA, which is responsible for checking if the item at some array-index is editable. This needs to be manually called for each place which uses rna to set settings for arrays (see the code changes in anim_sys.c for changes how to do this; the same thing needs to be done in the UI code too, and probably in py-api too)
2009-11-25 12:00:31 +00:00
RNA_def_property_editable_array_func(prop, "rna_Object_rotation_4d_editable");
Assorted Animation/RNA fixes: * Fix for compiler warning in mesh.c from previous commit * Fix for wrong name for dopesheet filter button used for meshes * Added RNA defines for the default values for quaternion and axis-angle rotations, so that clearing these to their default values "does the right thing (TM)"
2009-12-28 03:45:24 +00:00
RNA_def_property_float_array_default(prop, default_axisAngle);
RNA/Override: Move override-related property flags to own variable. We are already running out of available flags in main, generic int, and everytime I work on static override I find new special cases that will need new specific propflag, so...
2018-06-05 11:10:05 +02:00
RNA_def_property_override_flag(prop, PROPOVERRIDE_OVERRIDABLE_STATIC);
batch remove .'s used with RNA_def_struct_ui_text
2010-02-10 21:15:44 +00:00
RNA_def_property_ui_text(prop, "Axis-Angle Rotation", "Angle of Rotation for Axis-Angle rotation representation");
style cleanup: mostly whitespace in rna
2012-05-12 11:01:29 +00:00
RNA_def_property_update(prop, NC_OBJECT | ND_TRANSFORM, "rna_Object_internal_update");
Cleanup: trailing space in RNA
2018-06-09 14:40:09 +02:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "rotation_euler", PROP_FLOAT, PROP_EULER);
RNA * Object has some more properties wrapped, mostly game related. * Scene frame changes now send a notifier. * Added functions to create/free operator properties for calling operators. This also simplifies some duplicated code that did this. Ideally though this kind of thing should use the properties pointer provided by buttons and keymap items. Example code: PointerRNA ptr; WM_operator_properties_create(&ptr, "SOME_OT_name"); RNA_int_set(&ptr, "value", 42); WM_operator_name_call(C, "SOME_OT_name", WM_OP_EXEC_DEFAULT, &ptr); WM_operator_properties_free(&ptr);
2009-01-01 20:44:40 +00:00
RNA_def_property_float_sdna(prop, NULL, "rot");
AnimSys - Transform Locks + RNA: The Animation System now respects the Transform Locks too (i.e. lock x-location, etc.) when writing settings. This means that it is no longer necessary to set up "constant drivers" to make sure some values don't get accidentally animated. Internally, added a new callback for properties in RNA, which is responsible for checking if the item at some array-index is editable. This needs to be manually called for each place which uses rna to set settings for arrays (see the code changes in anim_sys.c for changes how to do this; the same thing needs to be done in the UI code too, and probably in py-api too)
2009-11-25 12:00:31 +00:00
RNA_def_property_editable_array_func(prop, "rna_Object_rotation_euler_editable");
RNA/Override: Move override-related property flags to own variable. We are already running out of available flags in main, generic int, and everytime I work on static override I find new special cases that will need new specific propflag, so...
2018-06-05 11:10:05 +02:00
RNA_def_property_override_flag(prop, PROPOVERRIDE_OVERRIDABLE_STATIC);
batch remove .'s used with RNA_def_struct_ui_text
2010-02-10 21:15:44 +00:00
RNA_def_property_ui_text(prop, "Euler Rotation", "Rotation in Eulers");
style cleanup: mostly whitespace in rna
2012-05-12 11:01:29 +00:00
RNA_def_property_update(prop, NC_OBJECT | ND_TRANSFORM, "rna_Object_internal_update");
Cleanup: trailing space in RNA
2018-06-09 14:40:09 +02:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "rotation_mode", PROP_ENUM, PROP_NONE);
merge with trunk/2.5 at r23876 [[Split portion of a mixed commit.]]
2009-10-22 23:22:05 +00:00
RNA_def_property_enum_sdna(prop, NULL, "rotmode");
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
RNA_def_property_enum_items(prop, prop_rotmode_items); /* XXX move to using a single define of this someday */
merge with trunk/2.5 at r23876 [[Split portion of a mixed commit.]]
2009-10-22 23:22:05 +00:00
RNA_def_property_enum_funcs(prop, NULL, "rna_Object_rotation_mode_set", NULL);
RNA_def_property_ui_text(prop, "Rotation Mode", "");
style cleanup: mostly whitespace in rna
2012-05-12 11:01:29 +00:00
RNA_def_property_update(prop, NC_OBJECT | ND_TRANSFORM, "rna_Object_internal_update");
Cleanup: trailing space in RNA
2018-06-09 14:40:09 +02:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "scale", PROP_FLOAT, PROP_XYZ);
RNA * Object has some more properties wrapped, mostly game related. * Scene frame changes now send a notifier. * Added functions to create/free operator properties for calling operators. This also simplifies some duplicated code that did this. Ideally though this kind of thing should use the properties pointer provided by buttons and keymap items. Example code: PointerRNA ptr; WM_operator_properties_create(&ptr, "SOME_OT_name"); RNA_int_set(&ptr, "value", 42); WM_operator_name_call(C, "SOME_OT_name", WM_OP_EXEC_DEFAULT, &ptr); WM_operator_properties_free(&ptr);
2009-01-01 20:44:40 +00:00
RNA_def_property_float_sdna(prop, NULL, "size");
RNA/Override: Move override-related property flags to own variable. We are already running out of available flags in main, generic int, and everytime I work on static override I find new special cases that will need new specific propflag, so...
2018-06-05 11:10:05 +02:00
RNA_def_property_flag(prop, PROP_PROPORTIONAL);
RNA_def_property_override_flag(prop, PROPOVERRIDE_OVERRIDABLE_STATIC);
AnimSys - Transform Locks + RNA: The Animation System now respects the Transform Locks too (i.e. lock x-location, etc.) when writing settings. This means that it is no longer necessary to set up "constant drivers" to make sure some values don't get accidentally animated. Internally, added a new callback for properties in RNA, which is responsible for checking if the item at some array-index is editable. This needs to be manually called for each place which uses rna to set settings for arrays (see the code changes in anim_sys.c for changes how to do this; the same thing needs to be done in the UI code too, and probably in py-api too)
2009-11-25 12:00:31 +00:00
RNA_def_property_editable_array_func(prop, "rna_Object_scale_editable");
- bone roll now in degrees not radians. - rna buttons with units set now use the units base value for snapping. - bone head/tail radius could be set negative. matt: removed a check in ui_is_but_unit() which made angle buttons return false, what was this for?
2010-09-16 04:19:22 +00:00
RNA_def_property_ui_range(prop, -FLT_MAX, FLT_MAX, 1, 3);
Various RNA defaults for more consistency when updating settings (scene changes), and incorrect default values for scale settings.
2010-02-23 05:02:00 +00:00
RNA_def_property_float_array_default(prop, default_scale);
batch remove .'s used with RNA_def_struct_ui_text
2010-02-10 21:15:44 +00:00
RNA_def_property_ui_text(prop, "Scale", "Scaling of the object");
style cleanup: mostly whitespace in rna
2012-05-12 11:01:29 +00:00
RNA_def_property_update(prop, NC_OBJECT | ND_TRANSFORM, "rna_Object_internal_update");
merge with trunk/2.5 at r23876 [[Split portion of a mixed commit.]]
2009-10-22 23:22:05 +00:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "dimensions", PROP_FLOAT, PROP_XYZ_LENGTH);
* Partial fix for bug [#19734] N panel's transform doesn't display the units Converted the Object transform properties to use rna/rna buttons. This has the advantage of not only displaying/editing units, but also RMB menu, keyframing, drivers, etc too. Part of this was to convert 'Dimensions' to an rna property, converting to and from scale. This also allows you to set the object's dimensions via fcurves or python, but note that it's driving the object scale setting internally so if you animate both dimension and scale at the same time one will override the other (i don't expect many people to attempt this).
2009-11-04 23:14:20 +00:00
RNA_def_property_array(prop, 3);
RNA: disable animating object dimensions
2016-06-06 12:54:55 +10:00
/* only for the transform-panel and conflicts with animating scale */
RNA_def_property_clear_flag(prop, PROP_ANIMATABLE);
* Partial fix for bug [#19734] N panel's transform doesn't display the units Converted the Object transform properties to use rna/rna buttons. This has the advantage of not only displaying/editing units, but also RMB menu, keyframing, drivers, etc too. Part of this was to convert 'Dimensions' to an rna property, converting to and from scale. This also allows you to set the object's dimensions via fcurves or python, but note that it's driving the object scale setting internally so if you animate both dimension and scale at the same time one will override the other (i don't expect many people to attempt this).
2009-11-04 23:14:20 +00:00
RNA_def_property_float_funcs(prop, "rna_Object_dimensions_get", "rna_Object_dimensions_set", NULL);
Fix T52729: Decimals not showing over 100m or 100 feet Use same 5 digits precision as we already use for e.g. Object's location, for Object's dimensions too. To be backported to 2.79a, should we do it.
2017-09-14 16:34:05 +02:00
RNA_def_property_ui_range(prop, 0.0f, FLT_MAX, 1, RNA_TRANSLATION_PREC_DEFAULT);
batch remove .'s used with RNA_def_struct_ui_text
2010-02-10 21:15:44 +00:00
RNA_def_property_ui_text(prop, "Dimensions", "Absolute bounding box dimensions of the object");
style cleanup: mostly whitespace in rna
2012-05-12 11:01:29 +00:00
RNA_def_property_update(prop, NC_OBJECT | ND_TRANSFORM, "rna_Object_internal_update");
Cleanup: trailing space in RNA
2018-06-09 14:40:09 +02:00
merge with trunk/2.5 at r23876 [[Split portion of a mixed commit.]]
2009-10-22 23:22:05 +00:00
/* delta transforms */
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "delta_location", PROP_FLOAT, PROP_TRANSLATION);
merge with trunk/2.5 at r23876 [[Split portion of a mixed commit.]]
2009-10-22 23:22:05 +00:00
RNA_def_property_float_sdna(prop, NULL, "dloc");
Object's RNA cleanups, made descriptions clearer, mostly aesthetic changes. Anyone who finds these incorrect feel free to change or make me notice.
2010-02-17 16:18:41 +00:00
RNA_def_property_ui_text(prop, "Delta Location", "Extra translation added to the location of the object");
Address [#30842] Blenders Measurement Units set to Metric, makes some Precision Flaws. use the same precision for location all over (2-5 was used), use define as 5. also disallow boolean to have any subtype besides PROP_LAYER_MEMBER, some booleans had TRANSLATION / XYZ subtypes which don't make sense.
2012-04-10 08:33:30 +00:00
RNA_def_property_ui_range(prop, -FLT_MAX, FLT_MAX, 1, RNA_TRANSLATION_PREC_DEFAULT);
style cleanup: mostly whitespace in rna
2012-05-12 11:01:29 +00:00
RNA_def_property_update(prop, NC_OBJECT | ND_TRANSFORM, "rna_Object_internal_update");
Cleanup: trailing space in RNA
2018-06-09 14:40:09 +02:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "delta_rotation_euler", PROP_FLOAT, PROP_EULER);
merge with trunk/2.5 at r23876 [[Split portion of a mixed commit.]]
2009-10-22 23:22:05 +00:00
RNA_def_property_float_sdna(prop, NULL, "drot");
Minor: Other UI strings typos and tweaks. Also updated french po & mo.
2011-09-25 09:55:13 +00:00
RNA_def_property_ui_text(prop, "Delta Rotation (Euler)",
"Extra rotation added to the rotation of the object (when using Euler rotations)");
style cleanup: mostly whitespace in rna
2012-05-12 11:01:29 +00:00
RNA_def_property_update(prop, NC_OBJECT | ND_TRANSFORM, "rna_Object_internal_update");
Cleanup: trailing space in RNA
2018-06-09 14:40:09 +02:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "delta_rotation_quaternion", PROP_FLOAT, PROP_QUATERNION);
merge with trunk/2.5 at r23876 [[Split portion of a mixed commit.]]
2009-10-22 23:22:05 +00:00
RNA_def_property_float_sdna(prop, NULL, "dquat");
Assorted Animation/RNA fixes: * Fix for compiler warning in mesh.c from previous commit * Fix for wrong name for dopesheet filter button used for meshes * Added RNA defines for the default values for quaternion and axis-angle rotations, so that clearing these to their default values "does the right thing (TM)"
2009-12-28 03:45:24 +00:00
RNA_def_property_float_array_default(prop, default_quat);
Minor: Other UI strings typos and tweaks. Also updated french po & mo.
2011-09-25 09:55:13 +00:00
RNA_def_property_ui_text(prop, "Delta Rotation (Quaternion)",
"Extra rotation added to the rotation of the object (when using Quaternion rotations)");
style cleanup: mostly whitespace in rna
2012-05-12 11:01:29 +00:00
RNA_def_property_update(prop, NC_OBJECT | ND_TRANSFORM, "rna_Object_internal_update");
Cleanup: trailing space in RNA
2018-06-09 14:40:09 +02:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
#if 0 /* XXX not supported well yet... */
prop = RNA_def_property(srna, "delta_rotation_axis_angle", PROP_FLOAT, PROP_AXISANGLE);
style cleanup: mostly whitespace in rna
2012-05-12 11:01:29 +00:00
/* FIXME: this is not a single field any more! (drotAxis and drotAngle) */
Code style edits (mostly spliting long lines, and removing trailing spaces). Note about long lines: I did not touch to two pieces of code (because I don’t see any way to keep a nicely formated, compact code, with shorter lines): * The node types definitions into rna_nodetree_types.h * The vgroup name functions into rna_particle.c
2012-03-18 09:27:36 +00:00
RNA_def_property_float_sdna(prop, NULL, "dquat");
Assorted Animation/RNA fixes: * Fix for compiler warning in mesh.c from previous commit * Fix for wrong name for dopesheet filter button used for meshes * Added RNA defines for the default values for quaternion and axis-angle rotations, so that clearing these to their default values "does the right thing (TM)"
2009-12-28 03:45:24 +00:00
RNA_def_property_float_array_default(prop, default_axisAngle);
Minor: Other UI strings typos and tweaks. Also updated french po & mo.
2011-09-25 09:55:13 +00:00
RNA_def_property_ui_text(prop, "Delta Rotation (Axis Angle)",
"Extra rotation added to the rotation of the object (when using Axis-Angle rotations)");
style cleanup: mostly whitespace in rna
2012-05-12 11:01:29 +00:00
RNA_def_property_update(prop, NC_OBJECT | ND_TRANSFORM, "rna_Object_internal_update");
merge with trunk/2.5 at r23876 [[Split portion of a mixed commit.]]
2009-10-22 23:22:05 +00:00
#endif
Address [#30842] Blenders Measurement Units set to Metric, makes some Precision Flaws. use the same precision for location all over (2-5 was used), use define as 5. also disallow boolean to have any subtype besides PROP_LAYER_MEMBER, some booleans had TRANSLATION / XYZ subtypes which don't make sense.
2012-04-10 08:33:30 +00:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "delta_scale", PROP_FLOAT, PROP_XYZ);
add a new object member to store the dsize, since with my recent commit broke forward compatibility. now the new values are copied into 'dscale' and existing ones remain. this is annoying since now we have dsize and dscale, will look into a way to deprecate struct members next.
2011-12-04 03:35:54 +00:00
RNA_def_property_float_sdna(prop, NULL, "dscale");
UI: use proportional option while dragging buttons
2014-02-09 08:42:45 +11:00
RNA_def_property_flag(prop, PROP_PROPORTIONAL);
delta scale default was still left at 0.0
2011-12-11 00:01:04 +00:00
RNA_def_property_ui_range(prop, -FLT_MAX, FLT_MAX, 1, 3);
RNA_def_property_float_array_default(prop, default_scale);
Object's RNA cleanups, made descriptions clearer, mostly aesthetic changes. Anyone who finds these incorrect feel free to change or make me notice.
2010-02-17 16:18:41 +00:00
RNA_def_property_ui_text(prop, "Delta Scale", "Extra scaling added to the scale of the object");
style cleanup: mostly whitespace in rna
2012-05-12 11:01:29 +00:00
RNA_def_property_update(prop, NC_OBJECT | ND_TRANSFORM, "rna_Object_internal_update");
Cleanup: trailing space in RNA
2018-06-09 14:40:09 +02:00
merge with trunk/2.5 at r23876 [[Split portion of a mixed commit.]]
2009-10-22 23:22:05 +00:00
/* transform locks */
Address [#30842] Blenders Measurement Units set to Metric, makes some Precision Flaws. use the same precision for location all over (2-5 was used), use define as 5. also disallow boolean to have any subtype besides PROP_LAYER_MEMBER, some booleans had TRANSLATION / XYZ subtypes which don't make sense.
2012-04-10 08:33:30 +00:00
prop = RNA_def_property(srna, "lock_location", PROP_BOOLEAN, PROP_NONE);
RNA * Added skeleton code for particle/object_force/userdef. * More Object properties wrapped. * Added User Preferences display in outliner.
2009-01-02 13:47:33 +00:00
RNA_def_property_boolean_sdna(prop, NULL, "protectflag", OB_LOCK_LOCX);
RNA_def_property_array(prop, 3);
batch remove .'s used with RNA_def_struct_ui_text
2010-02-10 21:15:44 +00:00
RNA_def_property_ui_text(prop, "Lock Location", "Lock editing of location in the interface");
Fix [#22271] N panel Lock icons not changing when pressed
2010-05-07 04:52:10 +00:00
RNA_def_property_ui_icon(prop, ICON_UNLOCKED, 1);
style cleanup: mostly whitespace in rna
2012-05-12 11:01:29 +00:00
RNA_def_property_update(prop, NC_OBJECT | ND_TRANSFORM, "rna_Object_internal_update");
RNA * Added skeleton code for particle/object_force/userdef. * More Object properties wrapped. * Added User Preferences display in outliner.
2009-01-02 13:47:33 +00:00
Address [#30842] Blenders Measurement Units set to Metric, makes some Precision Flaws. use the same precision for location all over (2-5 was used), use define as 5. also disallow boolean to have any subtype besides PROP_LAYER_MEMBER, some booleans had TRANSLATION / XYZ subtypes which don't make sense.
2012-04-10 08:33:30 +00:00
prop = RNA_def_property(srna, "lock_rotation", PROP_BOOLEAN, PROP_NONE);
RNA * Added skeleton code for particle/object_force/userdef. * More Object properties wrapped. * Added User Preferences display in outliner.
2009-01-02 13:47:33 +00:00
RNA_def_property_boolean_sdna(prop, NULL, "protectflag", OB_LOCK_ROTX);
RNA_def_property_array(prop, 3);
batch remove .'s used with RNA_def_struct_ui_text
2010-02-10 21:15:44 +00:00
RNA_def_property_ui_text(prop, "Lock Rotation", "Lock editing of rotation in the interface");
Fix [#22271] N panel Lock icons not changing when pressed
2010-05-07 04:52:10 +00:00
RNA_def_property_ui_icon(prop, ICON_UNLOCKED, 1);
style cleanup: mostly whitespace in rna
2012-05-12 11:01:29 +00:00
RNA_def_property_update(prop, NC_OBJECT | ND_TRANSFORM, "rna_Object_internal_update");
Cleanup: trailing space in RNA
2018-06-09 14:40:09 +02:00
style cleanup: mostly whitespace in rna
2012-05-12 11:01:29 +00:00
/* XXX this is sub-optimal - it really should be included above,
* but due to technical reasons we can't do this! */
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "lock_rotation_w", PROP_BOOLEAN, PROP_NONE);
merge with trunk/2.5 at r23876 [[Split portion of a mixed commit.]]
2009-10-22 23:22:05 +00:00
RNA_def_property_boolean_sdna(prop, NULL, "protectflag", OB_LOCK_ROTW);
Fix [#22271] N panel Lock icons not changing when pressed
2010-05-07 04:52:10 +00:00
RNA_def_property_ui_icon(prop, ICON_UNLOCKED, 1);
Minor: Other UI strings typos and tweaks. Also updated french po & mo.
2011-09-25 09:55:13 +00:00
RNA_def_property_ui_text(prop, "Lock Rotation (4D Angle)",
"Lock editing of 'angle' component of four-component rotations in the interface");
style cleanup: mostly whitespace in rna
2012-05-12 11:01:29 +00:00
/* XXX this needs a better name */
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "lock_rotations_4d", PROP_BOOLEAN, PROP_NONE);
merge with trunk/2.5 at r23876 [[Split portion of a mixed commit.]]
2009-10-22 23:22:05 +00:00
RNA_def_property_boolean_sdna(prop, NULL, "protectflag", OB_LOCK_ROT4D);
Minor: Other UI strings typos and tweaks. Also updated french po & mo.
2011-09-25 09:55:13 +00:00
RNA_def_property_ui_text(prop, "Lock Rotations (4D)",
"Lock editing of four component rotations by components (instead of as Eulers)");
RNA * Added skeleton code for particle/object_force/userdef. * More Object properties wrapped. * Added User Preferences display in outliner.
2009-01-02 13:47:33 +00:00
Address [#30842] Blenders Measurement Units set to Metric, makes some Precision Flaws. use the same precision for location all over (2-5 was used), use define as 5. also disallow boolean to have any subtype besides PROP_LAYER_MEMBER, some booleans had TRANSLATION / XYZ subtypes which don't make sense.
2012-04-10 08:33:30 +00:00
prop = RNA_def_property(srna, "lock_scale", PROP_BOOLEAN, PROP_NONE);
RNA * Added skeleton code for particle/object_force/userdef. * More Object properties wrapped. * Added User Preferences display in outliner.
2009-01-02 13:47:33 +00:00
RNA_def_property_boolean_sdna(prop, NULL, "protectflag", OB_LOCK_SCALEX);
RNA_def_property_array(prop, 3);
batch remove .'s used with RNA_def_struct_ui_text
2010-02-10 21:15:44 +00:00
RNA_def_property_ui_text(prop, "Lock Scale", "Lock editing of scale in the interface");
Fix [#22271] N panel Lock icons not changing when pressed
2010-05-07 04:52:10 +00:00
RNA_def_property_ui_icon(prop, ICON_UNLOCKED, 1);
style cleanup: mostly whitespace in rna
2012-05-12 11:01:29 +00:00
RNA_def_property_update(prop, NC_OBJECT | ND_TRANSFORM, "rna_Object_internal_update");
RNA * Added skeleton code for particle/object_force/userdef. * More Object properties wrapped. * Added User Preferences display in outliner.
2009-01-02 13:47:33 +00:00
RNA Merging changes made by Arystanbek in the soc-2009-kazanbas branch, plus some things modified and added by me. * The API files now all in the makesrna module, convention is to call them e.g. rna_mesh_api.c for rna_mesh.c. Note for visual studio build maintainers, the rna_*_api.c files are compiled as part of "makesrna", but do not have rna_*_gen.c generated as part of the library. SCons/cmake/make were updated. * Added function flags FUNC_USE_CONTEXT and FUNC_USE_REPORTS, to allow RNA functions to get context and error reporting parameters optionally. Renamed FUNC_TYPESTATIC to FUNC_NO_SELF. * RNA collections now have a pointer to add/remove FunctionRNA's, this isn't actually used anywhere yet, purpose is to make an alias main.meshes.add() for main.add_mesh() in python. * Fixes to make autogenerating property set/get for multidimensional arrays work, though a 4x4 matrix will be exposed as a length 16 one dimensional RNA array. * Functions and properties added: * Main.add_mesh() * Main.remove_mesh() * Object.matrix * Object.create_render_mesh() * WindowManager.add_fileselect()
2009-06-18 19:48:55 +00:00
/* matrix */
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "matrix_world", PROP_FLOAT, PROP_MATRIX);
RNA Merging changes made by Arystanbek in the soc-2009-kazanbas branch, plus some things modified and added by me. * The API files now all in the makesrna module, convention is to call them e.g. rna_mesh_api.c for rna_mesh.c. Note for visual studio build maintainers, the rna_*_api.c files are compiled as part of "makesrna", but do not have rna_*_gen.c generated as part of the library. SCons/cmake/make were updated. * Added function flags FUNC_USE_CONTEXT and FUNC_USE_REPORTS, to allow RNA functions to get context and error reporting parameters optionally. Renamed FUNC_TYPESTATIC to FUNC_NO_SELF. * RNA collections now have a pointer to add/remove FunctionRNA's, this isn't actually used anywhere yet, purpose is to make an alias main.meshes.add() for main.add_mesh() in python. * Fixes to make autogenerating property set/get for multidimensional arrays work, though a 4x4 matrix will be exposed as a length 16 one dimensional RNA array. * Functions and properties added: * Main.add_mesh() * Main.remove_mesh() * Object.matrix * Object.create_render_mesh() * WindowManager.add_fileselect()
2009-06-18 19:48:55 +00:00
RNA_def_property_float_sdna(prop, NULL, "obmat");
minor rna changes - set matrix values not to be animatable - some matrix values were still accessed as 1d arrays.
2010-11-30 20:22:26 +00:00
RNA_def_property_multi_array(prop, 2, rna_matrix_dimsize_4x4);
RNA_def_property_clear_flag(prop, PROP_ANIMATABLE);
rna api: rename object.matrix --> matrix_world added object.matrix_local (parent relative matrix)
2010-07-03 17:39:29 +00:00
RNA_def_property_ui_text(prop, "Matrix World", "Worldspace transformation matrix");
style cleanup: mostly whitespace in rna
2012-05-12 11:01:29 +00:00
RNA_def_property_update(prop, NC_OBJECT | ND_TRANSFORM, "rna_Object_matrix_world_update");
rna api: rename object.matrix --> matrix_world added object.matrix_local (parent relative matrix)
2010-07-03 17:39:29 +00:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "matrix_local", PROP_FLOAT, PROP_MATRIX);
minor rna changes - set matrix values not to be animatable - some matrix values were still accessed as 1d arrays.
2010-11-30 20:22:26 +00:00
RNA_def_property_multi_array(prop, 2, rna_matrix_dimsize_4x4);
RNA_def_property_clear_flag(prop, PROP_ANIMATABLE);
RNA Object.matrix_local: Add a big warning this matrix is only relative to parent object. So 'advanced' parenting like e.g. bones or vertices need further processing to get a real parent-relative matrix...
2014-12-20 14:14:36 +01:00
RNA_def_property_ui_text(prop, "Local Matrix", "Parent relative transformation matrix - "
"WARNING: Only takes into account 'Object' parenting, so e.g. in case of bone parenting "
"you get a matrix relative to the Armature object, not to the actual parent bone");
rna api: rename object.matrix --> matrix_world added object.matrix_local (parent relative matrix)
2010-07-03 17:39:29 +00:00
RNA_def_property_float_funcs(prop, "rna_Object_matrix_local_get", "rna_Object_matrix_local_set", NULL);
style cleanup: mostly whitespace in rna
2012-05-12 11:01:29 +00:00
RNA_def_property_update(prop, NC_OBJECT | ND_TRANSFORM, NULL);
RNA Merging changes made by Arystanbek in the soc-2009-kazanbas branch, plus some things modified and added by me. * The API files now all in the makesrna module, convention is to call them e.g. rna_mesh_api.c for rna_mesh.c. Note for visual studio build maintainers, the rna_*_api.c files are compiled as part of "makesrna", but do not have rna_*_gen.c generated as part of the library. SCons/cmake/make were updated. * Added function flags FUNC_USE_CONTEXT and FUNC_USE_REPORTS, to allow RNA functions to get context and error reporting parameters optionally. Renamed FUNC_TYPESTATIC to FUNC_NO_SELF. * RNA collections now have a pointer to add/remove FunctionRNA's, this isn't actually used anywhere yet, purpose is to make an alias main.meshes.add() for main.add_mesh() in python. * Fixes to make autogenerating property set/get for multidimensional arrays work, though a 4x4 matrix will be exposed as a length 16 one dimensional RNA array. * Functions and properties added: * Main.add_mesh() * Main.remove_mesh() * Object.matrix * Object.create_render_mesh() * WindowManager.add_fileselect()
2009-06-18 19:48:55 +00:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "matrix_basis", PROP_FLOAT, PROP_MATRIX);
minor rna changes - set matrix values not to be animatable - some matrix values were still accessed as 1d arrays.
2010-11-30 20:22:26 +00:00
RNA_def_property_multi_array(prop, 2, rna_matrix_dimsize_4x4);
RNA_def_property_clear_flag(prop, PROP_ANIMATABLE);
/blender/makesrna: Removed final points in UI strings and messages. Plus a few splits of very long lines…
2011-09-19 13:23:58 +00:00
RNA_def_property_ui_text(prop, "Input Matrix",
"Matrix access to location, rotation and scale (including deltas), "
"before constraints and parenting are applied");
- 'matrix_basis' for objects and pose bones, this is an alternative access to directly adjusting the loc/scale/rot. - pose bone 'matrix_local' wasn't well named since it didn't work like object or regular bones. - pose bone matrix values for rna had array access rather then 4x4 matrix access. note: for pose bones update scripts by renaming 'matrix_local' --> 'matrix_basis'
2010-11-15 06:38:07 +00:00
RNA_def_property_float_funcs(prop, "rna_Object_matrix_basis_get", "rna_Object_matrix_basis_set", NULL);
style cleanup: mostly whitespace in rna
2012-05-12 11:01:29 +00:00
RNA_def_property_update(prop, NC_OBJECT | ND_TRANSFORM, "rna_Object_internal_update");
patch [#22523] Expose Object.parentinv matrix via RNA from Balajee R C (balajeerc)
2011-08-15 17:29:07 +00:00
/*parent_inverse*/
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "matrix_parent_inverse", PROP_FLOAT, PROP_MATRIX);
patch [#22523] Expose Object.parentinv matrix via RNA from Balajee R C (balajeerc)
2011-08-15 17:29:07 +00:00
RNA_def_property_float_sdna(prop, NULL, "parentinv");
RNA_def_property_multi_array(prop, 2, rna_matrix_dimsize_4x4);
RNA_def_property_ui_text(prop, "Matrix", "Inverse of object's parent matrix at time of parenting");
style cleanup: mostly whitespace in rna
2012-05-12 11:01:29 +00:00
RNA_def_property_update(prop, NC_OBJECT | ND_TRANSFORM, "rna_Object_internal_update");
patch [#22523] Expose Object.parentinv matrix via RNA from Balajee R C (balajeerc)
2011-08-15 17:29:07 +00:00
Merged the particles-2010 branch with node improvements into trunk. This branch adds mostly organizational improvements to the node system by renaming the node folders and files. A couple of internal features have been added too. Detailed information can be found on the wiki page: http://wiki.blender.org/index.php/User:Phonybone/Particles2010
2011-09-05 21:01:50 +00:00
/* modifiers */
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "modifiers", PROP_COLLECTION, PROP_NONE);
Merged the particles-2010 branch with node improvements into trunk. This branch adds mostly organizational improvements to the node system by renaming the node folders and files. A couple of internal features have been added too. Detailed information can be found on the wiki page: http://wiki.blender.org/index.php/User:Phonybone/Particles2010
2011-09-05 21:01:50 +00:00
RNA_def_property_struct_type(prop, "Modifier");
RNA_def_property_ui_text(prop, "Modifiers", "Modifiers affecting the geometric data of the object");
Static Override: add insertion for modifiers and one constraints, fix editing of inserted items in collections. Now insertable collection items have a flag to say they are 'local' (and hence can be freely edited).
2018-05-02 18:13:15 +02:00
RNA_def_property_override_funcs(prop, NULL, NULL, "rna_Object_modifiers_override_apply");
RNA/Override: Move override-related property flags to own variable. We are already running out of available flags in main, generic int, and everytime I work on static override I find new special cases that will need new specific propflag, so...
2018-06-05 11:10:05 +02:00
RNA_def_property_override_flag(prop, PROPOVERRIDE_OVERRIDABLE_STATIC | PROPOVERRIDE_STATIC_INSERTION);
Merged the particles-2010 branch with node improvements into trunk. This branch adds mostly organizational improvements to the node system by renaming the node folders and files. A couple of internal features have been added too. Detailed information can be found on the wiki page: http://wiki.blender.org/index.php/User:Phonybone/Particles2010
2011-09-05 21:01:50 +00:00
rna_def_object_modifiers(brna, prop);
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
/* Grease Pencil modifiers. */
prop = RNA_def_property(srna, "grease_pencil_modifiers", PROP_COLLECTION, PROP_NONE);
RNA_def_property_collection_sdna(prop, NULL, "greasepencil_modifiers", NULL);
RNA_def_property_struct_type(prop, "GpencilModifier");
RNA_def_property_ui_text(prop, "Grease Pencil Modifiers", "Modifiers affecting the data of the grease pencil object");
rna_def_object_grease_pencil_modifiers(brna, prop);
/* Shader FX. */
prop = RNA_def_property(srna, "shader_effects", PROP_COLLECTION, PROP_NONE);
RNA_def_property_collection_sdna(prop, NULL, "shader_fx", NULL);
RNA_def_property_struct_type(prop, "ShaderFx");
RNA_def_property_ui_text(prop, "Shader Effects", "Effects affecting display of object");
rna_def_object_shaderfxs(brna, prop);
Merged the particles-2010 branch with node improvements into trunk. This branch adds mostly organizational improvements to the node system by renaming the node folders and files. A couple of internal features have been added too. Detailed information can be found on the wiki page: http://wiki.blender.org/index.php/User:Phonybone/Particles2010
2011-09-05 21:01:50 +00:00
/* constraints */
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "constraints", PROP_COLLECTION, PROP_NONE);
RNA: start of wrapping for Constraints Still need to find out how to get the variable struct-type for constraint->data to work correctly. Any ideas brecht?
2008-12-12 23:30:23 +00:00
RNA_def_property_struct_type(prop, "Constraint");
RNA/Override: Move override-related property flags to own variable. We are already running out of available flags in main, generic int, and everytime I work on static override I find new special cases that will need new specific propflag, so...
2018-06-05 11:10:05 +02:00
RNA_def_property_override_flag(prop, PROPOVERRIDE_OVERRIDABLE_STATIC | PROPOVERRIDE_STATIC_INSERTION);
Object's RNA cleanups, made descriptions clearer, mostly aesthetic changes. Anyone who finds these incorrect feel free to change or make me notice.
2010-02-17 16:18:41 +00:00
RNA_def_property_ui_text(prop, "Constraints", "Constraints affecting the transformation of the object");
Static override: Add basic two-passes system needed for apply insert op. And a dummy placeholder for object constraints... All this is WIP of course!
2018-05-01 17:41:44 +02:00
RNA_def_property_override_funcs(prop, NULL, NULL, "rna_Object_constraints_override_apply");
code cleanup: set enums as static or add RNA_enum_types.h where they are used elsewhere. also minor style cleanup.
2013-09-11 21:27:14 +00:00
/* RNA_def_property_collection_funcs(prop, NULL, NULL, NULL, NULL, NULL, NULL, NULL, "constraints__add", "constraints__remove"); */
arbitrary property and function support for rna properties (arrays and collections), this means functions can be easily added. eg. scene.objects.link() object.constraints.new() mesh.verts.transform(...) mesh.faces.active PropertyRNA stores an StructRNA pointer where these can be defined.
2009-11-13 16:08:03 +00:00
rna_def_object_constraints(brna, prop);
RNA * Added skeleton code for particle/object_force/userdef. * More Object properties wrapped. * Added User Preferences display in outliner.
2009-01-02 13:47:33 +00:00
RNA * Object has some more properties wrapped, mostly game related. * Scene frame changes now send a notifier. * Added functions to create/free operator properties for calling operators. This also simplifies some duplicated code that did this. Ideally though this kind of thing should use the properties pointer provided by buttons and keymap items. Example code: PointerRNA ptr; WM_operator_properties_create(&ptr, "SOME_OT_name"); RNA_int_set(&ptr, "value", 42); WM_operator_name_call(C, "SOME_OT_name", WM_OP_EXEC_DEFAULT, &ptr); WM_operator_properties_free(&ptr);
2009-01-01 20:44:40 +00:00
/* vertex groups */
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "vertex_groups", PROP_COLLECTION, PROP_NONE);
RNA * Object has some more properties wrapped, mostly game related. * Scene frame changes now send a notifier. * Added functions to create/free operator properties for calling operators. This also simplifies some duplicated code that did this. Ideally though this kind of thing should use the properties pointer provided by buttons and keymap items. Example code: PointerRNA ptr; WM_operator_properties_create(&ptr, "SOME_OT_name"); RNA_int_set(&ptr, "value", 42); WM_operator_name_call(C, "SOME_OT_name", WM_OP_EXEC_DEFAULT, &ptr); WM_operator_properties_free(&ptr);
2009-01-01 20:44:40 +00:00
RNA_def_property_collection_sdna(prop, NULL, "defbase", NULL);
RNA_def_property_struct_type(prop, "VertexGroup");
batch remove .'s used with RNA_def_struct_ui_text
2010-02-10 21:15:44 +00:00
RNA_def_property_ui_text(prop, "Vertex Groups", "Vertex groups of the object");
merge from trunk at r31523
2010-09-07 05:47:34 +00:00
rna_def_object_vertex_groups(brna, prop);
RNA * Object has some more properties wrapped, mostly game related. * Scene frame changes now send a notifier. * Added functions to create/free operator properties for calling operators. This also simplifies some duplicated code that did this. Ideally though this kind of thing should use the properties pointer provided by buttons and keymap items. Example code: PointerRNA ptr; WM_operator_properties_create(&ptr, "SOME_OT_name"); RNA_int_set(&ptr, "value", 42); WM_operator_name_call(C, "SOME_OT_name", WM_OP_EXEC_DEFAULT, &ptr); WM_operator_properties_free(&ptr);
2009-01-01 20:44:40 +00:00
Merge branch 'master' into blender2.8
2018-06-09 14:42:01 +02:00
Face Maps: custom-data, UI and RNA API Add face maps, needed for face-map widgets, only data structure, widgets will be separate commit. This comes from 'custom-manipulator' branch with only minor changes.
2017-05-30 17:58:24 +10:00
/* face maps */
prop = RNA_def_property(srna, "face_maps", PROP_COLLECTION, PROP_NONE);
RNA_def_property_collection_sdna(prop, NULL, "fmaps", NULL);
RNA_def_property_struct_type(prop, "FaceMap");
RNA_def_property_ui_text(prop, "Face Maps", "Maps of faces of the object");
rna_def_object_face_maps(brna, prop);
Merge branch 'master' into blender2.8
2018-06-09 14:42:01 +02:00
RNA * Added skeleton code for particle/object_force/userdef. * More Object properties wrapped. * Added User Preferences display in outliner.
2009-01-02 13:47:33 +00:00
/* empty */
UI / Python: rename X-Ray to In Front, Draw to Display. See T56648.
2018-09-03 18:58:41 +02:00
prop = RNA_def_property(srna, "empty_display_type", PROP_ENUM, PROP_NONE);
RNA * Added skeleton code for particle/object_force/userdef. * More Object properties wrapped. * Added User Preferences display in outliner.
2009-01-02 13:47:33 +00:00
RNA_def_property_enum_sdna(prop, NULL, "empty_drawtype");
Cleanup: use `rna_enum_` prefix for RNA enums Definitions could shadow local vars.
2015-11-23 13:49:52 +11:00
RNA_def_property_enum_items(prop, rna_enum_object_empty_drawtype_items);
UI / Python: rename X-Ray to In Front, Draw to Display. See T56648.
2018-09-03 18:58:41 +02:00
RNA_def_property_enum_funcs(prop, NULL, "rna_Object_empty_display_type_set", NULL);
batch remove .'s used with RNA_def_struct_ui_text
2010-02-10 21:15:44 +00:00
RNA_def_property_ui_text(prop, "Empty Display Type", "Viewport display style for empties");
style cleanup: mostly whitespace in rna
2012-05-12 11:01:29 +00:00
RNA_def_property_update(prop, NC_OBJECT | ND_DRAW, NULL);
RNA * Added skeleton code for particle/object_force/userdef. * More Object properties wrapped. * Added User Preferences display in outliner.
2009-01-02 13:47:33 +00:00
UI / Python: rename X-Ray to In Front, Draw to Display. See T56648.
2018-09-03 18:58:41 +02:00
prop = RNA_def_property(srna, "empty_display_size", PROP_FLOAT, PROP_DISTANCE);
RNA * Added skeleton code for particle/object_force/userdef. * More Object properties wrapped. * Added User Preferences display in outliner.
2009-01-02 13:47:33 +00:00
RNA_def_property_float_sdna(prop, NULL, "empty_drawsize");
fix for [#22195] Empty Size minimum limit too big (patch by Bassam Kurdali - slikdigit) with small change (ui range precision to 2 instead of 4, since 4 doesn't seem to work here). From the tracker: """ The smallest size allowed for empty_draw_size is 0.1. This is un-necessarily limiting and, depending on the scene, much too large resulting in visual confusion in the 3D View. Opening old files initially results in small empties, but when you click on them they 'grow' to the new minimum. This seems to show that previous blender versions didn't have this bug. Please remove the limitation, or, if needed, make it a much smaller number, so that empties are easier to see and distinguish from one another in small scenes/setups """
2010-04-28 21:18:40 +00:00
RNA_def_property_range(prop, 0.0001f, 1000.0f);
RNA_def_property_ui_range(prop, 0.01, 100, 1, 2);
Empty draw size tooltip fix and added soft limits
2010-02-24 03:58:26 +00:00
RNA_def_property_ui_text(prop, "Empty Display Size", "Size of display for empties in the viewport");
style cleanup: mostly whitespace in rna
2012-05-12 11:01:29 +00:00
RNA_def_property_update(prop, NC_OBJECT | ND_DRAW, NULL);
RNA * Added skeleton code for particle/object_force/userdef. * More Object properties wrapped. * Added User Preferences display in outliner.
2009-01-02 13:47:33 +00:00
fix [#35646] Image offset value in empty image display mode should be unitless
2013-06-06 05:48:16 +00:00
prop = RNA_def_property(srna, "empty_image_offset", PROP_FLOAT, PROP_NONE);
patch [#21740] Image support for Empty Objects from Andy Braham (andybraham) This adds support for empties to reference images and draw in the 3D view. Modifications from the original patch. - use an empty draw 'image' type - use image aspect ratio for non-square-pixels - when the image is not found, still draw the frame.
2011-05-09 16:31:54 +00:00
RNA_def_property_float_sdna(prop, NULL, "ima_ofs");
RNA_def_property_ui_text(prop, "Origin Offset", "Origin offset distance");
RNA_def_property_ui_range(prop, -FLT_MAX, FLT_MAX, 0.1f, 2);
style cleanup: mostly whitespace in rna
2012-05-12 11:01:29 +00:00
RNA_def_property_update(prop, NC_OBJECT | ND_DRAW, NULL);
patch [#21740] Image support for Empty Objects from Andy Braham (andybraham) This adds support for empties to reference images and draw in the 3D view. Modifications from the original patch. - use an empty draw 'image' type - use image aspect ratio for non-square-pixels - when the image is not found, still draw the frame.
2011-05-09 16:31:54 +00:00
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
prop = RNA_def_property(srna, "image_user", PROP_POINTER, PROP_NONE);
RNA_def_property_flag(prop, PROP_NEVER_NULL);
RNA_def_property_pointer_sdna(prop, NULL, "iuser");
RNA_def_property_ui_text(prop, "Image User",
Code Cleanup: style and redundant casts
2014-01-16 19:15:53 +11:00
"Parameters defining which layer, pass and frame of the image is displayed");
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
RNA_def_property_update(prop, NC_OBJECT | ND_DRAW, NULL);
Image Empties: More visibility settings Support for showing images in background/foreground and only in perspective/orthographic view. Internally the depth of the image is modified in the fragment shader by setting `gl_FragDepth` explicitly. The UI still needs some work to improve usability, see D3863 for details. Currently there is one duplicated function, not sure how to best deduplicate it yet. (`is_image_empty_visible`) Reviewer: fclem, brecht, campbellbarton Differential Revision: https://developer.blender.org/D3863
2018-10-31 13:35:53 +01:00
prop = RNA_def_property(srna, "empty_image_depth", PROP_ENUM, PROP_NONE);
RNA_def_property_enum_items(prop, rna_enum_object_empty_image_depth_items);
RNA_def_property_ui_text(prop, "Empty Image Depth", "Determine which other objects will occlude the image");
RNA_def_property_update(prop, NC_OBJECT | ND_DRAW, NULL);
prop = RNA_def_property(srna, "show_empty_image_perspective", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "empty_image_visibility_flag", OB_EMPTY_IMAGE_VISIBLE_PERSPECTIVE);
RNA_def_property_ui_text(prop, "Display in Perspective Mode", "Display image in perspective mode");
RNA_def_property_update(prop, NC_OBJECT | ND_DRAW, NULL);
prop = RNA_def_property(srna, "show_empty_image_orthographic", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "empty_image_visibility_flag", OB_EMPTY_IMAGE_VISIBLE_ORTHOGRAPHIC);
RNA_def_property_ui_text(prop, "Display in Orthographic Mode", "Display image in orthographic mode");
RNA_def_property_update(prop, NC_OBJECT | ND_DRAW, NULL);
Image Empties: Option to not display the backside of image empties Reviewers: brecht Differential Revision: https://developer.blender.org/D3964
2018-11-19 19:33:09 +01:00
prop = RNA_def_property(srna, "show_empty_image_backside", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "empty_image_visibility_flag", OB_EMPTY_IMAGE_VISIBLE_BACKSIDE);
RNA_def_property_ui_text(prop, "Display Back Side", "Display empty image even when viewed from the back");
RNA_def_property_update(prop, NC_OBJECT | ND_DRAW, NULL);
RNA * DNA_object_types.h done. * Scriptlink skeleton added. * Fix cmake compile.
2009-01-02 16:58:09 +00:00
/* render */
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "pass_index", PROP_INT, PROP_UNSIGNED);
RNA * Object has some more properties wrapped, mostly game related. * Scene frame changes now send a notifier. * Added functions to create/free operator properties for calling operators. This also simplifies some duplicated code that did this. Ideally though this kind of thing should use the properties pointer provided by buttons and keymap items. Example code: PointerRNA ptr; WM_operator_properties_create(&ptr, "SOME_OT_name"); RNA_int_set(&ptr, "value", 42); WM_operator_name_call(C, "SOME_OT_name", WM_OP_EXEC_DEFAULT, &ptr); WM_operator_properties_free(&ptr);
2009-01-01 20:44:40 +00:00
RNA_def_property_int_sdna(prop, NULL, "index");
Correct render pass identifier usage in toolitps
2016-08-30 22:05:27 +02:00
RNA_def_property_ui_text(prop, "Pass Index", "Index number for the \"Object Index\" render pass");
Fix T54089: missing GLSL material draw update when changing object pass index.
2018-02-18 19:28:14 +01:00
RNA_def_property_update(prop, NC_OBJECT, "rna_Object_internal_update_draw");
Cleanup: trailing space in RNA
2018-06-09 14:40:09 +02:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "color", PROP_FLOAT, PROP_COLOR);
RNA * Object has some more properties wrapped, mostly game related. * Scene frame changes now send a notifier. * Added functions to create/free operator properties for calling operators. This also simplifies some duplicated code that did this. Ideally though this kind of thing should use the properties pointer provided by buttons and keymap items. Example code: PointerRNA ptr; WM_operator_properties_create(&ptr, "SOME_OT_name"); RNA_int_set(&ptr, "value", 42); WM_operator_name_call(C, "SOME_OT_name", WM_OP_EXEC_DEFAULT, &ptr); WM_operator_properties_free(&ptr);
2009-01-01 20:44:40 +00:00
RNA_def_property_float_sdna(prop, NULL, "col");
batch remove .'s used with RNA_def_struct_ui_text
2010-02-10 21:15:44 +00:00
RNA_def_property_ui_text(prop, "Color", "Object color and alpha, used when faces have the ObColor mode enabled");
style cleanup: mostly whitespace in rna
2012-05-12 11:01:29 +00:00
RNA_def_property_update(prop, NC_OBJECT | ND_DRAW, NULL);
RNA * Added skeleton code for particle/object_force/userdef. * More Object properties wrapped. * Added User Preferences display in outliner.
2009-01-02 13:47:33 +00:00
/* physics */
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "field", PROP_POINTER, PROP_NONE);
RNA * Added skeleton code for particle/object_force/userdef. * More Object properties wrapped. * Added User Preferences display in outliner.
2009-01-02 13:47:33 +00:00
RNA_def_property_pointer_sdna(prop, NULL, "pd");
RNA_def_property_struct_type(prop, "FieldSettings");
rna pointer poll function, not used yet.
2010-08-03 05:14:59 +00:00
RNA_def_property_pointer_funcs(prop, "rna_Object_field_get", NULL, NULL, NULL);
Minor: Other UI strings typos and tweaks. Also updated french po & mo
2011-09-24 09:57:47 +00:00
RNA_def_property_ui_text(prop, "Field Settings", "Settings for using the object as a field in physics simulation");
RNA * Added skeleton code for particle/object_force/userdef. * More Object properties wrapped. * Added User Preferences display in outliner.
2009-01-02 13:47:33 +00:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "collision", PROP_POINTER, PROP_NONE);
RNA * Added skeleton code for particle/object_force/userdef. * More Object properties wrapped. * Added User Preferences display in outliner.
2009-01-02 13:47:33 +00:00
RNA_def_property_pointer_sdna(prop, NULL, "pd");
RNA_def_property_struct_type(prop, "CollisionSettings");
rna pointer poll function, not used yet.
2010-08-03 05:14:59 +00:00
RNA_def_property_pointer_funcs(prop, "rna_Object_collision_get", NULL, NULL, NULL);
Code style edits (mostly spliting long lines, and removing trailing spaces). Note about long lines: I did not touch to two pieces of code (because I don’t see any way to keep a nicely formated, compact code, with shorter lines): * The node types definitions into rna_nodetree_types.h * The vgroup name functions into rna_particle.c
2012-03-18 09:27:36 +00:00
RNA_def_property_ui_text(prop, "Collision Settings",
"Settings for using the object as a collider in physics simulation");
RNA * Added skeleton code for particle/object_force/userdef. * More Object properties wrapped. * Added User Preferences display in outliner.
2009-01-02 13:47:33 +00:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "soft_body", PROP_POINTER, PROP_NONE);
RNA * Added skeleton code for particle/object_force/userdef. * More Object properties wrapped. * Added User Preferences display in outliner.
2009-01-02 13:47:33 +00:00
RNA_def_property_pointer_sdna(prop, NULL, "soft");
* Fix for bug [#19726] Cannot add FCurve to any option under the physics panel except cloth I had to add some ugly RNA path finding code here, checking for all places these structs can possibly be reused. Can't think of a better way to go about this though with the path stored in the RNA type...?
2009-11-03 02:49:36 +00:00
RNA_def_property_struct_type(prop, "SoftBodySettings");
batch remove .'s used with RNA_def_struct_ui_text
2010-02-10 21:15:44 +00:00
RNA_def_property_ui_text(prop, "Soft Body Settings", "Settings for soft body simulation");
RNA * Added skeleton code for particle/object_force/userdef. * More Object properties wrapped. * Added User Preferences display in outliner.
2009-01-02 13:47:33 +00:00
Revert particle system and point cache removal in blender2.8 branch. This reverts commit 5aa19be91263a249ffae75573e3b32f24269d890 and b4a721af694817fa921b119df83d33ede7d7fed0. Due to postponement of particle system rewrite it was decided to put particle code back into the 2.8 branch for the time being.
2016-12-28 17:30:58 +01:00
prop = RNA_def_property(srna, "particle_systems", PROP_COLLECTION, PROP_NONE);
RNA_def_property_collection_sdna(prop, NULL, "particlesystem", NULL);
RNA_def_property_struct_type(prop, "ParticleSystem");
RNA_def_property_ui_text(prop, "Particle Systems", "Particle systems emitted from the object");
rna_def_object_particle_systems(brna, prop);
Cleanup: trailing space in RNA
2018-06-09 14:40:09 +02:00
rigidbody: Add DNA/RNA/BKE infrastructure for the rigid body sim This is just the basic structure, the simulation isn't hooked up yet. Scenes get a pointer to a rigid body world that holds rigid body objects. Objects get a pointer to a rigdid body object. Both rigid body world and objects aren't used directly in the simulation and only hold information to create the actual physics objects. Physics objects are created when rigid body objects are validated. In order to keep blender and bullet objects in sync care has to be taken to either call appropriate set functions or flag objects for validation. Part of GSoC 2010 and 2012. Authors: Joshua Leung (aligorith), Sergej Reich (sergof)
2013-01-23 05:56:22 +00:00
prop = RNA_def_property(srna, "rigid_body", PROP_POINTER, PROP_NONE);
RNA_def_property_pointer_sdna(prop, NULL, "rigidbody_object");
RNA_def_property_struct_type(prop, "RigidBodyObject");
RNA_def_property_ui_text(prop, "Rigid Body Settings", "Settings for rigid body simulation");
rigidbody: Add rigid body constraints Constraints connect two rigid bodies. Depending on which constraint is used different degrees of freedom are limited, e.g. a hinge constraint only allows the objects to rotate around a common axis. Constraints are implemented as individual objects and bahave similar to rigid bodies in terms of adding/removing/validating. The position and orientation of the constraint object is the pivot point of the constraint. Constraints have their own group in the rigid body world. To make connecting rigid bodies easier, there is a "Connect" operator that creates an empty objects with a rigid body constraint connecting the selected objects to active. Currently the following constraints are implemented: * Fixed * Point * Hinge * Slider * Piston * Generic Note: constraint limits aren't animatable yet).
2013-01-23 05:56:56 +00:00
prop = RNA_def_property(srna, "rigid_body_constraint", PROP_POINTER, PROP_NONE);
RNA_def_property_pointer_sdna(prop, NULL, "rigidbody_constraint");
RNA_def_property_struct_type(prop, "RigidBodyConstraint");
RNA_def_property_ui_text(prop, "Rigid Body Constraint", "Constraint constraining rigid bodies");
Cleanup: trailing space in RNA
2018-06-09 14:40:09 +02:00
RNA * Added skeleton code for particle/object_force/userdef. * More Object properties wrapped. * Added User Preferences display in outliner.
2009-01-02 13:47:33 +00:00
/* restrict */
Objects: restore per object restrict view/render/select. Note this is now separate from H key hiding, and meant for more persistent ways to define which objects are relevant to the viewport or render. This avoids some cases where you'd have to create collection specifically to hide objects for viewport/render.
2018-06-18 19:18:02 +02:00
prop = RNA_def_property(srna, "hide_viewport", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "restrictflag", OB_RESTRICT_VIEW);
Static Override: make hidden & co flags of object overridable.
2018-08-18 10:08:28 +02:00
RNA_def_property_override_flag(prop, PROPOVERRIDE_OVERRIDABLE_STATIC);
Cleanup: rename object base flags to be more clear.
2018-06-25 13:50:11 +02:00
RNA_def_property_ui_text(prop, "Disable View", "Disable object in the viewport");
Fix issues with hide/restrict icons after recent changes. Set the names to match the original order again, to avoid breaking addons and various places in the code that relied on them.
2018-11-02 13:05:05 +01:00
RNA_def_property_ui_icon(prop, ICON_RESTRICT_VIEW_OFF, -1);
Objects: restore per object restrict view/render/select. Note this is now separate from H key hiding, and meant for more persistent ways to define which objects are relevant to the viewport or render. This avoids some cases where you'd have to create collection specifically to hide objects for viewport/render.
2018-06-18 19:18:02 +02:00
RNA_def_property_update(prop, NC_OBJECT | ND_DRAW, "rna_Object_hide_update");
prop = RNA_def_property(srna, "hide_select", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "restrictflag", OB_RESTRICT_SELECT);
Static Override: make hidden & co flags of object overridable.
2018-08-18 10:08:28 +02:00
RNA_def_property_override_flag(prop, PROPOVERRIDE_OVERRIDABLE_STATIC);
Cleanup: rename object base flags to be more clear.
2018-06-25 13:50:11 +02:00
RNA_def_property_ui_text(prop, "Disable Select", "Disable object selection in the viewport");
Fix issues with hide/restrict icons after recent changes. Set the names to match the original order again, to avoid breaking addons and various places in the code that relied on them.
2018-11-02 13:05:05 +01:00
RNA_def_property_ui_icon(prop, ICON_RESTRICT_SELECT_OFF, -1);
Fix object restrict selection toggle in outliner not working
2018-09-24 11:53:25 +00:00
RNA_def_property_update(prop, NC_OBJECT | ND_DRAW, "rna_Object_hide_update");
Objects: restore per object restrict view/render/select. Note this is now separate from H key hiding, and meant for more persistent ways to define which objects are relevant to the viewport or render. This avoids some cases where you'd have to create collection specifically to hide objects for viewport/render.
2018-06-18 19:18:02 +02:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "hide_render", PROP_BOOLEAN, PROP_NONE);
RNA * Added skeleton code for particle/object_force/userdef. * More Object properties wrapped. * Added User Preferences display in outliner.
2009-01-02 13:47:33 +00:00
RNA_def_property_boolean_sdna(prop, NULL, "restrictflag", OB_RESTRICT_RENDER);
Static Override: make hidden & co flags of object overridable.
2018-08-18 10:08:28 +02:00
RNA_def_property_override_flag(prop, PROPOVERRIDE_OVERRIDABLE_STATIC);
Cleanup: rename object base flags to be more clear.
2018-06-25 13:50:11 +02:00
RNA_def_property_ui_text(prop, "Disable Render", "Disable object in renders");
Fix issues with hide/restrict icons after recent changes. Set the names to match the original order again, to avoid breaking addons and various places in the code that relied on them.
2018-11-02 13:05:05 +01:00
RNA_def_property_ui_icon(prop, ICON_RESTRICT_RENDER_OFF, -1);
Fix cycles not working in 3d local view, and missing update when toggling hiding in the outliner.
2012-06-25 11:43:22 +00:00
RNA_def_property_update(prop, NC_OBJECT | ND_DRAW, "rna_Object_hide_update");
RNA * DNA_object_types.h done. * Scriptlink skeleton added. * Fix cmake compile.
2009-01-02 16:58:09 +00:00
Implement duplicator viewport/render visibility options This allows a duplicator (as known as dupli parent) to be in a visible collection so its duplicated objects are visible, however while being invisible for the final render. An object that is a particle emitter is also considered a duplicator. Many thanks for the reviewers for the extense feedback. Reviewers: sergey, campbellbarton Differential Revision: https://developer.blender.org/D2966
2017-12-21 13:29:14 -02:00
prop = RNA_def_property(srna, "show_duplicator_for_render", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "duplicator_visibility_flag", OB_DUPLI_FLAG_RENDER);
RNA_def_property_ui_text(prop, "Render Duplicator", "Make duplicator visible when rendering");
prop = RNA_def_property(srna, "show_duplicator_for_viewport", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "duplicator_visibility_flag", OB_DUPLI_FLAG_VIEWPORT);
UI: use same "Viewport Display" name for scene/object/material panels.
2018-06-01 16:07:25 +02:00
RNA_def_property_ui_text(prop, "Display Duplicator", "Make duplicator visible in the viewport");
Implement duplicator viewport/render visibility options This allows a duplicator (as known as dupli parent) to be in a visible collection so its duplicated objects are visible, however while being invisible for the final render. An object that is a particle emitter is also considered a duplicator. Many thanks for the reviewers for the extense feedback. Reviewers: sergey, campbellbarton Differential Revision: https://developer.blender.org/D2966
2017-12-21 13:29:14 -02:00
RNA * DNA_object_types.h done. * Scriptlink skeleton added. * Fix cmake compile.
2009-01-02 16:58:09 +00:00
/* anim */
Animato RNA wrapping: It's about time that the RNA wrapping for various parts of the animation system were cleaned up for my recent changes. I've moved some code around (and/or deleted a file or two) in the process.
2009-02-02 11:51:10 +00:00
rna_def_animdata_common(srna);
Cleanup: trailing space in RNA
2018-06-09 14:40:09 +02:00
Animation Visualisation Cleanups - Part 2: * Finished baking code for motion paths, generalising it so that it works for both Objects and Bones. It is based on the old code for baking bones, although I have modified the updating code to use a more 'correct' method of updating dependencies. However, this may turn out to be too slow, and another API method should be added for that... * Moved some of the old version-patching code for animviz settings out of the drawing functions, instead doing this on the version patching proper. * Added RNA support for the new AnimViz types, and included RNA access via their users too. The old settings have still been left in for now, since there are still some things not ready to use yet. ---- * F-Curve's with sample points (i.e. sounds to F-Curves) now perform linear interpolation between sample points instead of using constant interpolation.
2010-01-07 22:54:05 +00:00
rna_def_animviz_common(srna);
rna_def_motionpath_common(srna);
Cleanup: trailing space in RNA
2018-06-09 14:40:09 +02:00
As discussed on the mailing list, removing the non-functional, incompatible, and unmaintainable Time Offset cruft. - Slow Parenting lives another day (just), although it now carries appropriate cautionary disclaimers. It's only really for the Game Engine nowadays, as that's the only place where it can possibly work with any reliability. - "Animation Hacks" panel is now "Relations Extras". I could've merged the two panels, though I figured these options weren't that frequently used to justify taking up screen-space by default along with the panel
2011-11-06 05:46:45 +00:00
/* slow parenting */
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
/* XXX: evil old crap */
prop = RNA_def_property(srna, "use_slow_parent", PROP_BOOLEAN, PROP_NONE);
RNA * DNA_object_types.h done. * Scriptlink skeleton added. * Fix cmake compile.
2009-01-02 16:58:09 +00:00
RNA_def_property_boolean_sdna(prop, NULL, "partype", PARSLOW);
Code style edits (mostly spliting long lines, and removing trailing spaces). Note about long lines: I did not touch to two pieces of code (because I don’t see any way to keep a nicely formated, compact code, with shorter lines): * The node types definitions into rna_nodetree_types.h * The vgroup name functions into rna_particle.c
2012-03-18 09:27:36 +00:00
RNA_def_property_ui_text(prop, "Slow Parent",
"Create a delay in the parent relationship (beware: this isn't renderfarm "
"safe and may be invalid after jumping around the timeline)");
style cleanup: mostly whitespace in rna
2012-05-12 11:01:29 +00:00
RNA_def_property_update(prop, NC_OBJECT | ND_DRAW, "rna_Object_internal_update");
Cleanup: trailing space in RNA
2018-06-09 14:40:09 +02:00
style cleanup: mostly whitespace in rna
2012-05-12 11:01:29 +00:00
prop = RNA_def_property(srna, "slow_parent_offset", PROP_FLOAT, PROP_NONE | PROP_UNIT_TIME);
As discussed on the mailing list, removing the non-functional, incompatible, and unmaintainable Time Offset cruft. - Slow Parenting lives another day (just), although it now carries appropriate cautionary disclaimers. It's only really for the Game Engine nowadays, as that's the only place where it can possibly work with any reliability. - "Animation Hacks" panel is now "Relations Extras". I could've merged the two panels, though I figured these options weren't that frequently used to justify taking up screen-space by default along with the panel
2011-11-06 05:46:45 +00:00
RNA_def_property_float_sdna(prop, NULL, "sf");
RNA_def_property_range(prop, MINAFRAMEF, MAXFRAMEF);
A bunch of fixes and tweaks in RNA messages, found while translating them in french...
2011-11-26 12:30:01 +00:00
RNA_def_property_ui_text(prop, "Slow Parent Offset", "Delay in the parent relationship");
style cleanup: mostly whitespace in rna
2012-05-12 11:01:29 +00:00
RNA_def_property_update(prop, NC_OBJECT | ND_TRANSFORM, "rna_Object_internal_update");
Cleanup: Get rid of legacy extra recalc flags Those are not used by new dependency graph and are not needed for properly created rigs with new granular nodes.
2018-01-16 16:45:35 +01:00
As discussed on the mailing list, removing the non-functional, incompatible, and unmaintainable Time Offset cruft. - Slow Parenting lives another day (just), although it now carries appropriate cautionary disclaimers. It's only really for the Game Engine nowadays, as that's the only place where it can possibly work with any reliability. - "Animation Hacks" panel is now "Relations Extras". I could've merged the two panels, though I figured these options weren't that frequently used to justify taking up screen-space by default along with the panel
2011-11-06 05:46:45 +00:00
/* duplicates */
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "dupli_type", PROP_ENUM, PROP_NONE);
RNA: * Added REQUIRED flag for function parameters. * Made dupliframes/verts/faces/groups an enum, and make it editable. * Enum bitflags were broken, fixed.
2009-04-11 01:43:50 +00:00
RNA_def_property_enum_bitflag_sdna(prop, NULL, "transflag");
RNA_def_property_enum_items(prop, dupli_items);
Remove dupli-group support for non-empty objects Behavior for mixing object-data & dupli data was confusing, exporters and render engines often got it wrong.
2017-06-29 23:22:05 +10:00
RNA_def_property_enum_funcs(prop, NULL, NULL, "rna_Object_dupli_type_itemf");
batch remove .'s used with RNA_def_struct_ui_text
2010-02-10 21:15:44 +00:00
RNA_def_property_ui_text(prop, "Dupli Type", "If not None, object duplication method to use");
style cleanup: mostly whitespace in rna
2012-05-12 11:01:29 +00:00
RNA_def_property_update(prop, NC_OBJECT | ND_DRAW, "rna_Object_dependency_update");
RNA * DNA_object_types.h done. * Scriptlink skeleton added. * Fix cmake compile.
2009-01-02 16:58:09 +00:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "use_dupli_frames_speed", PROP_BOOLEAN, PROP_NONE);
dupli faces inherit scale wasnt using the right flag internally. renamed... dupli_frames_no_speed --> use_dupli_frames_speed dupli_verts_rotation --> use_dupli_verts_rotation dupli_faces_inherit_scale --> use_dupli_faces_scale
2010-01-04 17:27:23 +00:00
RNA_def_property_boolean_negative_sdna(prop, NULL, "transflag", OB_DUPLINOSPEED);
Code style edits (mostly spliting long lines, and removing trailing spaces). Note about long lines: I did not touch to two pieces of code (because I don’t see any way to keep a nicely formated, compact code, with shorter lines): * The node types definitions into rna_nodetree_types.h * The vgroup name functions into rna_particle.c
2012-03-18 09:27:36 +00:00
RNA_def_property_ui_text(prop, "Dupli Frames Speed",
"Set dupliframes to use the current frame instead of parent curve's evaluation time");
style cleanup: mostly whitespace in rna
2012-05-12 11:01:29 +00:00
RNA_def_property_update(prop, NC_OBJECT | ND_DRAW, "rna_Object_internal_update");
RNA * DNA_object_types.h done. * Scriptlink skeleton added. * Fix cmake compile.
2009-01-02 16:58:09 +00:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "use_dupli_vertices_rotation", PROP_BOOLEAN, PROP_NONE);
RNA * DNA_object_types.h done. * Scriptlink skeleton added. * Fix cmake compile.
2009-01-02 16:58:09 +00:00
RNA_def_property_boolean_sdna(prop, NULL, "transflag", OB_DUPLIROT);
batch remove .'s used with RNA_def_struct_ui_text
2010-02-10 21:15:44 +00:00
RNA_def_property_ui_text(prop, "Dupli Verts Rotation", "Rotate dupli according to vertex normal");
style cleanup: mostly whitespace in rna
2012-05-12 11:01:29 +00:00
RNA_def_property_update(prop, NC_OBJECT | ND_DRAW, NULL);
RNA * DNA_object_types.h done. * Scriptlink skeleton added. * Fix cmake compile.
2009-01-02 16:58:09 +00:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "use_dupli_faces_scale", PROP_BOOLEAN, PROP_NONE);
dupli faces inherit scale wasnt using the right flag internally. renamed... dupli_frames_no_speed --> use_dupli_frames_speed dupli_verts_rotation --> use_dupli_verts_rotation dupli_faces_inherit_scale --> use_dupli_faces_scale
2010-01-04 17:27:23 +00:00
RNA_def_property_boolean_sdna(prop, NULL, "transflag", OB_DUPLIFACES_SCALE);
batch remove .'s used with RNA_def_struct_ui_text
2010-02-10 21:15:44 +00:00
RNA_def_property_ui_text(prop, "Dupli Faces Inherit Scale", "Scale dupli based on face size");
style cleanup: mostly whitespace in rna
2012-05-12 11:01:29 +00:00
RNA_def_property_update(prop, NC_OBJECT | ND_DRAW, "rna_Object_internal_update");
RNA * DNA_object_types.h done. * Scriptlink skeleton added. * Fix cmake compile.
2009-01-02 16:58:09 +00:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "dupli_faces_scale", PROP_FLOAT, PROP_NONE);
RNA * DNA_object_types.h done. * Scriptlink skeleton added. * Fix cmake compile.
2009-01-02 16:58:09 +00:00
RNA_def_property_float_sdna(prop, NULL, "dupfacesca");
Animato RNA wrapping: It's about time that the RNA wrapping for various parts of the animation system were cleaned up for my recent changes. I've moved some code around (and/or deleted a file or two) in the process.
2009-02-02 11:51:10 +00:00
RNA_def_property_range(prop, 0.001f, 10000.0f);
batch remove .'s used with RNA_def_struct_ui_text
2010-02-10 21:15:44 +00:00
RNA_def_property_ui_text(prop, "Dupli Faces Scale", "Scale the DupliFace objects");
Fix T41939: Dupliface: Inherit scale doesn't update viewport render. Render needs un object update it seems...
2014-09-24 19:48:16 +02:00
RNA_def_property_update(prop, NC_OBJECT | ND_DRAW, "rna_Object_internal_update");
RNA * DNA_object_types.h done. * Scriptlink skeleton added. * Fix cmake compile.
2009-01-02 16:58:09 +00:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "dupli_group", PROP_POINTER, PROP_NONE);
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_property_struct_type(prop, "Collection");
RNA * DNA_object_types.h done. * Scriptlink skeleton added. * Fix cmake compile.
2009-01-02 16:58:09 +00:00
RNA_def_property_pointer_sdna(prop, NULL, "dup_group");
RNA: * Automatically do us++ and us-- reference counting in ID pointer set functions. * Added an enum property callback to dynamically vary the list of available items. * Added some functions to do removes on pointers and collections runtime defined for RNA and using ID properties. * Constraints now have owner/target space wrapped, and most pointers made editable. They can be ported to use python layouts. * Also other pointers made editable that I think are see now with the automatic reference counting.
2009-05-28 23:23:47 +00:00
RNA_def_property_flag(prop, PROP_EDITABLE);
Bugfix [#25298] Nasty group cycle that creates crash blend files is allowed Infinite recursion (manisfesting as a crash) occurred when trying to set the dupli-group setting on an object, when the object is a member of the group being set. Added a check and warning for this in RNA to prevent such setups from occurring in future. Todo: The warning report is currently only printed to console as I can't quite remember how to grab reports pointer without context/operator pointer available.
2010-12-19 10:38:02 +00:00
RNA_def_property_pointer_funcs(prop, NULL, "rna_Object_dup_group_set", NULL, NULL);
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_property_ui_text(prop, "Dupli Collection", "Instance an existing collection");
style cleanup: mostly whitespace in rna
2012-05-12 11:01:29 +00:00
RNA_def_property_update(prop, NC_OBJECT | ND_DRAW, "rna_Object_dependency_update");
RNA * DNA_object_types.h done. * Scriptlink skeleton added. * Fix cmake compile.
2009-01-02 16:58:09 +00:00
style cleanup: mostly whitespace in rna
2012-05-12 11:01:29 +00:00
prop = RNA_def_property(srna, "dupli_frames_start", PROP_INT, PROP_NONE | PROP_UNIT_TIME);
RNA * DNA_object_types.h done. * Scriptlink skeleton added. * Fix cmake compile.
2009-01-02 16:58:09 +00:00
RNA_def_property_int_sdna(prop, NULL, "dupsta");
merge with trunk/2.5 at r23876 [[Split portion of a mixed commit.]]
2009-10-22 23:22:05 +00:00
RNA_def_property_range(prop, MINAFRAME, MAXFRAME);
batch remove .'s used with RNA_def_struct_ui_text
2010-02-10 21:15:44 +00:00
RNA_def_property_ui_text(prop, "Dupli Frames Start", "Start frame for DupliFrames");
style cleanup: mostly whitespace in rna
2012-05-12 11:01:29 +00:00
RNA_def_property_update(prop, NC_OBJECT | ND_DRAW, "rna_Object_internal_update");
RNA * DNA_object_types.h done. * Scriptlink skeleton added. * Fix cmake compile.
2009-01-02 16:58:09 +00:00
style cleanup: mostly whitespace in rna
2012-05-12 11:01:29 +00:00
prop = RNA_def_property(srna, "dupli_frames_end", PROP_INT, PROP_NONE | PROP_UNIT_TIME);
RNA * DNA_object_types.h done. * Scriptlink skeleton added. * Fix cmake compile.
2009-01-02 16:58:09 +00:00
RNA_def_property_int_sdna(prop, NULL, "dupend");
merge with trunk/2.5 at r23876 [[Split portion of a mixed commit.]]
2009-10-22 23:22:05 +00:00
RNA_def_property_range(prop, MINAFRAME, MAXFRAME);
batch remove .'s used with RNA_def_struct_ui_text
2010-02-10 21:15:44 +00:00
RNA_def_property_ui_text(prop, "Dupli Frames End", "End frame for DupliFrames");
style cleanup: mostly whitespace in rna
2012-05-12 11:01:29 +00:00
RNA_def_property_update(prop, NC_OBJECT | ND_DRAW, "rna_Object_internal_update");
RNA * DNA_object_types.h done. * Scriptlink skeleton added. * Fix cmake compile.
2009-01-02 16:58:09 +00:00
style cleanup: mostly whitespace in rna
2012-05-12 11:01:29 +00:00
prop = RNA_def_property(srna, "dupli_frames_on", PROP_INT, PROP_NONE | PROP_UNIT_TIME);
RNA * DNA_object_types.h done. * Scriptlink skeleton added. * Fix cmake compile.
2009-01-02 16:58:09 +00:00
RNA_def_property_int_sdna(prop, NULL, "dupon");
Fix T54525: crash when setting number of frames to use between dupoff frames caused division by zero if both dupli_frames_on and dupli_frames_off are zero. doing this doesnt seem useful, dupliframes can be disabled in other ways. Reviewed By: campbellbarton Differential Revision: https://developer.blender.org/D3132
2018-05-07 14:49:09 +02:00
RNA_def_property_range(prop, 1, MAXFRAME);
Fix #34875: 0 digits of precision was not supported for FloatProperty, now you can specify precision=0 for this, and use -1 for the default 2.
2013-04-08 18:55:08 +00:00
RNA_def_property_ui_range(prop, 1, 1500, 1, -1);
batch remove .'s used with RNA_def_struct_ui_text
2010-02-10 21:15:44 +00:00
RNA_def_property_ui_text(prop, "Dupli Frames On", "Number of frames to use between DupOff frames");
style cleanup: mostly whitespace in rna
2012-05-12 11:01:29 +00:00
RNA_def_property_update(prop, NC_OBJECT | ND_DRAW, "rna_Object_internal_update");
RNA * DNA_object_types.h done. * Scriptlink skeleton added. * Fix cmake compile.
2009-01-02 16:58:09 +00:00
style cleanup: mostly whitespace in rna
2012-05-12 11:01:29 +00:00
prop = RNA_def_property(srna, "dupli_frames_off", PROP_INT, PROP_NONE | PROP_UNIT_TIME);
RNA * DNA_object_types.h done. * Scriptlink skeleton added. * Fix cmake compile.
2009-01-02 16:58:09 +00:00
RNA_def_property_int_sdna(prop, NULL, "dupoff");
merge with trunk/2.5 at r23876 [[Split portion of a mixed commit.]]
2009-10-22 23:22:05 +00:00
RNA_def_property_range(prop, 0, MAXFRAME);
Fix #34875: 0 digits of precision was not supported for FloatProperty, now you can specify precision=0 for this, and use -1 for the default 2.
2013-04-08 18:55:08 +00:00
RNA_def_property_ui_range(prop, 0, 1500, 1, -1);
batch remove .'s used with RNA_def_struct_ui_text
2010-02-10 21:15:44 +00:00
RNA_def_property_ui_text(prop, "Dupli Frames Off", "Recurring frames to exclude from the Dupliframes");
style cleanup: mostly whitespace in rna
2012-05-12 11:01:29 +00:00
RNA_def_property_update(prop, NC_OBJECT | ND_DRAW, "rna_Object_internal_update");
RNA * DNA_object_types.h done. * Scriptlink skeleton added. * Fix cmake compile.
2009-01-02 16:58:09 +00:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "is_duplicator", PROP_BOOLEAN, PROP_NONE);
Add read-only property to check if any duplis are used. Without this, ob.create_dupli_list(scene) crashes when no duplis are on the object. We cannot use duply_type !='NONE' because for non rna dupli types like dupli_particles, it fails. And some dupli types, we don't want to have in rna
2010-05-02 13:48:32 +00:00
RNA_def_property_boolean_sdna(prop, NULL, "transflag", OB_DUPLI);
RNA_def_property_clear_flag(prop, PROP_EDITABLE);
Cleanup: trailing space in RNA
2018-06-09 14:40:09 +02:00
RNA * DNA_object_types.h done. * Scriptlink skeleton added. * Fix cmake compile.
2009-01-02 16:58:09 +00:00
/* drawing */
UI / Python: rename X-Ray to In Front, Draw to Display. See T56648.
2018-09-03 18:58:41 +02:00
prop = RNA_def_property(srna, "display_type", PROP_ENUM, PROP_NONE);
RNA * DNA_object_types.h done. * Scriptlink skeleton added. * Fix cmake compile.
2009-01-02 16:58:09 +00:00
RNA_def_property_enum_sdna(prop, NULL, "dt");
RNA_def_property_enum_items(prop, drawtype_items);
UI / Python: rename X-Ray to In Front, Draw to Display. See T56648.
2018-09-03 18:58:41 +02:00
RNA_def_property_ui_text(prop, "Display As", "How to display object in viewport");
Followup for fix T38318: Add back previous fix and fix a glitch. The previous fix 162d6c73e3d0 has been cancelled because it caused a problem that mesh deform cages and so on mess up the preview. To avoid the problem, viewport doesn't show mesh object if its draw type is bounding box or wireframe. Reviewers: brecht Reviewed By: brecht Differential Revision: https://developer.blender.org/D375
2014-03-13 02:50:01 +09:00
RNA_def_property_update(prop, NC_OBJECT | ND_DRAW, "rna_Object_internal_update");
RNA * DNA_object_types.h done. * Scriptlink skeleton added. * Fix cmake compile.
2009-01-02 16:58:09 +00:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "show_bounds", PROP_BOOLEAN, PROP_NONE);
move draw all edges into the object settings (object panel), makes more sense here since its next to draw extra wire
2013-01-18 19:01:26 +00:00
RNA_def_property_boolean_sdna(prop, NULL, "dtx", OB_DRAWBOUNDOX);
UI / Python: rename X-Ray to In Front, Draw to Display. See T56648.
2018-09-03 18:58:41 +02:00
RNA_def_property_ui_text(prop, "Display Bounds", "Display the object's bounds");
style cleanup: mostly whitespace in rna
2012-05-12 11:01:29 +00:00
RNA_def_property_update(prop, NC_OBJECT | ND_DRAW, NULL);
RNA * DNA_object_types.h done. * Scriptlink skeleton added. * Fix cmake compile.
2009-01-02 16:58:09 +00:00
UI / Python: rename X-Ray to In Front, Draw to Display. See T56648.
2018-09-03 18:58:41 +02:00
prop = RNA_def_property(srna, "display_bounds_type", PROP_ENUM, PROP_NONE);
RNA * DNA_object_types.h done. * Scriptlink skeleton added. * Fix cmake compile.
2009-01-02 16:58:09 +00:00
RNA_def_property_enum_sdna(prop, NULL, "boundtype");
RNA_def_property_enum_items(prop, boundtype_items);
UI / Python: rename X-Ray to In Front, Draw to Display. See T56648.
2018-09-03 18:58:41 +02:00
RNA_def_property_ui_text(prop, "Display Bounds Type", "Object boundary display type");
style cleanup: mostly whitespace in rna
2012-05-12 11:01:29 +00:00
RNA_def_property_update(prop, NC_OBJECT | ND_DRAW, NULL);
Cleanup: trailing space in RNA
2018-06-09 14:40:09 +02:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "show_name", PROP_BOOLEAN, PROP_NONE);
RNA * DNA_object_types.h done. * Scriptlink skeleton added. * Fix cmake compile.
2009-01-02 16:58:09 +00:00
RNA_def_property_boolean_sdna(prop, NULL, "dtx", OB_DRAWNAME);
UI / Python: rename X-Ray to In Front, Draw to Display. See T56648.
2018-09-03 18:58:41 +02:00
RNA_def_property_ui_text(prop, "Display Name", "Display the object's name");
style cleanup: mostly whitespace in rna
2012-05-12 11:01:29 +00:00
RNA_def_property_update(prop, NC_OBJECT | ND_DRAW, NULL);
Cleanup: trailing space in RNA
2018-06-09 14:40:09 +02:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "show_axis", PROP_BOOLEAN, PROP_NONE);
RNA * DNA_object_types.h done. * Scriptlink skeleton added. * Fix cmake compile.
2009-01-02 16:58:09 +00:00
RNA_def_property_boolean_sdna(prop, NULL, "dtx", OB_AXIS);
UI / Python: rename X-Ray to In Front, Draw to Display. See T56648.
2018-09-03 18:58:41 +02:00
RNA_def_property_ui_text(prop, "Display Axes", "Display the object's origin and axes");
style cleanup: mostly whitespace in rna
2012-05-12 11:01:29 +00:00
RNA_def_property_update(prop, NC_OBJECT | ND_DRAW, NULL);
Cleanup: trailing space in RNA
2018-06-09 14:40:09 +02:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "show_texture_space", PROP_BOOLEAN, PROP_NONE);
RNA * DNA_object_types.h done. * Scriptlink skeleton added. * Fix cmake compile.
2009-01-02 16:58:09 +00:00
RNA_def_property_boolean_sdna(prop, NULL, "dtx", OB_TEXSPACE);
UI / Python: rename X-Ray to In Front, Draw to Display. See T56648.
2018-09-03 18:58:41 +02:00
RNA_def_property_ui_text(prop, "Display Texture Space", "Display the object's texture space");
style cleanup: mostly whitespace in rna
2012-05-12 11:01:29 +00:00
RNA_def_property_update(prop, NC_OBJECT | ND_DRAW, NULL);
Cleanup: trailing space in RNA
2018-06-09 14:40:09 +02:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "show_wire", PROP_BOOLEAN, PROP_NONE);
RNA * DNA_object_types.h done. * Scriptlink skeleton added. * Fix cmake compile.
2009-01-02 16:58:09 +00:00
RNA_def_property_boolean_sdna(prop, NULL, "dtx", OB_DRAWWIRE);
UI / Python: rename X-Ray to In Front, Draw to Display. See T56648.
2018-09-03 18:58:41 +02:00
RNA_def_property_ui_text(prop, "Display Wire", "Add the object's wireframe over solid drawing");
style cleanup: mostly whitespace in rna
2012-05-12 11:01:29 +00:00
RNA_def_property_update(prop, NC_OBJECT | ND_DRAW, NULL);
move draw all edges into the object settings (object panel), makes more sense here since its next to draw extra wire
2013-01-18 19:01:26 +00:00
prop = RNA_def_property(srna, "show_all_edges", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "dtx", OB_DRAW_ALL_EDGES);
UI / Python: rename X-Ray to In Front, Draw to Display. See T56648.
2018-09-03 18:58:41 +02:00
RNA_def_property_ui_text(prop, "Display All Edges", "Display all edges for mesh objects");
move draw all edges into the object settings (object panel), makes more sense here since its next to draw extra wire
2013-01-18 19:01:26 +00:00
RNA_def_property_update(prop, NC_OBJECT | ND_DRAW, NULL);
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "show_transparent", PROP_BOOLEAN, PROP_NONE);
RNA * DNA_object_types.h done. * Scriptlink skeleton added. * Fix cmake compile.
2009-01-02 16:58:09 +00:00
RNA_def_property_boolean_sdna(prop, NULL, "dtx", OB_DRAWTRANSP);
UI / Python: rename X-Ray to In Front, Draw to Display. See T56648.
2018-09-03 18:58:41 +02:00
RNA_def_property_ui_text(prop, "Display Transparent",
"Display material transparency in the object");
style cleanup: mostly whitespace in rna
2012-05-12 11:01:29 +00:00
RNA_def_property_update(prop, NC_OBJECT | ND_DRAW, NULL);
Cleanup: trailing space in RNA
2018-06-09 14:40:09 +02:00
UI / Python: rename X-Ray to In Front, Draw to Display. See T56648.
2018-09-03 18:58:41 +02:00
prop = RNA_def_property(srna, "show_in_front", PROP_BOOLEAN, PROP_NONE);
RNA * DNA_object_types.h done. * Scriptlink skeleton added. * Fix cmake compile.
2009-01-02 16:58:09 +00:00
RNA_def_property_boolean_sdna(prop, NULL, "dtx", OB_DRAWXRAY);
UI / Python: rename X-Ray to In Front, Draw to Display. See T56648.
2018-09-03 18:58:41 +02:00
RNA_def_property_ui_text(prop, "In Front",
"Make the object draw in front of others");
style cleanup: mostly whitespace in rna
2012-05-12 11:01:29 +00:00
RNA_def_property_update(prop, NC_OBJECT | ND_DRAW, NULL);
Cleanup: trailing space in RNA
2018-06-09 14:40:09 +02:00
merge with 2.5/trunk at r23271
2009-09-16 17:43:09 +00:00
/* Grease Pencil */
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 1 /* FIXME: Remove this code when all Open-Movie assets have been fixed */
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "grease_pencil", PROP_POINTER, PROP_NONE);
merge with 2.5/trunk at r23271
2009-09-16 17:43:09 +00:00
RNA_def_property_pointer_sdna(prop, NULL, "gpd");
RNA_def_property_struct_type(prop, "GreasePencil");
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
RNA_def_property_pointer_funcs(prop, NULL, NULL, NULL, "rna_GPencil_datablocks_obdata_poll"); /* XXX */
Grease Pencil - Storyboarding Features (merge from GPencil_EditStrokes branch) This merge-commit brings in a number of new features and workflow/UI improvements for working with Grease Pencil. While these were originally targetted at improving the workflow for creating 3D storyboards in Blender using the Grease Pencil, many of these changes should also prove useful in other workflows too. The main highlights here are: 1) It is now possible to edit Grease Pencil strokes - Use D Tab, or toggle the "Enable Editing" toggles in the Toolbar/Properties regions to enter "Stroke Edit Mode". In this mode, many common editing tools will operate on Grease Pencil stroke points instead. - Tools implemented include Select, Select All/Border/Circle/Linked/More/Less, Grab, Rotate, Scale, Bend, Shear, To Sphere, Mirror, Duplicate, Delete. - Proportional Editing works when using the transform tools 2) Grease Pencil stroke settings can now be animated NOTE: Currently drivers don't work, but if time allows, this may still be added before the release. 3) Strokes can be drawn with "filled" interiors, using a separate set of colour/opacity settings to the ones used for the lines themselves. This makes use of OpenGL filled polys, which has the limitation of only being able to fill convex shapes. Some artifacts may be visible on concave shapes (e.g. pacman's mouth will be overdrawn) 4) "Volumetric Strokes" - An alternative drawing technique for stroke drawing has been added which draws strokes as a series of screen-aligned discs. While this was originally a partial experimental technique at getting better quality 3D lines, the effects possible using this technique were interesting enough to warrant making this a dedicated feature. Best results when partial opacity and large stroke widths are used. 5) Improved Onion Skinning Support - Different colours can be selected for the before/after ghosts. To do so, enable the "colour wheel" toggle beside the Onion Skinning toggle, and set the colours accordingly. - Different numbers of ghosts can be shown before/after the current frame 6) Grease Pencil datablocks are now attached to the scene by default instead of the active object. - For a long time, the object-attachment has proved to be quite problematic for users to keep track of. Now that this is done at scene level, it is easier for most users to use. - An exception for old files (and for any addons which may benefit from object attachment instead), is that if the active object has a Grease Pencil datablock, that will be used instead. - It is not currently possible to choose object-attachment from the UI, but it is simple to do this from the console instead, by doing: context.active_object.grease_pencil = bpy.data.grease_pencil["blah"] 7) Various UI Cleanups - The layers UI has been cleaned up to use a list instead of the nested-panels design. Apart from saving space, this is also much nicer to look at now. - The UI code is now all defined in Python. To support this, it has been necessary to add some new context properties to make it easier to access these settings. e.g. "gpencil_data" for the datablock "active_gpencil_layer" and "active_gpencil_frame" for active data, "editable_gpencil_strokes" for the strokes that can be edited - The "stroke placement/alignment" settings (previously "Drawing Settings" at the bottom of the Grease Pencil panel in the Properties Region) is now located in the toolbar. These were more toolsettings than properties for how GPencil got drawn. - "Use Sketching Sessions" has been renamed "Continuous Drawing", as per a suggestion for an earlier discussion on developer.blender.org - By default, the painting operator will wait for a mouse button to be pressed before it starts creating the stroke. This is to make it easier to include this operator in various toolbars/menus/etc. To get it immediately starting (as when you hold down DKEy to draw), set "wait_for_input" to False. - GPencil Layers can be rearranged in the "Grease Pencil" mode of the Action Editor - Toolbar panels have been added to all the other editors which support these. 8) Pie menus for quick-access to tools A set of experimental pie menus has been included for quick access to many tools and settings. It is not necessary to use these to get things done, but they have been designed to help make certain common tasks easier. - Ctrl-D = The main pie menu. Reveals tools in a context sensitive and spatially stable manner. - D Q = "Quick Settings" pie. This allows quick access to the active layer's settings. Notably, colours, thickness, and turning onion skinning on/off.
2014-12-01 01:52:06 +13:00
RNA_def_property_flag(prop, PROP_EDITABLE | PROP_ID_REFCOUNT);
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
RNA_def_property_ui_text(prop, "Grease Pencil Data", "Grease Pencil data-block (deprecated)");
style cleanup: mostly whitespace in rna
2012-05-12 11:01:29 +00:00
RNA_def_property_update(prop, NC_OBJECT | ND_DRAW, 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
#endif
Cleanup: trailing space in RNA
2018-06-09 14:40:09 +02:00
Animato RNA wrapping: It's about time that the RNA wrapping for various parts of the animation system were cleaned up for my recent changes. I've moved some code around (and/or deleted a file or two) in the process.
2009-02-02 11:51:10 +00:00
/* pose */
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "pose_library", PROP_POINTER, PROP_NONE);
RNA * DNA_object_types.h done. * Scriptlink skeleton added. * Fix cmake compile.
2009-01-02 16:58:09 +00:00
RNA_def_property_pointer_sdna(prop, NULL, "poselib");
Finally committing useful rna for action types. This includes actions, action channels and action groups. I broke both pose channels and pose off into their own rna. Links also updated in Object rna for both Action and Pose stuff.
2009-01-07 04:06:52 +00:00
RNA_def_property_struct_type(prop, "Action");
Grease Pencil - Storyboarding Features (merge from GPencil_EditStrokes branch) This merge-commit brings in a number of new features and workflow/UI improvements for working with Grease Pencil. While these were originally targetted at improving the workflow for creating 3D storyboards in Blender using the Grease Pencil, many of these changes should also prove useful in other workflows too. The main highlights here are: 1) It is now possible to edit Grease Pencil strokes - Use D Tab, or toggle the "Enable Editing" toggles in the Toolbar/Properties regions to enter "Stroke Edit Mode". In this mode, many common editing tools will operate on Grease Pencil stroke points instead. - Tools implemented include Select, Select All/Border/Circle/Linked/More/Less, Grab, Rotate, Scale, Bend, Shear, To Sphere, Mirror, Duplicate, Delete. - Proportional Editing works when using the transform tools 2) Grease Pencil stroke settings can now be animated NOTE: Currently drivers don't work, but if time allows, this may still be added before the release. 3) Strokes can be drawn with "filled" interiors, using a separate set of colour/opacity settings to the ones used for the lines themselves. This makes use of OpenGL filled polys, which has the limitation of only being able to fill convex shapes. Some artifacts may be visible on concave shapes (e.g. pacman's mouth will be overdrawn) 4) "Volumetric Strokes" - An alternative drawing technique for stroke drawing has been added which draws strokes as a series of screen-aligned discs. While this was originally a partial experimental technique at getting better quality 3D lines, the effects possible using this technique were interesting enough to warrant making this a dedicated feature. Best results when partial opacity and large stroke widths are used. 5) Improved Onion Skinning Support - Different colours can be selected for the before/after ghosts. To do so, enable the "colour wheel" toggle beside the Onion Skinning toggle, and set the colours accordingly. - Different numbers of ghosts can be shown before/after the current frame 6) Grease Pencil datablocks are now attached to the scene by default instead of the active object. - For a long time, the object-attachment has proved to be quite problematic for users to keep track of. Now that this is done at scene level, it is easier for most users to use. - An exception for old files (and for any addons which may benefit from object attachment instead), is that if the active object has a Grease Pencil datablock, that will be used instead. - It is not currently possible to choose object-attachment from the UI, but it is simple to do this from the console instead, by doing: context.active_object.grease_pencil = bpy.data.grease_pencil["blah"] 7) Various UI Cleanups - The layers UI has been cleaned up to use a list instead of the nested-panels design. Apart from saving space, this is also much nicer to look at now. - The UI code is now all defined in Python. To support this, it has been necessary to add some new context properties to make it easier to access these settings. e.g. "gpencil_data" for the datablock "active_gpencil_layer" and "active_gpencil_frame" for active data, "editable_gpencil_strokes" for the strokes that can be edited - The "stroke placement/alignment" settings (previously "Drawing Settings" at the bottom of the Grease Pencil panel in the Properties Region) is now located in the toolbar. These were more toolsettings than properties for how GPencil got drawn. - "Use Sketching Sessions" has been renamed "Continuous Drawing", as per a suggestion for an earlier discussion on developer.blender.org - By default, the painting operator will wait for a mouse button to be pressed before it starts creating the stroke. This is to make it easier to include this operator in various toolbars/menus/etc. To get it immediately starting (as when you hold down DKEy to draw), set "wait_for_input" to False. - GPencil Layers can be rearranged in the "Grease Pencil" mode of the Action Editor - Toolbar panels have been added to all the other editors which support these. 8) Pie menus for quick-access to tools A set of experimental pie menus has been included for quick access to many tools and settings. It is not necessary to use these to get things done, but they have been designed to help make certain common tasks easier. - Ctrl-D = The main pie menu. Reveals tools in a context sensitive and spatially stable manner. - D Q = "Quick Settings" pie. This allows quick access to the active layer's settings. Notably, colours, thickness, and turning onion skinning on/off.
2014-12-01 01:52:06 +13:00
RNA_def_property_flag(prop, PROP_EDITABLE | PROP_ID_REFCOUNT);
batch remove .'s used with RNA_def_struct_ui_text
2010-02-10 21:15:44 +00:00
RNA_def_property_ui_text(prop, "Pose Library", "Action used as a pose library for armatures");
RNA * DNA_object_types.h done. * Scriptlink skeleton added. * Fix cmake compile.
2009-01-02 16:58:09 +00:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "pose", PROP_POINTER, PROP_NONE);
RNA * DNA_object_types.h done. * Scriptlink skeleton added. * Fix cmake compile.
2009-01-02 16:58:09 +00:00
RNA_def_property_pointer_sdna(prop, NULL, "pose");
Finally committing useful rna for action types. This includes actions, action channels and action groups. I broke both pose channels and pose off into their own rna. Links also updated in Object rna for both Action and Pose stuff.
2009-01-07 04:06:52 +00:00
RNA_def_property_struct_type(prop, "Pose");
RNA/Override: Move override-related property flags to own variable. We are already running out of available flags in main, generic int, and everytime I work on static override I find new special cases that will need new specific propflag, so...
2018-06-05 11:10:05 +02:00
RNA_def_property_override_flag(prop, PROPOVERRIDE_OVERRIDABLE_STATIC);
batch remove .'s used with RNA_def_struct_ui_text
2010-02-10 21:15:44 +00:00
RNA_def_property_ui_text(prop, "Pose", "Current pose for armatures");
RNA * DNA_object_types.h done. * Scriptlink skeleton added. * Fix cmake compile.
2009-01-02 16:58:09 +00:00
/* shape keys */
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "show_only_shape_key", PROP_BOOLEAN, PROP_NONE);
RNA * DNA_object_types.h done. * Scriptlink skeleton added. * Fix cmake compile.
2009-01-02 16:58:09 +00:00
RNA_def_property_boolean_sdna(prop, NULL, "shapeflag", OB_SHAPE_LOCK);
batch remove .'s used with RNA_def_struct_ui_text
2010-02-10 21:15:44 +00:00
RNA_def_property_ui_text(prop, "Shape Key Lock", "Always show the current Shape for this Object");
2.5 * Lattices: properties editable, editmode operators, menus working again. As a bonus you can now edit u/v/w in editmode. * Shape Keys: some code cleanup, and added more buttons. The value/min/max buttons don't work correct yet though. * Fix issue with uv textures, vertex colors not being visible outside editmode, and a few other issue. Mesh.edit_mesh is now NULL when not in editmode.
2009-07-03 15:23:33 +00:00
RNA_def_property_ui_icon(prop, ICON_UNPINNED, 1);
rename rna function obj.make_display_list(scene) --> obj.update(scene) also added 3 optional bool arguments, 'object', 'data' & 'time', matching the object recalc flags.
2010-06-09 08:24:31 +00:00
RNA_def_property_update(prop, 0, "rna_Object_internal_update_data");
RNA * DNA_object_types.h done. * Scriptlink skeleton added. * Fix cmake compile.
2009-01-02 16:58:09 +00:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "use_shape_key_edit_mode", PROP_BOOLEAN, PROP_NONE);
commit before doing some hefty shapekey change, will break compilation
2009-11-01 00:06:53 +00:00
RNA_def_property_boolean_sdna(prop, NULL, "shapeflag", OB_SHAPE_EDIT_MODE);
batch remove .'s used with RNA_def_struct_ui_text
2010-02-10 21:15:44 +00:00
RNA_def_property_ui_text(prop, "Shape Key Edit Mode", "Apply shape keys in edit mode (for Meshes only)");
commit before doing some hefty shapekey change, will break compilation
2009-11-01 00:06:53 +00:00
RNA_def_property_ui_icon(prop, ICON_EDITMODE_HLT, 0);
rename rna function obj.make_display_list(scene) --> obj.update(scene) also added 3 optional bool arguments, 'object', 'data' & 'time', matching the object recalc flags.
2010-06-09 08:24:31 +00:00
RNA_def_property_update(prop, 0, "rna_Object_internal_update_data");
commit before doing some hefty shapekey change, will break compilation
2009-11-01 00:06:53 +00:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "active_shape_key", PROP_POINTER, PROP_NONE);
2.5 * Lattices: properties editable, editmode operators, menus working again. As a bonus you can now edit u/v/w in editmode. * Shape Keys: some code cleanup, and added more buttons. The value/min/max buttons don't work correct yet though. * Fix issue with uv textures, vertex colors not being visible outside editmode, and a few other issue. Mesh.edit_mesh is now NULL when not in editmode.
2009-07-03 15:23:33 +00:00
RNA_def_property_struct_type(prop, "ShapeKey");
rna pointer poll function, not used yet.
2010-08-03 05:14:59 +00:00
RNA_def_property_pointer_funcs(prop, "rna_Object_active_shape_key_get", NULL, NULL, NULL);
batch remove .'s used with RNA_def_struct_ui_text
2010-02-10 21:15:44 +00:00
RNA_def_property_ui_text(prop, "Active Shape Key", "Current shape key");
2.5 * Lattices: properties editable, editmode operators, menus working again. As a bonus you can now edit u/v/w in editmode. * Shape Keys: some code cleanup, and added more buttons. The value/min/max buttons don't work correct yet though. * Fix issue with uv textures, vertex colors not being visible outside editmode, and a few other issue. Mesh.edit_mesh is now NULL when not in editmode.
2009-07-03 15:23:33 +00:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "active_shape_key_index", PROP_INT, PROP_NONE);
RNA * DNA_object_types.h done. * Scriptlink skeleton added. * Fix cmake compile.
2009-01-02 16:58:09 +00:00
RNA_def_property_int_sdna(prop, NULL, "shapenr");
Object Mode: remove Scene.obedit for RNA
2018-02-13 21:06:51 +11:00
RNA_def_property_flag(prop, PROP_CONTEXT_UPDATE);
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
RNA_def_property_clear_flag(prop, PROP_ANIMATABLE); /* XXX this is really unpredictable... */
Code style edits (mostly spliting long lines, and removing trailing spaces). Note about long lines: I did not touch to two pieces of code (because I don’t see any way to keep a nicely formated, compact code, with shorter lines): * The node types definitions into rna_nodetree_types.h * The vgroup name functions into rna_particle.c
2012-03-18 09:27:36 +00:00
RNA_def_property_int_funcs(prop, "rna_Object_active_shape_key_index_get", "rna_Object_active_shape_key_index_set",
"rna_Object_active_shape_key_index_range");
batch remove .'s used with RNA_def_struct_ui_text
2010-02-10 21:15:44 +00:00
RNA_def_property_ui_text(prop, "Active Shape Key Index", "Current shape key index");
commit before doing some hefty shapekey change, will break compilation
2009-11-01 00:06:53 +00:00
RNA_def_property_update(prop, 0, "rna_Object_active_shape_update");
RNA Merging changes made by Arystanbek in the soc-2009-kazanbas branch, plus some things modified and added by me. * The API files now all in the makesrna module, convention is to call them e.g. rna_mesh_api.c for rna_mesh.c. Note for visual studio build maintainers, the rna_*_api.c files are compiled as part of "makesrna", but do not have rna_*_gen.c generated as part of the library. SCons/cmake/make were updated. * Added function flags FUNC_USE_CONTEXT and FUNC_USE_REPORTS, to allow RNA functions to get context and error reporting parameters optionally. Renamed FUNC_TYPESTATIC to FUNC_NO_SELF. * RNA collections now have a pointer to add/remove FunctionRNA's, this isn't actually used anywhere yet, purpose is to make an alias main.meshes.add() for main.add_mesh() in python. * Fixes to make autogenerating property set/get for multidimensional arrays work, though a 4x4 matrix will be exposed as a length 16 one dimensional RNA array. * Functions and properties added: * Main.add_mesh() * Main.remove_mesh() * Object.matrix * Object.create_render_mesh() * WindowManager.add_fileselect()
2009-06-18 19:48:55 +00:00
Add DNA/RNA/BKE infrastructure for dynamic-topology sculpt mode * Add a detail_size field to the Sculpt struct, two new sculpt flags, and a Mesh flag for dynamic-topology mode; that's it for file-level changes needed by dynamic topology * Add RNA for the new DNA field and flags * Add a new icon for dynamic-topology created by Julio Iglesias. TODO: update the icon for the new SVG icon format * Add a SculptSession function for converting from BMesh to Mesh, handles reordering mesh elements and setting face shading
2012-12-30 18:27:33 +00:00
/* sculpt */
prop = RNA_def_property(srna, "use_dynamic_topology_sculpting", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_funcs(prop, "rna_Object_use_dynamic_topology_sculpting_get", NULL);
RNA_def_property_clear_flag(prop, PROP_EDITABLE);
RNA_def_property_ui_text(prop, "Dynamic Topology Sculpting", NULL);
Object RNA: expose base_flag settings: object.is_from_set object.is_from_duplicator We need them for the unittests, and users can benefit from it as well. Note, this only makes sense when reading objects from depsgraph: `bpy.context.depsgraph.objects`
2017-11-24 11:24:37 -02:00
/* Base Settings */
prop = RNA_def_property(srna, "is_from_duplicator", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "base_flag", BASE_FROMDUPLI);
RNA_def_property_ui_text(prop, "Base from Duplicator", "Object comes from a duplicator");
RNA_def_property_clear_flag(prop, PROP_EDITABLE);
prop = RNA_def_property(srna, "is_from_set", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "base_flag", BASE_FROM_SET);
RNA_def_property_ui_text(prop, "Base from Set", "Object comes from a background set");
RNA_def_property_clear_flag(prop, PROP_EDITABLE);
T55014: Optionally: objects not cast shadows in workbench
2018-05-09 15:13:12 +02:00
/* Object Display */
prop = RNA_def_property(srna, "display", PROP_POINTER, PROP_NONE);
RNA_def_property_pointer_sdna(prop, NULL, "display");
RNA_def_property_struct_type(prop, "ObjectDisplay");
RNA_def_property_ui_text(prop, "Object Display", "Object display settings for 3d viewport");
RNA Merging changes made by Arystanbek in the soc-2009-kazanbas branch, plus some things modified and added by me. * The API files now all in the makesrna module, convention is to call them e.g. rna_mesh_api.c for rna_mesh.c. Note for visual studio build maintainers, the rna_*_api.c files are compiled as part of "makesrna", but do not have rna_*_gen.c generated as part of the library. SCons/cmake/make were updated. * Added function flags FUNC_USE_CONTEXT and FUNC_USE_REPORTS, to allow RNA functions to get context and error reporting parameters optionally. Renamed FUNC_TYPESTATIC to FUNC_NO_SELF. * RNA collections now have a pointer to add/remove FunctionRNA's, this isn't actually used anywhere yet, purpose is to make an alias main.meshes.add() for main.add_mesh() in python. * Fixes to make autogenerating property set/get for multidimensional arrays work, though a 4x4 matrix will be exposed as a length 16 one dimensional RNA array. * Functions and properties added: * Main.add_mesh() * Main.remove_mesh() * Object.matrix * Object.create_render_mesh() * WindowManager.add_fileselect()
2009-06-18 19:48:55 +00:00
RNA_api_object(srna);
RNA * Object has some more properties wrapped, mostly game related. * Scene frame changes now send a notifier. * Added functions to create/free operator properties for calling operators. This also simplifies some duplicated code that did this. Ideally though this kind of thing should use the properties pointer provided by buttons and keymap items. Example code: PointerRNA ptr; WM_operator_properties_create(&ptr, "SOME_OT_name"); RNA_int_set(&ptr, "value", 42); WM_operator_name_call(C, "SOME_OT_name", WM_OP_EXEC_DEFAULT, &ptr); WM_operator_properties_free(&ptr);
2009-01-01 20:44:40 +00:00
}
void RNA_def_object(BlenderRNA *brna)
{
RNA * Finished DNA_lamp_types.h, DNA_world_types.h and DNA_sound_types.h. * Renamed "parent" struct property to "nested", and also remaining "from" usage to "base". * Added a NEVER_NULL subtype for pointers and use it for all properties that apply. * Make sure all structs have a description, and fix any other DOC_BROKEN descriptions, also many other naming consistency improvements.
2009-01-10 22:57:33 +00:00
rna_def_object(brna);
add rna path callback for material slots but disable animation. without this - the info space would report an invalid rna-path when showing the string to change a value.
2013-10-01 04:49:47 +00:00
RNA_define_animate_sdna(false);
RNA * Added skeleton code for particle/object_force/userdef. * More Object properties wrapped. * Added User Preferences display in outliner.
2009-01-02 13:47:33 +00:00
rna_def_vertex_group(brna);
Face Maps: custom-data, UI and RNA API Add face maps, needed for face-map widgets, only data structure, widgets will be separate commit. This comes from 'custom-manipulator' branch with only minor changes.
2017-05-30 17:58:24 +10:00
rna_def_face_map(brna);
RNA: * Added a MaterialSlot collection in Object rather than giving the list of materials immediately. This should more correctly reflect how this data is organized, even though there is no equivalent C struct. * Added name properties to MaterialSlot/TextureSlot/ParticleSystem.
2009-06-03 23:22:43 +00:00
rna_def_material_slot(brna);
T55014: Optionally: objects not cast shadows in workbench
2018-05-09 15:13:12 +02:00
rna_def_object_display(brna);
add rna path callback for material slots but disable animation. without this - the info space would report an invalid rna-path when showing the string to change a value.
2013-10-01 04:49:47 +00:00
RNA_define_animate_sdna(true);
RNA / Data API This is the first code for the Data API, also known as RNA system in the 2.5 Branch. It does not include a user interface, and only wraps some Scene properties for testing. It is integrated with Scons and Makefiles, and compiles a 'makesrna' program that generates an RNA.c file. http://wiki.blender.org/index.php/BlenderDev/Blender2.5/DataAPI http://wiki.blender.org/index.php/BlenderDev/Blender2.5/RNA The changes are quite local, basically adding a makesrna module which works similar to the makesdna module. The one external change is in moving genfile.c from blenloader to the makesdna module, so that it can be reused by the RNA code. This also meant changing the DNA makefiles. It seems to be doing dependencies correct still in my tests, but if there is an issue with the DNA not being rebuilt this commit might be the one causing it. Also it seems for scons the makesdna and makesrna modules are compiling without warnings. Not a new issue but this should be fixed. The RNA code supports all types as defined in the Data API design, so in that sense it is fairly complete and I hope that aspect will not have to change much. Some obviously missing parts are context related code, notify() functions for updates and user defined / ID properties.
2008-10-31 23:50:02 +00:00
}
Initial revision
2002-10-12 11:37:38 +00:00
#endif
Copy Permalink