2011-10-10 11:38:02 +02:00
|
|
|
/*
|
2008-01-07 20:13:47 +01:00
|
|
|
* ***** BEGIN GPL LICENSE BLOCK *****
|
2002-10-12 13:37:38 +02:00
|
|
|
*
|
|
|
|
|
* This program is free software; you can redistribute it and/or
|
|
|
|
|
* modify it under the terms of the GNU General Public License
|
|
|
|
|
* as published by the Free Software Foundation; either version 2
|
2008-01-07 20:13:47 +01:00
|
|
|
* of the License, or (at your option) any later version.
|
2002-10-12 13:37:38 +02:00
|
|
|
*
|
|
|
|
|
* This program is distributed in the hope that it will be useful,
|
|
|
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
|
* GNU General Public License for more details.
|
|
|
|
|
*
|
|
|
|
|
* You should have received a copy of the GNU General Public License
|
|
|
|
|
* along with this program; if not, write to the Free Software Foundation,
|
2010-02-12 14:34:04 +01:00
|
|
|
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
2002-10-12 13:37:38 +02:00
|
|
|
*
|
|
|
|
|
* 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.
|
|
|
|
|
*
|
2008-01-07 20:13:47 +01:00
|
|
|
* ***** END GPL LICENSE BLOCK *****
|
2002-10-12 13:37:38 +02:00
|
|
|
*/
|
|
|
|
|
|
2011-02-27 21:40:57 +01:00
|
|
|
/** \file blender/blenkernel/intern/material.c
|
|
|
|
|
* \ingroup bke
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
|
2002-10-12 13:37:38 +02:00
|
|
|
#include <string.h>
|
Giant commit!
A full detailed description of this will be done later... is several days
of work. Here's a summary:
Render:
- Full cleanup of render code, removing *all* globals and bad level calls
all over blender. Render module is now not called abusive anymore
- API-fied calls to rendering
- Full recode of internal render pipeline. Is now rendering tiles by
default, prepared for much smarter 'bucket' render later.
- Each thread now can render a full part
- Renders were tested with 4 threads, goes fine, apart from some lookup
tables in softshadow and AO still
- Rendering is prepared to do multiple layers and passes
- No single 32 bits trick in render code anymore, all 100% floats now.
Writing images/movies
- moved writing images to blender kernel (bye bye 'schrijfplaatje'!)
- made a new Movie handle system, also in kernel. This will enable much
easier use of movies in Blender
PreviewRender:
- Using new render API, previewrender (in buttons) now uses regular render
code to generate images.
- new datafile 'preview.blend.c' has the preview scenes in it
- previews get rendered in exact displayed size (1 pixel = 1 pixel)
3D Preview render
- new; press Pkey in 3d window, for a panel that continuously renders
(pkey is for games, i know... but we dont do that in orange now!)
- this render works nearly identical to buttons-preview render, so it stops
rendering on any event (mouse, keyboard, etc)
- on moving/scaling the panel, the render code doesn't recreate all geometry
- same for shifting/panning view
- all other operations (now) regenerate the full render database still.
- this is WIP... but big fun, especially for simple scenes!
Compositor
- Using same node system as now in use for shaders, you can composit images
- works pretty straightforward... needs much more options/tools and integration
with rendering still
- is not threaded yet, nor is so smart to only recalculate changes... will be
done soon!
- the "Render Result" node will get all layers/passes as output sockets
- The "Output" node renders to a builtin image, which you can view in the Image
window. (yes, output nodes to render-result, and to files, is on the list!)
The Bad News
- "Unified Render" is removed. It might come back in some stage, but this
system should be built from scratch. I can't really understand this code...
I expect it is not much needed, especially with advanced layer/passes
control
- Panorama render, Field render, Motion blur, is not coded yet... (I had to
recode every single feature in render, so...!)
- Lens Flare is also not back... needs total revision, might become composit
effect though (using zbuffer for visibility)
- Part render is gone! (well, thats obvious, its default now).
- The render window is only restored with limited functionality... I am going
to check first the option to render to a Image window, so Blender can become
a true single-window application. :)
For example, the 'Spare render buffer' (jkey) doesnt work.
- Render with border, now default creates a smaller image
- No zbuffers are written yet... on the todo!
- Scons files and MSVC will need work to get compiling again
OK... thats what I can quickly recall. Now go compiling!
2006-01-23 23:05:47 +01:00
|
|
|
#include <math.h>
|
2011-09-20 06:38:59 +02:00
|
|
|
#include <stddef.h>
|
Giant commit!
A full detailed description of this will be done later... is several days
of work. Here's a summary:
Render:
- Full cleanup of render code, removing *all* globals and bad level calls
all over blender. Render module is now not called abusive anymore
- API-fied calls to rendering
- Full recode of internal render pipeline. Is now rendering tiles by
default, prepared for much smarter 'bucket' render later.
- Each thread now can render a full part
- Renders were tested with 4 threads, goes fine, apart from some lookup
tables in softshadow and AO still
- Rendering is prepared to do multiple layers and passes
- No single 32 bits trick in render code anymore, all 100% floats now.
Writing images/movies
- moved writing images to blender kernel (bye bye 'schrijfplaatje'!)
- made a new Movie handle system, also in kernel. This will enable much
easier use of movies in Blender
PreviewRender:
- Using new render API, previewrender (in buttons) now uses regular render
code to generate images.
- new datafile 'preview.blend.c' has the preview scenes in it
- previews get rendered in exact displayed size (1 pixel = 1 pixel)
3D Preview render
- new; press Pkey in 3d window, for a panel that continuously renders
(pkey is for games, i know... but we dont do that in orange now!)
- this render works nearly identical to buttons-preview render, so it stops
rendering on any event (mouse, keyboard, etc)
- on moving/scaling the panel, the render code doesn't recreate all geometry
- same for shifting/panning view
- all other operations (now) regenerate the full render database still.
- this is WIP... but big fun, especially for simple scenes!
Compositor
- Using same node system as now in use for shaders, you can composit images
- works pretty straightforward... needs much more options/tools and integration
with rendering still
- is not threaded yet, nor is so smart to only recalculate changes... will be
done soon!
- the "Render Result" node will get all layers/passes as output sockets
- The "Output" node renders to a builtin image, which you can view in the Image
window. (yes, output nodes to render-result, and to files, is on the list!)
The Bad News
- "Unified Render" is removed. It might come back in some stage, but this
system should be built from scratch. I can't really understand this code...
I expect it is not much needed, especially with advanced layer/passes
control
- Panorama render, Field render, Motion blur, is not coded yet... (I had to
recode every single feature in render, so...!)
- Lens Flare is also not back... needs total revision, might become composit
effect though (using zbuffer for visibility)
- Part render is gone! (well, thats obvious, its default now).
- The render window is only restored with limited functionality... I am going
to check first the option to render to a Image window, so Blender can become
a true single-window application. :)
For example, the 'Spare render buffer' (jkey) doesnt work.
- Render with border, now default creates a smaller image
- No zbuffers are written yet... on the todo!
- Scons files and MSVC will need work to get compiling again
OK... thats what I can quickly recall. Now go compiling!
2006-01-23 23:05:47 +01:00
|
|
|
|
2002-10-12 13:37:38 +02:00
|
|
|
#include "MEM_guardedalloc.h"
|
|
|
|
|
|
Bugfix [#31834] Cycles materials cannot be manipulated using drivers
Until now, there was never any code for making drivers on materials get
recalculated when their dependencies were changed. However, since changing
material colors with drivers is something that is quite common, a workaround was
introduced to ensure that materials could still be driven (albeit with the
relevant drivers rooted at object level). This worked well enough so far with
traditional materials - though it was sometimes clunky and confusing for some
users - and would have been ok to tide us over until the depsgraph refactor.
The introduction of Cycles changed this, as it has in many other ways. Now that
people use Cycles to render, they'll need to drive the material colors through
the nested nodetree (and other things nested deeply within that). However, this
is much more difficult to generate hacks to create the relevant paths needed to
work around the problem.
== This Commit... ==
* Adds a recursive driver calculation step to the BKE_object_handle_update()
(which gets called whenever the depsgraph has finished tagging object datablocks
for updates), which goes through calculating the drivers attached to the object
(and the materials/nodetrees attached to that). This case gets handled everytime
the object is tagged as needing updates to its "data" (OB_RECALC_DATA)
* When building the depsgraph, every dependency that the drivers there have are
treated as if they were attached to object.data instead. This should trick the
depsgraph into tagging OB_RECALC_DATA to force recalculation of drivers, at the
expense perhaps of modifiers getting recalculated again.
== Todo ==
* The old workarounds noted are still in place (will be commented out in the
next commit). This fix renders at least the material case redundant, although
the textures case still needs a bit more work.
* Check on whether similar hacks can be done for other datablock combinations
* So far, only simple test cases have been tested. There is probably some
performance penalty for heavy setups still (due to need to traverse down all
parts of material/node hierarchy to find things that need updates). If there
really is a problem here, we could try introducing some tags to limit this
traversal (which get added at depsgraph build time). <--- USER TESTING
NEEDED!!!
2012-07-03 07:11:37 +02:00
|
|
|
#include "DNA_anim_types.h"
|
Orange branch feature; Material Layering
(WIP, don't bugs for this in tracker yet please!)
- New Panel "Layers" in Material buttons, allows to add unlimited amount
of materials on top of each other.
- Every Layer is actually just another Material, which gets rendered/shaded
(including texture), and then added on top of previous layer with an
operation like Mix, Add, Mult, etc.
- Layers render fully independent, so bumpmaps are not passed on to next
layers.
- Per Layer you can set if it influences Diffuse, Specular or Alpha
- If a Material returns alpha (like from texture), the alpha value is
used for adding the layers too.
- New texture "Map To" channel allows to have a texture work on a Layer
- Each layer, including basis Material, can be turned on/off individually
Notes:
- at this moment, the full shading pass happens for each layer, including
shadow, AO and raytraced mirror or transparency...
- I had to remove old hacks from preview render, which corrected reflected
normals for preview texturing.
- still needs loadsa testing!
2005-12-04 15:32:21 +01:00
|
|
|
#include "DNA_curve_types.h"
|
2012-10-17 15:32:43 +02:00
|
|
|
#include "DNA_group_types.h"
|
2002-10-12 13:37:38 +02:00
|
|
|
#include "DNA_material_types.h"
|
|
|
|
|
#include "DNA_mesh_types.h"
|
TexFace to Material Settings big patch
Summary:
========
The idea here is to move the texface options into the material panel.
For images with the change please visit:
http://code.blender.org/index.php/2011/09/bge-material-texface-changes
1 - Some of the legacy problems 2.49 and 2.5x has with the texface system:
==========================================================================
1.1) Shadow, Bilboard and Halo are mutual exclusive (in the code), yet you can
select a face to be more than one mode.
1.2) Sort only works for blend Alpha yet it's an option regardless of the
Transparency Blend you pick.
1.3) Shared doesn't affect anything in BGE.
1.4) ObColor only works for Text objects (old bitmap texts) when using Texture
Face Materials. (not address yet, I so far ignored obcolor)
2 - Notes:
============
2.1) Now "Use Face Textures" in material Option panel will work in Multitexture
even if there is no texture channel.
2.2) In FaceTexture mode it will use TexFace all the time, even if you don't
check the "Use Texture Face" option in the UI. It's a matter of decision, since
the code for either way is there. I decided by the solution that makes the
creation of a material fast - in this mode the user doesn't need to mess with
textures or this "Use Texture Face" option at all. I'm not strong in my opinion
here. But I think if we don't have this then what is the point of the Texture
Face mode?
2.3) I kept references for tface only when we need the image, UV or the tiling
setting. It should help later when/if we split the Image and UV layers from the
tface struct (Campbell and Brecht proposal).
3 - Changes in a Nutshell:
==========================
3.1) "Texture Face" panel (in the Mesh/Object Data panel) no longer exists. Those settings are all part of the material properties, visible when Game Render is set.
3.2) "Texture Face" Shading mode (in the Render panel) is now called “Single Texture”, it needs a material for special settings (e.g. Billboard, Alpha Sort, …).
3.3) New options in the Material Panel
* Shadeless option in the Material panel is now supported for all three Shading modes.
* Physics is now toggleable, this is the old Collision option.
* Two Side (on) is now called Back Culling (off).
* Alpha Sort is one of the Alpha options, together (and mutually exclusive) to Alpha Blend, Alpha Clip, Add and Opaque (i.e. solid).
* Shadow, Billboard and Halo are grouped in the “Face Orientation” property.
* "Face Textures" and "Face Textures Alpha" (under Options) can be used for all but GLSL shading mode (to be supported in GLSL eventually).
* The backend in the game engine is still the same as before. The only changes are in the interface and in the way you need to think your materials. The bottomline is: It’s no longer possible to share materials between faces that do not share the same game properties.
4 - Acknowledgment:
==================
Mike Pan for the design discussions, and testing along the whole development process.
Vitor Balbio for the first hands-on code with the interface changes. That helped me a lot to push me into work on that.
Benoit Bolsee and Brecht van Lommel for patch review (* no one reviewed the whole patch, or the latest iteractions, so I still hold liability for any problems).
Blender artists that gave feedback and helped testing the patch.
Patch review and original documentation can be found here:
http://wiki.blender.org/index.php/User:Dfelinto/TexFace
http://codereview.appspot.com/4289041/
2011-09-19 21:55:59 +02:00
|
|
|
#include "DNA_meshdata_types.h"
|
|
|
|
|
#include "DNA_customdata_types.h"
|
2018-07-31 10:22:19 +02:00
|
|
|
#include "DNA_gpencil_types.h"
|
TexFace to Material Settings big patch
Summary:
========
The idea here is to move the texface options into the material panel.
For images with the change please visit:
http://code.blender.org/index.php/2011/09/bge-material-texface-changes
1 - Some of the legacy problems 2.49 and 2.5x has with the texface system:
==========================================================================
1.1) Shadow, Bilboard and Halo are mutual exclusive (in the code), yet you can
select a face to be more than one mode.
1.2) Sort only works for blend Alpha yet it's an option regardless of the
Transparency Blend you pick.
1.3) Shared doesn't affect anything in BGE.
1.4) ObColor only works for Text objects (old bitmap texts) when using Texture
Face Materials. (not address yet, I so far ignored obcolor)
2 - Notes:
============
2.1) Now "Use Face Textures" in material Option panel will work in Multitexture
even if there is no texture channel.
2.2) In FaceTexture mode it will use TexFace all the time, even if you don't
check the "Use Texture Face" option in the UI. It's a matter of decision, since
the code for either way is there. I decided by the solution that makes the
creation of a material fast - in this mode the user doesn't need to mess with
textures or this "Use Texture Face" option at all. I'm not strong in my opinion
here. But I think if we don't have this then what is the point of the Texture
Face mode?
2.3) I kept references for tface only when we need the image, UV or the tiling
setting. It should help later when/if we split the Image and UV layers from the
tface struct (Campbell and Brecht proposal).
3 - Changes in a Nutshell:
==========================
3.1) "Texture Face" panel (in the Mesh/Object Data panel) no longer exists. Those settings are all part of the material properties, visible when Game Render is set.
3.2) "Texture Face" Shading mode (in the Render panel) is now called “Single Texture”, it needs a material for special settings (e.g. Billboard, Alpha Sort, …).
3.3) New options in the Material Panel
* Shadeless option in the Material panel is now supported for all three Shading modes.
* Physics is now toggleable, this is the old Collision option.
* Two Side (on) is now called Back Culling (off).
* Alpha Sort is one of the Alpha options, together (and mutually exclusive) to Alpha Blend, Alpha Clip, Add and Opaque (i.e. solid).
* Shadow, Billboard and Halo are grouped in the “Face Orientation” property.
* "Face Textures" and "Face Textures Alpha" (under Options) can be used for all but GLSL shading mode (to be supported in GLSL eventually).
* The backend in the game engine is still the same as before. The only changes are in the interface and in the way you need to think your materials. The bottomline is: It’s no longer possible to share materials between faces that do not share the same game properties.
4 - Acknowledgment:
==================
Mike Pan for the design discussions, and testing along the whole development process.
Vitor Balbio for the first hands-on code with the interface changes. That helped me a lot to push me into work on that.
Benoit Bolsee and Brecht van Lommel for patch review (* no one reviewed the whole patch, or the latest iteractions, so I still hold liability for any problems).
Blender artists that gave feedback and helped testing the patch.
Patch review and original documentation can be found here:
http://wiki.blender.org/index.php/User:Dfelinto/TexFace
http://codereview.appspot.com/4289041/
2011-09-19 21:55:59 +02:00
|
|
|
#include "DNA_ID.h"
|
2002-10-12 13:37:38 +02:00
|
|
|
#include "DNA_meta_types.h"
|
Christmas coding work!
********* Node editor work:
- To enable Nodes for Materials, you have to set the "Use Nodes"
button, in the new Material buttons "Nodes" Panel or in header
of the Node editor. Doing this will disable Material-Layers.
- Nodes now execute materials ("shaders"), but still only using the
previewrender code.
- Nodes have (optional) previews for rendered images.
- Node headers allow to hide buttons and/or preview image
- Nodes can be dragged larger/smaller (right-bottom corner)
- Nodes can be hidden (minimized) with hotkey H
- CTRL+click on an Input Socket gives a popup with default values.
- Changing Material/Texture or Mix node will adjust Node title.
- Click-drag outside of a Node changes cursor to "Knife' and allows to
draw a rect where to cut Links.
- Added new node types RGBtoBW, Texture, In/Output, ColorRamp
- Material Nodes have options to ouput diffuse or specular, or to use
a negative normal. The input socket 'Normal' will force the material
to use that normal, otherwise it uses the normal from the Material
that has the node tree.
- When drawing a link between two not-matching sockets, Blender inserts
a converting node (now only for value/rgb combos)
- When drawing a link to an input socket that's already in use, the
old link will either disappear or flip to another unused socket.
- A click on a Material Node will activate it, and show all its settings
in the Material Buttons. Active Material Nodes draw the material icon
in red.
- A click on any node will show its options in the Node Panel in the
Material buttons.
- Multiple Output Nodes can be used, to sample contents of a tree, but
only one Output is the real one, which is indicated in a different
color and red material icon.
- Added ThemeColors for node types
- ALT+C will convert existing Material-Layers to Node... this currently
only adds the material/mix nodes and connects them. Dunno if this is
worth a lot of coding work to make perfect?
- Press C to call another "Solve order", which will show all possible
cyclic conflicts (if there are).
- Technical: nodes now use "Type" structs which define the
structure of nodes and in/output sockets. The Type structs store all
fixed info, callbacks, and allow to reconstruct saved Nodes to match
what is required by Blender.
- Defining (new) nodes now is as simple as filling in a fixed
Type struct, plus code some callbacks. A doc will be made!
- Node preview images are by default float
********* Icon drawing:
- Cleanup of how old icons were implemented in new system, making
them 16x16 too, correctly centered *and* scaled.
- Made drawing Icons use float coordinates
- Moved BIF_calcpreview_image() into interface_icons.c, renamed it
icon_from_image(). Removed a lot of unneeded Imbuf magic here! :)
- Skipped scaling and imbuf copying when icons are OK size
********* Preview render:
- Huge cleanup of code....
- renaming BIF_xxx calls that only were used internally
- BIF_previewrender() now accepts an argument for rendering method,
so it supports icons, buttonwindow previewrender and node editor
- Only a single BIF_preview_changed() call now exists, supporting all
signals as needed for buttos and node editor
********* More stuff:
- glutil.c, glaDrawPixelsSafe() and glaDrawPixelsTex() now accept format
argument for GL_FLOAT rects
- Made the ColorBand become a built-in button for interface.c
Was a load of cleanup work in buttons_shading.c...
- removed a load of unneeded glBlendFunc() calls
- Fixed bug in calculating text length for buttons (ancient!)
2005-12-28 16:42:51 +01:00
|
|
|
#include "DNA_node_types.h"
|
Orange branch feature; Material Layering
(WIP, don't bugs for this in tracker yet please!)
- New Panel "Layers" in Material buttons, allows to add unlimited amount
of materials on top of each other.
- Every Layer is actually just another Material, which gets rendered/shaded
(including texture), and then added on top of previous layer with an
operation like Mix, Add, Mult, etc.
- Layers render fully independent, so bumpmaps are not passed on to next
layers.
- Per Layer you can set if it influences Diffuse, Specular or Alpha
- If a Material returns alpha (like from texture), the alpha value is
used for adding the layers too.
- New texture "Map To" channel allows to have a texture work on a Layer
- Each layer, including basis Material, can be turned on/off individually
Notes:
- at this moment, the full shading pass happens for each layer, including
shadow, AO and raytraced mirror or transparency...
- I had to remove old hacks from preview render, which corrected reflected
normals for preview texturing.
- still needs loadsa testing!
2005-12-04 15:32:21 +01:00
|
|
|
#include "DNA_object_types.h"
|
2002-10-12 13:37:38 +02:00
|
|
|
#include "DNA_scene_types.h"
|
|
|
|
|
|
2018-06-17 17:05:51 +02:00
|
|
|
#include "BLI_math.h"
|
|
|
|
|
#include "BLI_listbase.h"
|
2011-01-07 19:36:47 +01:00
|
|
|
#include "BLI_utildefines.h"
|
2012-01-11 13:33:51 +01:00
|
|
|
#include "BLI_string.h"
|
2015-04-27 23:24:56 +02:00
|
|
|
#include "BLI_array_utils.h"
|
2002-10-12 13:37:38 +02:00
|
|
|
|
2009-01-18 11:41:45 +01:00
|
|
|
#include "BKE_animsys.h"
|
Orange branch feature; Material Layering
(WIP, don't bugs for this in tracker yet please!)
- New Panel "Layers" in Material buttons, allows to add unlimited amount
of materials on top of each other.
- Every Layer is actually just another Material, which gets rendered/shaded
(including texture), and then added on top of previous layer with an
operation like Mix, Add, Mult, etc.
- Layers render fully independent, so bumpmaps are not passed on to next
layers.
- Per Layer you can set if it influences Diffuse, Specular or Alpha
- If a Material returns alpha (like from texture), the alpha value is
used for adding the layers too.
- New texture "Map To" channel allows to have a texture work on a Layer
- Each layer, including basis Material, can be turned on/off individually
Notes:
- at this moment, the full shading pass happens for each layer, including
shadow, AO and raytraced mirror or transparency...
- I had to remove old hacks from preview render, which corrected reflected
normals for preview texturing.
- still needs loadsa testing!
2005-12-04 15:32:21 +01:00
|
|
|
#include "BKE_displist.h"
|
2002-10-12 13:37:38 +02:00
|
|
|
#include "BKE_global.h"
|
2018-07-31 10:22:19 +02:00
|
|
|
#include "BKE_gpencil.h"
|
2005-12-21 23:21:43 +01:00
|
|
|
#include "BKE_icons.h"
|
TexFace to Material Settings big patch
Summary:
========
The idea here is to move the texface options into the material panel.
For images with the change please visit:
http://code.blender.org/index.php/2011/09/bge-material-texface-changes
1 - Some of the legacy problems 2.49 and 2.5x has with the texface system:
==========================================================================
1.1) Shadow, Bilboard and Halo are mutual exclusive (in the code), yet you can
select a face to be more than one mode.
1.2) Sort only works for blend Alpha yet it's an option regardless of the
Transparency Blend you pick.
1.3) Shared doesn't affect anything in BGE.
1.4) ObColor only works for Text objects (old bitmap texts) when using Texture
Face Materials. (not address yet, I so far ignored obcolor)
2 - Notes:
============
2.1) Now "Use Face Textures" in material Option panel will work in Multitexture
even if there is no texture channel.
2.2) In FaceTexture mode it will use TexFace all the time, even if you don't
check the "Use Texture Face" option in the UI. It's a matter of decision, since
the code for either way is there. I decided by the solution that makes the
creation of a material fast - in this mode the user doesn't need to mess with
textures or this "Use Texture Face" option at all. I'm not strong in my opinion
here. But I think if we don't have this then what is the point of the Texture
Face mode?
2.3) I kept references for tface only when we need the image, UV or the tiling
setting. It should help later when/if we split the Image and UV layers from the
tface struct (Campbell and Brecht proposal).
3 - Changes in a Nutshell:
==========================
3.1) "Texture Face" panel (in the Mesh/Object Data panel) no longer exists. Those settings are all part of the material properties, visible when Game Render is set.
3.2) "Texture Face" Shading mode (in the Render panel) is now called “Single Texture”, it needs a material for special settings (e.g. Billboard, Alpha Sort, …).
3.3) New options in the Material Panel
* Shadeless option in the Material panel is now supported for all three Shading modes.
* Physics is now toggleable, this is the old Collision option.
* Two Side (on) is now called Back Culling (off).
* Alpha Sort is one of the Alpha options, together (and mutually exclusive) to Alpha Blend, Alpha Clip, Add and Opaque (i.e. solid).
* Shadow, Billboard and Halo are grouped in the “Face Orientation” property.
* "Face Textures" and "Face Textures Alpha" (under Options) can be used for all but GLSL shading mode (to be supported in GLSL eventually).
* The backend in the game engine is still the same as before. The only changes are in the interface and in the way you need to think your materials. The bottomline is: It’s no longer possible to share materials between faces that do not share the same game properties.
4 - Acknowledgment:
==================
Mike Pan for the design discussions, and testing along the whole development process.
Vitor Balbio for the first hands-on code with the interface changes. That helped me a lot to push me into work on that.
Benoit Bolsee and Brecht van Lommel for patch review (* no one reviewed the whole patch, or the latest iteractions, so I still hold liability for any problems).
Blender artists that gave feedback and helped testing the patch.
Patch review and original documentation can be found here:
http://wiki.blender.org/index.php/User:Dfelinto/TexFace
http://codereview.appspot.com/4289041/
2011-09-19 21:55:59 +02:00
|
|
|
#include "BKE_image.h"
|
2002-10-12 13:37:38 +02:00
|
|
|
#include "BKE_library.h"
|
2016-07-10 16:38:17 +02:00
|
|
|
#include "BKE_library_query.h"
|
|
|
|
|
#include "BKE_library_remap.h"
|
Orange branch feature; Material Layering
(WIP, don't bugs for this in tracker yet please!)
- New Panel "Layers" in Material buttons, allows to add unlimited amount
of materials on top of each other.
- Every Layer is actually just another Material, which gets rendered/shaded
(including texture), and then added on top of previous layer with an
operation like Mix, Add, Mult, etc.
- Layers render fully independent, so bumpmaps are not passed on to next
layers.
- Per Layer you can set if it influences Diffuse, Specular or Alpha
- If a Material returns alpha (like from texture), the alpha value is
used for adding the layers too.
- New texture "Map To" channel allows to have a texture work on a Layer
- Each layer, including basis Material, can be turned on/off individually
Notes:
- at this moment, the full shading pass happens for each layer, including
shadow, AO and raytraced mirror or transparency...
- I had to remove old hacks from preview render, which corrected reflected
normals for preview texturing.
- still needs loadsa testing!
2005-12-04 15:32:21 +01:00
|
|
|
#include "BKE_main.h"
|
2002-10-12 13:37:38 +02:00
|
|
|
#include "BKE_material.h"
|
Orange branch feature; Material Layering
(WIP, don't bugs for this in tracker yet please!)
- New Panel "Layers" in Material buttons, allows to add unlimited amount
of materials on top of each other.
- Every Layer is actually just another Material, which gets rendered/shaded
(including texture), and then added on top of previous layer with an
operation like Mix, Add, Mult, etc.
- Layers render fully independent, so bumpmaps are not passed on to next
layers.
- Per Layer you can set if it influences Diffuse, Specular or Alpha
- If a Material returns alpha (like from texture), the alpha value is
used for adding the layers too.
- New texture "Map To" channel allows to have a texture work on a Layer
- Each layer, including basis Material, can be turned on/off individually
Notes:
- at this moment, the full shading pass happens for each layer, including
shadow, AO and raytraced mirror or transparency...
- I had to remove old hacks from preview render, which corrected reflected
normals for preview texturing.
- still needs loadsa testing!
2005-12-04 15:32:21 +01:00
|
|
|
#include "BKE_mesh.h"
|
2014-08-27 15:52:24 +02:00
|
|
|
#include "BKE_scene.h"
|
Christmas coding work!
********* Node editor work:
- To enable Nodes for Materials, you have to set the "Use Nodes"
button, in the new Material buttons "Nodes" Panel or in header
of the Node editor. Doing this will disable Material-Layers.
- Nodes now execute materials ("shaders"), but still only using the
previewrender code.
- Nodes have (optional) previews for rendered images.
- Node headers allow to hide buttons and/or preview image
- Nodes can be dragged larger/smaller (right-bottom corner)
- Nodes can be hidden (minimized) with hotkey H
- CTRL+click on an Input Socket gives a popup with default values.
- Changing Material/Texture or Mix node will adjust Node title.
- Click-drag outside of a Node changes cursor to "Knife' and allows to
draw a rect where to cut Links.
- Added new node types RGBtoBW, Texture, In/Output, ColorRamp
- Material Nodes have options to ouput diffuse or specular, or to use
a negative normal. The input socket 'Normal' will force the material
to use that normal, otherwise it uses the normal from the Material
that has the node tree.
- When drawing a link between two not-matching sockets, Blender inserts
a converting node (now only for value/rgb combos)
- When drawing a link to an input socket that's already in use, the
old link will either disappear or flip to another unused socket.
- A click on a Material Node will activate it, and show all its settings
in the Material Buttons. Active Material Nodes draw the material icon
in red.
- A click on any node will show its options in the Node Panel in the
Material buttons.
- Multiple Output Nodes can be used, to sample contents of a tree, but
only one Output is the real one, which is indicated in a different
color and red material icon.
- Added ThemeColors for node types
- ALT+C will convert existing Material-Layers to Node... this currently
only adds the material/mix nodes and connects them. Dunno if this is
worth a lot of coding work to make perfect?
- Press C to call another "Solve order", which will show all possible
cyclic conflicts (if there are).
- Technical: nodes now use "Type" structs which define the
structure of nodes and in/output sockets. The Type structs store all
fixed info, callbacks, and allow to reconstruct saved Nodes to match
what is required by Blender.
- Defining (new) nodes now is as simple as filling in a fixed
Type struct, plus code some callbacks. A doc will be made!
- Node preview images are by default float
********* Icon drawing:
- Cleanup of how old icons were implemented in new system, making
them 16x16 too, correctly centered *and* scaled.
- Made drawing Icons use float coordinates
- Moved BIF_calcpreview_image() into interface_icons.c, renamed it
icon_from_image(). Removed a lot of unneeded Imbuf magic here! :)
- Skipped scaling and imbuf copying when icons are OK size
********* Preview render:
- Huge cleanup of code....
- renaming BIF_xxx calls that only were used internally
- BIF_previewrender() now accepts an argument for rendering method,
so it supports icons, buttonwindow previewrender and node editor
- Only a single BIF_preview_changed() call now exists, supporting all
signals as needed for buttos and node editor
********* More stuff:
- glutil.c, glaDrawPixelsSafe() and glaDrawPixelsTex() now accept format
argument for GL_FLOAT rects
- Made the ColorBand become a built-in button for interface.c
Was a load of cleanup work in buttons_shading.c...
- removed a load of unneeded glBlendFunc() calls
- Fixed bug in calculating text length for buttons (ancient!)
2005-12-28 16:42:51 +01:00
|
|
|
#include "BKE_node.h"
|
2011-07-31 13:12:38 +02:00
|
|
|
#include "BKE_curve.h"
|
2015-04-27 23:24:56 +02:00
|
|
|
#include "BKE_editmesh.h"
|
|
|
|
|
#include "BKE_font.h"
|
2002-10-12 13:37:38 +02:00
|
|
|
|
2018-03-16 11:17:45 +01:00
|
|
|
#include "DEG_depsgraph.h"
|
2017-04-06 16:11:50 +02:00
|
|
|
#include "DEG_depsgraph_build.h"
|
|
|
|
|
|
Merge of first part of changes from the apricot branch, especially
the features that are needed to run the game. Compile tested with
scons, make, but not cmake, that seems to have an issue not related
to these changes. The changes include:
* GLSL support in the viewport and game engine, enable in the game
menu in textured draw mode.
* Synced and merged part of the duplicated blender and gameengine/
gameplayer drawing code.
* Further refactoring of game engine drawing code, especially mesh
storage changed a lot.
* Optimizations in game engine armatures to avoid recomputations.
* A python function to get the framerate estimate in game.
* An option take object color into account in materials.
* An option to restrict shadow casters to a lamp's layers.
* Increase from 10 to 18 texture slots for materials, lamps, word.
An extra texture slot shows up once the last slot is used.
* Memory limit for undo, not enabled by default yet because it
needs the .B.blend to be changed.
* Multiple undo for image painting.
* An offset for dupligroups, so not all objects in a group have to
be at the origin.
2008-09-04 22:51:28 +02:00
|
|
|
#include "GPU_material.h"
|
2003-11-23 15:28:46 +01:00
|
|
|
|
Giant commit!
A full detailed description of this will be done later... is several days
of work. Here's a summary:
Render:
- Full cleanup of render code, removing *all* globals and bad level calls
all over blender. Render module is now not called abusive anymore
- API-fied calls to rendering
- Full recode of internal render pipeline. Is now rendering tiles by
default, prepared for much smarter 'bucket' render later.
- Each thread now can render a full part
- Renders were tested with 4 threads, goes fine, apart from some lookup
tables in softshadow and AO still
- Rendering is prepared to do multiple layers and passes
- No single 32 bits trick in render code anymore, all 100% floats now.
Writing images/movies
- moved writing images to blender kernel (bye bye 'schrijfplaatje'!)
- made a new Movie handle system, also in kernel. This will enable much
easier use of movies in Blender
PreviewRender:
- Using new render API, previewrender (in buttons) now uses regular render
code to generate images.
- new datafile 'preview.blend.c' has the preview scenes in it
- previews get rendered in exact displayed size (1 pixel = 1 pixel)
3D Preview render
- new; press Pkey in 3d window, for a panel that continuously renders
(pkey is for games, i know... but we dont do that in orange now!)
- this render works nearly identical to buttons-preview render, so it stops
rendering on any event (mouse, keyboard, etc)
- on moving/scaling the panel, the render code doesn't recreate all geometry
- same for shifting/panning view
- all other operations (now) regenerate the full render database still.
- this is WIP... but big fun, especially for simple scenes!
Compositor
- Using same node system as now in use for shaders, you can composit images
- works pretty straightforward... needs much more options/tools and integration
with rendering still
- is not threaded yet, nor is so smart to only recalculate changes... will be
done soon!
- the "Render Result" node will get all layers/passes as output sockets
- The "Output" node renders to a builtin image, which you can view in the Image
window. (yes, output nodes to render-result, and to files, is on the list!)
The Bad News
- "Unified Render" is removed. It might come back in some stage, but this
system should be built from scratch. I can't really understand this code...
I expect it is not much needed, especially with advanced layer/passes
control
- Panorama render, Field render, Motion blur, is not coded yet... (I had to
recode every single feature in render, so...!)
- Lens Flare is also not back... needs total revision, might become composit
effect though (using zbuffer for visibility)
- Part render is gone! (well, thats obvious, its default now).
- The render window is only restored with limited functionality... I am going
to check first the option to render to a Image window, so Blender can become
a true single-window application. :)
For example, the 'Spare render buffer' (jkey) doesnt work.
- Render with border, now default creates a smaller image
- No zbuffers are written yet... on the todo!
- Scons files and MSVC will need work to get compiling again
OK... thats what I can quickly recall. Now go compiling!
2006-01-23 23:05:47 +01:00
|
|
|
/* used in UI and render */
|
|
|
|
|
Material defmaterial;
|
|
|
|
|
|
|
|
|
|
/* called on startup, creator.c */
|
|
|
|
|
void init_def_material(void)
|
|
|
|
|
{
|
First step to handle missing libs/datablocks when reading a file.
Idea is, instead of ignoring completely missing linked datablocks, to
create void placeholders for them.
That way, you can work on your file, save it, and find again your missing data once
lib becomes available again. Or you can edit missing lib's path (in Outliner),
save and reload the file, and you are done.
Also, Outliner now shows broken libraries (and placeholders) with a 'broken lib' icon.
Future plans are also to be able to relocate missing libs and reload them at runtime.
Code notes:
- Placeholder ID is just a regular datablock of same type as expected linked one,
with 'default' data, and a LIB_MISSING bitflag set.
- To allow creation of such datablocks, creation of datablocks in BKE was split in two step:
+ Allocation of memory itself.
+ Setting of all internal data to default values.
See also the design task (T43351).
Reviewed by @campbellbarton, thanks a bunch!
Differential Revision: https://developer.blender.org/D1394
2015-10-20 14:44:57 +02:00
|
|
|
BKE_material_init(&defmaterial);
|
Giant commit!
A full detailed description of this will be done later... is several days
of work. Here's a summary:
Render:
- Full cleanup of render code, removing *all* globals and bad level calls
all over blender. Render module is now not called abusive anymore
- API-fied calls to rendering
- Full recode of internal render pipeline. Is now rendering tiles by
default, prepared for much smarter 'bucket' render later.
- Each thread now can render a full part
- Renders were tested with 4 threads, goes fine, apart from some lookup
tables in softshadow and AO still
- Rendering is prepared to do multiple layers and passes
- No single 32 bits trick in render code anymore, all 100% floats now.
Writing images/movies
- moved writing images to blender kernel (bye bye 'schrijfplaatje'!)
- made a new Movie handle system, also in kernel. This will enable much
easier use of movies in Blender
PreviewRender:
- Using new render API, previewrender (in buttons) now uses regular render
code to generate images.
- new datafile 'preview.blend.c' has the preview scenes in it
- previews get rendered in exact displayed size (1 pixel = 1 pixel)
3D Preview render
- new; press Pkey in 3d window, for a panel that continuously renders
(pkey is for games, i know... but we dont do that in orange now!)
- this render works nearly identical to buttons-preview render, so it stops
rendering on any event (mouse, keyboard, etc)
- on moving/scaling the panel, the render code doesn't recreate all geometry
- same for shifting/panning view
- all other operations (now) regenerate the full render database still.
- this is WIP... but big fun, especially for simple scenes!
Compositor
- Using same node system as now in use for shaders, you can composit images
- works pretty straightforward... needs much more options/tools and integration
with rendering still
- is not threaded yet, nor is so smart to only recalculate changes... will be
done soon!
- the "Render Result" node will get all layers/passes as output sockets
- The "Output" node renders to a builtin image, which you can view in the Image
window. (yes, output nodes to render-result, and to files, is on the list!)
The Bad News
- "Unified Render" is removed. It might come back in some stage, but this
system should be built from scratch. I can't really understand this code...
I expect it is not much needed, especially with advanced layer/passes
control
- Panorama render, Field render, Motion blur, is not coded yet... (I had to
recode every single feature in render, so...!)
- Lens Flare is also not back... needs total revision, might become composit
effect though (using zbuffer for visibility)
- Part render is gone! (well, thats obvious, its default now).
- The render window is only restored with limited functionality... I am going
to check first the option to render to a Image window, so Blender can become
a true single-window application. :)
For example, the 'Spare render buffer' (jkey) doesnt work.
- Render with border, now default creates a smaller image
- No zbuffers are written yet... on the todo!
- Scons files and MSVC will need work to get compiling again
OK... thats what I can quickly recall. Now go compiling!
2006-01-23 23:05:47 +01:00
|
|
|
}
|
|
|
|
|
|
ID-Remap - Step one: core work (cleanup and rework of generic ID datablock handling).
This commit changes a lot of how IDs are handled internally, especially the unlinking/freeing
processes. So far, this was very fuzy, to summarize cleanly deleting or replacing a datablock
was pretty much impossible, except for a few special cases.
Also, unlinking was handled by each datatype, in a rather messy and prone-to-errors way (quite
a few ID usages were missed or wrongly handled that way).
One of the main goal of id-remap branch was to cleanup this, and fatorize ID links handling
by using library_query utils to allow generic handling of those, which is now the case
(now, generic ID links handling is only "knwon" from readfile.c and library_query.c).
This commit also adds backends to allow live replacement and deletion of datablocks in Blender
(so-called 'remapping' process, where we replace all usages of a given ID pointer by a new one,
or NULL one in case of unlinking).
This will allow nice new features, like ability to easily reload or relocate libraries, real immediate
deletion of datablocks in blender, replacement of one datablock by another, etc.
Some of those are for next commits.
A word of warning: this commit is highly risky, because it affects potentially a lot in Blender core.
Though it was tested rather deeply, being totally impossible to check all possible ID usage cases,
it's likely there are some remaining issues and bugs in new code... Please report them! ;)
Review task: D2027 (https://developer.blender.org/D2027).
Reviewed by campbellbarton, thanks a bunch.
2016-06-22 17:29:38 +02:00
|
|
|
/** Free (or release) any data used by this material (does not free the material itself). */
|
2012-05-05 16:03:12 +02:00
|
|
|
void BKE_material_free(Material *ma)
|
2012-08-22 19:22:04 +02:00
|
|
|
{
|
ID-Remap - Step one: core work (cleanup and rework of generic ID datablock handling).
This commit changes a lot of how IDs are handled internally, especially the unlinking/freeing
processes. So far, this was very fuzy, to summarize cleanly deleting or replacing a datablock
was pretty much impossible, except for a few special cases.
Also, unlinking was handled by each datatype, in a rather messy and prone-to-errors way (quite
a few ID usages were missed or wrongly handled that way).
One of the main goal of id-remap branch was to cleanup this, and fatorize ID links handling
by using library_query utils to allow generic handling of those, which is now the case
(now, generic ID links handling is only "knwon" from readfile.c and library_query.c).
This commit also adds backends to allow live replacement and deletion of datablocks in Blender
(so-called 'remapping' process, where we replace all usages of a given ID pointer by a new one,
or NULL one in case of unlinking).
This will allow nice new features, like ability to easily reload or relocate libraries, real immediate
deletion of datablocks in blender, replacement of one datablock by another, etc.
Some of those are for next commits.
A word of warning: this commit is highly risky, because it affects potentially a lot in Blender core.
Though it was tested rather deeply, being totally impossible to check all possible ID usage cases,
it's likely there are some remaining issues and bugs in new code... Please report them! ;)
Review task: D2027 (https://developer.blender.org/D2027).
Reviewed by campbellbarton, thanks a bunch.
2016-06-22 17:29:38 +02:00
|
|
|
BKE_animdata_free((ID *)ma, false);
|
2018-06-17 17:05:51 +02:00
|
|
|
|
2018-03-05 00:52:19 +01:00
|
|
|
/* Free gpu material before the ntree */
|
|
|
|
|
GPU_material_free(&ma->gpumaterial);
|
2018-06-17 17:05:51 +02: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 14:06:05 +01:00
|
|
|
/* is no lib link block, but material extension */
|
2012-02-23 03:17:50 +01:00
|
|
|
if (ma->nodetree) {
|
ID-Remap - Step one: core work (cleanup and rework of generic ID datablock handling).
This commit changes a lot of how IDs are handled internally, especially the unlinking/freeing
processes. So far, this was very fuzy, to summarize cleanly deleting or replacing a datablock
was pretty much impossible, except for a few special cases.
Also, unlinking was handled by each datatype, in a rather messy and prone-to-errors way (quite
a few ID usages were missed or wrongly handled that way).
One of the main goal of id-remap branch was to cleanup this, and fatorize ID links handling
by using library_query utils to allow generic handling of those, which is now the case
(now, generic ID links handling is only "knwon" from readfile.c and library_query.c).
This commit also adds backends to allow live replacement and deletion of datablocks in Blender
(so-called 'remapping' process, where we replace all usages of a given ID pointer by a new one,
or NULL one in case of unlinking).
This will allow nice new features, like ability to easily reload or relocate libraries, real immediate
deletion of datablocks in blender, replacement of one datablock by another, etc.
Some of those are for next commits.
A word of warning: this commit is highly risky, because it affects potentially a lot in Blender core.
Though it was tested rather deeply, being totally impossible to check all possible ID usage cases,
it's likely there are some remaining issues and bugs in new code... Please report them! ;)
Review task: D2027 (https://developer.blender.org/D2027).
Reviewed by campbellbarton, thanks a bunch.
2016-06-22 17:29:38 +02:00
|
|
|
ntreeFreeTree(ma->nodetree);
|
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 14:06:05 +01:00
|
|
|
MEM_freeN(ma->nodetree);
|
ID-Remap - Step one: core work (cleanup and rework of generic ID datablock handling).
This commit changes a lot of how IDs are handled internally, especially the unlinking/freeing
processes. So far, this was very fuzy, to summarize cleanly deleting or replacing a datablock
was pretty much impossible, except for a few special cases.
Also, unlinking was handled by each datatype, in a rather messy and prone-to-errors way (quite
a few ID usages were missed or wrongly handled that way).
One of the main goal of id-remap branch was to cleanup this, and fatorize ID links handling
by using library_query utils to allow generic handling of those, which is now the case
(now, generic ID links handling is only "knwon" from readfile.c and library_query.c).
This commit also adds backends to allow live replacement and deletion of datablocks in Blender
(so-called 'remapping' process, where we replace all usages of a given ID pointer by a new one,
or NULL one in case of unlinking).
This will allow nice new features, like ability to easily reload or relocate libraries, real immediate
deletion of datablocks in blender, replacement of one datablock by another, etc.
Some of those are for next commits.
A word of warning: this commit is highly risky, because it affects potentially a lot in Blender core.
Though it was tested rather deeply, being totally impossible to check all possible ID usage cases,
it's likely there are some remaining issues and bugs in new code... Please report them! ;)
Review task: D2027 (https://developer.blender.org/D2027).
Reviewed by campbellbarton, thanks a bunch.
2016-06-22 17:29:38 +02:00
|
|
|
ma->nodetree = NULL;
|
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 14:06:05 +01:00
|
|
|
}
|
Merge of first part of changes from the apricot branch, especially
the features that are needed to run the game. Compile tested with
scons, make, but not cmake, that seems to have an issue not related
to these changes. The changes include:
* GLSL support in the viewport and game engine, enable in the game
menu in textured draw mode.
* Synced and merged part of the duplicated blender and gameengine/
gameplayer drawing code.
* Further refactoring of game engine drawing code, especially mesh
storage changed a lot.
* Optimizations in game engine armatures to avoid recomputations.
* A python function to get the framerate estimate in game.
* An option take object color into account in materials.
* An option to restrict shadow casters to a lamp's layers.
* Increase from 10 to 18 texture slots for materials, lamps, word.
An extra texture slot shows up once the last slot is used.
* Memory limit for undo, not enabled by default yet because it
needs the .B.blend to be changed.
* Multiple undo for image painting.
* An offset for dupligroups, so not all objects in a group have to
be at the origin.
2008-09-04 22:51:28 +02:00
|
|
|
|
ID-Remap - Step one: core work (cleanup and rework of generic ID datablock handling).
This commit changes a lot of how IDs are handled internally, especially the unlinking/freeing
processes. So far, this was very fuzy, to summarize cleanly deleting or replacing a datablock
was pretty much impossible, except for a few special cases.
Also, unlinking was handled by each datatype, in a rather messy and prone-to-errors way (quite
a few ID usages were missed or wrongly handled that way).
One of the main goal of id-remap branch was to cleanup this, and fatorize ID links handling
by using library_query utils to allow generic handling of those, which is now the case
(now, generic ID links handling is only "knwon" from readfile.c and library_query.c).
This commit also adds backends to allow live replacement and deletion of datablocks in Blender
(so-called 'remapping' process, where we replace all usages of a given ID pointer by a new one,
or NULL one in case of unlinking).
This will allow nice new features, like ability to easily reload or relocate libraries, real immediate
deletion of datablocks in blender, replacement of one datablock by another, etc.
Some of those are for next commits.
A word of warning: this commit is highly risky, because it affects potentially a lot in Blender core.
Though it was tested rather deeply, being totally impossible to check all possible ID usage cases,
it's likely there are some remaining issues and bugs in new code... Please report them! ;)
Review task: D2027 (https://developer.blender.org/D2027).
Reviewed by campbellbarton, thanks a bunch.
2016-06-22 17:29:38 +02:00
|
|
|
MEM_SAFE_FREE(ma->texpaintslot);
|
|
|
|
|
|
2018-07-31 10:22:19 +02:00
|
|
|
MEM_SAFE_FREE(ma->gp_style);
|
|
|
|
|
|
ID-Remap - Step one: core work (cleanup and rework of generic ID datablock handling).
This commit changes a lot of how IDs are handled internally, especially the unlinking/freeing
processes. So far, this was very fuzy, to summarize cleanly deleting or replacing a datablock
was pretty much impossible, except for a few special cases.
Also, unlinking was handled by each datatype, in a rather messy and prone-to-errors way (quite
a few ID usages were missed or wrongly handled that way).
One of the main goal of id-remap branch was to cleanup this, and fatorize ID links handling
by using library_query utils to allow generic handling of those, which is now the case
(now, generic ID links handling is only "knwon" from readfile.c and library_query.c).
This commit also adds backends to allow live replacement and deletion of datablocks in Blender
(so-called 'remapping' process, where we replace all usages of a given ID pointer by a new one,
or NULL one in case of unlinking).
This will allow nice new features, like ability to easily reload or relocate libraries, real immediate
deletion of datablocks in blender, replacement of one datablock by another, etc.
Some of those are for next commits.
A word of warning: this commit is highly risky, because it affects potentially a lot in Blender core.
Though it was tested rather deeply, being totally impossible to check all possible ID usage cases,
it's likely there are some remaining issues and bugs in new code... Please report them! ;)
Review task: D2027 (https://developer.blender.org/D2027).
Reviewed by campbellbarton, thanks a bunch.
2016-06-22 17:29:38 +02:00
|
|
|
BKE_icon_id_delete((ID *)ma);
|
|
|
|
|
BKE_previewimg_free(&ma->preview);
|
2002-10-12 13:37:38 +02:00
|
|
|
}
|
|
|
|
|
|
2018-07-31 10:22:19 +02:00
|
|
|
void BKE_material_init_gpencil_settings(Material *ma)
|
|
|
|
|
{
|
|
|
|
|
if ((ma) && (ma->gp_style == NULL)) {
|
|
|
|
|
ma->gp_style = MEM_callocN(sizeof(MaterialGPencilStyle), "Grease Pencil Material Settings");
|
|
|
|
|
|
|
|
|
|
MaterialGPencilStyle *gp_style = ma->gp_style;
|
|
|
|
|
/* set basic settings */
|
|
|
|
|
gp_style->stroke_rgba[3] = 1.0f;
|
|
|
|
|
gp_style->pattern_gridsize = 0.1f;
|
|
|
|
|
gp_style->gradient_radius = 0.5f;
|
|
|
|
|
ARRAY_SET_ITEMS(gp_style->mix_rgba, 1.0f, 1.0f, 1.0f, 0.2f);
|
|
|
|
|
ARRAY_SET_ITEMS(gp_style->gradient_scale, 1.0f, 1.0f);
|
|
|
|
|
ARRAY_SET_ITEMS(gp_style->texture_scale, 1.0f, 1.0f);
|
|
|
|
|
gp_style->texture_opacity = 1.0f;
|
|
|
|
|
gp_style->texture_pixsize = 100.0f;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
First step to handle missing libs/datablocks when reading a file.
Idea is, instead of ignoring completely missing linked datablocks, to
create void placeholders for them.
That way, you can work on your file, save it, and find again your missing data once
lib becomes available again. Or you can edit missing lib's path (in Outliner),
save and reload the file, and you are done.
Also, Outliner now shows broken libraries (and placeholders) with a 'broken lib' icon.
Future plans are also to be able to relocate missing libs and reload them at runtime.
Code notes:
- Placeholder ID is just a regular datablock of same type as expected linked one,
with 'default' data, and a LIB_MISSING bitflag set.
- To allow creation of such datablocks, creation of datablocks in BKE was split in two step:
+ Allocation of memory itself.
+ Setting of all internal data to default values.
See also the design task (T43351).
Reviewed by @campbellbarton, thanks a bunch!
Differential Revision: https://developer.blender.org/D1394
2015-10-20 14:44:57 +02:00
|
|
|
void BKE_material_init(Material *ma)
|
2002-10-12 13:37:38 +02:00
|
|
|
{
|
First step to handle missing libs/datablocks when reading a file.
Idea is, instead of ignoring completely missing linked datablocks, to
create void placeholders for them.
That way, you can work on your file, save it, and find again your missing data once
lib becomes available again. Or you can edit missing lib's path (in Outliner),
save and reload the file, and you are done.
Also, Outliner now shows broken libraries (and placeholders) with a 'broken lib' icon.
Future plans are also to be able to relocate missing libs and reload them at runtime.
Code notes:
- Placeholder ID is just a regular datablock of same type as expected linked one,
with 'default' data, and a LIB_MISSING bitflag set.
- To allow creation of such datablocks, creation of datablocks in BKE was split in two step:
+ Allocation of memory itself.
+ Setting of all internal data to default values.
See also the design task (T43351).
Reviewed by @campbellbarton, thanks a bunch!
Differential Revision: https://developer.blender.org/D1394
2015-10-20 14:44:57 +02:00
|
|
|
BLI_assert(MEMCMP_STRUCT_OFS_IS_ZERO(ma, id));
|
|
|
|
|
|
Remove Blender Internal and legacy viewport from Blender 2.8.
Brecht authored this commit, but he gave me the honours to actually
do it. Here it goes; Blender Internal. Bye bye, you did great!
* Point density, voxel data, ocean, environment map textures were removed,
as these only worked within BI rendering. Note that the ocean modifier
and the Cycles point density shader node continue to work.
* Dynamic paint using material shading was removed, as this only worked
with BI. If we ever wanted to support this again probably it should go
through the baking API.
* GPU shader export through the Python API was removed. This only worked
for the old BI GLSL shaders, which no longer exists. Doing something
similar for Eevee would be significantly more complicated because it
uses a lot of multiplass rendering and logic outside the shader, it's
probably impractical.
* Collada material import / export code is mostly gone, as it only worked
for BI materials. We need to add Cycles / Eevee material support at some
point.
* The mesh noise operator was removed since it only worked with BI
material texture slots. A displacement modifier can be used instead.
* The delete texture paint slot operator was removed since it only worked
for BI material texture slots. Could be added back with node support.
* Not all legacy viewport features are supported in the new viewport, but
their code was removed. If we need to bring anything back we can look at
older git revisions.
* There is some legacy viewport code that I could not remove yet, and some
that I probably missed.
* Shader node execution code was left mostly intact, even though it is not
used anywhere now. We may eventually use this to replace the texture
nodes with Cycles / Eevee shader nodes.
* The Cycles Bake panel now includes settings for baking multires normal
and displacement maps. The underlying code needs to be merged properly,
and we plan to add back support for multires AO baking and add support
to Cycles baking for features like vertex color, displacement, and other
missing baking features.
* This commit removes DNA and the Python API for BI material, lamp, world
and scene settings. This breaks a lot of addons.
* There is more DNA that can be removed or renamed, where Cycles or Eevee
are reusing some old BI properties but the names are not really correct
anymore.
* Texture slots for materials, lamps and world were removed. They remain
for brushes, particles and freestyle linestyles.
* 'BLENDER_RENDER' remains in the COMPAT_ENGINES of UI panels. Cycles and
other renderers use this to find all panels to show, minus a few panels
that they have their own replacement for.
2018-04-19 17:34:44 +02:00
|
|
|
ma->r = ma->g = ma->b = 0.8;
|
2012-05-06 17:15:33 +02:00
|
|
|
ma->specr = ma->specg = ma->specb = 1.0;
|
2018-06-01 13:56:39 +02:00
|
|
|
// ma->alpha = 1.0; /* DEPRECATED */
|
Remove Blender Internal and legacy viewport from Blender 2.8.
Brecht authored this commit, but he gave me the honours to actually
do it. Here it goes; Blender Internal. Bye bye, you did great!
* Point density, voxel data, ocean, environment map textures were removed,
as these only worked within BI rendering. Note that the ocean modifier
and the Cycles point density shader node continue to work.
* Dynamic paint using material shading was removed, as this only worked
with BI. If we ever wanted to support this again probably it should go
through the baking API.
* GPU shader export through the Python API was removed. This only worked
for the old BI GLSL shaders, which no longer exists. Doing something
similar for Eevee would be significantly more complicated because it
uses a lot of multiplass rendering and logic outside the shader, it's
probably impractical.
* Collada material import / export code is mostly gone, as it only worked
for BI materials. We need to add Cycles / Eevee material support at some
point.
* The mesh noise operator was removed since it only worked with BI
material texture slots. A displacement modifier can be used instead.
* The delete texture paint slot operator was removed since it only worked
for BI material texture slots. Could be added back with node support.
* Not all legacy viewport features are supported in the new viewport, but
their code was removed. If we need to bring anything back we can look at
older git revisions.
* There is some legacy viewport code that I could not remove yet, and some
that I probably missed.
* Shader node execution code was left mostly intact, even though it is not
used anywhere now. We may eventually use this to replace the texture
nodes with Cycles / Eevee shader nodes.
* The Cycles Bake panel now includes settings for baking multires normal
and displacement maps. The underlying code needs to be merged properly,
and we plan to add back support for multires AO baking and add support
to Cycles baking for features like vertex color, displacement, and other
missing baking features.
* This commit removes DNA and the Python API for BI material, lamp, world
and scene settings. This breaks a lot of addons.
* There is more DNA that can be removed or renamed, where Cycles or Eevee
are reusing some old BI properties but the names are not really correct
anymore.
* Texture slots for materials, lamps and world were removed. They remain
for brushes, particles and freestyle linestyles.
* 'BLENDER_RENDER' remains in the COMPAT_ENGINES of UI panels. Cycles and
other renderers use this to find all panels to show, minus a few panels
that they have their own replacement for.
2018-04-19 17:34:44 +02:00
|
|
|
ma->spec = 0.5;
|
|
|
|
|
|
2018-05-31 13:32:53 +02:00
|
|
|
ma->roughness = 0.25f;
|
2018-06-17 17:10:19 +02:00
|
|
|
|
2012-05-06 17:15:33 +02:00
|
|
|
ma->pr_lamp = 3; /* two lamps, is bits */
|
|
|
|
|
ma->pr_type = MA_SPHERE;
|
|
|
|
|
|
2007-09-02 19:25:03 +02:00
|
|
|
ma->preview = NULL;
|
2017-07-09 12:01:29 +02:00
|
|
|
|
|
|
|
|
ma->alpha_threshold = 0.5f;
|
2018-07-31 10:22:19 +02:00
|
|
|
|
2002-10-12 13:37:38 +02:00
|
|
|
}
|
|
|
|
|
|
2013-02-05 13:46:15 +01:00
|
|
|
Material *BKE_material_add(Main *bmain, const char *name)
|
2002-10-12 13:37:38 +02:00
|
|
|
{
|
|
|
|
|
Material *ma;
|
|
|
|
|
|
Refactor ID copying (and to some extent, ID freeing).
This will allow much finer controll over how we copy data-blocks, from
full copy in Main database, to "lighter" ones (out of Main, inside an
already allocated datablock, etc.).
This commit also transfers a llot of what was previously handled by
per-ID-type custom code to generic ID handling code in BKE_library.
Hopefully will avoid in future inconsistencies and missing bits we had
all over the codebase in the past.
It also adds missing copying handling for a few types, most notably
Scene (which where using a fully customized handling previously).
Note that the type of allocation used during copying (regular in Main,
allocated but outside of Main, or not allocated by ID handling code at
all) is stored in ID's, which allows to handle them correctly when
freeing. This needs to be taken care of with caution when doing 'weird'
unusual things with ID copying and/or allocation!
As a final note, while rather noisy, this commit will hopefully not
break too much existing branches, old 'API' has been kept for the main
part, as a wrapper around new code. Cleaning it up will happen later.
Design task : T51804
Phab Diff: D2714
2017-08-07 16:39:55 +02:00
|
|
|
ma = BKE_libblock_alloc(bmain, ID_MA, name, 0);
|
2018-06-17 17:05:51 +02:00
|
|
|
|
First step to handle missing libs/datablocks when reading a file.
Idea is, instead of ignoring completely missing linked datablocks, to
create void placeholders for them.
That way, you can work on your file, save it, and find again your missing data once
lib becomes available again. Or you can edit missing lib's path (in Outliner),
save and reload the file, and you are done.
Also, Outliner now shows broken libraries (and placeholders) with a 'broken lib' icon.
Future plans are also to be able to relocate missing libs and reload them at runtime.
Code notes:
- Placeholder ID is just a regular datablock of same type as expected linked one,
with 'default' data, and a LIB_MISSING bitflag set.
- To allow creation of such datablocks, creation of datablocks in BKE was split in two step:
+ Allocation of memory itself.
+ Setting of all internal data to default values.
See also the design task (T43351).
Reviewed by @campbellbarton, thanks a bunch!
Differential Revision: https://developer.blender.org/D1394
2015-10-20 14:44:57 +02:00
|
|
|
BKE_material_init(ma);
|
2018-06-17 17:05:51 +02:00
|
|
|
|
2012-10-21 07:46:41 +02:00
|
|
|
return ma;
|
2002-10-12 13:37:38 +02:00
|
|
|
}
|
|
|
|
|
|
2018-07-31 10:22:19 +02:00
|
|
|
Material *BKE_material_add_gpencil(Main *bmain, const char *name)
|
|
|
|
|
{
|
|
|
|
|
Material *ma;
|
|
|
|
|
|
|
|
|
|
ma = BKE_material_add(bmain, name);
|
|
|
|
|
|
|
|
|
|
/* grease pencil settings */
|
|
|
|
|
BKE_material_init_gpencil_settings(ma);
|
|
|
|
|
|
|
|
|
|
return ma;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
Refactor ID copying (and to some extent, ID freeing).
This will allow much finer controll over how we copy data-blocks, from
full copy in Main database, to "lighter" ones (out of Main, inside an
already allocated datablock, etc.).
This commit also transfers a llot of what was previously handled by
per-ID-type custom code to generic ID handling code in BKE_library.
Hopefully will avoid in future inconsistencies and missing bits we had
all over the codebase in the past.
It also adds missing copying handling for a few types, most notably
Scene (which where using a fully customized handling previously).
Note that the type of allocation used during copying (regular in Main,
allocated but outside of Main, or not allocated by ID handling code at
all) is stored in ID's, which allows to handle them correctly when
freeing. This needs to be taken care of with caution when doing 'weird'
unusual things with ID copying and/or allocation!
As a final note, while rather noisy, this commit will hopefully not
break too much existing branches, old 'API' has been kept for the main
part, as a wrapper around new code. Cleaning it up will happen later.
Design task : T51804
Phab Diff: D2714
2017-08-07 16:39:55 +02:00
|
|
|
/**
|
|
|
|
|
* Only copy internal data of Material ID from source to already allocated/initialized destination.
|
|
|
|
|
* You probably nerver want to use that directly, use id_copy or BKE_id_copy_ex for typical needs.
|
|
|
|
|
*
|
|
|
|
|
* WARNING! This function will not handle ID user count!
|
|
|
|
|
*
|
|
|
|
|
* \param flag Copying options (see BKE_library.h's LIB_ID_COPY_... flags for more).
|
|
|
|
|
*/
|
|
|
|
|
void BKE_material_copy_data(Main *bmain, Material *ma_dst, const Material *ma_src, const int flag)
|
2002-10-12 13:37:38 +02:00
|
|
|
{
|
Refactor ID copying (and to some extent, ID freeing).
This will allow much finer controll over how we copy data-blocks, from
full copy in Main database, to "lighter" ones (out of Main, inside an
already allocated datablock, etc.).
This commit also transfers a llot of what was previously handled by
per-ID-type custom code to generic ID handling code in BKE_library.
Hopefully will avoid in future inconsistencies and missing bits we had
all over the codebase in the past.
It also adds missing copying handling for a few types, most notably
Scene (which where using a fully customized handling previously).
Note that the type of allocation used during copying (regular in Main,
allocated but outside of Main, or not allocated by ID handling code at
all) is stored in ID's, which allows to handle them correctly when
freeing. This needs to be taken care of with caution when doing 'weird'
unusual things with ID copying and/or allocation!
As a final note, while rather noisy, this commit will hopefully not
break too much existing branches, old 'API' has been kept for the main
part, as a wrapper around new code. Cleaning it up will happen later.
Design task : T51804
Phab Diff: D2714
2017-08-07 16:39:55 +02:00
|
|
|
if (ma_src->nodetree) {
|
2017-10-19 12:31:58 +02:00
|
|
|
/* Note: nodetree is *not* in bmain, however this specific case is handled at lower level
|
|
|
|
|
* (see BKE_libblock_copy_ex()). */
|
Refactor ID copying (and to some extent, ID freeing).
This will allow much finer controll over how we copy data-blocks, from
full copy in Main database, to "lighter" ones (out of Main, inside an
already allocated datablock, etc.).
This commit also transfers a llot of what was previously handled by
per-ID-type custom code to generic ID handling code in BKE_library.
Hopefully will avoid in future inconsistencies and missing bits we had
all over the codebase in the past.
It also adds missing copying handling for a few types, most notably
Scene (which where using a fully customized handling previously).
Note that the type of allocation used during copying (regular in Main,
allocated but outside of Main, or not allocated by ID handling code at
all) is stored in ID's, which allows to handle them correctly when
freeing. This needs to be taken care of with caution when doing 'weird'
unusual things with ID copying and/or allocation!
As a final note, while rather noisy, this commit will hopefully not
break too much existing branches, old 'API' has been kept for the main
part, as a wrapper around new code. Cleaning it up will happen later.
Design task : T51804
Phab Diff: D2714
2017-08-07 16:39:55 +02:00
|
|
|
BKE_id_copy_ex(bmain, (ID *)ma_src->nodetree, (ID **)&ma_dst->nodetree, flag, false);
|
|
|
|
|
}
|
2016-07-11 16:50:59 +02:00
|
|
|
|
Refactor ID copying (and to some extent, ID freeing).
This will allow much finer controll over how we copy data-blocks, from
full copy in Main database, to "lighter" ones (out of Main, inside an
already allocated datablock, etc.).
This commit also transfers a llot of what was previously handled by
per-ID-type custom code to generic ID handling code in BKE_library.
Hopefully will avoid in future inconsistencies and missing bits we had
all over the codebase in the past.
It also adds missing copying handling for a few types, most notably
Scene (which where using a fully customized handling previously).
Note that the type of allocation used during copying (regular in Main,
allocated but outside of Main, or not allocated by ID handling code at
all) is stored in ID's, which allows to handle them correctly when
freeing. This needs to be taken care of with caution when doing 'weird'
unusual things with ID copying and/or allocation!
As a final note, while rather noisy, this commit will hopefully not
break too much existing branches, old 'API' has been kept for the main
part, as a wrapper around new code. Cleaning it up will happen later.
Design task : T51804
Phab Diff: D2714
2017-08-07 16:39:55 +02:00
|
|
|
if ((flag & LIB_ID_COPY_NO_PREVIEW) == 0) {
|
|
|
|
|
BKE_previewimg_id_copy(&ma_dst->id, &ma_src->id);
|
|
|
|
|
}
|
|
|
|
|
else {
|
|
|
|
|
ma_dst->preview = NULL;
|
|
|
|
|
}
|
2016-07-11 21:27:15 +02:00
|
|
|
|
2018-03-20 11:22:47 +01:00
|
|
|
if (ma_src->texpaintslot != NULL) {
|
|
|
|
|
ma_dst->texpaintslot = MEM_dupallocN(ma_src->texpaintslot);
|
|
|
|
|
}
|
|
|
|
|
|
2018-07-31 10:22:19 +02:00
|
|
|
if (ma_src->gp_style != NULL) {
|
|
|
|
|
ma_dst->gp_style = MEM_dupallocN(ma_src->gp_style);
|
|
|
|
|
}
|
|
|
|
|
|
Refactor ID copying (and to some extent, ID freeing).
This will allow much finer controll over how we copy data-blocks, from
full copy in Main database, to "lighter" ones (out of Main, inside an
already allocated datablock, etc.).
This commit also transfers a llot of what was previously handled by
per-ID-type custom code to generic ID handling code in BKE_library.
Hopefully will avoid in future inconsistencies and missing bits we had
all over the codebase in the past.
It also adds missing copying handling for a few types, most notably
Scene (which where using a fully customized handling previously).
Note that the type of allocation used during copying (regular in Main,
allocated but outside of Main, or not allocated by ID handling code at
all) is stored in ID's, which allows to handle them correctly when
freeing. This needs to be taken care of with caution when doing 'weird'
unusual things with ID copying and/or allocation!
As a final note, while rather noisy, this commit will hopefully not
break too much existing branches, old 'API' has been kept for the main
part, as a wrapper around new code. Cleaning it up will happen later.
Design task : T51804
Phab Diff: D2714
2017-08-07 16:39:55 +02:00
|
|
|
BLI_listbase_clear(&ma_dst->gpumaterial);
|
2017-02-07 11:20:15 +01:00
|
|
|
|
Refactor ID copying (and to some extent, ID freeing).
This will allow much finer controll over how we copy data-blocks, from
full copy in Main database, to "lighter" ones (out of Main, inside an
already allocated datablock, etc.).
This commit also transfers a llot of what was previously handled by
per-ID-type custom code to generic ID handling code in BKE_library.
Hopefully will avoid in future inconsistencies and missing bits we had
all over the codebase in the past.
It also adds missing copying handling for a few types, most notably
Scene (which where using a fully customized handling previously).
Note that the type of allocation used during copying (regular in Main,
allocated but outside of Main, or not allocated by ID handling code at
all) is stored in ID's, which allows to handle them correctly when
freeing. This needs to be taken care of with caution when doing 'weird'
unusual things with ID copying and/or allocation!
As a final note, while rather noisy, this commit will hopefully not
break too much existing branches, old 'API' has been kept for the main
part, as a wrapper around new code. Cleaning it up will happen later.
Design task : T51804
Phab Diff: D2714
2017-08-07 16:39:55 +02:00
|
|
|
/* TODO Duplicate Engine Settings and set runtime to NULL */
|
|
|
|
|
}
|
2015-01-09 09:52:51 +01:00
|
|
|
|
Refactor ID copying (and to some extent, ID freeing).
This will allow much finer controll over how we copy data-blocks, from
full copy in Main database, to "lighter" ones (out of Main, inside an
already allocated datablock, etc.).
This commit also transfers a llot of what was previously handled by
per-ID-type custom code to generic ID handling code in BKE_library.
Hopefully will avoid in future inconsistencies and missing bits we had
all over the codebase in the past.
It also adds missing copying handling for a few types, most notably
Scene (which where using a fully customized handling previously).
Note that the type of allocation used during copying (regular in Main,
allocated but outside of Main, or not allocated by ID handling code at
all) is stored in ID's, which allows to handle them correctly when
freeing. This needs to be taken care of with caution when doing 'weird'
unusual things with ID copying and/or allocation!
As a final note, while rather noisy, this commit will hopefully not
break too much existing branches, old 'API' has been kept for the main
part, as a wrapper around new code. Cleaning it up will happen later.
Design task : T51804
Phab Diff: D2714
2017-08-07 16:39:55 +02:00
|
|
|
Material *BKE_material_copy(Main *bmain, const Material *ma)
|
|
|
|
|
{
|
|
|
|
|
Material *ma_copy;
|
|
|
|
|
BKE_id_copy_ex(bmain, &ma->id, (ID **)&ma_copy, 0, false);
|
|
|
|
|
return ma_copy;
|
2002-10-12 13:37:38 +02:00
|
|
|
}
|
|
|
|
|
|
2010-12-19 21:12:12 +01:00
|
|
|
/* XXX (see above) material copy without adding to main dbase */
|
2018-01-10 23:55:41 +01:00
|
|
|
Material *BKE_material_localize(Material *ma)
|
2010-12-19 21:12:12 +01:00
|
|
|
{
|
Refactor ID copying (and to some extent, ID freeing).
This will allow much finer controll over how we copy data-blocks, from
full copy in Main database, to "lighter" ones (out of Main, inside an
already allocated datablock, etc.).
This commit also transfers a llot of what was previously handled by
per-ID-type custom code to generic ID handling code in BKE_library.
Hopefully will avoid in future inconsistencies and missing bits we had
all over the codebase in the past.
It also adds missing copying handling for a few types, most notably
Scene (which where using a fully customized handling previously).
Note that the type of allocation used during copying (regular in Main,
allocated but outside of Main, or not allocated by ID handling code at
all) is stored in ID's, which allows to handle them correctly when
freeing. This needs to be taken care of with caution when doing 'weird'
unusual things with ID copying and/or allocation!
As a final note, while rather noisy, this commit will hopefully not
break too much existing branches, old 'API' has been kept for the main
part, as a wrapper around new code. Cleaning it up will happen later.
Design task : T51804
Phab Diff: D2714
2017-08-07 16:39:55 +02:00
|
|
|
/* TODO replace with something like
|
|
|
|
|
* Material *ma_copy;
|
|
|
|
|
* BKE_id_copy_ex(bmain, &ma->id, (ID **)&ma_copy, LIB_ID_COPY_NO_MAIN | LIB_ID_COPY_NO_PREVIEW | LIB_ID_COPY_NO_USER_REFCOUNT, false);
|
|
|
|
|
* return ma_copy;
|
|
|
|
|
*
|
|
|
|
|
* ... Once f*** nodes are fully converted to that too :( */
|
|
|
|
|
|
2010-12-19 21:12:12 +01:00
|
|
|
Material *man;
|
2018-05-03 11:07:09 +02:00
|
|
|
|
|
|
|
|
BKE_id_copy_ex(
|
|
|
|
|
NULL, &ma->id, (ID **)&man,
|
|
|
|
|
(LIB_ID_CREATE_NO_MAIN |
|
|
|
|
|
LIB_ID_CREATE_NO_USER_REFCOUNT |
|
|
|
|
|
LIB_ID_COPY_NO_PREVIEW |
|
|
|
|
|
LIB_ID_COPY_NO_ANIMDATA),
|
|
|
|
|
false);
|
2010-12-19 21:12:12 +01:00
|
|
|
|
2014-08-31 16:47:54 +02:00
|
|
|
man->texpaintslot = NULL;
|
2011-01-02 20:46:32 +01:00
|
|
|
man->preview = NULL;
|
2018-05-03 11:07:09 +02:00
|
|
|
|
2018-07-31 10:22:19 +02:00
|
|
|
/* man->gp_style = NULL; */ /* XXX: We probably don't want to clear here, or else we may get problems with COW later? */
|
2014-02-07 20:07:10 +01:00
|
|
|
BLI_listbase_clear(&man->gpumaterial);
|
2017-02-07 11:20:15 +01:00
|
|
|
|
|
|
|
|
/* TODO Duplicate Engine Settings and set runtime to NULL */
|
2018-04-30 17:52:45 +02:00
|
|
|
|
|
|
|
|
man->id.tag |= LIB_TAG_LOCALIZED;
|
|
|
|
|
|
2010-12-19 21:12:12 +01:00
|
|
|
return man;
|
|
|
|
|
}
|
|
|
|
|
|
2016-07-20 19:49:45 +02:00
|
|
|
void BKE_material_make_local(Main *bmain, Material *ma, const bool lib_local)
|
2002-10-12 13:37:38 +02:00
|
|
|
{
|
2016-07-20 19:49:45 +02:00
|
|
|
BKE_id_make_local_generic(bmain, &ma->id, true, lib_local);
|
2002-10-12 13:37:38 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
Material ***give_matarar(Object *ob)
|
|
|
|
|
{
|
|
|
|
|
Mesh *me;
|
|
|
|
|
Curve *cu;
|
|
|
|
|
MetaBall *mb;
|
2018-07-31 10:22:19 +02:00
|
|
|
bGPdata *gpd;
|
2018-06-17 17:05:51 +02:00
|
|
|
|
2012-05-06 17:15:33 +02:00
|
|
|
if (ob->type == OB_MESH) {
|
|
|
|
|
me = ob->data;
|
2002-10-12 13:37:38 +02:00
|
|
|
return &(me->mat);
|
|
|
|
|
}
|
2014-07-19 17:30:29 +02:00
|
|
|
else if (ELEM(ob->type, OB_CURVE, OB_FONT, OB_SURF)) {
|
2012-05-06 17:15:33 +02:00
|
|
|
cu = ob->data;
|
2002-10-12 13:37:38 +02:00
|
|
|
return &(cu->mat);
|
|
|
|
|
}
|
2012-05-06 17:15:33 +02:00
|
|
|
else if (ob->type == OB_MBALL) {
|
|
|
|
|
mb = ob->data;
|
2002-10-12 13:37:38 +02:00
|
|
|
return &(mb->mat);
|
|
|
|
|
}
|
2018-07-31 10:22:19 +02:00
|
|
|
else if (ob->type == OB_GPENCIL) {
|
|
|
|
|
gpd = ob->data;
|
|
|
|
|
return &(gpd->mat);
|
|
|
|
|
}
|
2007-03-20 16:34:00 +01:00
|
|
|
return NULL;
|
2002-10-12 13:37:38 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
short *give_totcolp(Object *ob)
|
|
|
|
|
{
|
|
|
|
|
Mesh *me;
|
|
|
|
|
Curve *cu;
|
|
|
|
|
MetaBall *mb;
|
2018-07-31 10:22:19 +02:00
|
|
|
bGPdata *gpd;
|
2018-06-17 17:05:51 +02:00
|
|
|
|
2012-05-06 17:15:33 +02:00
|
|
|
if (ob->type == OB_MESH) {
|
|
|
|
|
me = ob->data;
|
2002-10-12 13:37:38 +02:00
|
|
|
return &(me->totcol);
|
|
|
|
|
}
|
2014-07-19 17:30:29 +02:00
|
|
|
else if (ELEM(ob->type, OB_CURVE, OB_FONT, OB_SURF)) {
|
2012-05-06 17:15:33 +02:00
|
|
|
cu = ob->data;
|
2002-10-12 13:37:38 +02:00
|
|
|
return &(cu->totcol);
|
|
|
|
|
}
|
2012-05-06 17:15:33 +02:00
|
|
|
else if (ob->type == OB_MBALL) {
|
|
|
|
|
mb = ob->data;
|
2002-10-12 13:37:38 +02:00
|
|
|
return &(mb->totcol);
|
|
|
|
|
}
|
2018-07-31 10:22:19 +02:00
|
|
|
else if (ob->type == OB_GPENCIL) {
|
|
|
|
|
gpd = ob->data;
|
|
|
|
|
return &(gpd->totcol);
|
|
|
|
|
}
|
2007-03-20 16:34:00 +01:00
|
|
|
return NULL;
|
2002-10-12 13:37:38 +02:00
|
|
|
}
|
|
|
|
|
|
2010-09-03 09:25:37 +02:00
|
|
|
/* same as above but for ID's */
|
|
|
|
|
Material ***give_matarar_id(ID *id)
|
|
|
|
|
{
|
2012-08-12 16:57:19 +02:00
|
|
|
/* ensure we don't try get materials from non-obdata */
|
|
|
|
|
BLI_assert(OB_DATA_SUPPORT_ID(GS(id->name)));
|
|
|
|
|
|
2012-04-28 08:31:57 +02:00
|
|
|
switch (GS(id->name)) {
|
2012-05-06 17:15:33 +02:00
|
|
|
case ID_ME:
|
|
|
|
|
return &(((Mesh *)id)->mat);
|
|
|
|
|
case ID_CU:
|
|
|
|
|
return &(((Curve *)id)->mat);
|
|
|
|
|
case ID_MB:
|
|
|
|
|
return &(((MetaBall *)id)->mat);
|
2018-08-02 18:03:01 +02:00
|
|
|
case ID_GD:
|
|
|
|
|
return &(((bGPdata *)id)->mat);
|
2017-08-28 11:19:58 +02:00
|
|
|
default:
|
|
|
|
|
break;
|
2010-09-03 09:25:37 +02:00
|
|
|
}
|
|
|
|
|
return NULL;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
short *give_totcolp_id(ID *id)
|
|
|
|
|
{
|
2012-08-12 16:57:19 +02:00
|
|
|
/* ensure we don't try get materials from non-obdata */
|
|
|
|
|
BLI_assert(OB_DATA_SUPPORT_ID(GS(id->name)));
|
|
|
|
|
|
2012-04-28 08:31:57 +02:00
|
|
|
switch (GS(id->name)) {
|
2012-05-06 17:15:33 +02:00
|
|
|
case ID_ME:
|
|
|
|
|
return &(((Mesh *)id)->totcol);
|
|
|
|
|
case ID_CU:
|
|
|
|
|
return &(((Curve *)id)->totcol);
|
|
|
|
|
case ID_MB:
|
|
|
|
|
return &(((MetaBall *)id)->totcol);
|
2018-07-31 10:22:19 +02:00
|
|
|
case ID_GD:
|
|
|
|
|
return &(((bGPdata *)id)->totcol);
|
2017-08-28 11:19:58 +02:00
|
|
|
default:
|
|
|
|
|
break;
|
2010-09-03 09:25:37 +02:00
|
|
|
}
|
|
|
|
|
return NULL;
|
|
|
|
|
}
|
|
|
|
|
|
2013-08-14 13:29:58 +02:00
|
|
|
static void material_data_index_remove_id(ID *id, short index)
|
2011-07-31 13:12:38 +02:00
|
|
|
{
|
2012-08-12 16:57:19 +02:00
|
|
|
/* ensure we don't try get materials from non-obdata */
|
|
|
|
|
BLI_assert(OB_DATA_SUPPORT_ID(GS(id->name)));
|
|
|
|
|
|
2012-04-28 08:31:57 +02:00
|
|
|
switch (GS(id->name)) {
|
2012-05-06 17:15:33 +02:00
|
|
|
case ID_ME:
|
2013-08-14 13:29:58 +02:00
|
|
|
BKE_mesh_material_index_remove((Mesh *)id, index);
|
2012-05-06 17:15:33 +02:00
|
|
|
break;
|
|
|
|
|
case ID_CU:
|
2013-08-14 13:29:58 +02:00
|
|
|
BKE_curve_material_index_remove((Curve *)id, index);
|
2012-05-06 17:15:33 +02:00
|
|
|
break;
|
|
|
|
|
case ID_MB:
|
|
|
|
|
/* meta-elems don't have materials atm */
|
|
|
|
|
break;
|
2018-07-31 10:22:19 +02:00
|
|
|
case ID_GD:
|
|
|
|
|
BKE_gpencil_material_index_remove((bGPdata *)id, index);
|
|
|
|
|
break;
|
2017-08-28 11:19:58 +02:00
|
|
|
default:
|
|
|
|
|
break;
|
2011-07-31 13:12:38 +02:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2013-08-14 13:29:58 +02:00
|
|
|
static void material_data_index_clear_id(ID *id)
|
|
|
|
|
{
|
|
|
|
|
/* ensure we don't try get materials from non-obdata */
|
|
|
|
|
BLI_assert(OB_DATA_SUPPORT_ID(GS(id->name)));
|
|
|
|
|
|
|
|
|
|
switch (GS(id->name)) {
|
|
|
|
|
case ID_ME:
|
|
|
|
|
BKE_mesh_material_index_clear((Mesh *)id);
|
|
|
|
|
break;
|
|
|
|
|
case ID_CU:
|
|
|
|
|
BKE_curve_material_index_clear((Curve *)id);
|
|
|
|
|
break;
|
|
|
|
|
case ID_MB:
|
|
|
|
|
/* meta-elems don't have materials atm */
|
|
|
|
|
break;
|
2017-08-28 11:19:58 +02:00
|
|
|
default:
|
|
|
|
|
break;
|
2013-08-14 13:29:58 +02:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2016-08-12 14:59:11 +02:00
|
|
|
void BKE_material_resize_id(Main *bmain, ID *id, short totcol, bool do_id_user)
|
2013-08-14 16:36:43 +02:00
|
|
|
{
|
|
|
|
|
Material ***matar = give_matarar_id(id);
|
|
|
|
|
short *totcolp = give_totcolp_id(id);
|
|
|
|
|
|
|
|
|
|
if (matar == NULL) {
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (do_id_user && totcol < (*totcolp)) {
|
|
|
|
|
short i;
|
|
|
|
|
for (i = totcol; i < (*totcolp); i++) {
|
|
|
|
|
id_us_min((ID *)(*matar)[i]);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (totcol == 0) {
|
|
|
|
|
if (*totcolp) {
|
|
|
|
|
MEM_freeN(*matar);
|
|
|
|
|
*matar = NULL;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
else {
|
|
|
|
|
*matar = MEM_recallocN(*matar, sizeof(void *) * totcol);
|
|
|
|
|
}
|
|
|
|
|
*totcolp = totcol;
|
2016-08-12 14:59:11 +02:00
|
|
|
|
2018-06-20 17:43:56 +02:00
|
|
|
DEG_id_tag_update(id, DEG_TAG_COPY_ON_WRITE);
|
2017-04-06 16:11:50 +02:00
|
|
|
DEG_relations_tag_update(bmain);
|
2013-08-14 16:36:43 +02:00
|
|
|
}
|
|
|
|
|
|
2016-08-12 14:59:11 +02:00
|
|
|
void BKE_material_append_id(Main *bmain, ID *id, Material *ma)
|
2010-09-03 09:25:37 +02:00
|
|
|
{
|
|
|
|
|
Material ***matar;
|
2012-05-06 17:15:33 +02:00
|
|
|
if ((matar = give_matarar_id(id))) {
|
|
|
|
|
short *totcol = give_totcolp_id(id);
|
|
|
|
|
Material **mat = MEM_callocN(sizeof(void *) * ((*totcol) + 1), "newmatar");
|
2012-02-23 03:17:50 +01:00
|
|
|
if (*totcol) memcpy(mat, *matar, sizeof(void *) * (*totcol));
|
|
|
|
|
if (*matar) MEM_freeN(*matar);
|
2010-09-03 09:25:37 +02:00
|
|
|
|
2012-05-06 17:15:33 +02:00
|
|
|
*matar = mat;
|
|
|
|
|
(*matar)[(*totcol)++] = ma;
|
2010-09-03 09:25:37 +02:00
|
|
|
|
|
|
|
|
id_us_plus((ID *)ma);
|
2016-08-12 14:59:11 +02:00
|
|
|
test_all_objects_materials(bmain, id);
|
2018-06-20 17:43:56 +02:00
|
|
|
|
|
|
|
|
DEG_id_tag_update(id, DEG_TAG_COPY_ON_WRITE);
|
2017-04-06 16:11:50 +02:00
|
|
|
DEG_relations_tag_update(bmain);
|
2010-09-03 09:25:37 +02:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2016-08-12 14:59:11 +02:00
|
|
|
Material *BKE_material_pop_id(Main *bmain, ID *id, int index_i, bool update_data)
|
2010-09-03 09:25:37 +02:00
|
|
|
{
|
2012-05-06 17:15:33 +02:00
|
|
|
short index = (short)index_i;
|
|
|
|
|
Material *ret = NULL;
|
2010-09-03 09:25:37 +02:00
|
|
|
Material ***matar;
|
2012-05-06 17:15:33 +02:00
|
|
|
if ((matar = give_matarar_id(id))) {
|
|
|
|
|
short *totcol = give_totcolp_id(id);
|
2012-02-23 03:17:50 +01:00
|
|
|
if (index >= 0 && index < (*totcol)) {
|
2012-05-06 17:15:33 +02:00
|
|
|
ret = (*matar)[index];
|
2011-07-31 13:12:38 +02:00
|
|
|
id_us_min((ID *)ret);
|
2010-09-03 09:25:37 +02:00
|
|
|
|
2013-08-13 12:21:11 +02:00
|
|
|
if (*totcol <= 1) {
|
|
|
|
|
*totcol = 0;
|
|
|
|
|
MEM_freeN(*matar);
|
|
|
|
|
*matar = NULL;
|
|
|
|
|
}
|
|
|
|
|
else {
|
|
|
|
|
if (index + 1 != (*totcol))
|
|
|
|
|
memmove((*matar) + index, (*matar) + (index + 1), sizeof(void *) * ((*totcol) - (index + 1)));
|
|
|
|
|
|
|
|
|
|
(*totcol)--;
|
|
|
|
|
*matar = MEM_reallocN(*matar, sizeof(void *) * (*totcol));
|
2018-05-29 15:49:21 +02:00
|
|
|
test_all_objects_materials(bmain, id);
|
2013-08-13 12:21:11 +02:00
|
|
|
}
|
2010-09-03 09:25:37 +02:00
|
|
|
|
2013-08-14 13:29:58 +02:00
|
|
|
if (update_data) {
|
2011-07-31 13:12:38 +02:00
|
|
|
/* decrease mat_nr index */
|
2013-08-14 13:29:58 +02:00
|
|
|
material_data_index_remove_id(id, index);
|
2010-09-03 09:25:37 +02:00
|
|
|
}
|
2016-08-12 14:59:11 +02:00
|
|
|
|
2018-06-20 17:43:56 +02:00
|
|
|
DEG_id_tag_update(id, DEG_TAG_COPY_ON_WRITE);
|
2017-04-06 16:11:50 +02:00
|
|
|
DEG_relations_tag_update(bmain);
|
2010-09-03 09:25:37 +02:00
|
|
|
}
|
|
|
|
|
}
|
2018-06-17 17:05:51 +02:00
|
|
|
|
2010-09-03 09:25:37 +02:00
|
|
|
return ret;
|
|
|
|
|
}
|
|
|
|
|
|
2016-08-12 14:59:11 +02:00
|
|
|
void BKE_material_clear_id(Main *bmain, ID *id, bool update_data)
|
2013-08-14 13:29:58 +02:00
|
|
|
{
|
|
|
|
|
Material ***matar;
|
|
|
|
|
if ((matar = give_matarar_id(id))) {
|
|
|
|
|
short *totcol = give_totcolp_id(id);
|
2015-11-19 18:03:38 +01:00
|
|
|
|
|
|
|
|
while ((*totcol)--) {
|
|
|
|
|
id_us_min((ID *)((*matar)[*totcol]));
|
|
|
|
|
}
|
2013-08-14 13:29:58 +02:00
|
|
|
*totcol = 0;
|
|
|
|
|
if (*matar) {
|
|
|
|
|
MEM_freeN(*matar);
|
|
|
|
|
*matar = NULL;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (update_data) {
|
|
|
|
|
/* decrease mat_nr index */
|
|
|
|
|
material_data_index_clear_id(id);
|
|
|
|
|
}
|
2016-08-12 14:59:11 +02:00
|
|
|
|
2018-06-20 17:43:56 +02:00
|
|
|
DEG_id_tag_update(id, DEG_TAG_COPY_ON_WRITE);
|
2017-04-06 16:11:50 +02:00
|
|
|
DEG_relations_tag_update(bmain);
|
2013-08-14 13:29:58 +02:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2011-09-20 08:25:15 +02:00
|
|
|
Material *give_current_material(Object *ob, short act)
|
2002-10-12 13:37:38 +02:00
|
|
|
{
|
|
|
|
|
Material ***matarar, *ma;
|
2014-04-26 16:20:13 +02:00
|
|
|
const short *totcolp;
|
2013-12-17 23:42:47 +01:00
|
|
|
|
2012-05-06 17:15:33 +02:00
|
|
|
if (ob == NULL) return NULL;
|
2018-06-17 17:05:51 +02:00
|
|
|
|
2012-05-27 21:40:36 +02:00
|
|
|
/* if object cannot have material, (totcolp == NULL) */
|
2012-05-06 17:15:33 +02:00
|
|
|
totcolp = give_totcolp(ob);
|
|
|
|
|
if (totcolp == NULL || ob->totcol == 0) return NULL;
|
2014-12-26 20:06:56 +01:00
|
|
|
|
2012-12-26 18:36:51 +01:00
|
|
|
/* return NULL for invalid 'act', can happen for mesh face indices */
|
|
|
|
|
if (act > ob->totcol)
|
|
|
|
|
return NULL;
|
2014-12-26 20:06:56 +01:00
|
|
|
else if (act <= 0) {
|
|
|
|
|
if (act < 0) {
|
|
|
|
|
printf("Negative material index!\n");
|
|
|
|
|
}
|
2012-12-26 18:36:51 +01:00
|
|
|
return NULL;
|
2014-12-26 20:06:56 +01:00
|
|
|
}
|
2002-10-12 13:37:38 +02:00
|
|
|
|
2012-05-06 17:15:33 +02:00
|
|
|
if (ob->matbits && ob->matbits[act - 1]) { /* in object */
|
|
|
|
|
ma = ob->mat[act - 1];
|
2002-10-12 13:37:38 +02:00
|
|
|
}
|
2012-05-06 17:15:33 +02:00
|
|
|
else { /* in data */
|
2006-11-25 19:15:55 +01:00
|
|
|
|
2010-09-02 09:00:34 +02:00
|
|
|
/* check for inconsistency */
|
2012-02-23 03:17:50 +01:00
|
|
|
if (*totcolp < ob->totcol)
|
2012-05-06 17:15:33 +02:00
|
|
|
ob->totcol = *totcolp;
|
|
|
|
|
if (act > ob->totcol) act = ob->totcol;
|
2006-11-25 19:15:55 +01:00
|
|
|
|
2012-05-06 17:15:33 +02:00
|
|
|
matarar = give_matarar(ob);
|
2018-06-17 17:05:51 +02:00
|
|
|
|
2012-05-06 17:15:33 +02:00
|
|
|
if (matarar && *matarar) ma = (*matarar)[act - 1];
|
|
|
|
|
else ma = NULL;
|
2018-06-17 17:05:51 +02:00
|
|
|
|
2002-10-12 13:37:38 +02:00
|
|
|
}
|
2018-06-17 17:05:51 +02:00
|
|
|
|
2002-10-12 13:37:38 +02:00
|
|
|
return ma;
|
|
|
|
|
}
|
|
|
|
|
|
2018-07-31 10:22:19 +02:00
|
|
|
MaterialGPencilStyle *BKE_material_gpencil_settings_get(Object *ob, short act)
|
|
|
|
|
{
|
|
|
|
|
Material *ma = give_current_material(ob, act);
|
|
|
|
|
if (ma != NULL) {
|
|
|
|
|
if (ma->gp_style == NULL) {
|
|
|
|
|
BKE_material_init_gpencil_settings(ma);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return ma->gp_style;
|
|
|
|
|
}
|
|
|
|
|
else {
|
|
|
|
|
return NULL;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2009-10-19 16:03:02 +02:00
|
|
|
Material *give_node_material(Material *ma)
|
|
|
|
|
{
|
2012-02-23 03:17:50 +01:00
|
|
|
if (ma && ma->use_nodes && ma->nodetree) {
|
2012-05-06 17:15:33 +02:00
|
|
|
bNode *node = nodeGetActiveID(ma->nodetree, ID_MA);
|
2009-10-19 16:03:02 +02:00
|
|
|
|
2012-02-23 03:17:50 +01:00
|
|
|
if (node)
|
2009-10-19 16:03:02 +02:00
|
|
|
return (Material *)node->id;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return NULL;
|
|
|
|
|
}
|
|
|
|
|
|
2016-08-12 14:59:11 +02:00
|
|
|
void BKE_material_resize_object(Main *bmain, Object *ob, const short totcol, bool do_id_user)
|
2002-10-12 13:37:38 +02:00
|
|
|
{
|
|
|
|
|
Material **newmatar;
|
2009-07-13 02:40:20 +02:00
|
|
|
char *newmatbits;
|
2002-10-12 13:37:38 +02:00
|
|
|
|
2013-08-14 16:36:43 +02:00
|
|
|
if (do_id_user && totcol < ob->totcol) {
|
|
|
|
|
short i;
|
|
|
|
|
for (i = totcol; i < ob->totcol; i++) {
|
|
|
|
|
id_us_min((ID *)ob->mat[i]);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2012-05-06 17:15:33 +02:00
|
|
|
if (totcol == 0) {
|
2012-02-23 03:17:50 +01:00
|
|
|
if (ob->totcol) {
|
2010-12-06 03:32:16 +01:00
|
|
|
MEM_freeN(ob->mat);
|
|
|
|
|
MEM_freeN(ob->matbits);
|
2012-05-06 17:15:33 +02:00
|
|
|
ob->mat = NULL;
|
|
|
|
|
ob->matbits = NULL;
|
2010-12-06 03:32:16 +01:00
|
|
|
}
|
2002-10-12 13:37:38 +02:00
|
|
|
}
|
2012-05-06 17:15:33 +02:00
|
|
|
else if (ob->totcol < totcol) {
|
|
|
|
|
newmatar = MEM_callocN(sizeof(void *) * totcol, "newmatar");
|
|
|
|
|
newmatbits = MEM_callocN(sizeof(char) * totcol, "newmatbits");
|
2012-02-23 03:17:50 +01:00
|
|
|
if (ob->totcol) {
|
2012-05-06 17:15:33 +02:00
|
|
|
memcpy(newmatar, ob->mat, sizeof(void *) * ob->totcol);
|
|
|
|
|
memcpy(newmatbits, ob->matbits, sizeof(char) * ob->totcol);
|
2010-12-06 03:32:16 +01:00
|
|
|
MEM_freeN(ob->mat);
|
|
|
|
|
MEM_freeN(ob->matbits);
|
|
|
|
|
}
|
2012-05-06 17:15:33 +02:00
|
|
|
ob->mat = newmatar;
|
|
|
|
|
ob->matbits = newmatbits;
|
2002-10-12 13:37:38 +02:00
|
|
|
}
|
2013-08-14 16:36:43 +02:00
|
|
|
/* XXX, why not realloc on shrink? - campbell */
|
|
|
|
|
|
2012-05-06 17:15:33 +02:00
|
|
|
ob->totcol = totcol;
|
|
|
|
|
if (ob->totcol && ob->actcol == 0) ob->actcol = 1;
|
|
|
|
|
if (ob->actcol > ob->totcol) ob->actcol = ob->totcol;
|
2016-08-12 14:59:11 +02:00
|
|
|
|
2018-06-26 12:26:10 +02:00
|
|
|
DEG_id_tag_update(&ob->id, DEG_TAG_COPY_ON_WRITE | DEG_TAG_GEOMETRY);
|
2017-04-06 16:11:50 +02:00
|
|
|
DEG_relations_tag_update(bmain);
|
2010-12-06 03:32:16 +01:00
|
|
|
}
|
|
|
|
|
|
2018-05-29 15:49:21 +02:00
|
|
|
void test_object_materials(Main *bmain, Object *ob, ID *id)
|
2016-07-08 14:36:25 +02:00
|
|
|
{
|
|
|
|
|
/* make the ob mat-array same size as 'ob->data' mat-array */
|
|
|
|
|
const short *totcol;
|
|
|
|
|
|
|
|
|
|
if (id == NULL || (totcol = give_totcolp_id(id)) == NULL) {
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
2018-05-29 15:49:21 +02:00
|
|
|
BKE_material_resize_object(bmain, ob, *totcol, false);
|
2016-07-08 14:36:25 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void test_all_objects_materials(Main *bmain, ID *id)
|
2010-12-06 03:32:16 +01:00
|
|
|
{
|
|
|
|
|
/* make the ob mat-array same size as 'ob->data' mat-array */
|
|
|
|
|
Object *ob;
|
2014-04-26 16:20:13 +02:00
|
|
|
const short *totcol;
|
2010-12-06 03:32:16 +01:00
|
|
|
|
2012-05-06 17:15:33 +02:00
|
|
|
if (id == NULL || (totcol = give_totcolp_id(id)) == NULL) {
|
2010-12-06 03:32:16 +01:00
|
|
|
return;
|
2002-10-12 13:37:38 +02:00
|
|
|
}
|
|
|
|
|
|
2014-06-26 10:55:40 +02:00
|
|
|
BKE_main_lock(bmain);
|
2016-07-10 20:12:58 +02:00
|
|
|
for (ob = bmain->object.first; ob; ob = ob->id.next) {
|
2012-05-06 17:15:33 +02:00
|
|
|
if (ob->data == id) {
|
2016-08-12 14:59:11 +02:00
|
|
|
BKE_material_resize_object(bmain, ob, *totcol, false);
|
2002-10-12 13:37:38 +02:00
|
|
|
}
|
|
|
|
|
}
|
2014-06-26 10:55:40 +02:00
|
|
|
BKE_main_unlock(bmain);
|
2002-10-12 13:37:38 +02:00
|
|
|
}
|
|
|
|
|
|
2018-05-29 15:49:21 +02:00
|
|
|
void assign_material_id(Main *bmain, ID *id, Material *ma, short act)
|
2011-10-01 19:51:47 +02:00
|
|
|
{
|
|
|
|
|
Material *mao, **matar, ***matarar;
|
|
|
|
|
short *totcolp;
|
|
|
|
|
|
2012-05-06 17:15:33 +02:00
|
|
|
if (act > MAXMAT) return;
|
|
|
|
|
if (act < 1) act = 1;
|
2011-10-01 19:51:47 +02:00
|
|
|
|
2015-04-20 12:20:08 +02:00
|
|
|
/* this is needed for Python overrides,
|
|
|
|
|
* we just have to take care that the UI can't do this */
|
|
|
|
|
#if 0
|
2011-10-01 19:51:47 +02:00
|
|
|
/* prevent crashing when using accidentally */
|
|
|
|
|
BLI_assert(id->lib == NULL);
|
2012-02-23 03:17:50 +01:00
|
|
|
if (id->lib) return;
|
2015-04-20 12:20:08 +02:00
|
|
|
#endif
|
2011-10-01 19:51:47 +02:00
|
|
|
|
|
|
|
|
/* test arraylens */
|
|
|
|
|
|
2012-05-06 17:15:33 +02:00
|
|
|
totcolp = give_totcolp_id(id);
|
|
|
|
|
matarar = give_matarar_id(id);
|
2011-10-01 19:51:47 +02:00
|
|
|
|
2012-05-06 17:15:33 +02:00
|
|
|
if (totcolp == NULL || matarar == NULL) return;
|
2011-10-01 19:51:47 +02:00
|
|
|
|
2012-02-23 03:17:50 +01:00
|
|
|
if (act > *totcolp) {
|
2012-05-06 17:15:33 +02:00
|
|
|
matar = MEM_callocN(sizeof(void *) * act, "matarray1");
|
2011-10-01 19:51:47 +02:00
|
|
|
|
2012-02-23 03:17:50 +01:00
|
|
|
if (*totcolp) {
|
2012-05-06 17:15:33 +02:00
|
|
|
memcpy(matar, *matarar, sizeof(void *) * (*totcolp));
|
2011-10-01 19:51:47 +02:00
|
|
|
MEM_freeN(*matarar);
|
|
|
|
|
}
|
|
|
|
|
|
2012-05-06 17:15:33 +02:00
|
|
|
*matarar = matar;
|
|
|
|
|
*totcolp = act;
|
2011-10-01 19:51:47 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* in data */
|
2012-05-06 17:15:33 +02:00
|
|
|
mao = (*matarar)[act - 1];
|
2015-11-09 19:47:10 +01:00
|
|
|
if (mao)
|
|
|
|
|
id_us_min(&mao->id);
|
2012-05-06 17:15:33 +02:00
|
|
|
(*matarar)[act - 1] = ma;
|
2011-10-01 19:51:47 +02:00
|
|
|
|
2012-02-23 03:17:50 +01:00
|
|
|
if (ma)
|
2015-11-09 19:47:10 +01:00
|
|
|
id_us_plus(&ma->id);
|
2011-10-01 19:51:47 +02:00
|
|
|
|
2018-05-29 15:49:21 +02:00
|
|
|
test_all_objects_materials(bmain, id);
|
2011-10-01 19:51:47 +02:00
|
|
|
}
|
|
|
|
|
|
2018-05-29 15:49:21 +02:00
|
|
|
void assign_material(Main *bmain, Object *ob, Material *ma, short act, int assign_type)
|
2002-10-12 13:37:38 +02:00
|
|
|
{
|
|
|
|
|
Material *mao, **matar, ***matarar;
|
|
|
|
|
short *totcolp;
|
2012-08-18 15:07:48 +02:00
|
|
|
char bit = 0;
|
2002-10-12 13:37:38 +02:00
|
|
|
|
2012-05-06 17:15:33 +02:00
|
|
|
if (act > MAXMAT) return;
|
|
|
|
|
if (act < 1) act = 1;
|
2018-06-17 17:05:51 +02:00
|
|
|
|
2011-04-08 18:56:44 +02:00
|
|
|
/* prevent crashing when using accidentally */
|
2017-11-06 17:17:10 +01:00
|
|
|
BLI_assert(!ID_IS_LINKED(ob));
|
|
|
|
|
if (ID_IS_LINKED(ob)) return;
|
2018-06-17 17:05:51 +02:00
|
|
|
|
2002-10-12 13:37:38 +02:00
|
|
|
/* test arraylens */
|
2018-06-17 17:05:51 +02:00
|
|
|
|
2012-05-06 17:15:33 +02:00
|
|
|
totcolp = give_totcolp(ob);
|
|
|
|
|
matarar = give_matarar(ob);
|
2018-06-17 17:05:51 +02:00
|
|
|
|
2012-05-06 17:15:33 +02:00
|
|
|
if (totcolp == NULL || matarar == NULL) return;
|
2018-06-17 17:05:51 +02:00
|
|
|
|
2012-02-23 03:17:50 +01:00
|
|
|
if (act > *totcolp) {
|
2012-05-06 17:15:33 +02:00
|
|
|
matar = MEM_callocN(sizeof(void *) * act, "matarray1");
|
2009-07-13 02:40:20 +02:00
|
|
|
|
2012-02-23 03:17:50 +01:00
|
|
|
if (*totcolp) {
|
2012-05-06 17:15:33 +02:00
|
|
|
memcpy(matar, *matarar, sizeof(void *) * (*totcolp));
|
2002-10-12 13:37:38 +02:00
|
|
|
MEM_freeN(*matarar);
|
|
|
|
|
}
|
2009-07-13 02:40:20 +02:00
|
|
|
|
2012-05-06 17:15:33 +02:00
|
|
|
*matarar = matar;
|
|
|
|
|
*totcolp = act;
|
2002-10-12 13:37:38 +02:00
|
|
|
}
|
2012-08-12 19:12:07 +02:00
|
|
|
|
2015-08-06 10:04:13 +02:00
|
|
|
if (act > ob->totcol) {
|
|
|
|
|
/* Need more space in the material arrays */
|
|
|
|
|
ob->mat = MEM_recallocN_id(ob->mat, sizeof(void *) * act, "matarray2");
|
|
|
|
|
ob->matbits = MEM_recallocN_id(ob->matbits, sizeof(char) * act, "matbits1");
|
|
|
|
|
ob->totcol = act;
|
|
|
|
|
}
|
|
|
|
|
|
2012-08-25 01:22:34 +02:00
|
|
|
/* Determine the object/mesh linking */
|
2015-08-06 10:04:13 +02:00
|
|
|
if (assign_type == BKE_MAT_ASSIGN_EXISTING) {
|
|
|
|
|
/* keep existing option (avoid confusion in scripts),
|
|
|
|
|
* intentionally ignore userpref (default to obdata). */
|
|
|
|
|
bit = ob->matbits[act - 1];
|
|
|
|
|
}
|
|
|
|
|
else if (assign_type == BKE_MAT_ASSIGN_USERPREF && ob->totcol && ob->actcol) {
|
2012-08-12 19:12:07 +02:00
|
|
|
/* copy from previous material */
|
|
|
|
|
bit = ob->matbits[ob->actcol - 1];
|
|
|
|
|
}
|
|
|
|
|
else {
|
2012-08-18 15:07:48 +02:00
|
|
|
switch (assign_type) {
|
2012-08-12 19:12:07 +02:00
|
|
|
case BKE_MAT_ASSIGN_OBDATA:
|
|
|
|
|
bit = 0;
|
|
|
|
|
break;
|
|
|
|
|
case BKE_MAT_ASSIGN_OBJECT:
|
|
|
|
|
bit = 1;
|
|
|
|
|
break;
|
|
|
|
|
case BKE_MAT_ASSIGN_USERPREF:
|
|
|
|
|
default:
|
|
|
|
|
bit = (U.flag & USER_MAT_ON_OB) ? 1 : 0;
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
}
|
2018-06-17 17:05:51 +02:00
|
|
|
|
2003-04-26 13:56:44 +02:00
|
|
|
/* do it */
|
2002-10-12 13:37:38 +02:00
|
|
|
|
2012-08-12 19:12:07 +02:00
|
|
|
ob->matbits[act - 1] = bit;
|
|
|
|
|
if (bit == 1) { /* in object */
|
2012-05-06 17:15:33 +02:00
|
|
|
mao = ob->mat[act - 1];
|
2015-11-09 19:47:10 +01:00
|
|
|
if (mao)
|
|
|
|
|
id_us_min(&mao->id);
|
2012-05-06 17:15:33 +02:00
|
|
|
ob->mat[act - 1] = ma;
|
2018-05-29 15:49:21 +02:00
|
|
|
test_object_materials(bmain, ob, ob->data);
|
2002-10-12 13:37:38 +02:00
|
|
|
}
|
2012-05-06 17:15:33 +02:00
|
|
|
else { /* in data */
|
|
|
|
|
mao = (*matarar)[act - 1];
|
2015-11-09 19:47:10 +01:00
|
|
|
if (mao)
|
|
|
|
|
id_us_min(&mao->id);
|
2012-05-06 17:15:33 +02:00
|
|
|
(*matarar)[act - 1] = ma;
|
2018-05-29 15:49:21 +02:00
|
|
|
test_all_objects_materials(bmain, ob->data); /* Data may be used by several objects... */
|
2002-10-12 13:37:38 +02:00
|
|
|
}
|
2009-07-13 02:40:20 +02:00
|
|
|
|
2012-02-23 03:17:50 +01:00
|
|
|
if (ma)
|
2015-11-09 19:47:10 +01:00
|
|
|
id_us_plus(&ma->id);
|
2002-10-12 13:37:38 +02:00
|
|
|
}
|
|
|
|
|
|
2015-04-27 23:24:56 +02:00
|
|
|
|
|
|
|
|
void BKE_material_remap_object(Object *ob, const unsigned int *remap)
|
|
|
|
|
{
|
|
|
|
|
Material ***matar = give_matarar(ob);
|
|
|
|
|
const short *totcol_p = give_totcolp(ob);
|
|
|
|
|
|
|
|
|
|
BLI_array_permute(ob->mat, ob->totcol, remap);
|
|
|
|
|
|
|
|
|
|
if (ob->matbits) {
|
|
|
|
|
BLI_array_permute(ob->matbits, ob->totcol, remap);
|
|
|
|
|
}
|
|
|
|
|
|
2015-04-30 00:07:15 +02:00
|
|
|
if (matar) {
|
2015-04-27 23:24:56 +02:00
|
|
|
BLI_array_permute(*matar, *totcol_p, remap);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (ob->type == OB_MESH) {
|
|
|
|
|
BKE_mesh_material_remap(ob->data, remap, ob->totcol);
|
|
|
|
|
}
|
|
|
|
|
else if (ELEM(ob->type, OB_CURVE, OB_SURF, OB_FONT)) {
|
|
|
|
|
BKE_curve_material_remap(ob->data, remap, ob->totcol);
|
|
|
|
|
}
|
2018-07-31 10:22:19 +02:00
|
|
|
if (ob->type == OB_GPENCIL) {
|
|
|
|
|
BKE_gpencil_material_remap(ob->data, remap, ob->totcol);
|
|
|
|
|
}
|
2015-04-27 23:24:56 +02:00
|
|
|
else {
|
|
|
|
|
/* add support for this object data! */
|
|
|
|
|
BLI_assert(matar == NULL);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2015-12-12 14:34:09 +01:00
|
|
|
/**
|
|
|
|
|
* Calculate a material remapping from \a ob_src to \a ob_dst.
|
|
|
|
|
*
|
|
|
|
|
* \param remap_src_to_dst: An array the size of `ob_src->totcol`
|
|
|
|
|
* where index values are filled in which map to \a ob_dst materials.
|
|
|
|
|
*/
|
|
|
|
|
void BKE_material_remap_object_calc(
|
|
|
|
|
Object *ob_dst, Object *ob_src,
|
|
|
|
|
short *remap_src_to_dst)
|
|
|
|
|
{
|
|
|
|
|
if (ob_src->totcol == 0) {
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
GHash *gh_mat_map = BLI_ghash_ptr_new_ex(__func__, ob_src->totcol);
|
|
|
|
|
|
|
|
|
|
for (int i = 0; i < ob_dst->totcol; i++) {
|
|
|
|
|
Material *ma_src = give_current_material(ob_dst, i + 1);
|
|
|
|
|
BLI_ghash_reinsert(gh_mat_map, ma_src, SET_INT_IN_POINTER(i), NULL, NULL);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* setup default mapping (when materials don't match) */
|
|
|
|
|
{
|
|
|
|
|
int i = 0;
|
|
|
|
|
if (ob_dst->totcol >= ob_src->totcol) {
|
|
|
|
|
for (; i < ob_src->totcol; i++) {
|
|
|
|
|
remap_src_to_dst[i] = i;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
else {
|
|
|
|
|
for (; i < ob_dst->totcol; i++) {
|
|
|
|
|
remap_src_to_dst[i] = i;
|
|
|
|
|
}
|
|
|
|
|
for (; i < ob_src->totcol; i++) {
|
|
|
|
|
remap_src_to_dst[i] = 0;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
for (int i = 0; i < ob_src->totcol; i++) {
|
|
|
|
|
Material *ma_src = give_current_material(ob_src, i + 1);
|
|
|
|
|
|
|
|
|
|
if ((i < ob_dst->totcol) && (ma_src == give_current_material(ob_dst, i + 1))) {
|
|
|
|
|
/* when objects have exact matching materials - keep existing index */
|
|
|
|
|
}
|
|
|
|
|
else {
|
|
|
|
|
void **index_src_p = BLI_ghash_lookup_p(gh_mat_map, ma_src);
|
|
|
|
|
if (index_src_p) {
|
|
|
|
|
remap_src_to_dst[i] = GET_INT_FROM_POINTER(*index_src_p);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
BLI_ghash_free(gh_mat_map, NULL, NULL);
|
|
|
|
|
}
|
|
|
|
|
|
2015-04-27 23:24:56 +02:00
|
|
|
|
2009-10-07 18:32:55 +02:00
|
|
|
/* XXX - this calls many more update calls per object then are needed, could be optimized */
|
2018-05-29 15:49:21 +02:00
|
|
|
void assign_matarar(Main *bmain, struct Object *ob, struct Material ***matar, short totcol)
|
2009-10-07 18:32:55 +02:00
|
|
|
{
|
2012-05-06 17:15:33 +02:00
|
|
|
int actcol_orig = ob->actcol;
|
2011-09-20 08:25:15 +02:00
|
|
|
short i;
|
2009-10-07 18:32:55 +02:00
|
|
|
|
2016-07-20 22:00:58 +02:00
|
|
|
while ((ob->totcol > totcol) &&
|
2018-05-29 15:49:21 +02:00
|
|
|
BKE_object_material_slot_remove(bmain, ob))
|
2016-07-20 22:00:58 +02:00
|
|
|
{
|
|
|
|
|
/* pass */
|
|
|
|
|
}
|
2009-10-07 18:32:55 +02:00
|
|
|
|
|
|
|
|
/* now we have the right number of slots */
|
2012-05-06 17:15:33 +02:00
|
|
|
for (i = 0; i < totcol; i++)
|
2018-05-29 15:49:21 +02:00
|
|
|
assign_material(bmain, ob, (*matar)[i], i + 1, BKE_MAT_ASSIGN_USERPREF);
|
2009-10-07 18:32:55 +02:00
|
|
|
|
2012-02-23 03:17:50 +01:00
|
|
|
if (actcol_orig > ob->totcol)
|
2012-05-06 17:15:33 +02:00
|
|
|
actcol_orig = ob->totcol;
|
2009-10-07 18:32:55 +02:00
|
|
|
|
2012-05-06 17:15:33 +02:00
|
|
|
ob->actcol = actcol_orig;
|
2009-10-07 18:32:55 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2016-07-20 21:56:12 +02:00
|
|
|
short BKE_object_material_slot_find_index(Object *ob, Material *ma)
|
2007-11-28 19:43:09 +01:00
|
|
|
{
|
|
|
|
|
Material ***matarar;
|
|
|
|
|
short a, *totcolp;
|
2018-06-17 17:05:51 +02:00
|
|
|
|
2012-05-06 17:15:33 +02:00
|
|
|
if (ma == NULL) return 0;
|
2018-06-17 17:05:51 +02:00
|
|
|
|
2012-05-06 17:15:33 +02:00
|
|
|
totcolp = give_totcolp(ob);
|
|
|
|
|
matarar = give_matarar(ob);
|
2018-06-17 17:05:51 +02:00
|
|
|
|
2012-05-06 17:15:33 +02:00
|
|
|
if (totcolp == NULL || matarar == NULL) return 0;
|
2018-06-17 17:05:51 +02:00
|
|
|
|
2012-05-06 17:15:33 +02:00
|
|
|
for (a = 0; a < *totcolp; a++)
|
|
|
|
|
if ((*matarar)[a] == ma)
|
|
|
|
|
break;
|
|
|
|
|
if (a < *totcolp)
|
|
|
|
|
return a + 1;
|
2012-10-21 07:46:41 +02:00
|
|
|
return 0;
|
2007-11-28 19:43:09 +01:00
|
|
|
}
|
|
|
|
|
|
2018-05-29 15:49:21 +02:00
|
|
|
bool BKE_object_material_slot_add(Main *bmain, Object *ob)
|
2002-10-12 13:37:38 +02:00
|
|
|
{
|
2014-04-01 02:34:00 +02:00
|
|
|
if (ob == NULL) return false;
|
|
|
|
|
if (ob->totcol >= MAXMAT) return false;
|
2018-06-17 17:05:51 +02:00
|
|
|
|
2018-05-29 15:49:21 +02:00
|
|
|
assign_material(bmain, ob, NULL, ob->totcol + 1, BKE_MAT_ASSIGN_USERPREF);
|
2012-05-06 17:15:33 +02:00
|
|
|
ob->actcol = ob->totcol;
|
2014-04-01 02:34:00 +02:00
|
|
|
return true;
|
2002-10-12 13:37:38 +02:00
|
|
|
}
|
|
|
|
|
|
Bugfix [#31834] Cycles materials cannot be manipulated using drivers
Until now, there was never any code for making drivers on materials get
recalculated when their dependencies were changed. However, since changing
material colors with drivers is something that is quite common, a workaround was
introduced to ensure that materials could still be driven (albeit with the
relevant drivers rooted at object level). This worked well enough so far with
traditional materials - though it was sometimes clunky and confusing for some
users - and would have been ok to tide us over until the depsgraph refactor.
The introduction of Cycles changed this, as it has in many other ways. Now that
people use Cycles to render, they'll need to drive the material colors through
the nested nodetree (and other things nested deeply within that). However, this
is much more difficult to generate hacks to create the relevant paths needed to
work around the problem.
== This Commit... ==
* Adds a recursive driver calculation step to the BKE_object_handle_update()
(which gets called whenever the depsgraph has finished tagging object datablocks
for updates), which goes through calculating the drivers attached to the object
(and the materials/nodetrees attached to that). This case gets handled everytime
the object is tagged as needing updates to its "data" (OB_RECALC_DATA)
* When building the depsgraph, every dependency that the drivers there have are
treated as if they were attached to object.data instead. This should trick the
depsgraph into tagging OB_RECALC_DATA to force recalculation of drivers, at the
expense perhaps of modifiers getting recalculated again.
== Todo ==
* The old workarounds noted are still in place (will be commented out in the
next commit). This fix renders at least the material case redundant, although
the textures case still needs a bit more work.
* Check on whether similar hacks can be done for other datablock combinations
* So far, only simple test cases have been tested. There is probably some
performance penalty for heavy setups still (due to need to traverse down all
parts of material/node hierarchy to find things that need updates). If there
really is a problem here, we could try introducing some tags to limit this
traversal (which get added at depsgraph build time). <--- USER TESTING
NEEDED!!!
2012-07-03 07:11:37 +02:00
|
|
|
/* ****************** */
|
|
|
|
|
|
2018-05-29 15:49:21 +02:00
|
|
|
bool BKE_object_material_slot_remove(Main *bmain, Object *ob)
|
2002-10-12 13:37:38 +02:00
|
|
|
{
|
|
|
|
|
Material *mao, ***matarar;
|
|
|
|
|
short *totcolp;
|
2011-09-20 08:25:15 +02:00
|
|
|
short a, actcol;
|
2018-06-17 17:05:51 +02:00
|
|
|
|
2012-05-06 17:15:33 +02:00
|
|
|
if (ob == NULL || ob->totcol == 0) {
|
2014-04-01 02:34:00 +02:00
|
|
|
return false;
|
2011-10-12 01:08:17 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* this should never happen and used to crash */
|
|
|
|
|
if (ob->actcol <= 0) {
|
|
|
|
|
printf("%s: invalid material index %d, report a bug!\n", __func__, ob->actcol);
|
|
|
|
|
BLI_assert(0);
|
2014-04-01 02:34:00 +02:00
|
|
|
return false;
|
2011-10-12 01:08:17 +02:00
|
|
|
}
|
|
|
|
|
|
2003-04-26 13:56:44 +02:00
|
|
|
/* take a mesh/curve/mball as starting point, remove 1 index,
|
|
|
|
|
* AND with all objects that share the ob->data
|
2018-06-17 17:05:51 +02:00
|
|
|
*
|
2003-04-26 13:56:44 +02:00
|
|
|
* after that check indices in mesh/curve/mball!!!
|
2002-10-12 13:37:38 +02:00
|
|
|
*/
|
2018-06-17 17:05:51 +02:00
|
|
|
|
2012-05-06 17:15:33 +02:00
|
|
|
totcolp = give_totcolp(ob);
|
|
|
|
|
matarar = give_matarar(ob);
|
2002-10-12 13:37:38 +02:00
|
|
|
|
2013-07-28 08:37:58 +02:00
|
|
|
if (ELEM(NULL, matarar, *matarar)) {
|
|
|
|
|
return false;
|
|
|
|
|
}
|
2009-10-08 11:22:39 +02:00
|
|
|
|
2012-12-26 18:36:51 +01:00
|
|
|
/* can happen on face selection in editmode */
|
|
|
|
|
if (ob->actcol > ob->totcol) {
|
|
|
|
|
ob->actcol = ob->totcol;
|
|
|
|
|
}
|
2018-06-17 17:05:51 +02:00
|
|
|
|
2003-04-26 13:56:44 +02:00
|
|
|
/* we delete the actcol */
|
2012-05-06 17:15:33 +02:00
|
|
|
mao = (*matarar)[ob->actcol - 1];
|
2015-11-09 19:47:10 +01:00
|
|
|
if (mao)
|
|
|
|
|
id_us_min(&mao->id);
|
2018-06-17 17:05:51 +02:00
|
|
|
|
2012-05-06 17:15:33 +02:00
|
|
|
for (a = ob->actcol; a < ob->totcol; a++)
|
|
|
|
|
(*matarar)[a - 1] = (*matarar)[a];
|
2002-10-12 13:37:38 +02:00
|
|
|
(*totcolp)--;
|
2018-06-17 17:05:51 +02:00
|
|
|
|
2012-05-06 17:15:33 +02:00
|
|
|
if (*totcolp == 0) {
|
2002-10-12 13:37:38 +02:00
|
|
|
MEM_freeN(*matarar);
|
2012-05-06 17:15:33 +02:00
|
|
|
*matarar = NULL;
|
2002-10-12 13:37:38 +02:00
|
|
|
}
|
2018-06-17 17:05:51 +02:00
|
|
|
|
2012-05-06 17:15:33 +02:00
|
|
|
actcol = ob->actcol;
|
2018-01-04 11:35:09 +01:00
|
|
|
|
2018-05-29 15:49:21 +02:00
|
|
|
for (Object *obt = bmain->object.first; obt; obt = obt->id.next) {
|
2012-05-06 17:15:33 +02:00
|
|
|
if (obt->data == ob->data) {
|
2018-01-04 11:35:09 +01:00
|
|
|
/* Can happen when object material lists are used, see: T52953 */
|
|
|
|
|
if (actcol > obt->totcol) {
|
|
|
|
|
continue;
|
|
|
|
|
}
|
2003-04-26 13:56:44 +02:00
|
|
|
/* WATCH IT: do not use actcol from ob or from obt (can become zero) */
|
2012-05-06 17:15:33 +02:00
|
|
|
mao = obt->mat[actcol - 1];
|
2015-11-09 19:47:10 +01:00
|
|
|
if (mao)
|
|
|
|
|
id_us_min(&mao->id);
|
2018-06-17 17:05:51 +02:00
|
|
|
|
2012-05-06 17:15:33 +02:00
|
|
|
for (a = actcol; a < obt->totcol; a++) {
|
|
|
|
|
obt->mat[a - 1] = obt->mat[a];
|
|
|
|
|
obt->matbits[a - 1] = obt->matbits[a];
|
2009-07-13 02:40:20 +02:00
|
|
|
}
|
2002-10-12 13:37:38 +02:00
|
|
|
obt->totcol--;
|
2012-05-06 17:15:33 +02:00
|
|
|
if (obt->actcol > obt->totcol) obt->actcol = obt->totcol;
|
2018-06-17 17:05:51 +02:00
|
|
|
|
2012-05-06 17:15:33 +02:00
|
|
|
if (obt->totcol == 0) {
|
2002-10-12 13:37:38 +02:00
|
|
|
MEM_freeN(obt->mat);
|
2009-07-13 02:40:20 +02:00
|
|
|
MEM_freeN(obt->matbits);
|
2012-05-06 17:15:33 +02:00
|
|
|
obt->mat = NULL;
|
|
|
|
|
obt->matbits = NULL;
|
2002-10-12 13:37:38 +02:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2003-04-26 13:56:44 +02:00
|
|
|
/* check indices from mesh */
|
2018-07-31 10:22:19 +02:00
|
|
|
if (ELEM(ob->type, OB_MESH, OB_CURVE, OB_SURF, OB_FONT, OB_GPENCIL)) {
|
2013-08-14 13:29:58 +02:00
|
|
|
material_data_index_remove_id((ID *)ob->data, actcol - 1);
|
2018-07-30 16:54:40 +02:00
|
|
|
if (ob->runtime.curve_cache) {
|
|
|
|
|
BKE_displist_free(&ob->runtime.curve_cache->disp);
|
2013-08-19 11:25:24 +02:00
|
|
|
}
|
2002-10-12 13:37:38 +02:00
|
|
|
}
|
2009-10-08 11:22:39 +02:00
|
|
|
|
2014-04-01 02:34:00 +02:00
|
|
|
return true;
|
2002-10-12 13:37:38 +02:00
|
|
|
}
|
Giant commit!
A full detailed description of this will be done later... is several days
of work. Here's a summary:
Render:
- Full cleanup of render code, removing *all* globals and bad level calls
all over blender. Render module is now not called abusive anymore
- API-fied calls to rendering
- Full recode of internal render pipeline. Is now rendering tiles by
default, prepared for much smarter 'bucket' render later.
- Each thread now can render a full part
- Renders were tested with 4 threads, goes fine, apart from some lookup
tables in softshadow and AO still
- Rendering is prepared to do multiple layers and passes
- No single 32 bits trick in render code anymore, all 100% floats now.
Writing images/movies
- moved writing images to blender kernel (bye bye 'schrijfplaatje'!)
- made a new Movie handle system, also in kernel. This will enable much
easier use of movies in Blender
PreviewRender:
- Using new render API, previewrender (in buttons) now uses regular render
code to generate images.
- new datafile 'preview.blend.c' has the preview scenes in it
- previews get rendered in exact displayed size (1 pixel = 1 pixel)
3D Preview render
- new; press Pkey in 3d window, for a panel that continuously renders
(pkey is for games, i know... but we dont do that in orange now!)
- this render works nearly identical to buttons-preview render, so it stops
rendering on any event (mouse, keyboard, etc)
- on moving/scaling the panel, the render code doesn't recreate all geometry
- same for shifting/panning view
- all other operations (now) regenerate the full render database still.
- this is WIP... but big fun, especially for simple scenes!
Compositor
- Using same node system as now in use for shaders, you can composit images
- works pretty straightforward... needs much more options/tools and integration
with rendering still
- is not threaded yet, nor is so smart to only recalculate changes... will be
done soon!
- the "Render Result" node will get all layers/passes as output sockets
- The "Output" node renders to a builtin image, which you can view in the Image
window. (yes, output nodes to render-result, and to files, is on the list!)
The Bad News
- "Unified Render" is removed. It might come back in some stage, but this
system should be built from scratch. I can't really understand this code...
I expect it is not much needed, especially with advanced layer/passes
control
- Panorama render, Field render, Motion blur, is not coded yet... (I had to
recode every single feature in render, so...!)
- Lens Flare is also not back... needs total revision, might become composit
effect though (using zbuffer for visibility)
- Part render is gone! (well, thats obvious, its default now).
- The render window is only restored with limited functionality... I am going
to check first the option to render to a Image window, so Blender can become
a true single-window application. :)
For example, the 'Spare render buffer' (jkey) doesnt work.
- Render with border, now default creates a smaller image
- No zbuffers are written yet... on the todo!
- Scons files and MSVC will need work to get compiling again
OK... thats what I can quickly recall. Now go compiling!
2006-01-23 23:05:47 +01:00
|
|
|
|
2015-01-28 14:42:47 +01:00
|
|
|
static bNode *nodetree_uv_node_recursive(bNode *node)
|
|
|
|
|
{
|
|
|
|
|
bNode *inode;
|
|
|
|
|
bNodeSocket *sock;
|
2018-06-17 17:05:51 +02:00
|
|
|
|
2015-01-28 14:42:47 +01:00
|
|
|
for (sock = node->inputs.first; sock; sock = sock->next) {
|
|
|
|
|
if (sock->link) {
|
|
|
|
|
inode = sock->link->fromnode;
|
|
|
|
|
if (inode->typeinfo->nclass == NODE_CLASS_INPUT && inode->typeinfo->type == SH_NODE_UVMAP) {
|
|
|
|
|
return inode;
|
|
|
|
|
}
|
|
|
|
|
else {
|
|
|
|
|
return nodetree_uv_node_recursive(inode);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
2018-06-17 17:05:51 +02:00
|
|
|
|
2015-01-28 14:42:47 +01:00
|
|
|
return NULL;
|
|
|
|
|
}
|
|
|
|
|
|
2014-08-27 15:52:24 +02:00
|
|
|
void BKE_texpaint_slot_refresh_cache(Scene *scene, Material *ma)
|
2014-07-21 12:02:05 +02:00
|
|
|
{
|
|
|
|
|
short count = 0;
|
Remove Blender Internal and legacy viewport from Blender 2.8.
Brecht authored this commit, but he gave me the honours to actually
do it. Here it goes; Blender Internal. Bye bye, you did great!
* Point density, voxel data, ocean, environment map textures were removed,
as these only worked within BI rendering. Note that the ocean modifier
and the Cycles point density shader node continue to work.
* Dynamic paint using material shading was removed, as this only worked
with BI. If we ever wanted to support this again probably it should go
through the baking API.
* GPU shader export through the Python API was removed. This only worked
for the old BI GLSL shaders, which no longer exists. Doing something
similar for Eevee would be significantly more complicated because it
uses a lot of multiplass rendering and logic outside the shader, it's
probably impractical.
* Collada material import / export code is mostly gone, as it only worked
for BI materials. We need to add Cycles / Eevee material support at some
point.
* The mesh noise operator was removed since it only worked with BI
material texture slots. A displacement modifier can be used instead.
* The delete texture paint slot operator was removed since it only worked
for BI material texture slots. Could be added back with node support.
* Not all legacy viewport features are supported in the new viewport, but
their code was removed. If we need to bring anything back we can look at
older git revisions.
* There is some legacy viewport code that I could not remove yet, and some
that I probably missed.
* Shader node execution code was left mostly intact, even though it is not
used anywhere now. We may eventually use this to replace the texture
nodes with Cycles / Eevee shader nodes.
* The Cycles Bake panel now includes settings for baking multires normal
and displacement maps. The underlying code needs to be merged properly,
and we plan to add back support for multires AO baking and add support
to Cycles baking for features like vertex color, displacement, and other
missing baking features.
* This commit removes DNA and the Python API for BI material, lamp, world
and scene settings. This breaks a lot of addons.
* There is more DNA that can be removed or renamed, where Cycles or Eevee
are reusing some old BI properties but the names are not really correct
anymore.
* Texture slots for materials, lamps and world were removed. They remain
for brushes, particles and freestyle linestyles.
* 'BLENDER_RENDER' remains in the COMPAT_ENGINES of UI panels. Cycles and
other renderers use this to find all panels to show, minus a few panels
that they have their own replacement for.
2018-04-19 17:34:44 +02:00
|
|
|
short index = 0;
|
2017-05-22 15:31:46 +02:00
|
|
|
|
2014-07-21 12:02:05 +02:00
|
|
|
if (!ma)
|
|
|
|
|
return;
|
|
|
|
|
|
|
|
|
|
if (ma->texpaintslot) {
|
|
|
|
|
MEM_freeN(ma->texpaintslot);
|
2014-08-28 16:40:38 +02:00
|
|
|
ma->tot_slots = 0;
|
2014-07-21 12:02:05 +02:00
|
|
|
ma->texpaintslot = NULL;
|
|
|
|
|
}
|
|
|
|
|
|
2014-08-28 16:40:38 +02:00
|
|
|
if (scene->toolsettings->imapaint.mode == IMAGEPAINT_MODE_IMAGE) {
|
|
|
|
|
ma->paint_active_slot = 0;
|
|
|
|
|
ma->paint_clone_slot = 0;
|
|
|
|
|
return;
|
|
|
|
|
}
|
2018-06-17 17:05:51 +02:00
|
|
|
|
Remove Blender Internal and legacy viewport from Blender 2.8.
Brecht authored this commit, but he gave me the honours to actually
do it. Here it goes; Blender Internal. Bye bye, you did great!
* Point density, voxel data, ocean, environment map textures were removed,
as these only worked within BI rendering. Note that the ocean modifier
and the Cycles point density shader node continue to work.
* Dynamic paint using material shading was removed, as this only worked
with BI. If we ever wanted to support this again probably it should go
through the baking API.
* GPU shader export through the Python API was removed. This only worked
for the old BI GLSL shaders, which no longer exists. Doing something
similar for Eevee would be significantly more complicated because it
uses a lot of multiplass rendering and logic outside the shader, it's
probably impractical.
* Collada material import / export code is mostly gone, as it only worked
for BI materials. We need to add Cycles / Eevee material support at some
point.
* The mesh noise operator was removed since it only worked with BI
material texture slots. A displacement modifier can be used instead.
* The delete texture paint slot operator was removed since it only worked
for BI material texture slots. Could be added back with node support.
* Not all legacy viewport features are supported in the new viewport, but
their code was removed. If we need to bring anything back we can look at
older git revisions.
* There is some legacy viewport code that I could not remove yet, and some
that I probably missed.
* Shader node execution code was left mostly intact, even though it is not
used anywhere now. We may eventually use this to replace the texture
nodes with Cycles / Eevee shader nodes.
* The Cycles Bake panel now includes settings for baking multires normal
and displacement maps. The underlying code needs to be merged properly,
and we plan to add back support for multires AO baking and add support
to Cycles baking for features like vertex color, displacement, and other
missing baking features.
* This commit removes DNA and the Python API for BI material, lamp, world
and scene settings. This breaks a lot of addons.
* There is more DNA that can be removed or renamed, where Cycles or Eevee
are reusing some old BI properties but the names are not really correct
anymore.
* Texture slots for materials, lamps and world were removed. They remain
for brushes, particles and freestyle linestyles.
* 'BLENDER_RENDER' remains in the COMPAT_ENGINES of UI panels. Cycles and
other renderers use this to find all panels to show, minus a few panels
that they have their own replacement for.
2018-04-19 17:34:44 +02:00
|
|
|
bNode *node, *active_node;
|
2014-07-21 12:02:05 +02:00
|
|
|
|
Remove Blender Internal and legacy viewport from Blender 2.8.
Brecht authored this commit, but he gave me the honours to actually
do it. Here it goes; Blender Internal. Bye bye, you did great!
* Point density, voxel data, ocean, environment map textures were removed,
as these only worked within BI rendering. Note that the ocean modifier
and the Cycles point density shader node continue to work.
* Dynamic paint using material shading was removed, as this only worked
with BI. If we ever wanted to support this again probably it should go
through the baking API.
* GPU shader export through the Python API was removed. This only worked
for the old BI GLSL shaders, which no longer exists. Doing something
similar for Eevee would be significantly more complicated because it
uses a lot of multiplass rendering and logic outside the shader, it's
probably impractical.
* Collada material import / export code is mostly gone, as it only worked
for BI materials. We need to add Cycles / Eevee material support at some
point.
* The mesh noise operator was removed since it only worked with BI
material texture slots. A displacement modifier can be used instead.
* The delete texture paint slot operator was removed since it only worked
for BI material texture slots. Could be added back with node support.
* Not all legacy viewport features are supported in the new viewport, but
their code was removed. If we need to bring anything back we can look at
older git revisions.
* There is some legacy viewport code that I could not remove yet, and some
that I probably missed.
* Shader node execution code was left mostly intact, even though it is not
used anywhere now. We may eventually use this to replace the texture
nodes with Cycles / Eevee shader nodes.
* The Cycles Bake panel now includes settings for baking multires normal
and displacement maps. The underlying code needs to be merged properly,
and we plan to add back support for multires AO baking and add support
to Cycles baking for features like vertex color, displacement, and other
missing baking features.
* This commit removes DNA and the Python API for BI material, lamp, world
and scene settings. This breaks a lot of addons.
* There is more DNA that can be removed or renamed, where Cycles or Eevee
are reusing some old BI properties but the names are not really correct
anymore.
* Texture slots for materials, lamps and world were removed. They remain
for brushes, particles and freestyle linestyles.
* 'BLENDER_RENDER' remains in the COMPAT_ENGINES of UI panels. Cycles and
other renderers use this to find all panels to show, minus a few panels
that they have their own replacement for.
2018-04-19 17:34:44 +02:00
|
|
|
if (!(ma->nodetree)) {
|
|
|
|
|
ma->paint_active_slot = 0;
|
|
|
|
|
ma->paint_clone_slot = 0;
|
|
|
|
|
return;
|
|
|
|
|
}
|
2014-07-21 12:02:05 +02:00
|
|
|
|
Remove Blender Internal and legacy viewport from Blender 2.8.
Brecht authored this commit, but he gave me the honours to actually
do it. Here it goes; Blender Internal. Bye bye, you did great!
* Point density, voxel data, ocean, environment map textures were removed,
as these only worked within BI rendering. Note that the ocean modifier
and the Cycles point density shader node continue to work.
* Dynamic paint using material shading was removed, as this only worked
with BI. If we ever wanted to support this again probably it should go
through the baking API.
* GPU shader export through the Python API was removed. This only worked
for the old BI GLSL shaders, which no longer exists. Doing something
similar for Eevee would be significantly more complicated because it
uses a lot of multiplass rendering and logic outside the shader, it's
probably impractical.
* Collada material import / export code is mostly gone, as it only worked
for BI materials. We need to add Cycles / Eevee material support at some
point.
* The mesh noise operator was removed since it only worked with BI
material texture slots. A displacement modifier can be used instead.
* The delete texture paint slot operator was removed since it only worked
for BI material texture slots. Could be added back with node support.
* Not all legacy viewport features are supported in the new viewport, but
their code was removed. If we need to bring anything back we can look at
older git revisions.
* There is some legacy viewport code that I could not remove yet, and some
that I probably missed.
* Shader node execution code was left mostly intact, even though it is not
used anywhere now. We may eventually use this to replace the texture
nodes with Cycles / Eevee shader nodes.
* The Cycles Bake panel now includes settings for baking multires normal
and displacement maps. The underlying code needs to be merged properly,
and we plan to add back support for multires AO baking and add support
to Cycles baking for features like vertex color, displacement, and other
missing baking features.
* This commit removes DNA and the Python API for BI material, lamp, world
and scene settings. This breaks a lot of addons.
* There is more DNA that can be removed or renamed, where Cycles or Eevee
are reusing some old BI properties but the names are not really correct
anymore.
* Texture slots for materials, lamps and world were removed. They remain
for brushes, particles and freestyle linestyles.
* 'BLENDER_RENDER' remains in the COMPAT_ENGINES of UI panels. Cycles and
other renderers use this to find all panels to show, minus a few panels
that they have their own replacement for.
2018-04-19 17:34:44 +02:00
|
|
|
for (node = ma->nodetree->nodes.first; node; node = node->next) {
|
|
|
|
|
if (node->typeinfo->nclass == NODE_CLASS_TEXTURE && node->typeinfo->type == SH_NODE_TEX_IMAGE && node->id)
|
|
|
|
|
count++;
|
2014-07-21 12:02:05 +02:00
|
|
|
}
|
|
|
|
|
|
Remove Blender Internal and legacy viewport from Blender 2.8.
Brecht authored this commit, but he gave me the honours to actually
do it. Here it goes; Blender Internal. Bye bye, you did great!
* Point density, voxel data, ocean, environment map textures were removed,
as these only worked within BI rendering. Note that the ocean modifier
and the Cycles point density shader node continue to work.
* Dynamic paint using material shading was removed, as this only worked
with BI. If we ever wanted to support this again probably it should go
through the baking API.
* GPU shader export through the Python API was removed. This only worked
for the old BI GLSL shaders, which no longer exists. Doing something
similar for Eevee would be significantly more complicated because it
uses a lot of multiplass rendering and logic outside the shader, it's
probably impractical.
* Collada material import / export code is mostly gone, as it only worked
for BI materials. We need to add Cycles / Eevee material support at some
point.
* The mesh noise operator was removed since it only worked with BI
material texture slots. A displacement modifier can be used instead.
* The delete texture paint slot operator was removed since it only worked
for BI material texture slots. Could be added back with node support.
* Not all legacy viewport features are supported in the new viewport, but
their code was removed. If we need to bring anything back we can look at
older git revisions.
* There is some legacy viewport code that I could not remove yet, and some
that I probably missed.
* Shader node execution code was left mostly intact, even though it is not
used anywhere now. We may eventually use this to replace the texture
nodes with Cycles / Eevee shader nodes.
* The Cycles Bake panel now includes settings for baking multires normal
and displacement maps. The underlying code needs to be merged properly,
and we plan to add back support for multires AO baking and add support
to Cycles baking for features like vertex color, displacement, and other
missing baking features.
* This commit removes DNA and the Python API for BI material, lamp, world
and scene settings. This breaks a lot of addons.
* There is more DNA that can be removed or renamed, where Cycles or Eevee
are reusing some old BI properties but the names are not really correct
anymore.
* Texture slots for materials, lamps and world were removed. They remain
for brushes, particles and freestyle linestyles.
* 'BLENDER_RENDER' remains in the COMPAT_ENGINES of UI panels. Cycles and
other renderers use this to find all panels to show, minus a few panels
that they have their own replacement for.
2018-04-19 17:34:44 +02:00
|
|
|
if (count == 0) {
|
|
|
|
|
ma->paint_active_slot = 0;
|
|
|
|
|
ma->paint_clone_slot = 0;
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
ma->texpaintslot = MEM_callocN(sizeof(*ma->texpaintslot) * count, "texpaint_slots");
|
2014-07-21 12:02:05 +02:00
|
|
|
|
Remove Blender Internal and legacy viewport from Blender 2.8.
Brecht authored this commit, but he gave me the honours to actually
do it. Here it goes; Blender Internal. Bye bye, you did great!
* Point density, voxel data, ocean, environment map textures were removed,
as these only worked within BI rendering. Note that the ocean modifier
and the Cycles point density shader node continue to work.
* Dynamic paint using material shading was removed, as this only worked
with BI. If we ever wanted to support this again probably it should go
through the baking API.
* GPU shader export through the Python API was removed. This only worked
for the old BI GLSL shaders, which no longer exists. Doing something
similar for Eevee would be significantly more complicated because it
uses a lot of multiplass rendering and logic outside the shader, it's
probably impractical.
* Collada material import / export code is mostly gone, as it only worked
for BI materials. We need to add Cycles / Eevee material support at some
point.
* The mesh noise operator was removed since it only worked with BI
material texture slots. A displacement modifier can be used instead.
* The delete texture paint slot operator was removed since it only worked
for BI material texture slots. Could be added back with node support.
* Not all legacy viewport features are supported in the new viewport, but
their code was removed. If we need to bring anything back we can look at
older git revisions.
* There is some legacy viewport code that I could not remove yet, and some
that I probably missed.
* Shader node execution code was left mostly intact, even though it is not
used anywhere now. We may eventually use this to replace the texture
nodes with Cycles / Eevee shader nodes.
* The Cycles Bake panel now includes settings for baking multires normal
and displacement maps. The underlying code needs to be merged properly,
and we plan to add back support for multires AO baking and add support
to Cycles baking for features like vertex color, displacement, and other
missing baking features.
* This commit removes DNA and the Python API for BI material, lamp, world
and scene settings. This breaks a lot of addons.
* There is more DNA that can be removed or renamed, where Cycles or Eevee
are reusing some old BI properties but the names are not really correct
anymore.
* Texture slots for materials, lamps and world were removed. They remain
for brushes, particles and freestyle linestyles.
* 'BLENDER_RENDER' remains in the COMPAT_ENGINES of UI panels. Cycles and
other renderers use this to find all panels to show, minus a few panels
that they have their own replacement for.
2018-04-19 17:34:44 +02:00
|
|
|
active_node = nodeGetActiveTexture(ma->nodetree);
|
2014-07-21 12:02:05 +02:00
|
|
|
|
Remove Blender Internal and legacy viewport from Blender 2.8.
Brecht authored this commit, but he gave me the honours to actually
do it. Here it goes; Blender Internal. Bye bye, you did great!
* Point density, voxel data, ocean, environment map textures were removed,
as these only worked within BI rendering. Note that the ocean modifier
and the Cycles point density shader node continue to work.
* Dynamic paint using material shading was removed, as this only worked
with BI. If we ever wanted to support this again probably it should go
through the baking API.
* GPU shader export through the Python API was removed. This only worked
for the old BI GLSL shaders, which no longer exists. Doing something
similar for Eevee would be significantly more complicated because it
uses a lot of multiplass rendering and logic outside the shader, it's
probably impractical.
* Collada material import / export code is mostly gone, as it only worked
for BI materials. We need to add Cycles / Eevee material support at some
point.
* The mesh noise operator was removed since it only worked with BI
material texture slots. A displacement modifier can be used instead.
* The delete texture paint slot operator was removed since it only worked
for BI material texture slots. Could be added back with node support.
* Not all legacy viewport features are supported in the new viewport, but
their code was removed. If we need to bring anything back we can look at
older git revisions.
* There is some legacy viewport code that I could not remove yet, and some
that I probably missed.
* Shader node execution code was left mostly intact, even though it is not
used anywhere now. We may eventually use this to replace the texture
nodes with Cycles / Eevee shader nodes.
* The Cycles Bake panel now includes settings for baking multires normal
and displacement maps. The underlying code needs to be merged properly,
and we plan to add back support for multires AO baking and add support
to Cycles baking for features like vertex color, displacement, and other
missing baking features.
* This commit removes DNA and the Python API for BI material, lamp, world
and scene settings. This breaks a lot of addons.
* There is more DNA that can be removed or renamed, where Cycles or Eevee
are reusing some old BI properties but the names are not really correct
anymore.
* Texture slots for materials, lamps and world were removed. They remain
for brushes, particles and freestyle linestyles.
* 'BLENDER_RENDER' remains in the COMPAT_ENGINES of UI panels. Cycles and
other renderers use this to find all panels to show, minus a few panels
that they have their own replacement for.
2018-04-19 17:34:44 +02:00
|
|
|
for (node = ma->nodetree->nodes.first; node; node = node->next) {
|
|
|
|
|
if (node->typeinfo->nclass == NODE_CLASS_TEXTURE && node->typeinfo->type == SH_NODE_TEX_IMAGE && node->id) {
|
|
|
|
|
if (active_node == node)
|
|
|
|
|
ma->paint_active_slot = index;
|
|
|
|
|
ma->texpaintslot[index].ima = (Image *)node->id;
|
2014-07-21 12:02:05 +02:00
|
|
|
|
Remove Blender Internal and legacy viewport from Blender 2.8.
Brecht authored this commit, but he gave me the honours to actually
do it. Here it goes; Blender Internal. Bye bye, you did great!
* Point density, voxel data, ocean, environment map textures were removed,
as these only worked within BI rendering. Note that the ocean modifier
and the Cycles point density shader node continue to work.
* Dynamic paint using material shading was removed, as this only worked
with BI. If we ever wanted to support this again probably it should go
through the baking API.
* GPU shader export through the Python API was removed. This only worked
for the old BI GLSL shaders, which no longer exists. Doing something
similar for Eevee would be significantly more complicated because it
uses a lot of multiplass rendering and logic outside the shader, it's
probably impractical.
* Collada material import / export code is mostly gone, as it only worked
for BI materials. We need to add Cycles / Eevee material support at some
point.
* The mesh noise operator was removed since it only worked with BI
material texture slots. A displacement modifier can be used instead.
* The delete texture paint slot operator was removed since it only worked
for BI material texture slots. Could be added back with node support.
* Not all legacy viewport features are supported in the new viewport, but
their code was removed. If we need to bring anything back we can look at
older git revisions.
* There is some legacy viewport code that I could not remove yet, and some
that I probably missed.
* Shader node execution code was left mostly intact, even though it is not
used anywhere now. We may eventually use this to replace the texture
nodes with Cycles / Eevee shader nodes.
* The Cycles Bake panel now includes settings for baking multires normal
and displacement maps. The underlying code needs to be merged properly,
and we plan to add back support for multires AO baking and add support
to Cycles baking for features like vertex color, displacement, and other
missing baking features.
* This commit removes DNA and the Python API for BI material, lamp, world
and scene settings. This breaks a lot of addons.
* There is more DNA that can be removed or renamed, where Cycles or Eevee
are reusing some old BI properties but the names are not really correct
anymore.
* Texture slots for materials, lamps and world were removed. They remain
for brushes, particles and freestyle linestyles.
* 'BLENDER_RENDER' remains in the COMPAT_ENGINES of UI panels. Cycles and
other renderers use this to find all panels to show, minus a few panels
that they have their own replacement for.
2018-04-19 17:34:44 +02:00
|
|
|
/* for new renderer, we need to traverse the treeback in search of a UV node */
|
|
|
|
|
bNode *uvnode = nodetree_uv_node_recursive(node);
|
2018-06-17 17:05:51 +02:00
|
|
|
|
Remove Blender Internal and legacy viewport from Blender 2.8.
Brecht authored this commit, but he gave me the honours to actually
do it. Here it goes; Blender Internal. Bye bye, you did great!
* Point density, voxel data, ocean, environment map textures were removed,
as these only worked within BI rendering. Note that the ocean modifier
and the Cycles point density shader node continue to work.
* Dynamic paint using material shading was removed, as this only worked
with BI. If we ever wanted to support this again probably it should go
through the baking API.
* GPU shader export through the Python API was removed. This only worked
for the old BI GLSL shaders, which no longer exists. Doing something
similar for Eevee would be significantly more complicated because it
uses a lot of multiplass rendering and logic outside the shader, it's
probably impractical.
* Collada material import / export code is mostly gone, as it only worked
for BI materials. We need to add Cycles / Eevee material support at some
point.
* The mesh noise operator was removed since it only worked with BI
material texture slots. A displacement modifier can be used instead.
* The delete texture paint slot operator was removed since it only worked
for BI material texture slots. Could be added back with node support.
* Not all legacy viewport features are supported in the new viewport, but
their code was removed. If we need to bring anything back we can look at
older git revisions.
* There is some legacy viewport code that I could not remove yet, and some
that I probably missed.
* Shader node execution code was left mostly intact, even though it is not
used anywhere now. We may eventually use this to replace the texture
nodes with Cycles / Eevee shader nodes.
* The Cycles Bake panel now includes settings for baking multires normal
and displacement maps. The underlying code needs to be merged properly,
and we plan to add back support for multires AO baking and add support
to Cycles baking for features like vertex color, displacement, and other
missing baking features.
* This commit removes DNA and the Python API for BI material, lamp, world
and scene settings. This breaks a lot of addons.
* There is more DNA that can be removed or renamed, where Cycles or Eevee
are reusing some old BI properties but the names are not really correct
anymore.
* Texture slots for materials, lamps and world were removed. They remain
for brushes, particles and freestyle linestyles.
* 'BLENDER_RENDER' remains in the COMPAT_ENGINES of UI panels. Cycles and
other renderers use this to find all panels to show, minus a few panels
that they have their own replacement for.
2018-04-19 17:34:44 +02:00
|
|
|
if (uvnode) {
|
|
|
|
|
NodeShaderUVMap *storage = (NodeShaderUVMap *)uvnode->storage;
|
|
|
|
|
ma->texpaintslot[index].uvname = storage->uv_map;
|
|
|
|
|
/* set a value to index so UI knows that we have a valid pointer for the mesh */
|
|
|
|
|
ma->texpaintslot[index].valid = true;
|
|
|
|
|
}
|
|
|
|
|
else {
|
|
|
|
|
/* just invalidate the index here so UV map does not get displayed on the UI */
|
|
|
|
|
ma->texpaintslot[index].valid = false;
|
2014-07-21 12:02:05 +02:00
|
|
|
}
|
Remove Blender Internal and legacy viewport from Blender 2.8.
Brecht authored this commit, but he gave me the honours to actually
do it. Here it goes; Blender Internal. Bye bye, you did great!
* Point density, voxel data, ocean, environment map textures were removed,
as these only worked within BI rendering. Note that the ocean modifier
and the Cycles point density shader node continue to work.
* Dynamic paint using material shading was removed, as this only worked
with BI. If we ever wanted to support this again probably it should go
through the baking API.
* GPU shader export through the Python API was removed. This only worked
for the old BI GLSL shaders, which no longer exists. Doing something
similar for Eevee would be significantly more complicated because it
uses a lot of multiplass rendering and logic outside the shader, it's
probably impractical.
* Collada material import / export code is mostly gone, as it only worked
for BI materials. We need to add Cycles / Eevee material support at some
point.
* The mesh noise operator was removed since it only worked with BI
material texture slots. A displacement modifier can be used instead.
* The delete texture paint slot operator was removed since it only worked
for BI material texture slots. Could be added back with node support.
* Not all legacy viewport features are supported in the new viewport, but
their code was removed. If we need to bring anything back we can look at
older git revisions.
* There is some legacy viewport code that I could not remove yet, and some
that I probably missed.
* Shader node execution code was left mostly intact, even though it is not
used anywhere now. We may eventually use this to replace the texture
nodes with Cycles / Eevee shader nodes.
* The Cycles Bake panel now includes settings for baking multires normal
and displacement maps. The underlying code needs to be merged properly,
and we plan to add back support for multires AO baking and add support
to Cycles baking for features like vertex color, displacement, and other
missing baking features.
* This commit removes DNA and the Python API for BI material, lamp, world
and scene settings. This breaks a lot of addons.
* There is more DNA that can be removed or renamed, where Cycles or Eevee
are reusing some old BI properties but the names are not really correct
anymore.
* Texture slots for materials, lamps and world were removed. They remain
for brushes, particles and freestyle linestyles.
* 'BLENDER_RENDER' remains in the COMPAT_ENGINES of UI panels. Cycles and
other renderers use this to find all panels to show, minus a few panels
that they have their own replacement for.
2018-04-19 17:34:44 +02:00
|
|
|
index++;
|
2014-07-21 12:02:05 +02:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2014-08-28 16:40:38 +02:00
|
|
|
ma->tot_slots = count;
|
2018-06-17 17:05:51 +02:00
|
|
|
|
|
|
|
|
|
2014-07-21 12:02:05 +02:00
|
|
|
if (ma->paint_active_slot >= count) {
|
|
|
|
|
ma->paint_active_slot = count - 1;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (ma->paint_clone_slot >= count) {
|
|
|
|
|
ma->paint_clone_slot = count - 1;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
2014-08-27 15:52:24 +02:00
|
|
|
void BKE_texpaint_slots_refresh_object(Scene *scene, struct Object *ob)
|
2014-07-21 12:02:05 +02:00
|
|
|
{
|
|
|
|
|
int i;
|
|
|
|
|
|
|
|
|
|
for (i = 1; i < ob->totcol + 1; i++) {
|
|
|
|
|
Material *ma = give_current_material(ob, i);
|
2014-08-27 15:52:24 +02:00
|
|
|
BKE_texpaint_slot_refresh_cache(scene, ma);
|
2014-07-21 12:02:05 +02:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
Giant commit!
A full detailed description of this will be done later... is several days
of work. Here's a summary:
Render:
- Full cleanup of render code, removing *all* globals and bad level calls
all over blender. Render module is now not called abusive anymore
- API-fied calls to rendering
- Full recode of internal render pipeline. Is now rendering tiles by
default, prepared for much smarter 'bucket' render later.
- Each thread now can render a full part
- Renders were tested with 4 threads, goes fine, apart from some lookup
tables in softshadow and AO still
- Rendering is prepared to do multiple layers and passes
- No single 32 bits trick in render code anymore, all 100% floats now.
Writing images/movies
- moved writing images to blender kernel (bye bye 'schrijfplaatje'!)
- made a new Movie handle system, also in kernel. This will enable much
easier use of movies in Blender
PreviewRender:
- Using new render API, previewrender (in buttons) now uses regular render
code to generate images.
- new datafile 'preview.blend.c' has the preview scenes in it
- previews get rendered in exact displayed size (1 pixel = 1 pixel)
3D Preview render
- new; press Pkey in 3d window, for a panel that continuously renders
(pkey is for games, i know... but we dont do that in orange now!)
- this render works nearly identical to buttons-preview render, so it stops
rendering on any event (mouse, keyboard, etc)
- on moving/scaling the panel, the render code doesn't recreate all geometry
- same for shifting/panning view
- all other operations (now) regenerate the full render database still.
- this is WIP... but big fun, especially for simple scenes!
Compositor
- Using same node system as now in use for shaders, you can composit images
- works pretty straightforward... needs much more options/tools and integration
with rendering still
- is not threaded yet, nor is so smart to only recalculate changes... will be
done soon!
- the "Render Result" node will get all layers/passes as output sockets
- The "Output" node renders to a builtin image, which you can view in the Image
window. (yes, output nodes to render-result, and to files, is on the list!)
The Bad News
- "Unified Render" is removed. It might come back in some stage, but this
system should be built from scratch. I can't really understand this code...
I expect it is not much needed, especially with advanced layer/passes
control
- Panorama render, Field render, Motion blur, is not coded yet... (I had to
recode every single feature in render, so...!)
- Lens Flare is also not back... needs total revision, might become composit
effect though (using zbuffer for visibility)
- Part render is gone! (well, thats obvious, its default now).
- The render window is only restored with limited functionality... I am going
to check first the option to render to a Image window, so Blender can become
a true single-window application. :)
For example, the 'Spare render buffer' (jkey) doesnt work.
- Render with border, now default creates a smaller image
- No zbuffers are written yet... on the todo!
- Scons files and MSVC will need work to get compiling again
OK... thats what I can quickly recall. Now go compiling!
2006-01-23 23:05:47 +01:00
|
|
|
|
2012-05-27 21:40:36 +02:00
|
|
|
/* r_col = current value, col = new value, (fac == 0) is no change */
|
2011-11-26 14:11:55 +01:00
|
|
|
void ramp_blend(int type, float r_col[3], const float fac, const float col[3])
|
Giant commit!
A full detailed description of this will be done later... is several days
of work. Here's a summary:
Render:
- Full cleanup of render code, removing *all* globals and bad level calls
all over blender. Render module is now not called abusive anymore
- API-fied calls to rendering
- Full recode of internal render pipeline. Is now rendering tiles by
default, prepared for much smarter 'bucket' render later.
- Each thread now can render a full part
- Renders were tested with 4 threads, goes fine, apart from some lookup
tables in softshadow and AO still
- Rendering is prepared to do multiple layers and passes
- No single 32 bits trick in render code anymore, all 100% floats now.
Writing images/movies
- moved writing images to blender kernel (bye bye 'schrijfplaatje'!)
- made a new Movie handle system, also in kernel. This will enable much
easier use of movies in Blender
PreviewRender:
- Using new render API, previewrender (in buttons) now uses regular render
code to generate images.
- new datafile 'preview.blend.c' has the preview scenes in it
- previews get rendered in exact displayed size (1 pixel = 1 pixel)
3D Preview render
- new; press Pkey in 3d window, for a panel that continuously renders
(pkey is for games, i know... but we dont do that in orange now!)
- this render works nearly identical to buttons-preview render, so it stops
rendering on any event (mouse, keyboard, etc)
- on moving/scaling the panel, the render code doesn't recreate all geometry
- same for shifting/panning view
- all other operations (now) regenerate the full render database still.
- this is WIP... but big fun, especially for simple scenes!
Compositor
- Using same node system as now in use for shaders, you can composit images
- works pretty straightforward... needs much more options/tools and integration
with rendering still
- is not threaded yet, nor is so smart to only recalculate changes... will be
done soon!
- the "Render Result" node will get all layers/passes as output sockets
- The "Output" node renders to a builtin image, which you can view in the Image
window. (yes, output nodes to render-result, and to files, is on the list!)
The Bad News
- "Unified Render" is removed. It might come back in some stage, but this
system should be built from scratch. I can't really understand this code...
I expect it is not much needed, especially with advanced layer/passes
control
- Panorama render, Field render, Motion blur, is not coded yet... (I had to
recode every single feature in render, so...!)
- Lens Flare is also not back... needs total revision, might become composit
effect though (using zbuffer for visibility)
- Part render is gone! (well, thats obvious, its default now).
- The render window is only restored with limited functionality... I am going
to check first the option to render to a Image window, so Blender can become
a true single-window application. :)
For example, the 'Spare render buffer' (jkey) doesnt work.
- Render with border, now default creates a smaller image
- No zbuffers are written yet... on the todo!
- Scons files and MSVC will need work to get compiling again
OK... thats what I can quickly recall. Now go compiling!
2006-01-23 23:05:47 +01:00
|
|
|
{
|
2012-05-06 17:15:33 +02:00
|
|
|
float tmp, facm = 1.0f - fac;
|
2018-06-17 17:05:51 +02:00
|
|
|
|
Giant commit!
A full detailed description of this will be done later... is several days
of work. Here's a summary:
Render:
- Full cleanup of render code, removing *all* globals and bad level calls
all over blender. Render module is now not called abusive anymore
- API-fied calls to rendering
- Full recode of internal render pipeline. Is now rendering tiles by
default, prepared for much smarter 'bucket' render later.
- Each thread now can render a full part
- Renders were tested with 4 threads, goes fine, apart from some lookup
tables in softshadow and AO still
- Rendering is prepared to do multiple layers and passes
- No single 32 bits trick in render code anymore, all 100% floats now.
Writing images/movies
- moved writing images to blender kernel (bye bye 'schrijfplaatje'!)
- made a new Movie handle system, also in kernel. This will enable much
easier use of movies in Blender
PreviewRender:
- Using new render API, previewrender (in buttons) now uses regular render
code to generate images.
- new datafile 'preview.blend.c' has the preview scenes in it
- previews get rendered in exact displayed size (1 pixel = 1 pixel)
3D Preview render
- new; press Pkey in 3d window, for a panel that continuously renders
(pkey is for games, i know... but we dont do that in orange now!)
- this render works nearly identical to buttons-preview render, so it stops
rendering on any event (mouse, keyboard, etc)
- on moving/scaling the panel, the render code doesn't recreate all geometry
- same for shifting/panning view
- all other operations (now) regenerate the full render database still.
- this is WIP... but big fun, especially for simple scenes!
Compositor
- Using same node system as now in use for shaders, you can composit images
- works pretty straightforward... needs much more options/tools and integration
with rendering still
- is not threaded yet, nor is so smart to only recalculate changes... will be
done soon!
- the "Render Result" node will get all layers/passes as output sockets
- The "Output" node renders to a builtin image, which you can view in the Image
window. (yes, output nodes to render-result, and to files, is on the list!)
The Bad News
- "Unified Render" is removed. It might come back in some stage, but this
system should be built from scratch. I can't really understand this code...
I expect it is not much needed, especially with advanced layer/passes
control
- Panorama render, Field render, Motion blur, is not coded yet... (I had to
recode every single feature in render, so...!)
- Lens Flare is also not back... needs total revision, might become composit
effect though (using zbuffer for visibility)
- Part render is gone! (well, thats obvious, its default now).
- The render window is only restored with limited functionality... I am going
to check first the option to render to a Image window, so Blender can become
a true single-window application. :)
For example, the 'Spare render buffer' (jkey) doesnt work.
- Render with border, now default creates a smaller image
- No zbuffers are written yet... on the todo!
- Scons files and MSVC will need work to get compiling again
OK... thats what I can quickly recall. Now go compiling!
2006-01-23 23:05:47 +01:00
|
|
|
switch (type) {
|
|
|
|
|
case MA_RAMP_BLEND:
|
2012-05-06 17:15:33 +02:00
|
|
|
r_col[0] = facm * (r_col[0]) + fac * col[0];
|
|
|
|
|
r_col[1] = facm * (r_col[1]) + fac * col[1];
|
|
|
|
|
r_col[2] = facm * (r_col[2]) + fac * col[2];
|
2011-11-26 22:42:04 +01:00
|
|
|
break;
|
Giant commit!
A full detailed description of this will be done later... is several days
of work. Here's a summary:
Render:
- Full cleanup of render code, removing *all* globals and bad level calls
all over blender. Render module is now not called abusive anymore
- API-fied calls to rendering
- Full recode of internal render pipeline. Is now rendering tiles by
default, prepared for much smarter 'bucket' render later.
- Each thread now can render a full part
- Renders were tested with 4 threads, goes fine, apart from some lookup
tables in softshadow and AO still
- Rendering is prepared to do multiple layers and passes
- No single 32 bits trick in render code anymore, all 100% floats now.
Writing images/movies
- moved writing images to blender kernel (bye bye 'schrijfplaatje'!)
- made a new Movie handle system, also in kernel. This will enable much
easier use of movies in Blender
PreviewRender:
- Using new render API, previewrender (in buttons) now uses regular render
code to generate images.
- new datafile 'preview.blend.c' has the preview scenes in it
- previews get rendered in exact displayed size (1 pixel = 1 pixel)
3D Preview render
- new; press Pkey in 3d window, for a panel that continuously renders
(pkey is for games, i know... but we dont do that in orange now!)
- this render works nearly identical to buttons-preview render, so it stops
rendering on any event (mouse, keyboard, etc)
- on moving/scaling the panel, the render code doesn't recreate all geometry
- same for shifting/panning view
- all other operations (now) regenerate the full render database still.
- this is WIP... but big fun, especially for simple scenes!
Compositor
- Using same node system as now in use for shaders, you can composit images
- works pretty straightforward... needs much more options/tools and integration
with rendering still
- is not threaded yet, nor is so smart to only recalculate changes... will be
done soon!
- the "Render Result" node will get all layers/passes as output sockets
- The "Output" node renders to a builtin image, which you can view in the Image
window. (yes, output nodes to render-result, and to files, is on the list!)
The Bad News
- "Unified Render" is removed. It might come back in some stage, but this
system should be built from scratch. I can't really understand this code...
I expect it is not much needed, especially with advanced layer/passes
control
- Panorama render, Field render, Motion blur, is not coded yet... (I had to
recode every single feature in render, so...!)
- Lens Flare is also not back... needs total revision, might become composit
effect though (using zbuffer for visibility)
- Part render is gone! (well, thats obvious, its default now).
- The render window is only restored with limited functionality... I am going
to check first the option to render to a Image window, so Blender can become
a true single-window application. :)
For example, the 'Spare render buffer' (jkey) doesnt work.
- Render with border, now default creates a smaller image
- No zbuffers are written yet... on the todo!
- Scons files and MSVC will need work to get compiling again
OK... thats what I can quickly recall. Now go compiling!
2006-01-23 23:05:47 +01:00
|
|
|
case MA_RAMP_ADD:
|
2012-05-06 17:15:33 +02:00
|
|
|
r_col[0] += fac * col[0];
|
|
|
|
|
r_col[1] += fac * col[1];
|
|
|
|
|
r_col[2] += fac * col[2];
|
2011-11-26 22:42:04 +01:00
|
|
|
break;
|
Giant commit!
A full detailed description of this will be done later... is several days
of work. Here's a summary:
Render:
- Full cleanup of render code, removing *all* globals and bad level calls
all over blender. Render module is now not called abusive anymore
- API-fied calls to rendering
- Full recode of internal render pipeline. Is now rendering tiles by
default, prepared for much smarter 'bucket' render later.
- Each thread now can render a full part
- Renders were tested with 4 threads, goes fine, apart from some lookup
tables in softshadow and AO still
- Rendering is prepared to do multiple layers and passes
- No single 32 bits trick in render code anymore, all 100% floats now.
Writing images/movies
- moved writing images to blender kernel (bye bye 'schrijfplaatje'!)
- made a new Movie handle system, also in kernel. This will enable much
easier use of movies in Blender
PreviewRender:
- Using new render API, previewrender (in buttons) now uses regular render
code to generate images.
- new datafile 'preview.blend.c' has the preview scenes in it
- previews get rendered in exact displayed size (1 pixel = 1 pixel)
3D Preview render
- new; press Pkey in 3d window, for a panel that continuously renders
(pkey is for games, i know... but we dont do that in orange now!)
- this render works nearly identical to buttons-preview render, so it stops
rendering on any event (mouse, keyboard, etc)
- on moving/scaling the panel, the render code doesn't recreate all geometry
- same for shifting/panning view
- all other operations (now) regenerate the full render database still.
- this is WIP... but big fun, especially for simple scenes!
Compositor
- Using same node system as now in use for shaders, you can composit images
- works pretty straightforward... needs much more options/tools and integration
with rendering still
- is not threaded yet, nor is so smart to only recalculate changes... will be
done soon!
- the "Render Result" node will get all layers/passes as output sockets
- The "Output" node renders to a builtin image, which you can view in the Image
window. (yes, output nodes to render-result, and to files, is on the list!)
The Bad News
- "Unified Render" is removed. It might come back in some stage, but this
system should be built from scratch. I can't really understand this code...
I expect it is not much needed, especially with advanced layer/passes
control
- Panorama render, Field render, Motion blur, is not coded yet... (I had to
recode every single feature in render, so...!)
- Lens Flare is also not back... needs total revision, might become composit
effect though (using zbuffer for visibility)
- Part render is gone! (well, thats obvious, its default now).
- The render window is only restored with limited functionality... I am going
to check first the option to render to a Image window, so Blender can become
a true single-window application. :)
For example, the 'Spare render buffer' (jkey) doesnt work.
- Render with border, now default creates a smaller image
- No zbuffers are written yet... on the todo!
- Scons files and MSVC will need work to get compiling again
OK... thats what I can quickly recall. Now go compiling!
2006-01-23 23:05:47 +01:00
|
|
|
case MA_RAMP_MULT:
|
2012-05-06 17:15:33 +02:00
|
|
|
r_col[0] *= (facm + fac * col[0]);
|
|
|
|
|
r_col[1] *= (facm + fac * col[1]);
|
|
|
|
|
r_col[2] *= (facm + fac * col[2]);
|
2011-11-26 22:42:04 +01:00
|
|
|
break;
|
Giant commit!
A full detailed description of this will be done later... is several days
of work. Here's a summary:
Render:
- Full cleanup of render code, removing *all* globals and bad level calls
all over blender. Render module is now not called abusive anymore
- API-fied calls to rendering
- Full recode of internal render pipeline. Is now rendering tiles by
default, prepared for much smarter 'bucket' render later.
- Each thread now can render a full part
- Renders were tested with 4 threads, goes fine, apart from some lookup
tables in softshadow and AO still
- Rendering is prepared to do multiple layers and passes
- No single 32 bits trick in render code anymore, all 100% floats now.
Writing images/movies
- moved writing images to blender kernel (bye bye 'schrijfplaatje'!)
- made a new Movie handle system, also in kernel. This will enable much
easier use of movies in Blender
PreviewRender:
- Using new render API, previewrender (in buttons) now uses regular render
code to generate images.
- new datafile 'preview.blend.c' has the preview scenes in it
- previews get rendered in exact displayed size (1 pixel = 1 pixel)
3D Preview render
- new; press Pkey in 3d window, for a panel that continuously renders
(pkey is for games, i know... but we dont do that in orange now!)
- this render works nearly identical to buttons-preview render, so it stops
rendering on any event (mouse, keyboard, etc)
- on moving/scaling the panel, the render code doesn't recreate all geometry
- same for shifting/panning view
- all other operations (now) regenerate the full render database still.
- this is WIP... but big fun, especially for simple scenes!
Compositor
- Using same node system as now in use for shaders, you can composit images
- works pretty straightforward... needs much more options/tools and integration
with rendering still
- is not threaded yet, nor is so smart to only recalculate changes... will be
done soon!
- the "Render Result" node will get all layers/passes as output sockets
- The "Output" node renders to a builtin image, which you can view in the Image
window. (yes, output nodes to render-result, and to files, is on the list!)
The Bad News
- "Unified Render" is removed. It might come back in some stage, but this
system should be built from scratch. I can't really understand this code...
I expect it is not much needed, especially with advanced layer/passes
control
- Panorama render, Field render, Motion blur, is not coded yet... (I had to
recode every single feature in render, so...!)
- Lens Flare is also not back... needs total revision, might become composit
effect though (using zbuffer for visibility)
- Part render is gone! (well, thats obvious, its default now).
- The render window is only restored with limited functionality... I am going
to check first the option to render to a Image window, so Blender can become
a true single-window application. :)
For example, the 'Spare render buffer' (jkey) doesnt work.
- Render with border, now default creates a smaller image
- No zbuffers are written yet... on the todo!
- Scons files and MSVC will need work to get compiling again
OK... thats what I can quickly recall. Now go compiling!
2006-01-23 23:05:47 +01:00
|
|
|
case MA_RAMP_SCREEN:
|
2012-05-06 17:15:33 +02:00
|
|
|
r_col[0] = 1.0f - (facm + fac * (1.0f - col[0])) * (1.0f - r_col[0]);
|
|
|
|
|
r_col[1] = 1.0f - (facm + fac * (1.0f - col[1])) * (1.0f - r_col[1]);
|
|
|
|
|
r_col[2] = 1.0f - (facm + fac * (1.0f - col[2])) * (1.0f - r_col[2]);
|
2011-11-26 22:42:04 +01:00
|
|
|
break;
|
2006-02-14 19:41:34 +01:00
|
|
|
case MA_RAMP_OVERLAY:
|
2012-02-23 03:17:50 +01:00
|
|
|
if (r_col[0] < 0.5f)
|
2012-05-06 17:15:33 +02:00
|
|
|
r_col[0] *= (facm + 2.0f * fac * col[0]);
|
2006-02-14 19:41:34 +01:00
|
|
|
else
|
2012-05-06 17:15:33 +02:00
|
|
|
r_col[0] = 1.0f - (facm + 2.0f * fac * (1.0f - col[0])) * (1.0f - r_col[0]);
|
2012-02-23 03:17:50 +01:00
|
|
|
if (r_col[1] < 0.5f)
|
2012-05-06 17:15:33 +02:00
|
|
|
r_col[1] *= (facm + 2.0f * fac * col[1]);
|
2011-11-26 22:42:04 +01:00
|
|
|
else
|
2012-05-06 17:15:33 +02:00
|
|
|
r_col[1] = 1.0f - (facm + 2.0f * fac * (1.0f - col[1])) * (1.0f - r_col[1]);
|
2012-02-23 03:17:50 +01:00
|
|
|
if (r_col[2] < 0.5f)
|
2012-05-06 17:15:33 +02:00
|
|
|
r_col[2] *= (facm + 2.0f * fac * col[2]);
|
2011-11-26 22:42:04 +01:00
|
|
|
else
|
2012-05-06 17:15:33 +02:00
|
|
|
r_col[2] = 1.0f - (facm + 2.0f * fac * (1.0f - col[2])) * (1.0f - r_col[2]);
|
2011-11-26 22:42:04 +01:00
|
|
|
break;
|
Giant commit!
A full detailed description of this will be done later... is several days
of work. Here's a summary:
Render:
- Full cleanup of render code, removing *all* globals and bad level calls
all over blender. Render module is now not called abusive anymore
- API-fied calls to rendering
- Full recode of internal render pipeline. Is now rendering tiles by
default, prepared for much smarter 'bucket' render later.
- Each thread now can render a full part
- Renders were tested with 4 threads, goes fine, apart from some lookup
tables in softshadow and AO still
- Rendering is prepared to do multiple layers and passes
- No single 32 bits trick in render code anymore, all 100% floats now.
Writing images/movies
- moved writing images to blender kernel (bye bye 'schrijfplaatje'!)
- made a new Movie handle system, also in kernel. This will enable much
easier use of movies in Blender
PreviewRender:
- Using new render API, previewrender (in buttons) now uses regular render
code to generate images.
- new datafile 'preview.blend.c' has the preview scenes in it
- previews get rendered in exact displayed size (1 pixel = 1 pixel)
3D Preview render
- new; press Pkey in 3d window, for a panel that continuously renders
(pkey is for games, i know... but we dont do that in orange now!)
- this render works nearly identical to buttons-preview render, so it stops
rendering on any event (mouse, keyboard, etc)
- on moving/scaling the panel, the render code doesn't recreate all geometry
- same for shifting/panning view
- all other operations (now) regenerate the full render database still.
- this is WIP... but big fun, especially for simple scenes!
Compositor
- Using same node system as now in use for shaders, you can composit images
- works pretty straightforward... needs much more options/tools and integration
with rendering still
- is not threaded yet, nor is so smart to only recalculate changes... will be
done soon!
- the "Render Result" node will get all layers/passes as output sockets
- The "Output" node renders to a builtin image, which you can view in the Image
window. (yes, output nodes to render-result, and to files, is on the list!)
The Bad News
- "Unified Render" is removed. It might come back in some stage, but this
system should be built from scratch. I can't really understand this code...
I expect it is not much needed, especially with advanced layer/passes
control
- Panorama render, Field render, Motion blur, is not coded yet... (I had to
recode every single feature in render, so...!)
- Lens Flare is also not back... needs total revision, might become composit
effect though (using zbuffer for visibility)
- Part render is gone! (well, thats obvious, its default now).
- The render window is only restored with limited functionality... I am going
to check first the option to render to a Image window, so Blender can become
a true single-window application. :)
For example, the 'Spare render buffer' (jkey) doesnt work.
- Render with border, now default creates a smaller image
- No zbuffers are written yet... on the todo!
- Scons files and MSVC will need work to get compiling again
OK... thats what I can quickly recall. Now go compiling!
2006-01-23 23:05:47 +01:00
|
|
|
case MA_RAMP_SUB:
|
2012-05-06 17:15:33 +02:00
|
|
|
r_col[0] -= fac * col[0];
|
|
|
|
|
r_col[1] -= fac * col[1];
|
|
|
|
|
r_col[2] -= fac * col[2];
|
2011-11-26 22:42:04 +01:00
|
|
|
break;
|
Giant commit!
A full detailed description of this will be done later... is several days
of work. Here's a summary:
Render:
- Full cleanup of render code, removing *all* globals and bad level calls
all over blender. Render module is now not called abusive anymore
- API-fied calls to rendering
- Full recode of internal render pipeline. Is now rendering tiles by
default, prepared for much smarter 'bucket' render later.
- Each thread now can render a full part
- Renders were tested with 4 threads, goes fine, apart from some lookup
tables in softshadow and AO still
- Rendering is prepared to do multiple layers and passes
- No single 32 bits trick in render code anymore, all 100% floats now.
Writing images/movies
- moved writing images to blender kernel (bye bye 'schrijfplaatje'!)
- made a new Movie handle system, also in kernel. This will enable much
easier use of movies in Blender
PreviewRender:
- Using new render API, previewrender (in buttons) now uses regular render
code to generate images.
- new datafile 'preview.blend.c' has the preview scenes in it
- previews get rendered in exact displayed size (1 pixel = 1 pixel)
3D Preview render
- new; press Pkey in 3d window, for a panel that continuously renders
(pkey is for games, i know... but we dont do that in orange now!)
- this render works nearly identical to buttons-preview render, so it stops
rendering on any event (mouse, keyboard, etc)
- on moving/scaling the panel, the render code doesn't recreate all geometry
- same for shifting/panning view
- all other operations (now) regenerate the full render database still.
- this is WIP... but big fun, especially for simple scenes!
Compositor
- Using same node system as now in use for shaders, you can composit images
- works pretty straightforward... needs much more options/tools and integration
with rendering still
- is not threaded yet, nor is so smart to only recalculate changes... will be
done soon!
- the "Render Result" node will get all layers/passes as output sockets
- The "Output" node renders to a builtin image, which you can view in the Image
window. (yes, output nodes to render-result, and to files, is on the list!)
The Bad News
- "Unified Render" is removed. It might come back in some stage, but this
system should be built from scratch. I can't really understand this code...
I expect it is not much needed, especially with advanced layer/passes
control
- Panorama render, Field render, Motion blur, is not coded yet... (I had to
recode every single feature in render, so...!)
- Lens Flare is also not back... needs total revision, might become composit
effect though (using zbuffer for visibility)
- Part render is gone! (well, thats obvious, its default now).
- The render window is only restored with limited functionality... I am going
to check first the option to render to a Image window, so Blender can become
a true single-window application. :)
For example, the 'Spare render buffer' (jkey) doesnt work.
- Render with border, now default creates a smaller image
- No zbuffers are written yet... on the todo!
- Scons files and MSVC will need work to get compiling again
OK... thats what I can quickly recall. Now go compiling!
2006-01-23 23:05:47 +01:00
|
|
|
case MA_RAMP_DIV:
|
2012-05-06 17:15:33 +02:00
|
|
|
if (col[0] != 0.0f)
|
|
|
|
|
r_col[0] = facm * (r_col[0]) + fac * (r_col[0]) / col[0];
|
|
|
|
|
if (col[1] != 0.0f)
|
|
|
|
|
r_col[1] = facm * (r_col[1]) + fac * (r_col[1]) / col[1];
|
|
|
|
|
if (col[2] != 0.0f)
|
|
|
|
|
r_col[2] = facm * (r_col[2]) + fac * (r_col[2]) / col[2];
|
2011-11-26 22:42:04 +01:00
|
|
|
break;
|
Giant commit!
A full detailed description of this will be done later... is several days
of work. Here's a summary:
Render:
- Full cleanup of render code, removing *all* globals and bad level calls
all over blender. Render module is now not called abusive anymore
- API-fied calls to rendering
- Full recode of internal render pipeline. Is now rendering tiles by
default, prepared for much smarter 'bucket' render later.
- Each thread now can render a full part
- Renders were tested with 4 threads, goes fine, apart from some lookup
tables in softshadow and AO still
- Rendering is prepared to do multiple layers and passes
- No single 32 bits trick in render code anymore, all 100% floats now.
Writing images/movies
- moved writing images to blender kernel (bye bye 'schrijfplaatje'!)
- made a new Movie handle system, also in kernel. This will enable much
easier use of movies in Blender
PreviewRender:
- Using new render API, previewrender (in buttons) now uses regular render
code to generate images.
- new datafile 'preview.blend.c' has the preview scenes in it
- previews get rendered in exact displayed size (1 pixel = 1 pixel)
3D Preview render
- new; press Pkey in 3d window, for a panel that continuously renders
(pkey is for games, i know... but we dont do that in orange now!)
- this render works nearly identical to buttons-preview render, so it stops
rendering on any event (mouse, keyboard, etc)
- on moving/scaling the panel, the render code doesn't recreate all geometry
- same for shifting/panning view
- all other operations (now) regenerate the full render database still.
- this is WIP... but big fun, especially for simple scenes!
Compositor
- Using same node system as now in use for shaders, you can composit images
- works pretty straightforward... needs much more options/tools and integration
with rendering still
- is not threaded yet, nor is so smart to only recalculate changes... will be
done soon!
- the "Render Result" node will get all layers/passes as output sockets
- The "Output" node renders to a builtin image, which you can view in the Image
window. (yes, output nodes to render-result, and to files, is on the list!)
The Bad News
- "Unified Render" is removed. It might come back in some stage, but this
system should be built from scratch. I can't really understand this code...
I expect it is not much needed, especially with advanced layer/passes
control
- Panorama render, Field render, Motion blur, is not coded yet... (I had to
recode every single feature in render, so...!)
- Lens Flare is also not back... needs total revision, might become composit
effect though (using zbuffer for visibility)
- Part render is gone! (well, thats obvious, its default now).
- The render window is only restored with limited functionality... I am going
to check first the option to render to a Image window, so Blender can become
a true single-window application. :)
For example, the 'Spare render buffer' (jkey) doesnt work.
- Render with border, now default creates a smaller image
- No zbuffers are written yet... on the todo!
- Scons files and MSVC will need work to get compiling again
OK... thats what I can quickly recall. Now go compiling!
2006-01-23 23:05:47 +01:00
|
|
|
case MA_RAMP_DIFF:
|
2012-09-30 08:12:47 +02:00
|
|
|
r_col[0] = facm * (r_col[0]) + fac * fabsf(r_col[0] - col[0]);
|
|
|
|
|
r_col[1] = facm * (r_col[1]) + fac * fabsf(r_col[1] - col[1]);
|
|
|
|
|
r_col[2] = facm * (r_col[2]) + fac * fabsf(r_col[2] - col[2]);
|
2011-11-26 22:42:04 +01:00
|
|
|
break;
|
Giant commit!
A full detailed description of this will be done later... is several days
of work. Here's a summary:
Render:
- Full cleanup of render code, removing *all* globals and bad level calls
all over blender. Render module is now not called abusive anymore
- API-fied calls to rendering
- Full recode of internal render pipeline. Is now rendering tiles by
default, prepared for much smarter 'bucket' render later.
- Each thread now can render a full part
- Renders were tested with 4 threads, goes fine, apart from some lookup
tables in softshadow and AO still
- Rendering is prepared to do multiple layers and passes
- No single 32 bits trick in render code anymore, all 100% floats now.
Writing images/movies
- moved writing images to blender kernel (bye bye 'schrijfplaatje'!)
- made a new Movie handle system, also in kernel. This will enable much
easier use of movies in Blender
PreviewRender:
- Using new render API, previewrender (in buttons) now uses regular render
code to generate images.
- new datafile 'preview.blend.c' has the preview scenes in it
- previews get rendered in exact displayed size (1 pixel = 1 pixel)
3D Preview render
- new; press Pkey in 3d window, for a panel that continuously renders
(pkey is for games, i know... but we dont do that in orange now!)
- this render works nearly identical to buttons-preview render, so it stops
rendering on any event (mouse, keyboard, etc)
- on moving/scaling the panel, the render code doesn't recreate all geometry
- same for shifting/panning view
- all other operations (now) regenerate the full render database still.
- this is WIP... but big fun, especially for simple scenes!
Compositor
- Using same node system as now in use for shaders, you can composit images
- works pretty straightforward... needs much more options/tools and integration
with rendering still
- is not threaded yet, nor is so smart to only recalculate changes... will be
done soon!
- the "Render Result" node will get all layers/passes as output sockets
- The "Output" node renders to a builtin image, which you can view in the Image
window. (yes, output nodes to render-result, and to files, is on the list!)
The Bad News
- "Unified Render" is removed. It might come back in some stage, but this
system should be built from scratch. I can't really understand this code...
I expect it is not much needed, especially with advanced layer/passes
control
- Panorama render, Field render, Motion blur, is not coded yet... (I had to
recode every single feature in render, so...!)
- Lens Flare is also not back... needs total revision, might become composit
effect though (using zbuffer for visibility)
- Part render is gone! (well, thats obvious, its default now).
- The render window is only restored with limited functionality... I am going
to check first the option to render to a Image window, so Blender can become
a true single-window application. :)
For example, the 'Spare render buffer' (jkey) doesnt work.
- Render with border, now default creates a smaller image
- No zbuffers are written yet... on the todo!
- Scons files and MSVC will need work to get compiling again
OK... thats what I can quickly recall. Now go compiling!
2006-01-23 23:05:47 +01:00
|
|
|
case MA_RAMP_DARK:
|
2014-04-28 17:38:34 +02:00
|
|
|
r_col[0] = min_ff(r_col[0], col[0]) * fac + r_col[0] * facm;
|
|
|
|
|
r_col[1] = min_ff(r_col[1], col[1]) * fac + r_col[1] * facm;
|
|
|
|
|
r_col[2] = min_ff(r_col[2], col[2]) * fac + r_col[2] * facm;
|
2011-11-26 22:42:04 +01:00
|
|
|
break;
|
Giant commit!
A full detailed description of this will be done later... is several days
of work. Here's a summary:
Render:
- Full cleanup of render code, removing *all* globals and bad level calls
all over blender. Render module is now not called abusive anymore
- API-fied calls to rendering
- Full recode of internal render pipeline. Is now rendering tiles by
default, prepared for much smarter 'bucket' render later.
- Each thread now can render a full part
- Renders were tested with 4 threads, goes fine, apart from some lookup
tables in softshadow and AO still
- Rendering is prepared to do multiple layers and passes
- No single 32 bits trick in render code anymore, all 100% floats now.
Writing images/movies
- moved writing images to blender kernel (bye bye 'schrijfplaatje'!)
- made a new Movie handle system, also in kernel. This will enable much
easier use of movies in Blender
PreviewRender:
- Using new render API, previewrender (in buttons) now uses regular render
code to generate images.
- new datafile 'preview.blend.c' has the preview scenes in it
- previews get rendered in exact displayed size (1 pixel = 1 pixel)
3D Preview render
- new; press Pkey in 3d window, for a panel that continuously renders
(pkey is for games, i know... but we dont do that in orange now!)
- this render works nearly identical to buttons-preview render, so it stops
rendering on any event (mouse, keyboard, etc)
- on moving/scaling the panel, the render code doesn't recreate all geometry
- same for shifting/panning view
- all other operations (now) regenerate the full render database still.
- this is WIP... but big fun, especially for simple scenes!
Compositor
- Using same node system as now in use for shaders, you can composit images
- works pretty straightforward... needs much more options/tools and integration
with rendering still
- is not threaded yet, nor is so smart to only recalculate changes... will be
done soon!
- the "Render Result" node will get all layers/passes as output sockets
- The "Output" node renders to a builtin image, which you can view in the Image
window. (yes, output nodes to render-result, and to files, is on the list!)
The Bad News
- "Unified Render" is removed. It might come back in some stage, but this
system should be built from scratch. I can't really understand this code...
I expect it is not much needed, especially with advanced layer/passes
control
- Panorama render, Field render, Motion blur, is not coded yet... (I had to
recode every single feature in render, so...!)
- Lens Flare is also not back... needs total revision, might become composit
effect though (using zbuffer for visibility)
- Part render is gone! (well, thats obvious, its default now).
- The render window is only restored with limited functionality... I am going
to check first the option to render to a Image window, so Blender can become
a true single-window application. :)
For example, the 'Spare render buffer' (jkey) doesnt work.
- Render with border, now default creates a smaller image
- No zbuffers are written yet... on the todo!
- Scons files and MSVC will need work to get compiling again
OK... thats what I can quickly recall. Now go compiling!
2006-01-23 23:05:47 +01:00
|
|
|
case MA_RAMP_LIGHT:
|
2012-05-06 17:15:33 +02:00
|
|
|
tmp = fac * col[0];
|
|
|
|
|
if (tmp > r_col[0]) r_col[0] = tmp;
|
|
|
|
|
tmp = fac * col[1];
|
|
|
|
|
if (tmp > r_col[1]) r_col[1] = tmp;
|
|
|
|
|
tmp = fac * col[2];
|
|
|
|
|
if (tmp > r_col[2]) r_col[2] = tmp;
|
|
|
|
|
break;
|
2011-11-26 22:42:04 +01:00
|
|
|
case MA_RAMP_DODGE:
|
2012-02-23 03:17:50 +01:00
|
|
|
if (r_col[0] != 0.0f) {
|
2012-05-06 17:15:33 +02:00
|
|
|
tmp = 1.0f - fac * col[0];
|
2012-02-23 03:17:50 +01:00
|
|
|
if (tmp <= 0.0f)
|
2011-11-26 14:11:55 +01:00
|
|
|
r_col[0] = 1.0f;
|
2012-05-06 17:15:33 +02:00
|
|
|
else if ((tmp = (r_col[0]) / tmp) > 1.0f)
|
2011-11-26 14:11:55 +01:00
|
|
|
r_col[0] = 1.0f;
|
2011-11-26 22:42:04 +01:00
|
|
|
else
|
2011-11-26 14:11:55 +01:00
|
|
|
r_col[0] = tmp;
|
2006-06-05 11:55:39 +02:00
|
|
|
}
|
2012-02-23 03:17:50 +01:00
|
|
|
if (r_col[1] != 0.0f) {
|
2012-05-06 17:15:33 +02:00
|
|
|
tmp = 1.0f - fac * col[1];
|
|
|
|
|
if (tmp <= 0.0f)
|
2011-11-26 22:42:04 +01:00
|
|
|
r_col[1] = 1.0f;
|
2012-05-06 17:15:33 +02:00
|
|
|
else if ((tmp = (r_col[1]) / tmp) > 1.0f)
|
2011-11-26 22:42:04 +01:00
|
|
|
r_col[1] = 1.0f;
|
|
|
|
|
else
|
|
|
|
|
r_col[1] = tmp;
|
2006-06-03 15:26:39 +02:00
|
|
|
}
|
2012-02-23 03:17:50 +01:00
|
|
|
if (r_col[2] != 0.0f) {
|
2012-05-06 17:15:33 +02:00
|
|
|
tmp = 1.0f - fac * col[2];
|
2012-02-23 03:17:50 +01:00
|
|
|
if (tmp <= 0.0f)
|
2011-11-26 22:42:04 +01:00
|
|
|
r_col[2] = 1.0f;
|
2012-05-06 17:15:33 +02:00
|
|
|
else if ((tmp = (r_col[2]) / tmp) > 1.0f)
|
2011-11-26 22:42:04 +01:00
|
|
|
r_col[2] = 1.0f;
|
|
|
|
|
else
|
|
|
|
|
r_col[2] = tmp;
|
|
|
|
|
}
|
|
|
|
|
break;
|
2006-06-03 15:26:39 +02:00
|
|
|
case MA_RAMP_BURN:
|
2012-05-06 17:15:33 +02:00
|
|
|
tmp = facm + fac * col[0];
|
2011-11-26 22:42:04 +01:00
|
|
|
|
2012-02-23 03:17:50 +01:00
|
|
|
if (tmp <= 0.0f)
|
2011-11-26 14:11:55 +01:00
|
|
|
r_col[0] = 0.0f;
|
2012-05-06 17:15:33 +02:00
|
|
|
else if ((tmp = (1.0f - (1.0f - (r_col[0])) / tmp)) < 0.0f)
|
|
|
|
|
r_col[0] = 0.0f;
|
2009-10-19 13:50:01 +02:00
|
|
|
else if (tmp > 1.0f)
|
2012-05-06 17:15:33 +02:00
|
|
|
r_col[0] = 1.0f;
|
2011-11-26 22:42:04 +01:00
|
|
|
else
|
2011-11-26 14:11:55 +01:00
|
|
|
r_col[0] = tmp;
|
2006-06-05 11:55:39 +02:00
|
|
|
|
2012-05-06 17:15:33 +02:00
|
|
|
tmp = facm + fac * col[1];
|
2012-02-23 03:17:50 +01:00
|
|
|
if (tmp <= 0.0f)
|
2011-11-26 22:42:04 +01:00
|
|
|
r_col[1] = 0.0f;
|
2012-05-06 17:15:33 +02:00
|
|
|
else if ((tmp = (1.0f - (1.0f - (r_col[1])) / tmp)) < 0.0f)
|
|
|
|
|
r_col[1] = 0.0f;
|
|
|
|
|
else if (tmp > 1.0f)
|
|
|
|
|
r_col[1] = 1.0f;
|
2011-11-26 22:42:04 +01:00
|
|
|
else
|
|
|
|
|
r_col[1] = tmp;
|
2011-09-25 14:31:21 +02:00
|
|
|
|
2012-05-06 17:15:33 +02:00
|
|
|
tmp = facm + fac * col[2];
|
|
|
|
|
if (tmp <= 0.0f)
|
|
|
|
|
r_col[2] = 0.0f;
|
|
|
|
|
else if ((tmp = (1.0f - (1.0f - (r_col[2])) / tmp)) < 0.0f)
|
2011-11-26 22:42:04 +01:00
|
|
|
r_col[2] = 0.0f;
|
2012-05-06 17:15:33 +02:00
|
|
|
else if (tmp > 1.0f)
|
|
|
|
|
r_col[2] = 1.0f;
|
2011-11-26 22:42:04 +01:00
|
|
|
else
|
|
|
|
|
r_col[2] = tmp;
|
|
|
|
|
break;
|
|
|
|
|
case MA_RAMP_HUE:
|
2012-05-06 17:15:33 +02:00
|
|
|
{
|
|
|
|
|
float rH, rS, rV;
|
|
|
|
|
float colH, colS, colV;
|
|
|
|
|
float tmpr, tmpg, tmpb;
|
|
|
|
|
rgb_to_hsv(col[0], col[1], col[2], &colH, &colS, &colV);
|
|
|
|
|
if (colS != 0) {
|
2012-04-29 17:47:02 +02:00
|
|
|
rgb_to_hsv(r_col[0], r_col[1], r_col[2], &rH, &rS, &rV);
|
2012-05-06 17:15:33 +02:00
|
|
|
hsv_to_rgb(colH, rS, rV, &tmpr, &tmpg, &tmpb);
|
|
|
|
|
r_col[0] = facm * (r_col[0]) + fac * tmpr;
|
|
|
|
|
r_col[1] = facm * (r_col[1]) + fac * tmpg;
|
|
|
|
|
r_col[2] = facm * (r_col[2]) + fac * tmpb;
|
2006-06-03 15:26:39 +02:00
|
|
|
}
|
2013-07-19 17:23:42 +02:00
|
|
|
break;
|
2012-05-06 17:15:33 +02:00
|
|
|
}
|
|
|
|
|
case MA_RAMP_SAT:
|
|
|
|
|
{
|
|
|
|
|
float rH, rS, rV;
|
|
|
|
|
float colH, colS, colV;
|
|
|
|
|
rgb_to_hsv(r_col[0], r_col[1], r_col[2], &rH, &rS, &rV);
|
|
|
|
|
if (rS != 0) {
|
2012-04-29 17:47:02 +02:00
|
|
|
rgb_to_hsv(col[0], col[1], col[2], &colH, &colS, &colV);
|
2012-05-06 17:15:33 +02:00
|
|
|
hsv_to_rgb(rH, (facm * rS + fac * colS), rV, r_col + 0, r_col + 1, r_col + 2);
|
2006-06-03 15:26:39 +02:00
|
|
|
}
|
2013-07-19 17:23:42 +02:00
|
|
|
break;
|
2012-05-06 17:15:33 +02:00
|
|
|
}
|
|
|
|
|
case MA_RAMP_VAL:
|
|
|
|
|
{
|
|
|
|
|
float rH, rS, rV;
|
|
|
|
|
float colH, colS, colV;
|
|
|
|
|
rgb_to_hsv(r_col[0], r_col[1], r_col[2], &rH, &rS, &rV);
|
|
|
|
|
rgb_to_hsv(col[0], col[1], col[2], &colH, &colS, &colV);
|
|
|
|
|
hsv_to_rgb(rH, rS, (facm * rV + fac * colV), r_col + 0, r_col + 1, r_col + 2);
|
2013-07-19 17:23:42 +02:00
|
|
|
break;
|
2012-05-06 17:15:33 +02:00
|
|
|
}
|
2011-11-26 22:42:04 +01:00
|
|
|
case MA_RAMP_COLOR:
|
2012-05-06 17:15:33 +02:00
|
|
|
{
|
|
|
|
|
float rH, rS, rV;
|
|
|
|
|
float colH, colS, colV;
|
|
|
|
|
float tmpr, tmpg, tmpb;
|
|
|
|
|
rgb_to_hsv(col[0], col[1], col[2], &colH, &colS, &colV);
|
|
|
|
|
if (colS != 0) {
|
|
|
|
|
rgb_to_hsv(r_col[0], r_col[1], r_col[2], &rH, &rS, &rV);
|
|
|
|
|
hsv_to_rgb(colH, colS, rV, &tmpr, &tmpg, &tmpb);
|
|
|
|
|
r_col[0] = facm * (r_col[0]) + fac * tmpr;
|
|
|
|
|
r_col[1] = facm * (r_col[1]) + fac * tmpg;
|
|
|
|
|
r_col[2] = facm * (r_col[2]) + fac * tmpb;
|
2006-06-03 15:26:39 +02:00
|
|
|
}
|
2013-07-19 17:23:42 +02:00
|
|
|
break;
|
2012-05-06 17:15:33 +02:00
|
|
|
}
|
2011-11-26 22:42:04 +01:00
|
|
|
case MA_RAMP_SOFT:
|
2012-05-06 17:15:33 +02:00
|
|
|
{
|
|
|
|
|
float scr, scg, scb;
|
2011-04-21 15:11:51 +02:00
|
|
|
|
2012-05-06 17:15:33 +02:00
|
|
|
/* first calculate non-fac based Screen mix */
|
|
|
|
|
scr = 1.0f - (1.0f - col[0]) * (1.0f - r_col[0]);
|
|
|
|
|
scg = 1.0f - (1.0f - col[1]) * (1.0f - r_col[1]);
|
|
|
|
|
scb = 1.0f - (1.0f - col[2]) * (1.0f - r_col[2]);
|
2011-04-21 15:11:51 +02:00
|
|
|
|
2012-05-06 17:15:33 +02:00
|
|
|
r_col[0] = facm * (r_col[0]) + fac * (((1.0f - r_col[0]) * col[0] * (r_col[0])) + (r_col[0] * scr));
|
|
|
|
|
r_col[1] = facm * (r_col[1]) + fac * (((1.0f - r_col[1]) * col[1] * (r_col[1])) + (r_col[1] * scg));
|
|
|
|
|
r_col[2] = facm * (r_col[2]) + fac * (((1.0f - r_col[2]) * col[2] * (r_col[2])) + (r_col[2] * scb));
|
2013-07-19 17:23:42 +02:00
|
|
|
break;
|
2012-05-06 17:15:33 +02:00
|
|
|
}
|
2011-11-26 22:42:04 +01:00
|
|
|
case MA_RAMP_LINEAR:
|
|
|
|
|
if (col[0] > 0.5f)
|
2012-05-06 17:15:33 +02:00
|
|
|
r_col[0] = r_col[0] + fac * (2.0f * (col[0] - 0.5f));
|
2011-11-26 22:42:04 +01:00
|
|
|
else
|
2012-05-06 17:15:33 +02:00
|
|
|
r_col[0] = r_col[0] + fac * (2.0f * (col[0]) - 1.0f);
|
2011-11-26 22:42:04 +01:00
|
|
|
if (col[1] > 0.5f)
|
2012-05-06 17:15:33 +02:00
|
|
|
r_col[1] = r_col[1] + fac * (2.0f * (col[1] - 0.5f));
|
2011-11-26 22:42:04 +01:00
|
|
|
else
|
2012-05-06 17:15:33 +02:00
|
|
|
r_col[1] = r_col[1] + fac * (2.0f * (col[1]) - 1.0f);
|
2011-11-26 22:42:04 +01:00
|
|
|
if (col[2] > 0.5f)
|
2012-05-06 17:15:33 +02:00
|
|
|
r_col[2] = r_col[2] + fac * (2.0f * (col[2] - 0.5f));
|
2011-11-26 22:42:04 +01:00
|
|
|
else
|
2012-05-06 17:15:33 +02:00
|
|
|
r_col[2] = r_col[2] + fac * (2.0f * (col[2]) - 1.0f);
|
2011-11-26 22:42:04 +01:00
|
|
|
break;
|
|
|
|
|
}
|
Giant commit!
A full detailed description of this will be done later... is several days
of work. Here's a summary:
Render:
- Full cleanup of render code, removing *all* globals and bad level calls
all over blender. Render module is now not called abusive anymore
- API-fied calls to rendering
- Full recode of internal render pipeline. Is now rendering tiles by
default, prepared for much smarter 'bucket' render later.
- Each thread now can render a full part
- Renders were tested with 4 threads, goes fine, apart from some lookup
tables in softshadow and AO still
- Rendering is prepared to do multiple layers and passes
- No single 32 bits trick in render code anymore, all 100% floats now.
Writing images/movies
- moved writing images to blender kernel (bye bye 'schrijfplaatje'!)
- made a new Movie handle system, also in kernel. This will enable much
easier use of movies in Blender
PreviewRender:
- Using new render API, previewrender (in buttons) now uses regular render
code to generate images.
- new datafile 'preview.blend.c' has the preview scenes in it
- previews get rendered in exact displayed size (1 pixel = 1 pixel)
3D Preview render
- new; press Pkey in 3d window, for a panel that continuously renders
(pkey is for games, i know... but we dont do that in orange now!)
- this render works nearly identical to buttons-preview render, so it stops
rendering on any event (mouse, keyboard, etc)
- on moving/scaling the panel, the render code doesn't recreate all geometry
- same for shifting/panning view
- all other operations (now) regenerate the full render database still.
- this is WIP... but big fun, especially for simple scenes!
Compositor
- Using same node system as now in use for shaders, you can composit images
- works pretty straightforward... needs much more options/tools and integration
with rendering still
- is not threaded yet, nor is so smart to only recalculate changes... will be
done soon!
- the "Render Result" node will get all layers/passes as output sockets
- The "Output" node renders to a builtin image, which you can view in the Image
window. (yes, output nodes to render-result, and to files, is on the list!)
The Bad News
- "Unified Render" is removed. It might come back in some stage, but this
system should be built from scratch. I can't really understand this code...
I expect it is not much needed, especially with advanced layer/passes
control
- Panorama render, Field render, Motion blur, is not coded yet... (I had to
recode every single feature in render, so...!)
- Lens Flare is also not back... needs total revision, might become composit
effect though (using zbuffer for visibility)
- Part render is gone! (well, thats obvious, its default now).
- The render window is only restored with limited functionality... I am going
to check first the option to render to a Image window, so Blender can become
a true single-window application. :)
For example, the 'Spare render buffer' (jkey) doesnt work.
- Render with border, now default creates a smaller image
- No zbuffers are written yet... on the todo!
- Scons files and MSVC will need work to get compiling again
OK... thats what I can quickly recall. Now go compiling!
2006-01-23 23:05:47 +01:00
|
|
|
}
|
|
|
|
|
|
2012-08-22 11:35:46 +02:00
|
|
|
/**
|
2012-09-26 22:05:38 +02:00
|
|
|
* \brief copy/paste buffer, if we had a proper py api that would be better
|
2012-08-22 11:35:46 +02:00
|
|
|
* \note matcopybuf.nodetree does _NOT_ use ID's
|
|
|
|
|
* \todo matcopybuf.nodetree's node->id's are NOT validated, this will crash!
|
|
|
|
|
*/
|
2011-08-28 07:06:30 +02:00
|
|
|
static Material matcopybuf;
|
2012-05-06 17:15:33 +02:00
|
|
|
static short matcopied = 0;
|
Giant commit!
A full detailed description of this will be done later... is several days
of work. Here's a summary:
Render:
- Full cleanup of render code, removing *all* globals and bad level calls
all over blender. Render module is now not called abusive anymore
- API-fied calls to rendering
- Full recode of internal render pipeline. Is now rendering tiles by
default, prepared for much smarter 'bucket' render later.
- Each thread now can render a full part
- Renders were tested with 4 threads, goes fine, apart from some lookup
tables in softshadow and AO still
- Rendering is prepared to do multiple layers and passes
- No single 32 bits trick in render code anymore, all 100% floats now.
Writing images/movies
- moved writing images to blender kernel (bye bye 'schrijfplaatje'!)
- made a new Movie handle system, also in kernel. This will enable much
easier use of movies in Blender
PreviewRender:
- Using new render API, previewrender (in buttons) now uses regular render
code to generate images.
- new datafile 'preview.blend.c' has the preview scenes in it
- previews get rendered in exact displayed size (1 pixel = 1 pixel)
3D Preview render
- new; press Pkey in 3d window, for a panel that continuously renders
(pkey is for games, i know... but we dont do that in orange now!)
- this render works nearly identical to buttons-preview render, so it stops
rendering on any event (mouse, keyboard, etc)
- on moving/scaling the panel, the render code doesn't recreate all geometry
- same for shifting/panning view
- all other operations (now) regenerate the full render database still.
- this is WIP... but big fun, especially for simple scenes!
Compositor
- Using same node system as now in use for shaders, you can composit images
- works pretty straightforward... needs much more options/tools and integration
with rendering still
- is not threaded yet, nor is so smart to only recalculate changes... will be
done soon!
- the "Render Result" node will get all layers/passes as output sockets
- The "Output" node renders to a builtin image, which you can view in the Image
window. (yes, output nodes to render-result, and to files, is on the list!)
The Bad News
- "Unified Render" is removed. It might come back in some stage, but this
system should be built from scratch. I can't really understand this code...
I expect it is not much needed, especially with advanced layer/passes
control
- Panorama render, Field render, Motion blur, is not coded yet... (I had to
recode every single feature in render, so...!)
- Lens Flare is also not back... needs total revision, might become composit
effect though (using zbuffer for visibility)
- Part render is gone! (well, thats obvious, its default now).
- The render window is only restored with limited functionality... I am going
to check first the option to render to a Image window, so Blender can become
a true single-window application. :)
For example, the 'Spare render buffer' (jkey) doesnt work.
- Render with border, now default creates a smaller image
- No zbuffers are written yet... on the todo!
- Scons files and MSVC will need work to get compiling again
OK... thats what I can quickly recall. Now go compiling!
2006-01-23 23:05:47 +01:00
|
|
|
|
2010-01-28 18:31:11 +01:00
|
|
|
void clear_matcopybuf(void)
|
|
|
|
|
{
|
|
|
|
|
memset(&matcopybuf, 0, sizeof(Material));
|
2012-05-06 17:15:33 +02:00
|
|
|
matcopied = 0;
|
2010-01-28 18:31:11 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void free_matcopybuf(void)
|
|
|
|
|
{
|
2012-02-23 03:17:50 +01:00
|
|
|
if (matcopybuf.nodetree) {
|
ID-Remap - Step one: core work (cleanup and rework of generic ID datablock handling).
This commit changes a lot of how IDs are handled internally, especially the unlinking/freeing
processes. So far, this was very fuzy, to summarize cleanly deleting or replacing a datablock
was pretty much impossible, except for a few special cases.
Also, unlinking was handled by each datatype, in a rather messy and prone-to-errors way (quite
a few ID usages were missed or wrongly handled that way).
One of the main goal of id-remap branch was to cleanup this, and fatorize ID links handling
by using library_query utils to allow generic handling of those, which is now the case
(now, generic ID links handling is only "knwon" from readfile.c and library_query.c).
This commit also adds backends to allow live replacement and deletion of datablocks in Blender
(so-called 'remapping' process, where we replace all usages of a given ID pointer by a new one,
or NULL one in case of unlinking).
This will allow nice new features, like ability to easily reload or relocate libraries, real immediate
deletion of datablocks in blender, replacement of one datablock by another, etc.
Some of those are for next commits.
A word of warning: this commit is highly risky, because it affects potentially a lot in Blender core.
Though it was tested rather deeply, being totally impossible to check all possible ID usage cases,
it's likely there are some remaining issues and bugs in new code... Please report them! ;)
Review task: D2027 (https://developer.blender.org/D2027).
Reviewed by campbellbarton, thanks a bunch.
2016-06-22 17:29:38 +02:00
|
|
|
ntreeFreeTree(matcopybuf.nodetree);
|
2010-01-28 18:31:11 +01:00
|
|
|
MEM_freeN(matcopybuf.nodetree);
|
2012-05-06 17:15:33 +02:00
|
|
|
matcopybuf.nodetree = NULL;
|
2010-01-28 18:31:11 +01:00
|
|
|
}
|
2010-03-09 10:17:45 +01:00
|
|
|
|
2012-05-06 17:15:33 +02:00
|
|
|
matcopied = 0;
|
2010-01-28 18:31:11 +01:00
|
|
|
}
|
|
|
|
|
|
2018-05-29 15:49:21 +02:00
|
|
|
void copy_matcopybuf(Main *bmain, Material *ma)
|
2010-01-28 18:31:11 +01:00
|
|
|
{
|
2012-02-23 03:17:50 +01:00
|
|
|
if (matcopied)
|
2010-01-28 18:31:11 +01:00
|
|
|
free_matcopybuf();
|
|
|
|
|
|
|
|
|
|
memcpy(&matcopybuf, ma, sizeof(Material));
|
|
|
|
|
|
2018-05-29 15:49:21 +02:00
|
|
|
matcopybuf.nodetree = ntreeCopyTree_ex(ma->nodetree, bmain, false);
|
2012-05-06 17:15:33 +02:00
|
|
|
matcopybuf.preview = NULL;
|
2014-02-07 20:07:10 +01:00
|
|
|
BLI_listbase_clear(&matcopybuf.gpumaterial);
|
2017-02-07 11:20:15 +01:00
|
|
|
/* TODO Duplicate Engine Settings and set runtime to NULL */
|
2012-05-06 17:15:33 +02:00
|
|
|
matcopied = 1;
|
2010-01-28 18:31:11 +01:00
|
|
|
}
|
|
|
|
|
|
2018-05-29 15:49:21 +02:00
|
|
|
void paste_matcopybuf(Main *bmain, Material *ma)
|
2010-01-28 18:31:11 +01:00
|
|
|
{
|
|
|
|
|
ID id;
|
|
|
|
|
|
2012-05-06 17:15:33 +02:00
|
|
|
if (matcopied == 0)
|
2010-01-28 18:31:11 +01:00
|
|
|
return;
|
|
|
|
|
|
2018-03-05 00:52:19 +01:00
|
|
|
/* Free gpu material before the ntree */
|
|
|
|
|
GPU_material_free(&ma->gpumaterial);
|
|
|
|
|
|
2012-02-23 03:17:50 +01:00
|
|
|
if (ma->nodetree) {
|
2010-01-28 18:31:11 +01:00
|
|
|
ntreeFreeTree(ma->nodetree);
|
|
|
|
|
MEM_freeN(ma->nodetree);
|
|
|
|
|
}
|
|
|
|
|
|
2012-05-06 17:15:33 +02:00
|
|
|
id = (ma->id);
|
2010-01-28 18:31:11 +01:00
|
|
|
memcpy(ma, &matcopybuf, sizeof(Material));
|
2012-05-06 17:15:33 +02:00
|
|
|
(ma->id) = id;
|
2010-01-28 18:31:11 +01:00
|
|
|
|
2018-05-29 15:49:21 +02:00
|
|
|
ma->nodetree = ntreeCopyTree_ex(matcopybuf.nodetree, bmain, false);
|
2010-01-28 18:31:11 +01:00
|
|
|
}
|
TexFace to Material Settings big patch
Summary:
========
The idea here is to move the texface options into the material panel.
For images with the change please visit:
http://code.blender.org/index.php/2011/09/bge-material-texface-changes
1 - Some of the legacy problems 2.49 and 2.5x has with the texface system:
==========================================================================
1.1) Shadow, Bilboard and Halo are mutual exclusive (in the code), yet you can
select a face to be more than one mode.
1.2) Sort only works for blend Alpha yet it's an option regardless of the
Transparency Blend you pick.
1.3) Shared doesn't affect anything in BGE.
1.4) ObColor only works for Text objects (old bitmap texts) when using Texture
Face Materials. (not address yet, I so far ignored obcolor)
2 - Notes:
============
2.1) Now "Use Face Textures" in material Option panel will work in Multitexture
even if there is no texture channel.
2.2) In FaceTexture mode it will use TexFace all the time, even if you don't
check the "Use Texture Face" option in the UI. It's a matter of decision, since
the code for either way is there. I decided by the solution that makes the
creation of a material fast - in this mode the user doesn't need to mess with
textures or this "Use Texture Face" option at all. I'm not strong in my opinion
here. But I think if we don't have this then what is the point of the Texture
Face mode?
2.3) I kept references for tface only when we need the image, UV or the tiling
setting. It should help later when/if we split the Image and UV layers from the
tface struct (Campbell and Brecht proposal).
3 - Changes in a Nutshell:
==========================
3.1) "Texture Face" panel (in the Mesh/Object Data panel) no longer exists. Those settings are all part of the material properties, visible when Game Render is set.
3.2) "Texture Face" Shading mode (in the Render panel) is now called “Single Texture”, it needs a material for special settings (e.g. Billboard, Alpha Sort, …).
3.3) New options in the Material Panel
* Shadeless option in the Material panel is now supported for all three Shading modes.
* Physics is now toggleable, this is the old Collision option.
* Two Side (on) is now called Back Culling (off).
* Alpha Sort is one of the Alpha options, together (and mutually exclusive) to Alpha Blend, Alpha Clip, Add and Opaque (i.e. solid).
* Shadow, Billboard and Halo are grouped in the “Face Orientation” property.
* "Face Textures" and "Face Textures Alpha" (under Options) can be used for all but GLSL shading mode (to be supported in GLSL eventually).
* The backend in the game engine is still the same as before. The only changes are in the interface and in the way you need to think your materials. The bottomline is: It’s no longer possible to share materials between faces that do not share the same game properties.
4 - Acknowledgment:
==================
Mike Pan for the design discussions, and testing along the whole development process.
Vitor Balbio for the first hands-on code with the interface changes. That helped me a lot to push me into work on that.
Benoit Bolsee and Brecht van Lommel for patch review (* no one reviewed the whole patch, or the latest iteractions, so I still hold liability for any problems).
Blender artists that gave feedback and helped testing the patch.
Patch review and original documentation can be found here:
http://wiki.blender.org/index.php/User:Dfelinto/TexFace
http://codereview.appspot.com/4289041/
2011-09-19 21:55:59 +02:00
|
|
|
|
2018-05-02 11:46:56 +02:00
|
|
|
void BKE_material_eval(struct Depsgraph *depsgraph, Material *material)
|
2017-07-20 16:13:08 +02:00
|
|
|
{
|
2018-05-02 11:46:56 +02:00
|
|
|
DEG_debug_print_eval(depsgraph, __func__, material->id.name, material);
|
2018-06-08 16:11:34 +02:00
|
|
|
GPU_material_free(&material->gpumaterial);
|
2017-07-20 16:13:08 +02:00
|
|
|
}
|
