2005-12-12 16:29:47 +00:00
|
|
|
/**
|
2002-10-12 11:37:38 +00:00
|
|
|
* $Id$
|
2005-12-12 16:29:47 +00:00
|
|
|
*
|
2002-10-12 11:37:38 +00:00
|
|
|
* ***** BEGIN GPL/BL DUAL LICENSE BLOCK *****
|
|
|
|
*
|
|
|
|
* This program is free software; you can redistribute it and/or
|
|
|
|
* modify it under the terms of the GNU General Public License
|
|
|
|
* as published by the Free Software Foundation; either version 2
|
|
|
|
* of the License, or (at your option) any later version. The Blender
|
|
|
|
* Foundation also sells licenses for use in proprietary software under
|
|
|
|
* the Blender License. See http://www.blender.org/BL/ for information
|
|
|
|
* about this.
|
|
|
|
*
|
|
|
|
* 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,
|
|
|
|
* Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
|
|
|
*
|
|
|
|
* The Original Code is Copyright (C) 2001-2002 by NaN Holding BV.
|
|
|
|
* All rights reserved.
|
|
|
|
*
|
|
|
|
* The Original Code is: all of this file.
|
|
|
|
*
|
|
|
|
* Contributor(s): none yet.
|
|
|
|
*
|
|
|
|
* ***** END GPL/BL DUAL LICENSE BLOCK *****
|
|
|
|
*/
|
2005-12-12 16:29:47 +00:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Contains management of ID's and libraries
|
|
|
|
* allocate and free of all library data
|
|
|
|
*
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
2002-10-12 11:37:38 +00:00
|
|
|
#include <stdio.h>
|
|
|
|
#include <ctype.h>
|
|
|
|
#include <string.h>
|
|
|
|
#include <stdlib.h>
|
|
|
|
|
2002-11-25 12:02:15 +00:00
|
|
|
#ifdef HAVE_CONFIG_H
|
|
|
|
#include <config.h>
|
|
|
|
#endif
|
|
|
|
|
2002-10-12 11:37:38 +00:00
|
|
|
#include "MEM_guardedalloc.h"
|
|
|
|
|
|
|
|
/* all types are needed here, in order to do memory operations */
|
|
|
|
#include "DNA_ID.h"
|
|
|
|
#include "DNA_listBase.h"
|
|
|
|
#include "DNA_scene_types.h"
|
|
|
|
#include "DNA_object_types.h"
|
|
|
|
#include "DNA_mesh_types.h"
|
|
|
|
#include "DNA_lattice_types.h"
|
|
|
|
#include "DNA_curve_types.h"
|
|
|
|
#include "DNA_meta_types.h"
|
|
|
|
#include "DNA_material_types.h"
|
|
|
|
#include "DNA_texture_types.h"
|
|
|
|
#include "DNA_image_types.h"
|
|
|
|
#include "DNA_wave_types.h"
|
|
|
|
#include "DNA_lamp_types.h"
|
|
|
|
#include "DNA_camera_types.h"
|
|
|
|
#include "DNA_ipo_types.h"
|
|
|
|
#include "DNA_key_types.h"
|
|
|
|
#include "DNA_world_types.h"
|
|
|
|
#include "DNA_screen_types.h"
|
|
|
|
#include "DNA_vfont_types.h"
|
|
|
|
#include "DNA_text_types.h"
|
|
|
|
#include "DNA_sound_types.h"
|
|
|
|
#include "DNA_group_types.h"
|
|
|
|
#include "DNA_armature_types.h"
|
|
|
|
#include "DNA_action_types.h"
|
2005-07-11 23:49:06 +00:00
|
|
|
#include "DNA_userdef_types.h"
|
Orange: more noodle updates!
**** NEW: Group Nodes
Node trees usually become messy and confusing quickly, so we need
not only a way to collapse Nodes into single 'groups', but also a
way to re-use that data to create libraries of effects.
This has been done by making a new Library data type, the NodeTree.
Everything that has been grouped is stored here, and available for
re-use, appending or linking. These NodeTrees are fully generic,
i.e. can store shader trees, composit trees, and so on. The 'type'
value as stored in the NodeTree will keep track of internal type
definitions and execute/drawing callbacks. Needless to say, re-using
shader trees in a composit tree is a bit useless, and will be
prevented in the browsing code. :)
So; any NodeTree can become a "Goup Node" inside in a NodeTree. This
Group Node then works just like any Node.
To prevent the current code to become too complex, I've disabled
the possibility to insert Groups inside of Groups. That might be
enabled later, but is a real nasty piece of code to get OK.
Since Group Nodes are a dynamic Node type, a lot of work has been
done to ensure Node definitions can be dynamic too, but still allow
to be stored in files, and allow to be verified for type-definition
changes on reloading. This system needs a little bit maturing still,
so the Python gurus should better wait a little bit! (Also for me to
write the definite API docs for it).
What works now:
- Press CTRL+G to create a new Group. The grouping code checks for
impossible selections (like an unselected node between selected nodes).
Everthing that's selected then gets removed from the current tree, and
inserted in a new NodeTree library data block. A Group Node then is
added which links to this new NodeTree.
- Press ALT+G to ungroup. This will not delete the NodeTree library
data, but just duplicate the Group into the current tree.
- Press TAB, or click on the NodeTree icon to edit Groups. Note that
NodeTrees are instances, so editing one Group will also change the
other users.
This also means that when removing nodes in a Group (or hiding sockets
or changing internal links) this is immediately corrected for all users
of this Group, also in other Materials.
- While editing Groups, only the internal Nodes can be edited. A single
click outside of the Group boundary will close this 'edit mode'.
What needs to be done:
- SHIFT+A menu in toolbox style, also including a list of Groups
- Enable the single-user button in the Group Node
- Displaying all (visible) internal group UI elements in the Node Panel
- Enable Library linking and prevent editing of Groups then.
**** NEW: Socket Visibility control
Node types will be generated with a lot of possible inputs or outputs,
and drawing all sockets all the time isn't very useful then.
A new option in the Node header ('plus' icon) allows to either hide all
unused sockets (first keypress) or to reveil them (when there are hidden
sockets, the icon displays black, otherwise it's blended).
Hidden sockets in Nodes also are not exported to a Group, so this way
you can control what options (in/outputs) exactly are available.
To be done:
- a way to hide individual sockets, like with a RMB click on it.
**** NEW: Nodes now render!
This is still quite primitive, more on a level to replace the (now
obsolete and disabled) Material Layers.
What needs to be done:
- make the "Geometry" node work properly, also for AA textures
- make the Texture Node work (does very little at the moment)
- give Material Nodes all inputs as needed (like Map-to Panel)
- find a way to export more data from a Material Node, like the
shadow value, or light intensity only, etc
Very important also to separate from the Material Buttons the
"global" options, like "Ztransp" or "Wire" or "Halo". These can not
be set for each Material-Node individually.
Also note that the Preview Render (Buttons window) now renders a bit
differently. This was a horrid piece of antique code, using a totally
incompatible way of rendering. Target is to fully re-use internal
render code for previews.
OK... that's it mostly. Now test!
2006-01-02 13:06:05 +00:00
|
|
|
#include "DNA_node_types.h"
|
2006-03-05 17:35:06 +00:00
|
|
|
#include "DNA_nla_types.h"
|
|
|
|
#include "DNA_effect_types.h"
|
Brush Datablock:
- Added a new Brush datablock, only used by image paint, but intended
to be used in texture paint, vertex paint, weight paint and sculpt
mode also.
- Being a datablock, these brushes can be saved, appended and linked.
They have a fake user by default, to make sure they are saved even if
not selected.
Image Painting:
- Replaced the img module with C code in imagepaint.c
- Airbrush is no longer a separate tool, but rather an option that can
be used for soften, smear and clone also.
- Blend modes mix, add, subtract, multiply, darken and lighten have been
added, code taken directly from vertex paint.
Note to project files maintainers:
- The img module was removed from SCons and Makefiles, and this should
be done in other build systems also. I'll wait to remove the module
from cvs, to not break compilation.
2006-07-26 22:29:23 +00:00
|
|
|
#include "DNA_brush_types.h"
|
2002-10-12 11:37:38 +00:00
|
|
|
|
|
|
|
#include "BLI_blenlib.h"
|
|
|
|
#include "BLI_dynstr.h"
|
|
|
|
|
|
|
|
#include "BKE_bad_level_calls.h"
|
|
|
|
#include "BKE_library.h"
|
|
|
|
#include "BKE_main.h"
|
|
|
|
#include "BKE_global.h"
|
|
|
|
#include "BKE_sound.h"
|
|
|
|
#include "BKE_object.h"
|
|
|
|
#include "BKE_screen.h"
|
2003-12-14 01:18:09 +00:00
|
|
|
#include "BKE_script.h"
|
2002-10-12 11:37:38 +00:00
|
|
|
#include "BKE_mesh.h"
|
|
|
|
#include "BKE_material.h"
|
|
|
|
#include "BKE_curve.h"
|
|
|
|
#include "BKE_mball.h"
|
2003-12-14 01:18:09 +00:00
|
|
|
#include "BKE_text.h"
|
2002-10-12 11:37:38 +00:00
|
|
|
#include "BKE_texture.h"
|
|
|
|
#include "BKE_scene.h"
|
2005-12-21 22:21:43 +00:00
|
|
|
#include "BKE_icons.h"
|
2002-10-12 11:37:38 +00:00
|
|
|
#include "BKE_image.h"
|
|
|
|
#include "BKE_ipo.h"
|
|
|
|
#include "BKE_key.h"
|
|
|
|
#include "BKE_world.h"
|
|
|
|
#include "BKE_font.h"
|
|
|
|
#include "BKE_group.h"
|
|
|
|
#include "BKE_lattice.h"
|
|
|
|
#include "BKE_armature.h"
|
|
|
|
#include "BKE_action.h"
|
Orange: more noodle updates!
**** NEW: Group Nodes
Node trees usually become messy and confusing quickly, so we need
not only a way to collapse Nodes into single 'groups', but also a
way to re-use that data to create libraries of effects.
This has been done by making a new Library data type, the NodeTree.
Everything that has been grouped is stored here, and available for
re-use, appending or linking. These NodeTrees are fully generic,
i.e. can store shader trees, composit trees, and so on. The 'type'
value as stored in the NodeTree will keep track of internal type
definitions and execute/drawing callbacks. Needless to say, re-using
shader trees in a composit tree is a bit useless, and will be
prevented in the browsing code. :)
So; any NodeTree can become a "Goup Node" inside in a NodeTree. This
Group Node then works just like any Node.
To prevent the current code to become too complex, I've disabled
the possibility to insert Groups inside of Groups. That might be
enabled later, but is a real nasty piece of code to get OK.
Since Group Nodes are a dynamic Node type, a lot of work has been
done to ensure Node definitions can be dynamic too, but still allow
to be stored in files, and allow to be verified for type-definition
changes on reloading. This system needs a little bit maturing still,
so the Python gurus should better wait a little bit! (Also for me to
write the definite API docs for it).
What works now:
- Press CTRL+G to create a new Group. The grouping code checks for
impossible selections (like an unselected node between selected nodes).
Everthing that's selected then gets removed from the current tree, and
inserted in a new NodeTree library data block. A Group Node then is
added which links to this new NodeTree.
- Press ALT+G to ungroup. This will not delete the NodeTree library
data, but just duplicate the Group into the current tree.
- Press TAB, or click on the NodeTree icon to edit Groups. Note that
NodeTrees are instances, so editing one Group will also change the
other users.
This also means that when removing nodes in a Group (or hiding sockets
or changing internal links) this is immediately corrected for all users
of this Group, also in other Materials.
- While editing Groups, only the internal Nodes can be edited. A single
click outside of the Group boundary will close this 'edit mode'.
What needs to be done:
- SHIFT+A menu in toolbox style, also including a list of Groups
- Enable the single-user button in the Group Node
- Displaying all (visible) internal group UI elements in the Node Panel
- Enable Library linking and prevent editing of Groups then.
**** NEW: Socket Visibility control
Node types will be generated with a lot of possible inputs or outputs,
and drawing all sockets all the time isn't very useful then.
A new option in the Node header ('plus' icon) allows to either hide all
unused sockets (first keypress) or to reveil them (when there are hidden
sockets, the icon displays black, otherwise it's blended).
Hidden sockets in Nodes also are not exported to a Group, so this way
you can control what options (in/outputs) exactly are available.
To be done:
- a way to hide individual sockets, like with a RMB click on it.
**** NEW: Nodes now render!
This is still quite primitive, more on a level to replace the (now
obsolete and disabled) Material Layers.
What needs to be done:
- make the "Geometry" node work properly, also for AA textures
- make the Texture Node work (does very little at the moment)
- give Material Nodes all inputs as needed (like Map-to Panel)
- find a way to export more data from a Material Node, like the
shadow value, or light intensity only, etc
Very important also to separate from the Material Buttons the
"global" options, like "Ztransp" or "Wire" or "Halo". These can not
be set for each Material-Node individually.
Also note that the Preview Render (Buttons window) now renders a bit
differently. This was a horrid piece of antique code, using a totally
incompatible way of rendering. Target is to fully re-use internal
render code for previews.
OK... that's it mostly. Now test!
2006-01-02 13:06:05 +00:00
|
|
|
#include "BKE_node.h"
|
2006-03-05 17:35:06 +00:00
|
|
|
#include "BKE_effect.h"
|
Brush Datablock:
- Added a new Brush datablock, only used by image paint, but intended
to be used in texture paint, vertex paint, weight paint and sculpt
mode also.
- Being a datablock, these brushes can be saved, appended and linked.
They have a fake user by default, to make sure they are saved even if
not selected.
Image Painting:
- Replaced the img module with C code in imagepaint.c
- Airbrush is no longer a separate tool, but rather an option that can
be used for soften, smear and clone also.
- Blend modes mix, add, subtract, multiply, darken and lighten have been
added, code taken directly from vertex paint.
Note to project files maintainers:
- The img module was removed from SCons and Makefiles, and this should
be done in other build systems also. I'll wait to remove the module
from cvs, to not break compilation.
2006-07-26 22:29:23 +00:00
|
|
|
#include "BKE_brush.h"
|
2006-11-17 04:46:48 +00:00
|
|
|
#include "BKE_idprop.h"
|
Orange: more noodle updates!
**** NEW: Group Nodes
Node trees usually become messy and confusing quickly, so we need
not only a way to collapse Nodes into single 'groups', but also a
way to re-use that data to create libraries of effects.
This has been done by making a new Library data type, the NodeTree.
Everything that has been grouped is stored here, and available for
re-use, appending or linking. These NodeTrees are fully generic,
i.e. can store shader trees, composit trees, and so on. The 'type'
value as stored in the NodeTree will keep track of internal type
definitions and execute/drawing callbacks. Needless to say, re-using
shader trees in a composit tree is a bit useless, and will be
prevented in the browsing code. :)
So; any NodeTree can become a "Goup Node" inside in a NodeTree. This
Group Node then works just like any Node.
To prevent the current code to become too complex, I've disabled
the possibility to insert Groups inside of Groups. That might be
enabled later, but is a real nasty piece of code to get OK.
Since Group Nodes are a dynamic Node type, a lot of work has been
done to ensure Node definitions can be dynamic too, but still allow
to be stored in files, and allow to be verified for type-definition
changes on reloading. This system needs a little bit maturing still,
so the Python gurus should better wait a little bit! (Also for me to
write the definite API docs for it).
What works now:
- Press CTRL+G to create a new Group. The grouping code checks for
impossible selections (like an unselected node between selected nodes).
Everthing that's selected then gets removed from the current tree, and
inserted in a new NodeTree library data block. A Group Node then is
added which links to this new NodeTree.
- Press ALT+G to ungroup. This will not delete the NodeTree library
data, but just duplicate the Group into the current tree.
- Press TAB, or click on the NodeTree icon to edit Groups. Note that
NodeTrees are instances, so editing one Group will also change the
other users.
This also means that when removing nodes in a Group (or hiding sockets
or changing internal links) this is immediately corrected for all users
of this Group, also in other Materials.
- While editing Groups, only the internal Nodes can be edited. A single
click outside of the Group boundary will close this 'edit mode'.
What needs to be done:
- SHIFT+A menu in toolbox style, also including a list of Groups
- Enable the single-user button in the Group Node
- Displaying all (visible) internal group UI elements in the Node Panel
- Enable Library linking and prevent editing of Groups then.
**** NEW: Socket Visibility control
Node types will be generated with a lot of possible inputs or outputs,
and drawing all sockets all the time isn't very useful then.
A new option in the Node header ('plus' icon) allows to either hide all
unused sockets (first keypress) or to reveil them (when there are hidden
sockets, the icon displays black, otherwise it's blended).
Hidden sockets in Nodes also are not exported to a Group, so this way
you can control what options (in/outputs) exactly are available.
To be done:
- a way to hide individual sockets, like with a RMB click on it.
**** NEW: Nodes now render!
This is still quite primitive, more on a level to replace the (now
obsolete and disabled) Material Layers.
What needs to be done:
- make the "Geometry" node work properly, also for AA textures
- make the Texture Node work (does very little at the moment)
- give Material Nodes all inputs as needed (like Map-to Panel)
- find a way to export more data from a Material Node, like the
shadow value, or light intensity only, etc
Very important also to separate from the Material Buttons the
"global" options, like "Ztransp" or "Wire" or "Halo". These can not
be set for each Material-Node individually.
Also note that the Preview Render (Buttons window) now renders a bit
differently. This was a horrid piece of antique code, using a totally
incompatible way of rendering. Target is to fully re-use internal
render code for previews.
OK... that's it mostly. Now test!
2006-01-02 13:06:05 +00:00
|
|
|
|
2004-01-21 04:38:03 +00:00
|
|
|
#include "BPI_script.h"
|
2002-10-12 11:37:38 +00:00
|
|
|
|
2005-12-12 16:29:47 +00:00
|
|
|
#define MAX_IDPUP 60 /* was 24 */
|
2002-10-12 11:37:38 +00:00
|
|
|
|
2003-04-26 11:56:44 +00:00
|
|
|
/* ************* general ************************ */
|
2002-10-12 11:37:38 +00:00
|
|
|
|
|
|
|
void id_lib_extern(ID *id)
|
|
|
|
{
|
|
|
|
if(id) {
|
|
|
|
if(id->flag & LIB_INDIRECT) {
|
|
|
|
id->flag -= LIB_INDIRECT;
|
|
|
|
id->flag |= LIB_EXTERN;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
void id_us_plus(ID *id)
|
|
|
|
{
|
|
|
|
if(id) {
|
|
|
|
id->us++;
|
|
|
|
if(id->flag & LIB_INDIRECT) {
|
|
|
|
id->flag -= LIB_INDIRECT;
|
|
|
|
id->flag |= LIB_EXTERN;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
ListBase *wich_libbase(Main *mainlib, short type)
|
|
|
|
{
|
|
|
|
switch( type ) {
|
|
|
|
case ID_SCE:
|
|
|
|
return &(mainlib->scene);
|
|
|
|
case ID_LI:
|
|
|
|
return &(mainlib->library);
|
|
|
|
case ID_OB:
|
|
|
|
return &(mainlib->object);
|
|
|
|
case ID_ME:
|
|
|
|
return &(mainlib->mesh);
|
|
|
|
case ID_CU:
|
|
|
|
return &(mainlib->curve);
|
|
|
|
case ID_MB:
|
|
|
|
return &(mainlib->mball);
|
|
|
|
case ID_MA:
|
|
|
|
return &(mainlib->mat);
|
|
|
|
case ID_TE:
|
|
|
|
return &(mainlib->tex);
|
|
|
|
case ID_IM:
|
|
|
|
return &(mainlib->image);
|
|
|
|
case ID_WV:
|
|
|
|
return &(mainlib->wave);
|
|
|
|
case ID_LT:
|
|
|
|
return &(mainlib->latt);
|
|
|
|
case ID_LA:
|
|
|
|
return &(mainlib->lamp);
|
|
|
|
case ID_CA:
|
|
|
|
return &(mainlib->camera);
|
|
|
|
case ID_IP:
|
|
|
|
return &(mainlib->ipo);
|
|
|
|
case ID_KE:
|
|
|
|
return &(mainlib->key);
|
|
|
|
case ID_WO:
|
|
|
|
return &(mainlib->world);
|
|
|
|
case ID_SCR:
|
|
|
|
return &(mainlib->screen);
|
|
|
|
case ID_VF:
|
|
|
|
return &(mainlib->vfont);
|
|
|
|
case ID_TXT:
|
|
|
|
return &(mainlib->text);
|
2003-12-14 01:18:09 +00:00
|
|
|
case ID_SCRIPT:
|
|
|
|
return &(mainlib->script);
|
2002-10-12 11:37:38 +00:00
|
|
|
case ID_SO:
|
|
|
|
return &(mainlib->sound);
|
|
|
|
case ID_SAMPLE:
|
|
|
|
/* declared as an external in sound.h !!! */
|
|
|
|
return (samples);
|
|
|
|
case ID_GR:
|
|
|
|
return &(mainlib->group);
|
|
|
|
case ID_AR:
|
|
|
|
return &(mainlib->armature);
|
|
|
|
case ID_AC:
|
|
|
|
return &(mainlib->action);
|
Orange: more noodle updates!
**** NEW: Group Nodes
Node trees usually become messy and confusing quickly, so we need
not only a way to collapse Nodes into single 'groups', but also a
way to re-use that data to create libraries of effects.
This has been done by making a new Library data type, the NodeTree.
Everything that has been grouped is stored here, and available for
re-use, appending or linking. These NodeTrees are fully generic,
i.e. can store shader trees, composit trees, and so on. The 'type'
value as stored in the NodeTree will keep track of internal type
definitions and execute/drawing callbacks. Needless to say, re-using
shader trees in a composit tree is a bit useless, and will be
prevented in the browsing code. :)
So; any NodeTree can become a "Goup Node" inside in a NodeTree. This
Group Node then works just like any Node.
To prevent the current code to become too complex, I've disabled
the possibility to insert Groups inside of Groups. That might be
enabled later, but is a real nasty piece of code to get OK.
Since Group Nodes are a dynamic Node type, a lot of work has been
done to ensure Node definitions can be dynamic too, but still allow
to be stored in files, and allow to be verified for type-definition
changes on reloading. This system needs a little bit maturing still,
so the Python gurus should better wait a little bit! (Also for me to
write the definite API docs for it).
What works now:
- Press CTRL+G to create a new Group. The grouping code checks for
impossible selections (like an unselected node between selected nodes).
Everthing that's selected then gets removed from the current tree, and
inserted in a new NodeTree library data block. A Group Node then is
added which links to this new NodeTree.
- Press ALT+G to ungroup. This will not delete the NodeTree library
data, but just duplicate the Group into the current tree.
- Press TAB, or click on the NodeTree icon to edit Groups. Note that
NodeTrees are instances, so editing one Group will also change the
other users.
This also means that when removing nodes in a Group (or hiding sockets
or changing internal links) this is immediately corrected for all users
of this Group, also in other Materials.
- While editing Groups, only the internal Nodes can be edited. A single
click outside of the Group boundary will close this 'edit mode'.
What needs to be done:
- SHIFT+A menu in toolbox style, also including a list of Groups
- Enable the single-user button in the Group Node
- Displaying all (visible) internal group UI elements in the Node Panel
- Enable Library linking and prevent editing of Groups then.
**** NEW: Socket Visibility control
Node types will be generated with a lot of possible inputs or outputs,
and drawing all sockets all the time isn't very useful then.
A new option in the Node header ('plus' icon) allows to either hide all
unused sockets (first keypress) or to reveil them (when there are hidden
sockets, the icon displays black, otherwise it's blended).
Hidden sockets in Nodes also are not exported to a Group, so this way
you can control what options (in/outputs) exactly are available.
To be done:
- a way to hide individual sockets, like with a RMB click on it.
**** NEW: Nodes now render!
This is still quite primitive, more on a level to replace the (now
obsolete and disabled) Material Layers.
What needs to be done:
- make the "Geometry" node work properly, also for AA textures
- make the Texture Node work (does very little at the moment)
- give Material Nodes all inputs as needed (like Map-to Panel)
- find a way to export more data from a Material Node, like the
shadow value, or light intensity only, etc
Very important also to separate from the Material Buttons the
"global" options, like "Ztransp" or "Wire" or "Halo". These can not
be set for each Material-Node individually.
Also note that the Preview Render (Buttons window) now renders a bit
differently. This was a horrid piece of antique code, using a totally
incompatible way of rendering. Target is to fully re-use internal
render code for previews.
OK... that's it mostly. Now test!
2006-01-02 13:06:05 +00:00
|
|
|
case ID_NT:
|
|
|
|
return &(mainlib->nodetree);
|
Brush Datablock:
- Added a new Brush datablock, only used by image paint, but intended
to be used in texture paint, vertex paint, weight paint and sculpt
mode also.
- Being a datablock, these brushes can be saved, appended and linked.
They have a fake user by default, to make sure they are saved even if
not selected.
Image Painting:
- Replaced the img module with C code in imagepaint.c
- Airbrush is no longer a separate tool, but rather an option that can
be used for soften, smear and clone also.
- Blend modes mix, add, subtract, multiply, darken and lighten have been
added, code taken directly from vertex paint.
Note to project files maintainers:
- The img module was removed from SCons and Makefiles, and this should
be done in other build systems also. I'll wait to remove the module
from cvs, to not break compilation.
2006-07-26 22:29:23 +00:00
|
|
|
case ID_BR:
|
|
|
|
return &(mainlib->brush);
|
2002-10-12 11:37:38 +00:00
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2006-09-06 09:51:30 +00:00
|
|
|
/* note: MAX_LIBARRAY define should match this code */
|
2002-10-12 11:37:38 +00:00
|
|
|
int set_listbasepointers(Main *main, ListBase **lb)
|
|
|
|
{
|
2003-04-26 11:56:44 +00:00
|
|
|
/* BACKWARDS! also watch order of free-ing! (mesh<->mat) */
|
2002-10-12 11:37:38 +00:00
|
|
|
|
|
|
|
lb[0]= &(main->ipo);
|
|
|
|
lb[1]= &(main->key);
|
|
|
|
lb[2]= &(main->image);
|
|
|
|
lb[3]= &(main->tex);
|
|
|
|
lb[4]= &(main->mat);
|
|
|
|
lb[5]= &(main->vfont);
|
|
|
|
|
|
|
|
/* Important!: When adding a new object type,
|
|
|
|
* the specific data should be inserted here
|
|
|
|
*/
|
|
|
|
|
|
|
|
lb[6]= &(main->armature);
|
|
|
|
lb[7]= &(main->action);
|
|
|
|
|
|
|
|
lb[8]= &(main->mesh);
|
|
|
|
lb[9]= &(main->curve);
|
|
|
|
lb[10]= &(main->mball);
|
|
|
|
|
Result of 2 weeks of quiet coding work in Greece :)
Aim was to get a total refresh of the animation system. This
is needed because;
- we need to upgrade it with 21st century features
- current code is spaghetti/hack combo, and hides good design
- it should become lag-free with using dependency graphs
A full log, with complete code API/structure/design explanation
will follow, that's a load of work... so here below the list with
hot changes;
- The entire object update system (matrices, geometry) is now
centralized. Calls to where_is_object and makeDispList are
forbidden, instead we tag objects 'changed' and let the
depgraph code sort it out
- Removed all old "Ika" code
- Depgraph is aware of all relationships, including meta balls,
constraints, bevelcurve, and so on.
- Made depgraph aware of relation types and layers, to do smart
flushing of 'changed' events. Nothing gets calculated too often!
- Transform uses depgraph to detect changes
- On frame-advance, depgraph flushes animated changes
Armatures;
Almost all armature related code has been fully built from scratch.
It now reveils the original design much better, with a very clean
implementation, lag free without even calculating each Bone more than
once. Result is quite a speedup yes!
Important to note is;
1) Armature is data containing the 'rest position'
2) Pose is the changes of rest position, and always on object level.
That way more Objects can use same Pose. Also constraints are in Pose
3) Actions only contain the Ipos to change values in Poses.
- Bones draw unrotated now
- Drawing bones speedup enormously (10-20 times)
- Bone selecting in EditMode, selection state is saved for PoseMode,
and vice-versa
- Undo in editmode
- Bone renaming does vertexgroups, constraints, posechannels, actions,
for all users of Armature in entire file
- Added Bone renaming in NKey panel
- Nkey PoseMode shows eulers now
- EditMode and PoseMode now have 'active' bone too (last clicked)
- Parenting in EditMode' CTRL+P, ALT+P, with nice options!
- Pose is added in Outliner now, with showing that constraints are in
the Pose, not Armature
- Disconnected IK solving from constraints. It's a separate phase now,
on top of the full Pose calculations
- Pose itself has a dependency graph too, so evaluation order is lag free.
TODO NOW;
- Rotating in Posemode has incorrect inverse transform (Martin will fix)
- Python Bone/Armature/Pose API disabled... needs full recode too
(wait for my doc!)
- Game engine will need upgrade too
- Depgraph code needs revision, cleanup, can be much faster!
(But, compliments for Jean-Luc, it works like a charm!)
- IK changed, it now doesnt use previous position to advance to next
position anymore. That system looks nice (no flips) but is not well
suited for NLA and background render.
TODO LATER;
We now can do loadsa new nifty features as well; like:
- Kill PoseMode (can be option for armatures itself)
- Make B-Bones (Bezier, Bspline, like for spines)
- Move all silly button level edit to 3d window (like CTRL+I = add
IK)
- Much better & informative drawing
- Fix action/nla editors
- Put all ipos in Actions (object, mesh key, lamp color)
- Add hooks
- Null bones
- Much more advanced constraints...
Bugfixes;
- OGL render (view3d header) had wrong first frame on anim render
- Ipo 'recording' mode had wrong playback speed
- Vertex-key mode now sticks to show 'active key', until frame change
-Ton-
2005-07-03 17:35:38 +00:00
|
|
|
lb[11]= &(main->wave);
|
|
|
|
lb[12]= &(main->latt);
|
|
|
|
lb[13]= &(main->lamp);
|
|
|
|
lb[14]= &(main->camera);
|
2002-10-12 11:37:38 +00:00
|
|
|
|
Result of 2 weeks of quiet coding work in Greece :)
Aim was to get a total refresh of the animation system. This
is needed because;
- we need to upgrade it with 21st century features
- current code is spaghetti/hack combo, and hides good design
- it should become lag-free with using dependency graphs
A full log, with complete code API/structure/design explanation
will follow, that's a load of work... so here below the list with
hot changes;
- The entire object update system (matrices, geometry) is now
centralized. Calls to where_is_object and makeDispList are
forbidden, instead we tag objects 'changed' and let the
depgraph code sort it out
- Removed all old "Ika" code
- Depgraph is aware of all relationships, including meta balls,
constraints, bevelcurve, and so on.
- Made depgraph aware of relation types and layers, to do smart
flushing of 'changed' events. Nothing gets calculated too often!
- Transform uses depgraph to detect changes
- On frame-advance, depgraph flushes animated changes
Armatures;
Almost all armature related code has been fully built from scratch.
It now reveils the original design much better, with a very clean
implementation, lag free without even calculating each Bone more than
once. Result is quite a speedup yes!
Important to note is;
1) Armature is data containing the 'rest position'
2) Pose is the changes of rest position, and always on object level.
That way more Objects can use same Pose. Also constraints are in Pose
3) Actions only contain the Ipos to change values in Poses.
- Bones draw unrotated now
- Drawing bones speedup enormously (10-20 times)
- Bone selecting in EditMode, selection state is saved for PoseMode,
and vice-versa
- Undo in editmode
- Bone renaming does vertexgroups, constraints, posechannels, actions,
for all users of Armature in entire file
- Added Bone renaming in NKey panel
- Nkey PoseMode shows eulers now
- EditMode and PoseMode now have 'active' bone too (last clicked)
- Parenting in EditMode' CTRL+P, ALT+P, with nice options!
- Pose is added in Outliner now, with showing that constraints are in
the Pose, not Armature
- Disconnected IK solving from constraints. It's a separate phase now,
on top of the full Pose calculations
- Pose itself has a dependency graph too, so evaluation order is lag free.
TODO NOW;
- Rotating in Posemode has incorrect inverse transform (Martin will fix)
- Python Bone/Armature/Pose API disabled... needs full recode too
(wait for my doc!)
- Game engine will need upgrade too
- Depgraph code needs revision, cleanup, can be much faster!
(But, compliments for Jean-Luc, it works like a charm!)
- IK changed, it now doesnt use previous position to advance to next
position anymore. That system looks nice (no flips) but is not well
suited for NLA and background render.
TODO LATER;
We now can do loadsa new nifty features as well; like:
- Kill PoseMode (can be option for armatures itself)
- Make B-Bones (Bezier, Bspline, like for spines)
- Move all silly button level edit to 3d window (like CTRL+I = add
IK)
- Much better & informative drawing
- Fix action/nla editors
- Put all ipos in Actions (object, mesh key, lamp color)
- Add hooks
- Null bones
- Much more advanced constraints...
Bugfixes;
- OGL render (view3d header) had wrong first frame on anim render
- Ipo 'recording' mode had wrong playback speed
- Vertex-key mode now sticks to show 'active key', until frame change
-Ton-
2005-07-03 17:35:38 +00:00
|
|
|
lb[15]= &(main->world);
|
|
|
|
lb[16]= &(main->screen);
|
|
|
|
lb[17]= &(main->object);
|
|
|
|
lb[18]= &(main->scene);
|
|
|
|
lb[19]= &(main->library);
|
|
|
|
lb[20]= &(main->text);
|
|
|
|
lb[21]= &(main->sound);
|
|
|
|
lb[22]= &(main->group);
|
Orange: more noodle updates!
**** NEW: Group Nodes
Node trees usually become messy and confusing quickly, so we need
not only a way to collapse Nodes into single 'groups', but also a
way to re-use that data to create libraries of effects.
This has been done by making a new Library data type, the NodeTree.
Everything that has been grouped is stored here, and available for
re-use, appending or linking. These NodeTrees are fully generic,
i.e. can store shader trees, composit trees, and so on. The 'type'
value as stored in the NodeTree will keep track of internal type
definitions and execute/drawing callbacks. Needless to say, re-using
shader trees in a composit tree is a bit useless, and will be
prevented in the browsing code. :)
So; any NodeTree can become a "Goup Node" inside in a NodeTree. This
Group Node then works just like any Node.
To prevent the current code to become too complex, I've disabled
the possibility to insert Groups inside of Groups. That might be
enabled later, but is a real nasty piece of code to get OK.
Since Group Nodes are a dynamic Node type, a lot of work has been
done to ensure Node definitions can be dynamic too, but still allow
to be stored in files, and allow to be verified for type-definition
changes on reloading. This system needs a little bit maturing still,
so the Python gurus should better wait a little bit! (Also for me to
write the definite API docs for it).
What works now:
- Press CTRL+G to create a new Group. The grouping code checks for
impossible selections (like an unselected node between selected nodes).
Everthing that's selected then gets removed from the current tree, and
inserted in a new NodeTree library data block. A Group Node then is
added which links to this new NodeTree.
- Press ALT+G to ungroup. This will not delete the NodeTree library
data, but just duplicate the Group into the current tree.
- Press TAB, or click on the NodeTree icon to edit Groups. Note that
NodeTrees are instances, so editing one Group will also change the
other users.
This also means that when removing nodes in a Group (or hiding sockets
or changing internal links) this is immediately corrected for all users
of this Group, also in other Materials.
- While editing Groups, only the internal Nodes can be edited. A single
click outside of the Group boundary will close this 'edit mode'.
What needs to be done:
- SHIFT+A menu in toolbox style, also including a list of Groups
- Enable the single-user button in the Group Node
- Displaying all (visible) internal group UI elements in the Node Panel
- Enable Library linking and prevent editing of Groups then.
**** NEW: Socket Visibility control
Node types will be generated with a lot of possible inputs or outputs,
and drawing all sockets all the time isn't very useful then.
A new option in the Node header ('plus' icon) allows to either hide all
unused sockets (first keypress) or to reveil them (when there are hidden
sockets, the icon displays black, otherwise it's blended).
Hidden sockets in Nodes also are not exported to a Group, so this way
you can control what options (in/outputs) exactly are available.
To be done:
- a way to hide individual sockets, like with a RMB click on it.
**** NEW: Nodes now render!
This is still quite primitive, more on a level to replace the (now
obsolete and disabled) Material Layers.
What needs to be done:
- make the "Geometry" node work properly, also for AA textures
- make the Texture Node work (does very little at the moment)
- give Material Nodes all inputs as needed (like Map-to Panel)
- find a way to export more data from a Material Node, like the
shadow value, or light intensity only, etc
Very important also to separate from the Material Buttons the
"global" options, like "Ztransp" or "Wire" or "Halo". These can not
be set for each Material-Node individually.
Also note that the Preview Render (Buttons window) now renders a bit
differently. This was a horrid piece of antique code, using a totally
incompatible way of rendering. Target is to fully re-use internal
render code for previews.
OK... that's it mostly. Now test!
2006-01-02 13:06:05 +00:00
|
|
|
lb[23]= &(main->nodetree);
|
Brush Datablock:
- Added a new Brush datablock, only used by image paint, but intended
to be used in texture paint, vertex paint, weight paint and sculpt
mode also.
- Being a datablock, these brushes can be saved, appended and linked.
They have a fake user by default, to make sure they are saved even if
not selected.
Image Painting:
- Replaced the img module with C code in imagepaint.c
- Airbrush is no longer a separate tool, but rather an option that can
be used for soften, smear and clone also.
- Blend modes mix, add, subtract, multiply, darken and lighten have been
added, code taken directly from vertex paint.
Note to project files maintainers:
- The img module was removed from SCons and Makefiles, and this should
be done in other build systems also. I'll wait to remove the module
from cvs, to not break compilation.
2006-07-26 22:29:23 +00:00
|
|
|
lb[24]= &(main->brush);
|
2003-12-14 01:18:09 +00:00
|
|
|
|
Brush Datablock:
- Added a new Brush datablock, only used by image paint, but intended
to be used in texture paint, vertex paint, weight paint and sculpt
mode also.
- Being a datablock, these brushes can be saved, appended and linked.
They have a fake user by default, to make sure they are saved even if
not selected.
Image Painting:
- Replaced the img module with C code in imagepaint.c
- Airbrush is no longer a separate tool, but rather an option that can
be used for soften, smear and clone also.
- Blend modes mix, add, subtract, multiply, darken and lighten have been
added, code taken directly from vertex paint.
Note to project files maintainers:
- The img module was removed from SCons and Makefiles, and this should
be done in other build systems also. I'll wait to remove the module
from cvs, to not break compilation.
2006-07-26 22:29:23 +00:00
|
|
|
lb[25]= samples;
|
|
|
|
lb[26]= &(main->script);
|
|
|
|
lb[27]= NULL;
|
Result of 2 weeks of quiet coding work in Greece :)
Aim was to get a total refresh of the animation system. This
is needed because;
- we need to upgrade it with 21st century features
- current code is spaghetti/hack combo, and hides good design
- it should become lag-free with using dependency graphs
A full log, with complete code API/structure/design explanation
will follow, that's a load of work... so here below the list with
hot changes;
- The entire object update system (matrices, geometry) is now
centralized. Calls to where_is_object and makeDispList are
forbidden, instead we tag objects 'changed' and let the
depgraph code sort it out
- Removed all old "Ika" code
- Depgraph is aware of all relationships, including meta balls,
constraints, bevelcurve, and so on.
- Made depgraph aware of relation types and layers, to do smart
flushing of 'changed' events. Nothing gets calculated too often!
- Transform uses depgraph to detect changes
- On frame-advance, depgraph flushes animated changes
Armatures;
Almost all armature related code has been fully built from scratch.
It now reveils the original design much better, with a very clean
implementation, lag free without even calculating each Bone more than
once. Result is quite a speedup yes!
Important to note is;
1) Armature is data containing the 'rest position'
2) Pose is the changes of rest position, and always on object level.
That way more Objects can use same Pose. Also constraints are in Pose
3) Actions only contain the Ipos to change values in Poses.
- Bones draw unrotated now
- Drawing bones speedup enormously (10-20 times)
- Bone selecting in EditMode, selection state is saved for PoseMode,
and vice-versa
- Undo in editmode
- Bone renaming does vertexgroups, constraints, posechannels, actions,
for all users of Armature in entire file
- Added Bone renaming in NKey panel
- Nkey PoseMode shows eulers now
- EditMode and PoseMode now have 'active' bone too (last clicked)
- Parenting in EditMode' CTRL+P, ALT+P, with nice options!
- Pose is added in Outliner now, with showing that constraints are in
the Pose, not Armature
- Disconnected IK solving from constraints. It's a separate phase now,
on top of the full Pose calculations
- Pose itself has a dependency graph too, so evaluation order is lag free.
TODO NOW;
- Rotating in Posemode has incorrect inverse transform (Martin will fix)
- Python Bone/Armature/Pose API disabled... needs full recode too
(wait for my doc!)
- Game engine will need upgrade too
- Depgraph code needs revision, cleanup, can be much faster!
(But, compliments for Jean-Luc, it works like a charm!)
- IK changed, it now doesnt use previous position to advance to next
position anymore. That system looks nice (no flips) but is not well
suited for NLA and background render.
TODO LATER;
We now can do loadsa new nifty features as well; like:
- Kill PoseMode (can be option for armatures itself)
- Make B-Bones (Bezier, Bspline, like for spines)
- Move all silly button level edit to 3d window (like CTRL+I = add
IK)
- Much better & informative drawing
- Fix action/nla editors
- Put all ipos in Actions (object, mesh key, lamp color)
- Add hooks
- Null bones
- Much more advanced constraints...
Bugfixes;
- OGL render (view3d header) had wrong first frame on anim render
- Ipo 'recording' mode had wrong playback speed
- Vertex-key mode now sticks to show 'active key', until frame change
-Ton-
2005-07-03 17:35:38 +00:00
|
|
|
|
Brush Datablock:
- Added a new Brush datablock, only used by image paint, but intended
to be used in texture paint, vertex paint, weight paint and sculpt
mode also.
- Being a datablock, these brushes can be saved, appended and linked.
They have a fake user by default, to make sure they are saved even if
not selected.
Image Painting:
- Replaced the img module with C code in imagepaint.c
- Airbrush is no longer a separate tool, but rather an option that can
be used for soften, smear and clone also.
- Blend modes mix, add, subtract, multiply, darken and lighten have been
added, code taken directly from vertex paint.
Note to project files maintainers:
- The img module was removed from SCons and Makefiles, and this should
be done in other build systems also. I'll wait to remove the module
from cvs, to not break compilation.
2006-07-26 22:29:23 +00:00
|
|
|
return 27;
|
2002-10-12 11:37:38 +00:00
|
|
|
}
|
|
|
|
|
2003-04-26 11:56:44 +00:00
|
|
|
/* *********** ALLOC AND FREE *****************
|
2002-10-12 11:37:38 +00:00
|
|
|
|
|
|
|
free_libblock(ListBase *lb, ID *id )
|
2003-04-26 11:56:44 +00:00
|
|
|
provide a list-basis and datablock, but only ID is read
|
2002-10-12 11:37:38 +00:00
|
|
|
|
|
|
|
void *alloc_libblock(ListBase *lb, type, name)
|
2003-04-26 11:56:44 +00:00
|
|
|
inserts in list and returns a new ID
|
2002-10-12 11:37:38 +00:00
|
|
|
|
|
|
|
***************************** */
|
|
|
|
|
|
|
|
static ID *alloc_libblock_notest(short type)
|
|
|
|
{
|
Orange: more noodle updates!
**** NEW: Group Nodes
Node trees usually become messy and confusing quickly, so we need
not only a way to collapse Nodes into single 'groups', but also a
way to re-use that data to create libraries of effects.
This has been done by making a new Library data type, the NodeTree.
Everything that has been grouped is stored here, and available for
re-use, appending or linking. These NodeTrees are fully generic,
i.e. can store shader trees, composit trees, and so on. The 'type'
value as stored in the NodeTree will keep track of internal type
definitions and execute/drawing callbacks. Needless to say, re-using
shader trees in a composit tree is a bit useless, and will be
prevented in the browsing code. :)
So; any NodeTree can become a "Goup Node" inside in a NodeTree. This
Group Node then works just like any Node.
To prevent the current code to become too complex, I've disabled
the possibility to insert Groups inside of Groups. That might be
enabled later, but is a real nasty piece of code to get OK.
Since Group Nodes are a dynamic Node type, a lot of work has been
done to ensure Node definitions can be dynamic too, but still allow
to be stored in files, and allow to be verified for type-definition
changes on reloading. This system needs a little bit maturing still,
so the Python gurus should better wait a little bit! (Also for me to
write the definite API docs for it).
What works now:
- Press CTRL+G to create a new Group. The grouping code checks for
impossible selections (like an unselected node between selected nodes).
Everthing that's selected then gets removed from the current tree, and
inserted in a new NodeTree library data block. A Group Node then is
added which links to this new NodeTree.
- Press ALT+G to ungroup. This will not delete the NodeTree library
data, but just duplicate the Group into the current tree.
- Press TAB, or click on the NodeTree icon to edit Groups. Note that
NodeTrees are instances, so editing one Group will also change the
other users.
This also means that when removing nodes in a Group (or hiding sockets
or changing internal links) this is immediately corrected for all users
of this Group, also in other Materials.
- While editing Groups, only the internal Nodes can be edited. A single
click outside of the Group boundary will close this 'edit mode'.
What needs to be done:
- SHIFT+A menu in toolbox style, also including a list of Groups
- Enable the single-user button in the Group Node
- Displaying all (visible) internal group UI elements in the Node Panel
- Enable Library linking and prevent editing of Groups then.
**** NEW: Socket Visibility control
Node types will be generated with a lot of possible inputs or outputs,
and drawing all sockets all the time isn't very useful then.
A new option in the Node header ('plus' icon) allows to either hide all
unused sockets (first keypress) or to reveil them (when there are hidden
sockets, the icon displays black, otherwise it's blended).
Hidden sockets in Nodes also are not exported to a Group, so this way
you can control what options (in/outputs) exactly are available.
To be done:
- a way to hide individual sockets, like with a RMB click on it.
**** NEW: Nodes now render!
This is still quite primitive, more on a level to replace the (now
obsolete and disabled) Material Layers.
What needs to be done:
- make the "Geometry" node work properly, also for AA textures
- make the Texture Node work (does very little at the moment)
- give Material Nodes all inputs as needed (like Map-to Panel)
- find a way to export more data from a Material Node, like the
shadow value, or light intensity only, etc
Very important also to separate from the Material Buttons the
"global" options, like "Ztransp" or "Wire" or "Halo". These can not
be set for each Material-Node individually.
Also note that the Preview Render (Buttons window) now renders a bit
differently. This was a horrid piece of antique code, using a totally
incompatible way of rendering. Target is to fully re-use internal
render code for previews.
OK... that's it mostly. Now test!
2006-01-02 13:06:05 +00:00
|
|
|
ID *id= NULL;
|
2002-10-12 11:37:38 +00:00
|
|
|
|
|
|
|
switch( type ) {
|
|
|
|
case ID_SCE:
|
|
|
|
id= MEM_callocN(sizeof(Scene), "scene");
|
|
|
|
break;
|
|
|
|
case ID_LI:
|
|
|
|
id= MEM_callocN(sizeof(Library), "library");
|
|
|
|
break;
|
|
|
|
case ID_OB:
|
|
|
|
id= MEM_callocN(sizeof(Object), "object");
|
|
|
|
break;
|
|
|
|
case ID_ME:
|
|
|
|
id= MEM_callocN(sizeof(Mesh), "mesh");
|
|
|
|
break;
|
|
|
|
case ID_CU:
|
|
|
|
id= MEM_callocN(sizeof(Curve), "curve");
|
|
|
|
break;
|
|
|
|
case ID_MB:
|
|
|
|
id= MEM_callocN(sizeof(MetaBall), "mball");
|
|
|
|
break;
|
|
|
|
case ID_MA:
|
|
|
|
id= MEM_callocN(sizeof(Material), "mat");
|
|
|
|
break;
|
|
|
|
case ID_TE:
|
|
|
|
id= MEM_callocN(sizeof(Tex), "tex");
|
|
|
|
break;
|
|
|
|
case ID_IM:
|
|
|
|
id= MEM_callocN(sizeof(Image), "image");
|
|
|
|
break;
|
|
|
|
case ID_WV:
|
|
|
|
id= MEM_callocN(sizeof(Wave), "wave");
|
|
|
|
break;
|
|
|
|
case ID_LT:
|
|
|
|
id= MEM_callocN(sizeof(Lattice), "latt");
|
|
|
|
break;
|
|
|
|
case ID_LA:
|
|
|
|
id= MEM_callocN(sizeof(Lamp), "lamp");
|
|
|
|
break;
|
|
|
|
case ID_CA:
|
|
|
|
id= MEM_callocN(sizeof(Camera), "camera");
|
|
|
|
break;
|
|
|
|
case ID_IP:
|
|
|
|
id= MEM_callocN(sizeof(Ipo), "ipo");
|
|
|
|
break;
|
|
|
|
case ID_KE:
|
|
|
|
id= MEM_callocN(sizeof(Key), "key");
|
|
|
|
break;
|
|
|
|
case ID_WO:
|
|
|
|
id= MEM_callocN(sizeof(World), "world");
|
|
|
|
break;
|
|
|
|
case ID_SCR:
|
|
|
|
id= MEM_callocN(sizeof(bScreen), "screen");
|
|
|
|
break;
|
|
|
|
case ID_VF:
|
|
|
|
id= MEM_callocN(sizeof(VFont), "vfont");
|
|
|
|
break;
|
|
|
|
case ID_TXT:
|
|
|
|
id= MEM_callocN(sizeof(Text), "text");
|
|
|
|
break;
|
2003-12-14 01:18:09 +00:00
|
|
|
case ID_SCRIPT:
|
|
|
|
id= MEM_callocN(sizeof(Script), "script");
|
|
|
|
break;
|
2002-10-12 11:37:38 +00:00
|
|
|
case ID_SO:
|
|
|
|
id= MEM_callocN(sizeof(bSound), "sound");
|
|
|
|
break;
|
|
|
|
case ID_SAMPLE:
|
|
|
|
id = MEM_callocN(sizeof(bSample), "sound");
|
|
|
|
break;
|
|
|
|
case ID_GR:
|
|
|
|
id= MEM_callocN(sizeof(Group), "sound");
|
|
|
|
break;
|
|
|
|
case ID_AR:
|
|
|
|
id = MEM_callocN(sizeof(bArmature), "armature");
|
|
|
|
break;
|
|
|
|
case ID_AC:
|
|
|
|
id = MEM_callocN(sizeof(bAction), "action");
|
|
|
|
break;
|
Orange: more noodle updates!
**** NEW: Group Nodes
Node trees usually become messy and confusing quickly, so we need
not only a way to collapse Nodes into single 'groups', but also a
way to re-use that data to create libraries of effects.
This has been done by making a new Library data type, the NodeTree.
Everything that has been grouped is stored here, and available for
re-use, appending or linking. These NodeTrees are fully generic,
i.e. can store shader trees, composit trees, and so on. The 'type'
value as stored in the NodeTree will keep track of internal type
definitions and execute/drawing callbacks. Needless to say, re-using
shader trees in a composit tree is a bit useless, and will be
prevented in the browsing code. :)
So; any NodeTree can become a "Goup Node" inside in a NodeTree. This
Group Node then works just like any Node.
To prevent the current code to become too complex, I've disabled
the possibility to insert Groups inside of Groups. That might be
enabled later, but is a real nasty piece of code to get OK.
Since Group Nodes are a dynamic Node type, a lot of work has been
done to ensure Node definitions can be dynamic too, but still allow
to be stored in files, and allow to be verified for type-definition
changes on reloading. This system needs a little bit maturing still,
so the Python gurus should better wait a little bit! (Also for me to
write the definite API docs for it).
What works now:
- Press CTRL+G to create a new Group. The grouping code checks for
impossible selections (like an unselected node between selected nodes).
Everthing that's selected then gets removed from the current tree, and
inserted in a new NodeTree library data block. A Group Node then is
added which links to this new NodeTree.
- Press ALT+G to ungroup. This will not delete the NodeTree library
data, but just duplicate the Group into the current tree.
- Press TAB, or click on the NodeTree icon to edit Groups. Note that
NodeTrees are instances, so editing one Group will also change the
other users.
This also means that when removing nodes in a Group (or hiding sockets
or changing internal links) this is immediately corrected for all users
of this Group, also in other Materials.
- While editing Groups, only the internal Nodes can be edited. A single
click outside of the Group boundary will close this 'edit mode'.
What needs to be done:
- SHIFT+A menu in toolbox style, also including a list of Groups
- Enable the single-user button in the Group Node
- Displaying all (visible) internal group UI elements in the Node Panel
- Enable Library linking and prevent editing of Groups then.
**** NEW: Socket Visibility control
Node types will be generated with a lot of possible inputs or outputs,
and drawing all sockets all the time isn't very useful then.
A new option in the Node header ('plus' icon) allows to either hide all
unused sockets (first keypress) or to reveil them (when there are hidden
sockets, the icon displays black, otherwise it's blended).
Hidden sockets in Nodes also are not exported to a Group, so this way
you can control what options (in/outputs) exactly are available.
To be done:
- a way to hide individual sockets, like with a RMB click on it.
**** NEW: Nodes now render!
This is still quite primitive, more on a level to replace the (now
obsolete and disabled) Material Layers.
What needs to be done:
- make the "Geometry" node work properly, also for AA textures
- make the Texture Node work (does very little at the moment)
- give Material Nodes all inputs as needed (like Map-to Panel)
- find a way to export more data from a Material Node, like the
shadow value, or light intensity only, etc
Very important also to separate from the Material Buttons the
"global" options, like "Ztransp" or "Wire" or "Halo". These can not
be set for each Material-Node individually.
Also note that the Preview Render (Buttons window) now renders a bit
differently. This was a horrid piece of antique code, using a totally
incompatible way of rendering. Target is to fully re-use internal
render code for previews.
OK... that's it mostly. Now test!
2006-01-02 13:06:05 +00:00
|
|
|
case ID_NT:
|
Brush Datablock:
- Added a new Brush datablock, only used by image paint, but intended
to be used in texture paint, vertex paint, weight paint and sculpt
mode also.
- Being a datablock, these brushes can be saved, appended and linked.
They have a fake user by default, to make sure they are saved even if
not selected.
Image Painting:
- Replaced the img module with C code in imagepaint.c
- Airbrush is no longer a separate tool, but rather an option that can
be used for soften, smear and clone also.
- Blend modes mix, add, subtract, multiply, darken and lighten have been
added, code taken directly from vertex paint.
Note to project files maintainers:
- The img module was removed from SCons and Makefiles, and this should
be done in other build systems also. I'll wait to remove the module
from cvs, to not break compilation.
2006-07-26 22:29:23 +00:00
|
|
|
id = MEM_callocN(sizeof(bNodeTree), "nodetree");
|
|
|
|
break;
|
|
|
|
case ID_BR:
|
|
|
|
id = MEM_callocN(sizeof(Brush), "brush");
|
Orange: more noodle updates!
**** NEW: Group Nodes
Node trees usually become messy and confusing quickly, so we need
not only a way to collapse Nodes into single 'groups', but also a
way to re-use that data to create libraries of effects.
This has been done by making a new Library data type, the NodeTree.
Everything that has been grouped is stored here, and available for
re-use, appending or linking. These NodeTrees are fully generic,
i.e. can store shader trees, composit trees, and so on. The 'type'
value as stored in the NodeTree will keep track of internal type
definitions and execute/drawing callbacks. Needless to say, re-using
shader trees in a composit tree is a bit useless, and will be
prevented in the browsing code. :)
So; any NodeTree can become a "Goup Node" inside in a NodeTree. This
Group Node then works just like any Node.
To prevent the current code to become too complex, I've disabled
the possibility to insert Groups inside of Groups. That might be
enabled later, but is a real nasty piece of code to get OK.
Since Group Nodes are a dynamic Node type, a lot of work has been
done to ensure Node definitions can be dynamic too, but still allow
to be stored in files, and allow to be verified for type-definition
changes on reloading. This system needs a little bit maturing still,
so the Python gurus should better wait a little bit! (Also for me to
write the definite API docs for it).
What works now:
- Press CTRL+G to create a new Group. The grouping code checks for
impossible selections (like an unselected node between selected nodes).
Everthing that's selected then gets removed from the current tree, and
inserted in a new NodeTree library data block. A Group Node then is
added which links to this new NodeTree.
- Press ALT+G to ungroup. This will not delete the NodeTree library
data, but just duplicate the Group into the current tree.
- Press TAB, or click on the NodeTree icon to edit Groups. Note that
NodeTrees are instances, so editing one Group will also change the
other users.
This also means that when removing nodes in a Group (or hiding sockets
or changing internal links) this is immediately corrected for all users
of this Group, also in other Materials.
- While editing Groups, only the internal Nodes can be edited. A single
click outside of the Group boundary will close this 'edit mode'.
What needs to be done:
- SHIFT+A menu in toolbox style, also including a list of Groups
- Enable the single-user button in the Group Node
- Displaying all (visible) internal group UI elements in the Node Panel
- Enable Library linking and prevent editing of Groups then.
**** NEW: Socket Visibility control
Node types will be generated with a lot of possible inputs or outputs,
and drawing all sockets all the time isn't very useful then.
A new option in the Node header ('plus' icon) allows to either hide all
unused sockets (first keypress) or to reveil them (when there are hidden
sockets, the icon displays black, otherwise it's blended).
Hidden sockets in Nodes also are not exported to a Group, so this way
you can control what options (in/outputs) exactly are available.
To be done:
- a way to hide individual sockets, like with a RMB click on it.
**** NEW: Nodes now render!
This is still quite primitive, more on a level to replace the (now
obsolete and disabled) Material Layers.
What needs to be done:
- make the "Geometry" node work properly, also for AA textures
- make the Texture Node work (does very little at the moment)
- give Material Nodes all inputs as needed (like Map-to Panel)
- find a way to export more data from a Material Node, like the
shadow value, or light intensity only, etc
Very important also to separate from the Material Buttons the
"global" options, like "Ztransp" or "Wire" or "Halo". These can not
be set for each Material-Node individually.
Also note that the Preview Render (Buttons window) now renders a bit
differently. This was a horrid piece of antique code, using a totally
incompatible way of rendering. Target is to fully re-use internal
render code for previews.
OK... that's it mostly. Now test!
2006-01-02 13:06:05 +00:00
|
|
|
break;
|
2002-10-12 11:37:38 +00:00
|
|
|
}
|
|
|
|
return id;
|
|
|
|
}
|
|
|
|
|
|
|
|
// used everywhere in blenkernel and text.c
|
Orange: more noodle updates!
**** NEW: Group Nodes
Node trees usually become messy and confusing quickly, so we need
not only a way to collapse Nodes into single 'groups', but also a
way to re-use that data to create libraries of effects.
This has been done by making a new Library data type, the NodeTree.
Everything that has been grouped is stored here, and available for
re-use, appending or linking. These NodeTrees are fully generic,
i.e. can store shader trees, composit trees, and so on. The 'type'
value as stored in the NodeTree will keep track of internal type
definitions and execute/drawing callbacks. Needless to say, re-using
shader trees in a composit tree is a bit useless, and will be
prevented in the browsing code. :)
So; any NodeTree can become a "Goup Node" inside in a NodeTree. This
Group Node then works just like any Node.
To prevent the current code to become too complex, I've disabled
the possibility to insert Groups inside of Groups. That might be
enabled later, but is a real nasty piece of code to get OK.
Since Group Nodes are a dynamic Node type, a lot of work has been
done to ensure Node definitions can be dynamic too, but still allow
to be stored in files, and allow to be verified for type-definition
changes on reloading. This system needs a little bit maturing still,
so the Python gurus should better wait a little bit! (Also for me to
write the definite API docs for it).
What works now:
- Press CTRL+G to create a new Group. The grouping code checks for
impossible selections (like an unselected node between selected nodes).
Everthing that's selected then gets removed from the current tree, and
inserted in a new NodeTree library data block. A Group Node then is
added which links to this new NodeTree.
- Press ALT+G to ungroup. This will not delete the NodeTree library
data, but just duplicate the Group into the current tree.
- Press TAB, or click on the NodeTree icon to edit Groups. Note that
NodeTrees are instances, so editing one Group will also change the
other users.
This also means that when removing nodes in a Group (or hiding sockets
or changing internal links) this is immediately corrected for all users
of this Group, also in other Materials.
- While editing Groups, only the internal Nodes can be edited. A single
click outside of the Group boundary will close this 'edit mode'.
What needs to be done:
- SHIFT+A menu in toolbox style, also including a list of Groups
- Enable the single-user button in the Group Node
- Displaying all (visible) internal group UI elements in the Node Panel
- Enable Library linking and prevent editing of Groups then.
**** NEW: Socket Visibility control
Node types will be generated with a lot of possible inputs or outputs,
and drawing all sockets all the time isn't very useful then.
A new option in the Node header ('plus' icon) allows to either hide all
unused sockets (first keypress) or to reveil them (when there are hidden
sockets, the icon displays black, otherwise it's blended).
Hidden sockets in Nodes also are not exported to a Group, so this way
you can control what options (in/outputs) exactly are available.
To be done:
- a way to hide individual sockets, like with a RMB click on it.
**** NEW: Nodes now render!
This is still quite primitive, more on a level to replace the (now
obsolete and disabled) Material Layers.
What needs to be done:
- make the "Geometry" node work properly, also for AA textures
- make the Texture Node work (does very little at the moment)
- give Material Nodes all inputs as needed (like Map-to Panel)
- find a way to export more data from a Material Node, like the
shadow value, or light intensity only, etc
Very important also to separate from the Material Buttons the
"global" options, like "Ztransp" or "Wire" or "Halo". These can not
be set for each Material-Node individually.
Also note that the Preview Render (Buttons window) now renders a bit
differently. This was a horrid piece of antique code, using a totally
incompatible way of rendering. Target is to fully re-use internal
render code for previews.
OK... that's it mostly. Now test!
2006-01-02 13:06:05 +00:00
|
|
|
void *alloc_libblock(ListBase *lb, short type, const char *name)
|
2002-10-12 11:37:38 +00:00
|
|
|
{
|
Orange: more noodle updates!
**** NEW: Group Nodes
Node trees usually become messy and confusing quickly, so we need
not only a way to collapse Nodes into single 'groups', but also a
way to re-use that data to create libraries of effects.
This has been done by making a new Library data type, the NodeTree.
Everything that has been grouped is stored here, and available for
re-use, appending or linking. These NodeTrees are fully generic,
i.e. can store shader trees, composit trees, and so on. The 'type'
value as stored in the NodeTree will keep track of internal type
definitions and execute/drawing callbacks. Needless to say, re-using
shader trees in a composit tree is a bit useless, and will be
prevented in the browsing code. :)
So; any NodeTree can become a "Goup Node" inside in a NodeTree. This
Group Node then works just like any Node.
To prevent the current code to become too complex, I've disabled
the possibility to insert Groups inside of Groups. That might be
enabled later, but is a real nasty piece of code to get OK.
Since Group Nodes are a dynamic Node type, a lot of work has been
done to ensure Node definitions can be dynamic too, but still allow
to be stored in files, and allow to be verified for type-definition
changes on reloading. This system needs a little bit maturing still,
so the Python gurus should better wait a little bit! (Also for me to
write the definite API docs for it).
What works now:
- Press CTRL+G to create a new Group. The grouping code checks for
impossible selections (like an unselected node between selected nodes).
Everthing that's selected then gets removed from the current tree, and
inserted in a new NodeTree library data block. A Group Node then is
added which links to this new NodeTree.
- Press ALT+G to ungroup. This will not delete the NodeTree library
data, but just duplicate the Group into the current tree.
- Press TAB, or click on the NodeTree icon to edit Groups. Note that
NodeTrees are instances, so editing one Group will also change the
other users.
This also means that when removing nodes in a Group (or hiding sockets
or changing internal links) this is immediately corrected for all users
of this Group, also in other Materials.
- While editing Groups, only the internal Nodes can be edited. A single
click outside of the Group boundary will close this 'edit mode'.
What needs to be done:
- SHIFT+A menu in toolbox style, also including a list of Groups
- Enable the single-user button in the Group Node
- Displaying all (visible) internal group UI elements in the Node Panel
- Enable Library linking and prevent editing of Groups then.
**** NEW: Socket Visibility control
Node types will be generated with a lot of possible inputs or outputs,
and drawing all sockets all the time isn't very useful then.
A new option in the Node header ('plus' icon) allows to either hide all
unused sockets (first keypress) or to reveil them (when there are hidden
sockets, the icon displays black, otherwise it's blended).
Hidden sockets in Nodes also are not exported to a Group, so this way
you can control what options (in/outputs) exactly are available.
To be done:
- a way to hide individual sockets, like with a RMB click on it.
**** NEW: Nodes now render!
This is still quite primitive, more on a level to replace the (now
obsolete and disabled) Material Layers.
What needs to be done:
- make the "Geometry" node work properly, also for AA textures
- make the Texture Node work (does very little at the moment)
- give Material Nodes all inputs as needed (like Map-to Panel)
- find a way to export more data from a Material Node, like the
shadow value, or light intensity only, etc
Very important also to separate from the Material Buttons the
"global" options, like "Ztransp" or "Wire" or "Halo". These can not
be set for each Material-Node individually.
Also note that the Preview Render (Buttons window) now renders a bit
differently. This was a horrid piece of antique code, using a totally
incompatible way of rendering. Target is to fully re-use internal
render code for previews.
OK... that's it mostly. Now test!
2006-01-02 13:06:05 +00:00
|
|
|
ID *id= NULL;
|
2002-10-12 11:37:38 +00:00
|
|
|
|
|
|
|
id= alloc_libblock_notest(type);
|
|
|
|
if(id) {
|
|
|
|
BLI_addtail(lb, id);
|
|
|
|
id->us= 1;
|
2005-12-21 22:21:43 +00:00
|
|
|
id->icon_id = 0;
|
2002-10-12 11:37:38 +00:00
|
|
|
*( (short *)id->name )= type;
|
|
|
|
new_id(lb, id, name);
|
2003-04-26 11:56:44 +00:00
|
|
|
/* alphabetic insterion: is in new_id */
|
2002-10-12 11:37:38 +00:00
|
|
|
}
|
|
|
|
return id;
|
|
|
|
}
|
|
|
|
|
Orange: more noodle updates!
**** NEW: Group Nodes
Node trees usually become messy and confusing quickly, so we need
not only a way to collapse Nodes into single 'groups', but also a
way to re-use that data to create libraries of effects.
This has been done by making a new Library data type, the NodeTree.
Everything that has been grouped is stored here, and available for
re-use, appending or linking. These NodeTrees are fully generic,
i.e. can store shader trees, composit trees, and so on. The 'type'
value as stored in the NodeTree will keep track of internal type
definitions and execute/drawing callbacks. Needless to say, re-using
shader trees in a composit tree is a bit useless, and will be
prevented in the browsing code. :)
So; any NodeTree can become a "Goup Node" inside in a NodeTree. This
Group Node then works just like any Node.
To prevent the current code to become too complex, I've disabled
the possibility to insert Groups inside of Groups. That might be
enabled later, but is a real nasty piece of code to get OK.
Since Group Nodes are a dynamic Node type, a lot of work has been
done to ensure Node definitions can be dynamic too, but still allow
to be stored in files, and allow to be verified for type-definition
changes on reloading. This system needs a little bit maturing still,
so the Python gurus should better wait a little bit! (Also for me to
write the definite API docs for it).
What works now:
- Press CTRL+G to create a new Group. The grouping code checks for
impossible selections (like an unselected node between selected nodes).
Everthing that's selected then gets removed from the current tree, and
inserted in a new NodeTree library data block. A Group Node then is
added which links to this new NodeTree.
- Press ALT+G to ungroup. This will not delete the NodeTree library
data, but just duplicate the Group into the current tree.
- Press TAB, or click on the NodeTree icon to edit Groups. Note that
NodeTrees are instances, so editing one Group will also change the
other users.
This also means that when removing nodes in a Group (or hiding sockets
or changing internal links) this is immediately corrected for all users
of this Group, also in other Materials.
- While editing Groups, only the internal Nodes can be edited. A single
click outside of the Group boundary will close this 'edit mode'.
What needs to be done:
- SHIFT+A menu in toolbox style, also including a list of Groups
- Enable the single-user button in the Group Node
- Displaying all (visible) internal group UI elements in the Node Panel
- Enable Library linking and prevent editing of Groups then.
**** NEW: Socket Visibility control
Node types will be generated with a lot of possible inputs or outputs,
and drawing all sockets all the time isn't very useful then.
A new option in the Node header ('plus' icon) allows to either hide all
unused sockets (first keypress) or to reveil them (when there are hidden
sockets, the icon displays black, otherwise it's blended).
Hidden sockets in Nodes also are not exported to a Group, so this way
you can control what options (in/outputs) exactly are available.
To be done:
- a way to hide individual sockets, like with a RMB click on it.
**** NEW: Nodes now render!
This is still quite primitive, more on a level to replace the (now
obsolete and disabled) Material Layers.
What needs to be done:
- make the "Geometry" node work properly, also for AA textures
- make the Texture Node work (does very little at the moment)
- give Material Nodes all inputs as needed (like Map-to Panel)
- find a way to export more data from a Material Node, like the
shadow value, or light intensity only, etc
Very important also to separate from the Material Buttons the
"global" options, like "Ztransp" or "Wire" or "Halo". These can not
be set for each Material-Node individually.
Also note that the Preview Render (Buttons window) now renders a bit
differently. This was a horrid piece of antique code, using a totally
incompatible way of rendering. Target is to fully re-use internal
render code for previews.
OK... that's it mostly. Now test!
2006-01-02 13:06:05 +00:00
|
|
|
/* GS reads the memory pointed at in a specific ordering.
|
|
|
|
only use this definition, makes little and big endian systems
|
|
|
|
work fine, in conjunction with MAKE_ID */
|
2002-10-12 11:37:38 +00:00
|
|
|
|
|
|
|
/* from blendef: */
|
|
|
|
#define GS(a) (*((short *)(a)))
|
|
|
|
|
|
|
|
// used everywhere in blenkernel and text.c
|
|
|
|
void *copy_libblock(void *rt)
|
|
|
|
{
|
|
|
|
ID *idn, *id;
|
|
|
|
ListBase *lb;
|
|
|
|
char *cp, *cpn;
|
|
|
|
int idn_len;
|
|
|
|
|
|
|
|
id= rt;
|
|
|
|
|
|
|
|
lb= wich_libbase(G.main, GS(id->name));
|
|
|
|
idn= alloc_libblock(lb, GS(id->name), id->name+2);
|
|
|
|
|
|
|
|
idn_len= MEM_allocN_len(idn);
|
|
|
|
if(idn_len - sizeof(ID) > 0) {
|
|
|
|
cp= (char *)id;
|
|
|
|
cpn= (char *)idn;
|
|
|
|
memcpy(cpn+sizeof(ID), cp+sizeof(ID), idn_len - sizeof(ID));
|
|
|
|
}
|
|
|
|
|
|
|
|
id->newid= idn;
|
|
|
|
idn->flag |= LIB_NEW;
|
|
|
|
|
|
|
|
return idn;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void free_library(Library *lib)
|
|
|
|
{
|
|
|
|
/* no freeing needed for libraries yet */
|
|
|
|
}
|
|
|
|
|
|
|
|
// used in headerbuttons.c image.c mesh.c screen.c sound.c and library.c
|
|
|
|
void free_libblock(ListBase *lb, void *idv)
|
|
|
|
{
|
|
|
|
ID *id= idv;
|
|
|
|
|
2003-04-26 11:56:44 +00:00
|
|
|
switch( GS(id->name) ) { /* GetShort from util.h */
|
2002-10-12 11:37:38 +00:00
|
|
|
case ID_SCE:
|
|
|
|
free_scene((Scene *)id);
|
|
|
|
break;
|
|
|
|
case ID_LI:
|
|
|
|
free_library((Library *)id);
|
|
|
|
break;
|
|
|
|
case ID_OB:
|
|
|
|
free_object((Object *)id);
|
|
|
|
break;
|
|
|
|
case ID_ME:
|
|
|
|
free_mesh((Mesh *)id);
|
|
|
|
break;
|
|
|
|
case ID_CU:
|
|
|
|
free_curve((Curve *)id);
|
|
|
|
break;
|
|
|
|
case ID_MB:
|
|
|
|
free_mball((MetaBall *)id);
|
|
|
|
break;
|
|
|
|
case ID_MA:
|
|
|
|
free_material((Material *)id);
|
|
|
|
break;
|
|
|
|
case ID_TE:
|
|
|
|
free_texture((Tex *)id);
|
|
|
|
break;
|
|
|
|
case ID_IM:
|
|
|
|
free_image((Image *)id);
|
|
|
|
break;
|
|
|
|
case ID_WV:
|
|
|
|
/* free_wave(id); */
|
|
|
|
break;
|
|
|
|
case ID_LT:
|
|
|
|
free_lattice((Lattice *)id);
|
|
|
|
break;
|
|
|
|
case ID_LA:
|
|
|
|
free_lamp((Lamp *)id);
|
|
|
|
break;
|
|
|
|
case ID_CA:
|
|
|
|
free_camera((Camera*) id);
|
|
|
|
break;
|
|
|
|
case ID_IP:
|
|
|
|
free_ipo((Ipo *)id);
|
|
|
|
break;
|
|
|
|
case ID_KE:
|
|
|
|
free_key((Key *)id);
|
|
|
|
break;
|
|
|
|
case ID_WO:
|
|
|
|
free_world((World *)id);
|
|
|
|
break;
|
|
|
|
case ID_SCR:
|
|
|
|
free_screen((bScreen *)id);
|
|
|
|
break;
|
|
|
|
case ID_VF:
|
|
|
|
free_vfont((VFont *)id);
|
|
|
|
break;
|
|
|
|
case ID_TXT:
|
|
|
|
free_text((Text *)id);
|
|
|
|
break;
|
2003-12-14 01:18:09 +00:00
|
|
|
case ID_SCRIPT:
|
|
|
|
free_script((Script *)id);
|
|
|
|
break;
|
2002-10-12 11:37:38 +00:00
|
|
|
case ID_SO:
|
|
|
|
sound_free_sound((bSound *)id);
|
|
|
|
break;
|
|
|
|
case ID_SAMPLE:
|
|
|
|
sound_free_sample((bSample *)id);
|
|
|
|
break;
|
|
|
|
case ID_GR:
|
|
|
|
free_group((Group *)id);
|
|
|
|
break;
|
|
|
|
case ID_AR:
|
|
|
|
free_armature((bArmature *)id);
|
|
|
|
break;
|
|
|
|
case ID_AC:
|
|
|
|
free_action((bAction *)id);
|
|
|
|
break;
|
Orange: more noodle updates!
**** NEW: Group Nodes
Node trees usually become messy and confusing quickly, so we need
not only a way to collapse Nodes into single 'groups', but also a
way to re-use that data to create libraries of effects.
This has been done by making a new Library data type, the NodeTree.
Everything that has been grouped is stored here, and available for
re-use, appending or linking. These NodeTrees are fully generic,
i.e. can store shader trees, composit trees, and so on. The 'type'
value as stored in the NodeTree will keep track of internal type
definitions and execute/drawing callbacks. Needless to say, re-using
shader trees in a composit tree is a bit useless, and will be
prevented in the browsing code. :)
So; any NodeTree can become a "Goup Node" inside in a NodeTree. This
Group Node then works just like any Node.
To prevent the current code to become too complex, I've disabled
the possibility to insert Groups inside of Groups. That might be
enabled later, but is a real nasty piece of code to get OK.
Since Group Nodes are a dynamic Node type, a lot of work has been
done to ensure Node definitions can be dynamic too, but still allow
to be stored in files, and allow to be verified for type-definition
changes on reloading. This system needs a little bit maturing still,
so the Python gurus should better wait a little bit! (Also for me to
write the definite API docs for it).
What works now:
- Press CTRL+G to create a new Group. The grouping code checks for
impossible selections (like an unselected node between selected nodes).
Everthing that's selected then gets removed from the current tree, and
inserted in a new NodeTree library data block. A Group Node then is
added which links to this new NodeTree.
- Press ALT+G to ungroup. This will not delete the NodeTree library
data, but just duplicate the Group into the current tree.
- Press TAB, or click on the NodeTree icon to edit Groups. Note that
NodeTrees are instances, so editing one Group will also change the
other users.
This also means that when removing nodes in a Group (or hiding sockets
or changing internal links) this is immediately corrected for all users
of this Group, also in other Materials.
- While editing Groups, only the internal Nodes can be edited. A single
click outside of the Group boundary will close this 'edit mode'.
What needs to be done:
- SHIFT+A menu in toolbox style, also including a list of Groups
- Enable the single-user button in the Group Node
- Displaying all (visible) internal group UI elements in the Node Panel
- Enable Library linking and prevent editing of Groups then.
**** NEW: Socket Visibility control
Node types will be generated with a lot of possible inputs or outputs,
and drawing all sockets all the time isn't very useful then.
A new option in the Node header ('plus' icon) allows to either hide all
unused sockets (first keypress) or to reveil them (when there are hidden
sockets, the icon displays black, otherwise it's blended).
Hidden sockets in Nodes also are not exported to a Group, so this way
you can control what options (in/outputs) exactly are available.
To be done:
- a way to hide individual sockets, like with a RMB click on it.
**** NEW: Nodes now render!
This is still quite primitive, more on a level to replace the (now
obsolete and disabled) Material Layers.
What needs to be done:
- make the "Geometry" node work properly, also for AA textures
- make the Texture Node work (does very little at the moment)
- give Material Nodes all inputs as needed (like Map-to Panel)
- find a way to export more data from a Material Node, like the
shadow value, or light intensity only, etc
Very important also to separate from the Material Buttons the
"global" options, like "Ztransp" or "Wire" or "Halo". These can not
be set for each Material-Node individually.
Also note that the Preview Render (Buttons window) now renders a bit
differently. This was a horrid piece of antique code, using a totally
incompatible way of rendering. Target is to fully re-use internal
render code for previews.
OK... that's it mostly. Now test!
2006-01-02 13:06:05 +00:00
|
|
|
case ID_NT:
|
|
|
|
ntreeFreeTree((bNodeTree *)id);
|
|
|
|
break;
|
Brush Datablock:
- Added a new Brush datablock, only used by image paint, but intended
to be used in texture paint, vertex paint, weight paint and sculpt
mode also.
- Being a datablock, these brushes can be saved, appended and linked.
They have a fake user by default, to make sure they are saved even if
not selected.
Image Painting:
- Replaced the img module with C code in imagepaint.c
- Airbrush is no longer a separate tool, but rather an option that can
be used for soften, smear and clone also.
- Blend modes mix, add, subtract, multiply, darken and lighten have been
added, code taken directly from vertex paint.
Note to project files maintainers:
- The img module was removed from SCons and Makefiles, and this should
be done in other build systems also. I'll wait to remove the module
from cvs, to not break compilation.
2006-07-26 22:29:23 +00:00
|
|
|
case ID_BR:
|
|
|
|
free_brush((Brush *)id);
|
|
|
|
break;
|
2002-10-12 11:37:38 +00:00
|
|
|
}
|
|
|
|
|
2006-11-17 04:46:48 +00:00
|
|
|
if (id->properties) {
|
|
|
|
IDP_FreeProperty(id->properties);
|
|
|
|
MEM_freeN(id->properties);
|
|
|
|
}
|
2002-10-12 11:37:38 +00:00
|
|
|
BLI_remlink(lb, id);
|
|
|
|
MEM_freeN(id);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
void free_libblock_us(ListBase *lb, void *idv) /* test users */
|
|
|
|
{
|
|
|
|
ID *id= idv;
|
|
|
|
|
|
|
|
id->us--;
|
|
|
|
|
|
|
|
if(id->us<0) {
|
|
|
|
if(id->lib) printf("ERROR block %s %s users %d\n", id->lib->name, id->name, id->us);
|
|
|
|
else printf("ERROR block %s users %d\n", id->name, id->us);
|
|
|
|
}
|
|
|
|
if(id->us==0) {
|
|
|
|
if( GS(id->name)==ID_OB ) unlink_object((Object *)id);
|
|
|
|
|
|
|
|
free_libblock(lb, id);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void free_main(Main *mainvar)
|
|
|
|
{
|
2003-04-26 11:56:44 +00:00
|
|
|
/* also call when reading a file, erase all, etc */
|
2002-10-12 11:37:38 +00:00
|
|
|
ListBase *lbarray[MAX_LIBARRAY];
|
|
|
|
int a;
|
|
|
|
|
|
|
|
a= set_listbasepointers(mainvar, lbarray);
|
|
|
|
while(a--) {
|
|
|
|
ListBase *lb= lbarray[a];
|
|
|
|
ID *id;
|
|
|
|
|
Phew, a lot of work, and no new features...
Main target was to make the inner rendering loop using no globals anymore.
This is essential for proper usage while raytracing, it caused a lot of
hacks in the raycode as well, which even didn't work correctly for all
situations (textures especially).
Done this by creating a new local struct RenderInput, which replaces usage
of the global struct Render R. The latter now only is used to denote
image size, viewmatrix, and the like.
Making the inner render loops using no globals caused 1000s of vars to
be changed... but the result definitely is much nicer code, which enables
making 'real' shaders in a next stage.
It also enabled me to remove the hacks from ray.c
Then i went to the task of removing redundant code. Especially the calculus
of texture coords took place (identical) in three locations.
Most obvious is the change in the unified render part, which is much less
code now; it uses the same rendering routines as normal render now.
(Note; not for halos yet!)
I also removed 6 files called 'shadowbuffer' something. This was experimen-
tal stuff from NaN days. And again saved a lot of double used code.
Finally I went over the blenkernel and blender/src calls to render stuff.
Here the same local data is used now, resulting in less dependency.
I also moved render-texture to the render module, this was still in Kernel.
(new file: texture.c)
So! After this commit I will check on the autofiles, to try to fix that.
MSVC people have to do it themselves.
This commit will need quite some testing help, but I'm around!
2003-12-21 21:52:51 +00:00
|
|
|
while ( (id= lb->first) ) {
|
2002-10-12 11:37:38 +00:00
|
|
|
free_libblock(lb, id);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
MEM_freeN(mainvar);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* ***************** ID ************************ */
|
|
|
|
|
2006-07-07 17:08:04 +00:00
|
|
|
|
2003-04-26 11:56:44 +00:00
|
|
|
ID *find_id(char *type, char *name) /* type: "OB" or "MA" etc */
|
2002-10-12 11:37:38 +00:00
|
|
|
{
|
|
|
|
ID *id;
|
|
|
|
ListBase *lb;
|
|
|
|
|
|
|
|
lb= wich_libbase(G.main, GS(type));
|
|
|
|
|
|
|
|
id= lb->first;
|
|
|
|
while(id) {
|
|
|
|
if( strcmp(id->name+2, name)==0 ) return id;
|
|
|
|
id= id->next;
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
More node goodies!
First note; this is a WIP project, some commits might change things that
make formerly saved situations not to work identically... like now!
------ New Material integration ------
Until now, the Node system worked on top of the 'current' Material, just
like how the Material Layers worked. That's quite confusing in practice,
especially to see what Material is a Node, or what is the "base material"
Best solution is to completely separate the two. This has been implemented
as follows now;
- The confusing "Input" node has been removed.
- When choosing a Material in Blender, you can define this Material to be
either 'normal' (default) or be the root of a Node tree.
- If a Material is a Node tree, you have to add Nodes in the tree to see
something happen. An empty Node tree doesn't do anything (black).
- If a Material is a Node Tree, the 'data browse' menus show it with an
'N' mark before the name. The 'data block' buttons display it with the
suffix 'NT' (instead of 'MA').
- In a Node Tree, any Material can be inserted, including itself. Only in
that case the Material is being used itself for shading.
UI changes:
Added a new Panel "Links", which shows:
- where the Material is linked to (Object, Mesh, etc)
- if the Material is a NodeTree or not
- the actual active Material in the Tree
The "Node" Panel itself now only shows buttons from the other nodes, when
they are active.
Further the Material Nodes themselves allow browsing and renaming or adding
new Materials now too.
Second half of today's work was cleaning up selection when the Nodes
overlap... it was possible to drag links from invisible sockets, or click
headers for invisible nodes, etc. This because the mouse input code was
not checking for visibility yet.
Works now even for buttons. :)
2005-12-29 18:08:01 +00:00
|
|
|
static void get_flags_for_id(ID *id, char *buf)
|
|
|
|
{
|
2002-10-12 11:37:38 +00:00
|
|
|
int isfake= id->flag & LIB_FAKEUSER;
|
More node goodies!
First note; this is a WIP project, some commits might change things that
make formerly saved situations not to work identically... like now!
------ New Material integration ------
Until now, the Node system worked on top of the 'current' Material, just
like how the Material Layers worked. That's quite confusing in practice,
especially to see what Material is a Node, or what is the "base material"
Best solution is to completely separate the two. This has been implemented
as follows now;
- The confusing "Input" node has been removed.
- When choosing a Material in Blender, you can define this Material to be
either 'normal' (default) or be the root of a Node tree.
- If a Material is a Node tree, you have to add Nodes in the tree to see
something happen. An empty Node tree doesn't do anything (black).
- If a Material is a Node Tree, the 'data browse' menus show it with an
'N' mark before the name. The 'data block' buttons display it with the
suffix 'NT' (instead of 'MA').
- In a Node Tree, any Material can be inserted, including itself. Only in
that case the Material is being used itself for shading.
UI changes:
Added a new Panel "Links", which shows:
- where the Material is linked to (Object, Mesh, etc)
- if the Material is a NodeTree or not
- the actual active Material in the Tree
The "Node" Panel itself now only shows buttons from the other nodes, when
they are active.
Further the Material Nodes themselves allow browsing and renaming or adding
new Materials now too.
Second half of today's work was cleaning up selection when the Nodes
overlap... it was possible to drag links from invisible sockets, or click
headers for invisible nodes, etc. This because the mouse input code was
not checking for visibility yet.
Works now even for buttons. :)
2005-12-29 18:08:01 +00:00
|
|
|
int isnode=0;
|
2002-10-12 11:37:38 +00:00
|
|
|
/* Writeout the flags for the entry, note there
|
|
|
|
* is a small hack that writes 5 spaces instead
|
|
|
|
* of 4 if no flags are displayed... this makes
|
|
|
|
* things usually line up ok - better would be
|
|
|
|
* to have that explicit, oh well - zr
|
|
|
|
*/
|
|
|
|
|
More node goodies!
First note; this is a WIP project, some commits might change things that
make formerly saved situations not to work identically... like now!
------ New Material integration ------
Until now, the Node system worked on top of the 'current' Material, just
like how the Material Layers worked. That's quite confusing in practice,
especially to see what Material is a Node, or what is the "base material"
Best solution is to completely separate the two. This has been implemented
as follows now;
- The confusing "Input" node has been removed.
- When choosing a Material in Blender, you can define this Material to be
either 'normal' (default) or be the root of a Node tree.
- If a Material is a Node tree, you have to add Nodes in the tree to see
something happen. An empty Node tree doesn't do anything (black).
- If a Material is a Node Tree, the 'data browse' menus show it with an
'N' mark before the name. The 'data block' buttons display it with the
suffix 'NT' (instead of 'MA').
- In a Node Tree, any Material can be inserted, including itself. Only in
that case the Material is being used itself for shading.
UI changes:
Added a new Panel "Links", which shows:
- where the Material is linked to (Object, Mesh, etc)
- if the Material is a NodeTree or not
- the actual active Material in the Tree
The "Node" Panel itself now only shows buttons from the other nodes, when
they are active.
Further the Material Nodes themselves allow browsing and renaming or adding
new Materials now too.
Second half of today's work was cleaning up selection when the Nodes
overlap... it was possible to drag links from invisible sockets, or click
headers for invisible nodes, etc. This because the mouse input code was
not checking for visibility yet.
Works now even for buttons. :)
2005-12-29 18:08:01 +00:00
|
|
|
if(GS(id->name)==ID_MA)
|
|
|
|
isnode= ((Material *)id)->use_nodes;
|
|
|
|
|
2002-10-12 11:37:38 +00:00
|
|
|
if (id->us<0)
|
|
|
|
sprintf(buf, "-1W ");
|
More node goodies!
First note; this is a WIP project, some commits might change things that
make formerly saved situations not to work identically... like now!
------ New Material integration ------
Until now, the Node system worked on top of the 'current' Material, just
like how the Material Layers worked. That's quite confusing in practice,
especially to see what Material is a Node, or what is the "base material"
Best solution is to completely separate the two. This has been implemented
as follows now;
- The confusing "Input" node has been removed.
- When choosing a Material in Blender, you can define this Material to be
either 'normal' (default) or be the root of a Node tree.
- If a Material is a Node tree, you have to add Nodes in the tree to see
something happen. An empty Node tree doesn't do anything (black).
- If a Material is a Node Tree, the 'data browse' menus show it with an
'N' mark before the name. The 'data block' buttons display it with the
suffix 'NT' (instead of 'MA').
- In a Node Tree, any Material can be inserted, including itself. Only in
that case the Material is being used itself for shading.
UI changes:
Added a new Panel "Links", which shows:
- where the Material is linked to (Object, Mesh, etc)
- if the Material is a NodeTree or not
- the actual active Material in the Tree
The "Node" Panel itself now only shows buttons from the other nodes, when
they are active.
Further the Material Nodes themselves allow browsing and renaming or adding
new Materials now too.
Second half of today's work was cleaning up selection when the Nodes
overlap... it was possible to drag links from invisible sockets, or click
headers for invisible nodes, etc. This because the mouse input code was
not checking for visibility yet.
Works now even for buttons. :)
2005-12-29 18:08:01 +00:00
|
|
|
else if (!id->lib && !isfake && id->us && !isnode)
|
2002-10-12 11:37:38 +00:00
|
|
|
sprintf(buf, " ");
|
More node goodies!
First note; this is a WIP project, some commits might change things that
make formerly saved situations not to work identically... like now!
------ New Material integration ------
Until now, the Node system worked on top of the 'current' Material, just
like how the Material Layers worked. That's quite confusing in practice,
especially to see what Material is a Node, or what is the "base material"
Best solution is to completely separate the two. This has been implemented
as follows now;
- The confusing "Input" node has been removed.
- When choosing a Material in Blender, you can define this Material to be
either 'normal' (default) or be the root of a Node tree.
- If a Material is a Node tree, you have to add Nodes in the tree to see
something happen. An empty Node tree doesn't do anything (black).
- If a Material is a Node Tree, the 'data browse' menus show it with an
'N' mark before the name. The 'data block' buttons display it with the
suffix 'NT' (instead of 'MA').
- In a Node Tree, any Material can be inserted, including itself. Only in
that case the Material is being used itself for shading.
UI changes:
Added a new Panel "Links", which shows:
- where the Material is linked to (Object, Mesh, etc)
- if the Material is a NodeTree or not
- the actual active Material in the Tree
The "Node" Panel itself now only shows buttons from the other nodes, when
they are active.
Further the Material Nodes themselves allow browsing and renaming or adding
new Materials now too.
Second half of today's work was cleaning up selection when the Nodes
overlap... it was possible to drag links from invisible sockets, or click
headers for invisible nodes, etc. This because the mouse input code was
not checking for visibility yet.
Works now even for buttons. :)
2005-12-29 18:08:01 +00:00
|
|
|
else if(isnode)
|
|
|
|
sprintf(buf, "%c%cN%c ", id->lib?'L':' ', isfake?'F':' ', (id->us==0)?'O':' ');
|
2002-10-12 11:37:38 +00:00
|
|
|
else
|
|
|
|
sprintf(buf, "%c%c%c ", id->lib?'L':' ', isfake?'F':' ', (id->us==0)?'O':' ');
|
|
|
|
}
|
|
|
|
|
|
|
|
static void IDnames_to_dyn_pupstring(DynStr *pupds, ListBase *lb, ID *link, short *nr)
|
|
|
|
{
|
|
|
|
int i, nids= BLI_countlist(lb);
|
|
|
|
|
2004-04-10 15:13:28 +00:00
|
|
|
if (nr) *nr= -1;
|
2002-10-12 11:37:38 +00:00
|
|
|
|
2004-04-10 15:13:28 +00:00
|
|
|
if (nr && nids>MAX_IDPUP) {
|
2002-10-12 11:37:38 +00:00
|
|
|
BLI_dynstr_append(pupds, "DataBrowse %x-2");
|
2005-12-12 16:29:47 +00:00
|
|
|
*nr= -2;
|
2002-10-12 11:37:38 +00:00
|
|
|
} else {
|
|
|
|
ID *id;
|
|
|
|
|
|
|
|
for (i=0, id= lb->first; id; id= id->next, i++) {
|
|
|
|
char buf[32];
|
|
|
|
|
2004-04-10 15:13:28 +00:00
|
|
|
if (nr && id==link) *nr= i+1;
|
2005-07-11 23:49:06 +00:00
|
|
|
|
|
|
|
if (U.uiflag & USER_HIDE_DOT && id->name[2]=='.')
|
|
|
|
continue;
|
2002-10-12 11:37:38 +00:00
|
|
|
|
|
|
|
get_flags_for_id(id, buf);
|
|
|
|
|
|
|
|
BLI_dynstr_append(pupds, buf);
|
|
|
|
BLI_dynstr_append(pupds, id->name+2);
|
First commit of a new toolbox system.
Aim was to find a simple & easy system, script alike, to add and configure
a toolbox system, so that others can experiment, but also of course Python.
Summary:
- spacebar calls it up. SHIFT+A still does old toolbox
- hold left or rightmouse for 0.4 second, and it pops up as well
this is experimental! Can be tweaked with Userdef var "ThresA"
- it is a little bit complete for Object mode only. Needs still work
at information desing/structure level
- the code works like an engine, interpreting structs like this:
static TBitem addmenu_curve[]= {
{ 0, "Bezier Curve", 0, NULL},
{ 0, "Bezier Circle", 1, NULL},
{ 0, "NURBS Curve", 2, NULL},
{ 0, "NURBS Circle", 3, NULL},
{ 0, "Path", 4, NULL},
{ -1, "", 0, do_info_add_curvemenu}};
- first value is ICON code,
- then name
- return value
- pointer to optional child
last row has -1 to indicate its the last...
plus a callback to event function.
I also built an old toolbox style callback for this:
static TBitem tb_object_select[]= {
{ 0, "Border Select|B", 'b', NULL},
{ 0, "(De)select All|A", 'a', NULL},
{ 0, "Linked...|Shift L", 'L', NULL},
{ 0, "Grouped...|Shift G", 'G', NULL},
{ -1, "", 0, tb_do_hotkey}};
here the return values are put back as hotkeys in mainqueue.
A mainloop can do all context switching, and build menus on the fly.
Meaning, it also allows other designs such as radials...
2003-10-25 00:08:12 +00:00
|
|
|
sprintf(buf, "%%x%d", i+1);
|
|
|
|
BLI_dynstr_append(pupds, buf);
|
|
|
|
|
More node goodies!
First note; this is a WIP project, some commits might change things that
make formerly saved situations not to work identically... like now!
------ New Material integration ------
Until now, the Node system worked on top of the 'current' Material, just
like how the Material Layers worked. That's quite confusing in practice,
especially to see what Material is a Node, or what is the "base material"
Best solution is to completely separate the two. This has been implemented
as follows now;
- The confusing "Input" node has been removed.
- When choosing a Material in Blender, you can define this Material to be
either 'normal' (default) or be the root of a Node tree.
- If a Material is a Node tree, you have to add Nodes in the tree to see
something happen. An empty Node tree doesn't do anything (black).
- If a Material is a Node Tree, the 'data browse' menus show it with an
'N' mark before the name. The 'data block' buttons display it with the
suffix 'NT' (instead of 'MA').
- In a Node Tree, any Material can be inserted, including itself. Only in
that case the Material is being used itself for shading.
UI changes:
Added a new Panel "Links", which shows:
- where the Material is linked to (Object, Mesh, etc)
- if the Material is a NodeTree or not
- the actual active Material in the Tree
The "Node" Panel itself now only shows buttons from the other nodes, when
they are active.
Further the Material Nodes themselves allow browsing and renaming or adding
new Materials now too.
Second half of today's work was cleaning up selection when the Nodes
overlap... it was possible to drag links from invisible sockets, or click
headers for invisible nodes, etc. This because the mouse input code was
not checking for visibility yet.
Works now even for buttons. :)
2005-12-29 18:08:01 +00:00
|
|
|
/* icon */
|
2005-12-21 22:21:43 +00:00
|
|
|
switch(GS(id->name))
|
|
|
|
{
|
|
|
|
case ID_MA: /* fall through */
|
|
|
|
case ID_TE: /* fall through */
|
|
|
|
case ID_IM: /* fall through */
|
|
|
|
case ID_WO: /* fall through */
|
|
|
|
case ID_LA: /* fall through */
|
|
|
|
sprintf(buf, "%%i%d", BKE_icon_getid(id) );
|
|
|
|
BLI_dynstr_append(pupds, buf);
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
2002-10-12 11:37:38 +00:00
|
|
|
if(id->next)
|
|
|
|
BLI_dynstr_append(pupds, "|");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Silly routine, the only difference between the one
|
|
|
|
* above is that it only adds items with a matching
|
|
|
|
* blocktype... this should be unified somehow... - zr
|
|
|
|
*/
|
|
|
|
static void IPOnames_to_dyn_pupstring(DynStr *pupds, ListBase *lb, ID *link, short *nr, int blocktype)
|
|
|
|
{
|
|
|
|
ID *id;
|
|
|
|
int i, nids;
|
|
|
|
|
|
|
|
for (id= lb->first, nids= 0; id; id= id->next) {
|
|
|
|
Ipo *ipo= (Ipo*) id;
|
|
|
|
|
|
|
|
if (ipo->blocktype==blocktype)
|
|
|
|
nids++;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (nids>MAX_IDPUP) {
|
|
|
|
BLI_dynstr_append(pupds, "DataBrowse %x-2");
|
|
|
|
} else {
|
|
|
|
for (i=0, id= lb->first; id; id= id->next) {
|
|
|
|
Ipo *ipo= (Ipo*) id;
|
|
|
|
|
|
|
|
if (ipo->blocktype==blocktype) {
|
|
|
|
char buf[32];
|
|
|
|
|
|
|
|
if (id==link)
|
|
|
|
*nr= i+1;
|
|
|
|
|
2005-07-11 23:49:06 +00:00
|
|
|
if (U.uiflag & USER_HIDE_DOT && id->name[2]=='.')
|
|
|
|
continue;
|
|
|
|
|
2002-10-12 11:37:38 +00:00
|
|
|
get_flags_for_id(id, buf);
|
|
|
|
|
|
|
|
BLI_dynstr_append(pupds, buf);
|
|
|
|
BLI_dynstr_append(pupds, id->name+2);
|
First commit of a new toolbox system.
Aim was to find a simple & easy system, script alike, to add and configure
a toolbox system, so that others can experiment, but also of course Python.
Summary:
- spacebar calls it up. SHIFT+A still does old toolbox
- hold left or rightmouse for 0.4 second, and it pops up as well
this is experimental! Can be tweaked with Userdef var "ThresA"
- it is a little bit complete for Object mode only. Needs still work
at information desing/structure level
- the code works like an engine, interpreting structs like this:
static TBitem addmenu_curve[]= {
{ 0, "Bezier Curve", 0, NULL},
{ 0, "Bezier Circle", 1, NULL},
{ 0, "NURBS Curve", 2, NULL},
{ 0, "NURBS Circle", 3, NULL},
{ 0, "Path", 4, NULL},
{ -1, "", 0, do_info_add_curvemenu}};
- first value is ICON code,
- then name
- return value
- pointer to optional child
last row has -1 to indicate its the last...
plus a callback to event function.
I also built an old toolbox style callback for this:
static TBitem tb_object_select[]= {
{ 0, "Border Select|B", 'b', NULL},
{ 0, "(De)select All|A", 'a', NULL},
{ 0, "Linked...|Shift L", 'L', NULL},
{ 0, "Grouped...|Shift G", 'G', NULL},
{ -1, "", 0, tb_do_hotkey}};
here the return values are put back as hotkeys in mainqueue.
A mainloop can do all context switching, and build menus on the fly.
Meaning, it also allows other designs such as radials...
2003-10-25 00:08:12 +00:00
|
|
|
sprintf(buf, "%%x%d", i+1);
|
|
|
|
BLI_dynstr_append(pupds, buf);
|
2002-10-12 11:37:38 +00:00
|
|
|
|
|
|
|
if(id->next)
|
|
|
|
BLI_dynstr_append(pupds, "|");
|
|
|
|
|
|
|
|
i++;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// used by headerbuttons.c buttons.c editobject.c editseq.c
|
2004-04-10 15:13:28 +00:00
|
|
|
// if nr==NULL no MAX_IDPUP, this for non-header browsing
|
2002-10-12 11:37:38 +00:00
|
|
|
void IDnames_to_pupstring(char **str, char *title, char *extraops, ListBase *lb, ID *link, short *nr)
|
|
|
|
{
|
|
|
|
DynStr *pupds= BLI_dynstr_new();
|
|
|
|
|
|
|
|
if (title) {
|
|
|
|
BLI_dynstr_append(pupds, title);
|
|
|
|
BLI_dynstr_append(pupds, "%t|");
|
|
|
|
}
|
|
|
|
|
|
|
|
if (extraops) {
|
First commit of a new toolbox system.
Aim was to find a simple & easy system, script alike, to add and configure
a toolbox system, so that others can experiment, but also of course Python.
Summary:
- spacebar calls it up. SHIFT+A still does old toolbox
- hold left or rightmouse for 0.4 second, and it pops up as well
this is experimental! Can be tweaked with Userdef var "ThresA"
- it is a little bit complete for Object mode only. Needs still work
at information desing/structure level
- the code works like an engine, interpreting structs like this:
static TBitem addmenu_curve[]= {
{ 0, "Bezier Curve", 0, NULL},
{ 0, "Bezier Circle", 1, NULL},
{ 0, "NURBS Curve", 2, NULL},
{ 0, "NURBS Circle", 3, NULL},
{ 0, "Path", 4, NULL},
{ -1, "", 0, do_info_add_curvemenu}};
- first value is ICON code,
- then name
- return value
- pointer to optional child
last row has -1 to indicate its the last...
plus a callback to event function.
I also built an old toolbox style callback for this:
static TBitem tb_object_select[]= {
{ 0, "Border Select|B", 'b', NULL},
{ 0, "(De)select All|A", 'a', NULL},
{ 0, "Linked...|Shift L", 'L', NULL},
{ 0, "Grouped...|Shift G", 'G', NULL},
{ -1, "", 0, tb_do_hotkey}};
here the return values are put back as hotkeys in mainqueue.
A mainloop can do all context switching, and build menus on the fly.
Meaning, it also allows other designs such as radials...
2003-10-25 00:08:12 +00:00
|
|
|
BLI_dynstr_append(pupds, extraops);
|
2002-10-12 11:37:38 +00:00
|
|
|
if (BLI_dynstr_get_len(pupds))
|
|
|
|
BLI_dynstr_append(pupds, "|");
|
|
|
|
}
|
First commit of a new toolbox system.
Aim was to find a simple & easy system, script alike, to add and configure
a toolbox system, so that others can experiment, but also of course Python.
Summary:
- spacebar calls it up. SHIFT+A still does old toolbox
- hold left or rightmouse for 0.4 second, and it pops up as well
this is experimental! Can be tweaked with Userdef var "ThresA"
- it is a little bit complete for Object mode only. Needs still work
at information desing/structure level
- the code works like an engine, interpreting structs like this:
static TBitem addmenu_curve[]= {
{ 0, "Bezier Curve", 0, NULL},
{ 0, "Bezier Circle", 1, NULL},
{ 0, "NURBS Curve", 2, NULL},
{ 0, "NURBS Circle", 3, NULL},
{ 0, "Path", 4, NULL},
{ -1, "", 0, do_info_add_curvemenu}};
- first value is ICON code,
- then name
- return value
- pointer to optional child
last row has -1 to indicate its the last...
plus a callback to event function.
I also built an old toolbox style callback for this:
static TBitem tb_object_select[]= {
{ 0, "Border Select|B", 'b', NULL},
{ 0, "(De)select All|A", 'a', NULL},
{ 0, "Linked...|Shift L", 'L', NULL},
{ 0, "Grouped...|Shift G", 'G', NULL},
{ -1, "", 0, tb_do_hotkey}};
here the return values are put back as hotkeys in mainqueue.
A mainloop can do all context switching, and build menus on the fly.
Meaning, it also allows other designs such as radials...
2003-10-25 00:08:12 +00:00
|
|
|
|
|
|
|
IDnames_to_dyn_pupstring(pupds, lb, link, nr);
|
2002-10-12 11:37:38 +00:00
|
|
|
|
|
|
|
*str= BLI_dynstr_get_cstring(pupds);
|
|
|
|
BLI_dynstr_free(pupds);
|
|
|
|
}
|
|
|
|
|
|
|
|
// only used by headerbuttons.c
|
|
|
|
void IPOnames_to_pupstring(char **str, char *title, char *extraops, ListBase *lb, ID *link, short *nr, int blocktype)
|
|
|
|
{
|
|
|
|
DynStr *pupds= BLI_dynstr_new();
|
|
|
|
|
|
|
|
if (title) {
|
|
|
|
BLI_dynstr_append(pupds, title);
|
|
|
|
BLI_dynstr_append(pupds, "%t|");
|
|
|
|
}
|
|
|
|
|
|
|
|
if (extraops) {
|
First commit of a new toolbox system.
Aim was to find a simple & easy system, script alike, to add and configure
a toolbox system, so that others can experiment, but also of course Python.
Summary:
- spacebar calls it up. SHIFT+A still does old toolbox
- hold left or rightmouse for 0.4 second, and it pops up as well
this is experimental! Can be tweaked with Userdef var "ThresA"
- it is a little bit complete for Object mode only. Needs still work
at information desing/structure level
- the code works like an engine, interpreting structs like this:
static TBitem addmenu_curve[]= {
{ 0, "Bezier Curve", 0, NULL},
{ 0, "Bezier Circle", 1, NULL},
{ 0, "NURBS Curve", 2, NULL},
{ 0, "NURBS Circle", 3, NULL},
{ 0, "Path", 4, NULL},
{ -1, "", 0, do_info_add_curvemenu}};
- first value is ICON code,
- then name
- return value
- pointer to optional child
last row has -1 to indicate its the last...
plus a callback to event function.
I also built an old toolbox style callback for this:
static TBitem tb_object_select[]= {
{ 0, "Border Select|B", 'b', NULL},
{ 0, "(De)select All|A", 'a', NULL},
{ 0, "Linked...|Shift L", 'L', NULL},
{ 0, "Grouped...|Shift G", 'G', NULL},
{ -1, "", 0, tb_do_hotkey}};
here the return values are put back as hotkeys in mainqueue.
A mainloop can do all context switching, and build menus on the fly.
Meaning, it also allows other designs such as radials...
2003-10-25 00:08:12 +00:00
|
|
|
BLI_dynstr_append(pupds, extraops);
|
2002-10-12 11:37:38 +00:00
|
|
|
if (BLI_dynstr_get_len(pupds))
|
|
|
|
BLI_dynstr_append(pupds, "|");
|
|
|
|
}
|
First commit of a new toolbox system.
Aim was to find a simple & easy system, script alike, to add and configure
a toolbox system, so that others can experiment, but also of course Python.
Summary:
- spacebar calls it up. SHIFT+A still does old toolbox
- hold left or rightmouse for 0.4 second, and it pops up as well
this is experimental! Can be tweaked with Userdef var "ThresA"
- it is a little bit complete for Object mode only. Needs still work
at information desing/structure level
- the code works like an engine, interpreting structs like this:
static TBitem addmenu_curve[]= {
{ 0, "Bezier Curve", 0, NULL},
{ 0, "Bezier Circle", 1, NULL},
{ 0, "NURBS Curve", 2, NULL},
{ 0, "NURBS Circle", 3, NULL},
{ 0, "Path", 4, NULL},
{ -1, "", 0, do_info_add_curvemenu}};
- first value is ICON code,
- then name
- return value
- pointer to optional child
last row has -1 to indicate its the last...
plus a callback to event function.
I also built an old toolbox style callback for this:
static TBitem tb_object_select[]= {
{ 0, "Border Select|B", 'b', NULL},
{ 0, "(De)select All|A", 'a', NULL},
{ 0, "Linked...|Shift L", 'L', NULL},
{ 0, "Grouped...|Shift G", 'G', NULL},
{ -1, "", 0, tb_do_hotkey}};
here the return values are put back as hotkeys in mainqueue.
A mainloop can do all context switching, and build menus on the fly.
Meaning, it also allows other designs such as radials...
2003-10-25 00:08:12 +00:00
|
|
|
|
|
|
|
IPOnames_to_dyn_pupstring(pupds, lb, link, nr, blocktype);
|
2002-10-12 11:37:38 +00:00
|
|
|
|
|
|
|
*str= BLI_dynstr_get_cstring(pupds);
|
|
|
|
BLI_dynstr_free(pupds);
|
|
|
|
}
|
|
|
|
|
|
|
|
// used by buttons.c library.c mball.c
|
|
|
|
void splitIDname(char *name, char *left, int *nr)
|
|
|
|
{
|
|
|
|
int a;
|
|
|
|
|
|
|
|
*nr= 0;
|
|
|
|
strncpy(left, name, 21);
|
|
|
|
|
|
|
|
a= strlen(name);
|
|
|
|
if(a>1 && name[a-1]=='.') return;
|
|
|
|
|
|
|
|
while(a--) {
|
|
|
|
if( name[a]=='.' ) {
|
|
|
|
left[a]= 0;
|
|
|
|
*nr= atol(name+a+1);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
if( isdigit(name[a])==0 ) break;
|
|
|
|
|
|
|
|
left[a]= 0;
|
|
|
|
}
|
|
|
|
strcpy(left, name);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void sort_alpha_id(ListBase *lb, ID *id)
|
|
|
|
{
|
|
|
|
ID *idtest;
|
|
|
|
|
2003-04-26 11:56:44 +00:00
|
|
|
/* insert alphabetically */
|
2002-10-12 11:37:38 +00:00
|
|
|
if(lb->first!=lb->last) {
|
|
|
|
BLI_remlink(lb, id);
|
|
|
|
|
|
|
|
idtest= lb->first;
|
|
|
|
while(idtest) {
|
2005-04-02 15:36:57 +00:00
|
|
|
if(BLI_strcasecmp(idtest->name, id->name)>0 || idtest->lib) {
|
2002-10-12 11:37:38 +00:00
|
|
|
BLI_insertlinkbefore(lb, idtest, id);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
idtest= idtest->next;
|
|
|
|
}
|
2003-04-26 11:56:44 +00:00
|
|
|
/* as last */
|
2002-10-12 11:37:38 +00:00
|
|
|
if(idtest==0) {
|
|
|
|
BLI_addtail(lb, id);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
Orange: more noodle updates!
**** NEW: Group Nodes
Node trees usually become messy and confusing quickly, so we need
not only a way to collapse Nodes into single 'groups', but also a
way to re-use that data to create libraries of effects.
This has been done by making a new Library data type, the NodeTree.
Everything that has been grouped is stored here, and available for
re-use, appending or linking. These NodeTrees are fully generic,
i.e. can store shader trees, composit trees, and so on. The 'type'
value as stored in the NodeTree will keep track of internal type
definitions and execute/drawing callbacks. Needless to say, re-using
shader trees in a composit tree is a bit useless, and will be
prevented in the browsing code. :)
So; any NodeTree can become a "Goup Node" inside in a NodeTree. This
Group Node then works just like any Node.
To prevent the current code to become too complex, I've disabled
the possibility to insert Groups inside of Groups. That might be
enabled later, but is a real nasty piece of code to get OK.
Since Group Nodes are a dynamic Node type, a lot of work has been
done to ensure Node definitions can be dynamic too, but still allow
to be stored in files, and allow to be verified for type-definition
changes on reloading. This system needs a little bit maturing still,
so the Python gurus should better wait a little bit! (Also for me to
write the definite API docs for it).
What works now:
- Press CTRL+G to create a new Group. The grouping code checks for
impossible selections (like an unselected node between selected nodes).
Everthing that's selected then gets removed from the current tree, and
inserted in a new NodeTree library data block. A Group Node then is
added which links to this new NodeTree.
- Press ALT+G to ungroup. This will not delete the NodeTree library
data, but just duplicate the Group into the current tree.
- Press TAB, or click on the NodeTree icon to edit Groups. Note that
NodeTrees are instances, so editing one Group will also change the
other users.
This also means that when removing nodes in a Group (or hiding sockets
or changing internal links) this is immediately corrected for all users
of this Group, also in other Materials.
- While editing Groups, only the internal Nodes can be edited. A single
click outside of the Group boundary will close this 'edit mode'.
What needs to be done:
- SHIFT+A menu in toolbox style, also including a list of Groups
- Enable the single-user button in the Group Node
- Displaying all (visible) internal group UI elements in the Node Panel
- Enable Library linking and prevent editing of Groups then.
**** NEW: Socket Visibility control
Node types will be generated with a lot of possible inputs or outputs,
and drawing all sockets all the time isn't very useful then.
A new option in the Node header ('plus' icon) allows to either hide all
unused sockets (first keypress) or to reveil them (when there are hidden
sockets, the icon displays black, otherwise it's blended).
Hidden sockets in Nodes also are not exported to a Group, so this way
you can control what options (in/outputs) exactly are available.
To be done:
- a way to hide individual sockets, like with a RMB click on it.
**** NEW: Nodes now render!
This is still quite primitive, more on a level to replace the (now
obsolete and disabled) Material Layers.
What needs to be done:
- make the "Geometry" node work properly, also for AA textures
- make the Texture Node work (does very little at the moment)
- give Material Nodes all inputs as needed (like Map-to Panel)
- find a way to export more data from a Material Node, like the
shadow value, or light intensity only, etc
Very important also to separate from the Material Buttons the
"global" options, like "Ztransp" or "Wire" or "Halo". These can not
be set for each Material-Node individually.
Also note that the Preview Render (Buttons window) now renders a bit
differently. This was a horrid piece of antique code, using a totally
incompatible way of rendering. Target is to fully re-use internal
render code for previews.
OK... that's it mostly. Now test!
2006-01-02 13:06:05 +00:00
|
|
|
int new_id(ListBase *lb, ID *id, const char *tname)
|
2003-04-26 11:56:44 +00:00
|
|
|
/* only for local blocks: external en indirect blocks already have a unique ID */
|
|
|
|
/* return 1: created a new name */
|
2002-10-12 11:37:38 +00:00
|
|
|
{
|
|
|
|
ID *idtest;
|
|
|
|
int nr= 0, nrtest, maxtest=32, a;
|
|
|
|
char aname[32], *name, left[24], leftest[24], in_use[32];
|
|
|
|
|
2003-04-26 11:56:44 +00:00
|
|
|
/* - split name
|
|
|
|
* - search
|
2002-10-12 11:37:38 +00:00
|
|
|
*/
|
|
|
|
|
|
|
|
if(id->lib) return 0;
|
|
|
|
|
|
|
|
if(tname==0) name= id->name+2;
|
|
|
|
else {
|
|
|
|
/* tname can be const */
|
|
|
|
strncpy(aname, tname, 21);
|
|
|
|
name= aname;
|
|
|
|
|
|
|
|
if( strlen(name) > 21 ) name[21]= 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
if(lb==0) lb= wich_libbase(G.main, GS(id->name));
|
|
|
|
|
2003-04-26 11:56:44 +00:00
|
|
|
/* phase 1: id already exists? */
|
2002-10-12 11:37:38 +00:00
|
|
|
idtest= lb->first;
|
|
|
|
while(idtest) {
|
|
|
|
|
|
|
|
if(id!=idtest && idtest->lib==0) {
|
|
|
|
|
2003-04-26 11:56:44 +00:00
|
|
|
/* do not test alphabetic! */
|
|
|
|
/* optimized */
|
2002-10-12 11:37:38 +00:00
|
|
|
if( idtest->name[2] == name[0] ) {
|
|
|
|
if(strcmp(name, idtest->name+2)==0) break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
idtest= idtest->next;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* if there is no double return */
|
|
|
|
if(idtest==0) {
|
|
|
|
strcpy(id->name+2, name);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
memset(in_use, 0, maxtest);
|
|
|
|
|
|
|
|
splitIDname(name, left, &nr);
|
|
|
|
if(nr>999 && strlen(left)>16) left[16]= 0;
|
|
|
|
else if(strlen(left)>17) left[17]= 0;
|
|
|
|
|
|
|
|
|
|
|
|
idtest= lb->first;
|
|
|
|
while(idtest) {
|
|
|
|
|
|
|
|
if(id!=idtest && idtest->lib==0) {
|
|
|
|
|
|
|
|
splitIDname(idtest->name+2, leftest, &nrtest);
|
|
|
|
if(strcmp(left, leftest)==0) {
|
|
|
|
|
|
|
|
if(nrtest<maxtest) in_use[nrtest]= 1;
|
|
|
|
if(nr <= nrtest) nr= nrtest+1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
idtest= idtest->next;
|
|
|
|
}
|
|
|
|
|
|
|
|
for(a=0; a<maxtest; a++) {
|
|
|
|
if(a>=nr) break;
|
|
|
|
if( in_use[a]==0 ) {
|
|
|
|
nr= a;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if(nr==0) sprintf(id->name+2, "%s", left);
|
|
|
|
else {
|
|
|
|
if (nr >= 1000 && strlen(left) > 16) {
|
|
|
|
// this would overflow name buffer
|
|
|
|
left[16]= 0;
|
|
|
|
return (new_id(lb, id, left));
|
|
|
|
}
|
2003-04-26 11:56:44 +00:00
|
|
|
/* this format specifier is from hell... */
|
Phew, a lot of work, and no new features...
Main target was to make the inner rendering loop using no globals anymore.
This is essential for proper usage while raytracing, it caused a lot of
hacks in the raycode as well, which even didn't work correctly for all
situations (textures especially).
Done this by creating a new local struct RenderInput, which replaces usage
of the global struct Render R. The latter now only is used to denote
image size, viewmatrix, and the like.
Making the inner render loops using no globals caused 1000s of vars to
be changed... but the result definitely is much nicer code, which enables
making 'real' shaders in a next stage.
It also enabled me to remove the hacks from ray.c
Then i went to the task of removing redundant code. Especially the calculus
of texture coords took place (identical) in three locations.
Most obvious is the change in the unified render part, which is much less
code now; it uses the same rendering routines as normal render now.
(Note; not for halos yet!)
I also removed 6 files called 'shadowbuffer' something. This was experimen-
tal stuff from NaN days. And again saved a lot of double used code.
Finally I went over the blenkernel and blender/src calls to render stuff.
Here the same local data is used now, resulting in less dependency.
I also moved render-texture to the render module, this was still in Kernel.
(new file: texture.c)
So! After this commit I will check on the autofiles, to try to fix that.
MSVC people have to do it themselves.
This commit will need quite some testing help, but I'm around!
2003-12-21 21:52:51 +00:00
|
|
|
sprintf(id->name+2, "%s.%.3d", left, nr);
|
2002-10-12 11:37:38 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
sort_alpha_id(lb, id);
|
|
|
|
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
// next to indirect usage in read/writefile also in editobject.c scene.c
|
|
|
|
void clear_id_newpoins()
|
|
|
|
{
|
|
|
|
ListBase *lbarray[MAX_LIBARRAY];
|
|
|
|
ID *id;
|
|
|
|
int a;
|
|
|
|
|
|
|
|
a= set_listbasepointers(G.main, lbarray);
|
|
|
|
while(a--) {
|
|
|
|
id= lbarray[a]->first;
|
|
|
|
while(id) {
|
|
|
|
id->newid= 0;
|
|
|
|
id->flag &= ~LIB_NEW;
|
|
|
|
id= id->next;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2006-02-09 19:47:53 +00:00
|
|
|
/* only for library fixes */
|
|
|
|
static void image_fix_relative_path(Image *ima)
|
|
|
|
{
|
|
|
|
if(ima->id.lib==NULL) return;
|
|
|
|
if(strncmp(ima->name, "//", 2)==0) {
|
|
|
|
BLI_convertstringcode(ima->name, ima->id.lib->filename, 0);
|
|
|
|
BLI_makestringcode(G.sce, ima->name);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2006-03-05 17:35:06 +00:00
|
|
|
#define LIBTAG(a) if(a && a->id.lib) {a->id.flag &=~LIB_INDIRECT; a->id.flag |= LIB_EXTERN;}
|
|
|
|
|
|
|
|
static void lib_indirect_test_id(ID *id)
|
|
|
|
{
|
|
|
|
|
|
|
|
if(id->lib)
|
|
|
|
return;
|
|
|
|
|
|
|
|
if(GS(id->name)==ID_OB) {
|
|
|
|
Object *ob= (Object *)id;
|
|
|
|
bActionStrip *strip;
|
|
|
|
Mesh *me;
|
|
|
|
PartEff *paf;
|
|
|
|
int a;
|
|
|
|
|
|
|
|
for (strip=ob->nlastrips.first; strip; strip=strip->next){
|
|
|
|
LIBTAG(strip->object);
|
|
|
|
LIBTAG(strip->act);
|
|
|
|
LIBTAG(strip->ipo);
|
|
|
|
}
|
|
|
|
|
|
|
|
for(a=0; a<ob->totcol; a++) {
|
|
|
|
LIBTAG(ob->mat[a]);
|
|
|
|
}
|
|
|
|
|
|
|
|
paf = give_parteff(ob);
|
|
|
|
if (paf)
|
|
|
|
LIBTAG(paf->group);
|
|
|
|
|
|
|
|
LIBTAG(ob->dup_group);
|
|
|
|
me= ob->data;
|
|
|
|
LIBTAG(me);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2004-04-22 19:58:54 +00:00
|
|
|
/* if lib!=NULL, only all from lib local */
|
|
|
|
void all_local(Library *lib)
|
2002-10-12 11:37:38 +00:00
|
|
|
{
|
|
|
|
ListBase *lbarray[MAX_LIBARRAY], tempbase={0, 0};
|
|
|
|
ID *id, *idn;
|
|
|
|
int a;
|
|
|
|
|
|
|
|
a= set_listbasepointers(G.main, lbarray);
|
|
|
|
while(a--) {
|
|
|
|
id= lbarray[a]->first;
|
|
|
|
|
|
|
|
while(id) {
|
2004-04-22 19:58:54 +00:00
|
|
|
id->newid= NULL;
|
2003-04-26 11:56:44 +00:00
|
|
|
idn= id->next; /* id is possibly being inserted again */
|
2004-04-22 19:58:54 +00:00
|
|
|
|
|
|
|
if(id->flag & (LIB_EXTERN|LIB_INDIRECT|LIB_NEW)) {
|
|
|
|
if(lib==NULL || id->lib==lib) {
|
|
|
|
id->flag &= ~(LIB_EXTERN|LIB_INDIRECT|LIB_NEW);
|
|
|
|
|
|
|
|
if(id->lib) {
|
2006-02-09 19:47:53 +00:00
|
|
|
/* relative file patch */
|
|
|
|
if(GS(id->name)==ID_IM)
|
|
|
|
image_fix_relative_path((Image *)id);
|
|
|
|
|
2004-04-22 19:58:54 +00:00
|
|
|
id->lib= NULL;
|
|
|
|
new_id(lbarray[a], id, 0); /* new_id only does it with double names */
|
|
|
|
sort_alpha_id(lbarray[a], id);
|
2002-10-12 11:37:38 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
id= idn;
|
|
|
|
}
|
|
|
|
|
2003-04-26 11:56:44 +00:00
|
|
|
/* patch2: make it aphabetically */
|
2002-10-12 11:37:38 +00:00
|
|
|
while( (id=tempbase.first) ) {
|
|
|
|
BLI_remlink(&tempbase, id);
|
|
|
|
BLI_addtail(lbarray[a], id);
|
|
|
|
new_id(lbarray[a], id, 0);
|
|
|
|
}
|
|
|
|
}
|
2006-03-05 17:35:06 +00:00
|
|
|
|
|
|
|
/* patch 3: make sure library data isn't indirect falsely... */
|
|
|
|
a= set_listbasepointers(G.main, lbarray);
|
|
|
|
while(a--) {
|
|
|
|
for(id= lbarray[a]->first; id; id=id->next)
|
|
|
|
lib_indirect_test_id(id);
|
|
|
|
}
|
2002-10-12 11:37:38 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void test_idbutton(char *name)
|
|
|
|
{
|
2003-04-26 11:56:44 +00:00
|
|
|
/* called from buttons: when name already exists: call new_id */
|
2002-10-12 11:37:38 +00:00
|
|
|
ListBase *lb;
|
|
|
|
ID *idtest;
|
|
|
|
|
|
|
|
|
|
|
|
lb= wich_libbase(G.main, GS(name-2) );
|
|
|
|
if(lb==0) return;
|
|
|
|
|
2003-04-26 11:56:44 +00:00
|
|
|
/* search for id */
|
2002-10-12 11:37:38 +00:00
|
|
|
idtest= lb->first;
|
|
|
|
while(idtest) {
|
|
|
|
if( strcmp(idtest->name+2, name)==0) break;
|
|
|
|
idtest= idtest->next;
|
|
|
|
}
|
|
|
|
|
|
|
|
if(idtest) if( new_id(lb, idtest, name)==0 ) sort_alpha_id(lb, idtest);
|
|
|
|
}
|
|
|
|
|
|
|
|
void rename_id(ID *id, char *name)
|
|
|
|
{
|
|
|
|
ListBase *lb;
|
|
|
|
|
|
|
|
strncpy(id->name+2, name, 21);
|
|
|
|
lb= wich_libbase(G.main, GS(id->name) );
|
|
|
|
|
|
|
|
new_id(lb, id, name);
|
|
|
|
}
|
|
|
|
|