Paths

Table of Contentst

Initial support for an image layers system in Blender.
AbandonedPublic
Actions

Authored by Kévin Dietrich (kevindietrich) on Feb 22 2015, 12:09 AM.

Details

Reviewers

Julian Eisel (Severin)
Sergey Sharybin (sergey)

Summary

This serves as an update to T30975 by @Fabio Russo (ruesp83), which in turn is based on some GSOC 2010 project, see some somewhat still reliable docs here.

This patch compiles but isn't usuable at all at the moment. I upload this here as it is easier for other devs to see the changes and in turn for me to get help.

The code in Blender changed a bit since last update by @Fabio Russo (ruesp83), and more work needs to done to port the patch to a usable state. Mainly, the image cache system was reworked as per rBce893552c359d11cfa93709f239a3c93f4cdb244 and this here patch should align with it.

Some quick notes:

IMB_imbuf_types.h was moved to the DNA, I reverted the change. Apparently this was to be able to read/write the layers' imbufs from/to the blender file (which feels wrong to me, judging from other code)
some logic here and there (e.g. getting the current layer) could be improved/simplified
a fair amount of syle issues (naming convention essentially)
the patch could be split up: e.g. one for the layer system, and one or two for the extra image filters/tools that it brings

Diff Detail

Event Timeline

Kévin Dietrich (kevindietrich) updated this revision to Diff 3599.Feb 22 2015, 12:09 AM

Kévin Dietrich (kevindietrich) retitled this revision from to Initial support for an image layers system in Blender..

Kévin Dietrich (kevindietrich) updated this object.

Kévin Dietrich (kevindietrich) added reviewers: Sergey Sharybin (sergey), Antonis Ryakiotakis (psy-fi), Campbell Barton (campbellbarton).

Kévin Dietrich (kevindietrich) set the repository for this revision to rB Blender.

Kévin Dietrich (kevindietrich) added a subscriber: Fabio Russo (ruesp83).

Snip from IRC (just in case):

kevindietrich : sergey-: as a side project I updated the image layers patch (https://developer.blender.org/T30975) but there's some issues with getting the image buffer/cache which you changed in https://developer.blender.org/rBce893552c359d11cfa93709f239a3c93f4cdb244.
kevindietrich : sergey-: Currently the layers are using the old approach (Listbase ibufs), and when entering paint mode the image gets a layer, which duplicates the image imbuf (IMB_dupImBuf(ima->ibufs.fist)). And that doesn't work well with the new system (either I get a crash, or it gets stuck at some point in BLI_spinlock()).
kevindietrich : One option (the best IMO) would be to rewrite the layers to use a MovieCache. It'd be good to get your eyes on it at some point :). Mind if >upload the patch to differential system to have a quick look (when you have time :) )?
sergey- : kevindietrich: yah, review is easier in Differencial
sergey- : upload patch there and i'll have a look later

Some interesting piece of knowledge:
After many failed attempts to upload this patch through arcanist, I decided to upload it manually. I figured that arcanist generates the patch like so:

git diff --no-ext-diff --no-textconv --no-color --src-prefix=a/ --dst-prefix=b/ -U32767 -M -C 'current_master_head' 'current_branch_head' --

Generally when diffing, only 3 lines before and after the changes are included to have some sort of context. The -U32767 option will basically include 32767 lines before and after (so basically the whole file, thus having full blown context), which in this case creates a *.diff of about 8Mb which apparently exceeds the file size limit for uploading. And I'm not including the other infos (commits, logs, branch...), which made the size of the data to transfer to about ~11Mb. The culprit here being that IMB_imbuf_types.h -> DNA_imbuf_types.h change...

Updating the diff through arc (hopefully).
This includes a few cleanups and reverts the move of IMB_imbuf types to the DNA.

Add new files from the patch.
Move IMB_imbuf_types to dna.
Addendum to previous commits.
Import changes from BKE_image, round 1
Import changes from BKE_image, round 2
Import some more changes from the patch, almost done
Import some more changes from the patch, although there's still quite a few lines to be ported I'd rather do a commit now as a checkpoint
Finally done with the C-code, now to the UI-copter!
UI code merged from patch
Some fixes for the UI
Fix infinite loop when loading an image
A bunch of style cleanup, comment out unused functions
Style cleanup, remove dead code
Merge branch 'master' into image_layers
Code cleanup(tm)
Prepare ground for next commit
Revert "Move IMB_imbuf_types to dna."
Addendum to previous commit

Kévin Dietrich (kevindietrich) updated this object.Feb 22 2015, 4:29 AM

Kévin Dietrich (kevindietrich) updated this object.

mathieu menuet (bliblubli) added a subscriber: mathieu menuet (bliblubli).May 11 2015, 6:41 PM

Will Olis (willolis) added a subscriber: Will Olis (willolis).Jul 13 2015, 9:28 AM

I'm seeing this dumped to console and killing the build. What am I missing?

[ 31%] /home/mdriftmeyer/Projects/Blender/blender/source/blender/editors/sculpt_paint/paint_image_proj.c:1033:44: error:

controlling expression type 'const int [3]' not compatible with any
generic association type
                  i1_fidx = BKE_MESH_TESSTRI_VINDEX_ORDER(lt_vtri, i1);
                                                          ^~~~~~~

/home/mdriftmeyer/Projects/Blender/blender/source/blender/blenkernel/BKE_mesh_mapping.h:204:21: note:

  expanded from macro 'BKE_MESH_TESSTRI_VINDEX_ORDER'
(CHECK_TYPE_ANY(_tri, unsigned int *, int *, const unsigned int *, c...
                ^

/home/mdriftmeyer/Projects/Blender/blender/source/blender/blenlib/BLI_compiler_typecheck.h:379:74: note:

    expanded from macro 'CHECK_TYPE_ANY'
...CHECK_TYPE_ANY(...) VA_NARGS_CALL_OVERLOAD(_VA_CHECK_TYPE_ANY, __VA_ARGS__)
                                                                  ^

/home/mdriftmeyer/Projects/Blender/blender/source/blender/blenlib/BLI_utildefines.h:69:80: note:

    expanded from macro 'VA_NARGS_CALL_OVERLOAD'
..._VA_NARGS_COUNT(__VA_ARGS__)), (__VA_ARGS__))
                                   ^

/home/mdriftmeyer/Projects/Blender/blender/source/blender/blenlib/BLI_utildefines.h:50:32: note:

expanded from macro '_VA_NARGS_GLUE'

#define _VA_NARGS_GLUE(x, y) x y

/home/mdriftmeyer/Projects/Blender/blender/source/blender/blenlib/BLI_compiler_typecheck.h:100:19: note:

expanded from macro '_VA_CHECK_TYPE_ANY5'
  ((void)_Generic((v), a0: 0, b0: 0, c0: 0, d0: 0))
                   ^

/home/mdriftmeyer/Projects/Blender/blender/source/blender/editors/sculpt_paint/paint_image_proj.c:1033:53: error:

controlling expression type 'const unsigned int' not compatible with any
generic association type
                  i1_fidx = BKE_MESH_TESSTRI_VINDEX_ORDER(lt_vtri, i1);
                                                                   ^~

/home/mdriftmeyer/Projects/Blender/blender/source/blender/blenkernel/BKE_mesh_mapping.h:205:21: note:

 expanded from macro 'BKE_MESH_TESSTRI_VINDEX_ORDER'
CHECK_TYPE_ANY(_v, unsigned int, int)),                                \
               ^

/home/mdriftmeyer/Projects/Blender/blender/source/blender/blenlib/BLI_compiler_typecheck.h:379:74: note:

    expanded from macro 'CHECK_TYPE_ANY'
...CHECK_TYPE_ANY(...) VA_NARGS_CALL_OVERLOAD(_VA_CHECK_TYPE_ANY, __VA_ARGS__)
                                                                  ^

/home/mdriftmeyer/Projects/Blender/blender/source/blender/blenlib/BLI_utildefines.h:69:80: note:

    expanded from macro 'VA_NARGS_CALL_OVERLOAD'
..._VA_NARGS_COUNT(__VA_ARGS__)), (__VA_ARGS__))
                                   ^

/home/mdriftmeyer/Projects/Blender/blender/source/blender/blenlib/BLI_utildefines.h:50:32: note:

expanded from macro '_VA_NARGS_GLUE'

#define _VA_NARGS_GLUE(x, y) x y

/home/mdriftmeyer/Projects/Blender/blender/source/blender/blenlib/BLI_compiler_typecheck.h:96:19: note:

expanded from macro '_VA_CHECK_TYPE_ANY3'
  ((void)_Generic((v), a0: 0, b0: 0))
                   ^

/home/mdriftmeyer/Projects/Blender/blender/source/blender/editors/sculpt_paint/paint_image_proj.c:1034:44: error:

controlling expression type 'const int [3]' not compatible with any
generic association type
                  i2_fidx = BKE_MESH_TESSTRI_VINDEX_ORDER(lt_vtri, i2);
                                                          ^~~~~~~

/home/mdriftmeyer/Projects/Blender/blender/source/blender/blenkernel/BKE_mesh_mapping.h:204:21: note:

  expanded from macro 'BKE_MESH_TESSTRI_VINDEX_ORDER'
(CHECK_TYPE_ANY(_tri, unsigned int *, int *, const unsigned int *, c...
                ^

/home/mdriftmeyer/Projects/Blender/blender/source/blender/blenlib/BLI_compiler_typecheck.h:379:74: note:

    expanded from macro 'CHECK_TYPE_ANY'
...CHECK_TYPE_ANY(...) VA_NARGS_CALL_OVERLOAD(_VA_CHECK_TYPE_ANY, __VA_ARGS__)
                                                                  ^

/home/mdriftmeyer/Projects/Blender/blender/source/blender/blenlib/BLI_utildefines.h:69:80: note:

    expanded from macro 'VA_NARGS_CALL_OVERLOAD'
..._VA_NARGS_COUNT(__VA_ARGS__)), (__VA_ARGS__))
                                   ^

/home/mdriftmeyer/Projects/Blender/blender/source/blender/blenlib/BLI_utildefines.h:50:32: note:

expanded from macro '_VA_NARGS_GLUE'

#define _VA_NARGS_GLUE(x, y) x y

/home/mdriftmeyer/Projects/Blender/blender/source/blender/blenlib/BLI_compiler_typecheck.h:100:19: note:

expanded from macro '_VA_CHECK_TYPE_ANY5'
  ((void)_Generic((v), a0: 0, b0: 0, c0: 0, d0: 0))
                   ^

/home/mdriftmeyer/Projects/Blender/blender/source/blender/editors/sculpt_paint/paint_image_proj.c:1034:53: error:

controlling expression type 'const unsigned int' not compatible with any
generic association type
                  i2_fidx = BKE_MESH_TESSTRI_VINDEX_ORDER(lt_vtri, i2);
                                                                   ^~

/home/mdriftmeyer/Projects/Blender/blender/source/blender/blenkernel/BKE_mesh_mapping.h:205:21: note:

 expanded from macro 'BKE_MESH_TESSTRI_VINDEX_ORDER'
CHECK_TYPE_ANY(_v, unsigned int, int)),                                \
               ^

/home/mdriftmeyer/Projects/Blender/blender/source/blender/blenlib/BLI_compiler_typecheck.h:379:74: note:

    expanded from macro 'CHECK_TYPE_ANY'
...CHECK_TYPE_ANY(...) VA_NARGS_CALL_OVERLOAD(_VA_CHECK_TYPE_ANY, __VA_ARGS__)
                                                                  ^

/home/mdriftmeyer/Projects/Blender/blender/source/blender/blenlib/BLI_utildefines.h:69:80: note:

    expanded from macro 'VA_NARGS_CALL_OVERLOAD'
..._VA_NARGS_COUNT(__VA_ARGS__)), (__VA_ARGS__))
                                   ^

/home/mdriftmeyer/Projects/Blender/blender/source/blender/blenlib/BLI_utildefines.h:50:32: note:

expanded from macro '_VA_NARGS_GLUE'

#define _VA_NARGS_GLUE(x, y) x y

/home/mdriftmeyer/Projects/Blender/blender/source/blender/blenlib/BLI_compiler_typecheck.h:96:19: note:

expanded from macro '_VA_CHECK_TYPE_ANY3'
  ((void)_Generic((v), a0: 0, b0: 0))

@Marc J. Driftmeyer (mdriftmeyer), this patch won't work at all, as written in the description and the IRC snippet I posted above. I would think that due to the numerous changes which happened in master since I posted this patch, it would need to be updated.

For now development is on hold from my side at the moment, as my main focus is elsewhere. I can update the patch to compile with current master it you wish to continue development here, otherwise you'll have to wait a bit :)

Alright I just revisited this patch and managed to fix the couple of issues which lead me to upload this here to get some help, so for the time being, setting this as planned changes so it doesn't stay on someone's "to review" stack.

Campbell Barton (campbellbarton) removed a reviewer: Campbell Barton (campbellbarton).Aug 11 2016, 6:12 AM

Aaron Carlisle (Blendify) mentioned this in T30975: Image Layer for Blender.Sep 4 2016, 1:41 AM

Julian Eisel (Severin) added a reviewer: Julian Eisel (Severin).Sep 4 2016, 2:27 AM

Paweł Łyczkowski (plyczkowski) added a subscriber: Paweł Łyczkowski (plyczkowski).Sep 4 2016, 9:43 AM

Antonis Ryakiotakis (psy-fi) removed a reviewer: Antonis Ryakiotakis (psy-fi).Sep 4 2016, 11:27 AM

Please continue this really usefull work :)

I second @mathieu menuet (bliblubli), this would be great to have! This could pave the way to 2D art in blender!

Jad Sarout (xananax) added a subscriber: Jad Sarout (xananax).Oct 17 2016, 11:40 PM

I'm not sure what the policy on here is about the +1s, but I'll allow myself to weigh in. Came here from ruesp83.com, and I would so much like to see this in Blender. Blender is already my favorite app in the universe, and it replaces several apps of my old workflow (Maya, AFX), and is shaping up to be maybe the best 2D animation package there ever was. The interface is amazing. I would love it if I could do everything without quitting Blender at all.

Blenderize all the things!

Krzysztof Rećko (chrisr) added a subscriber: Krzysztof Rećko (chrisr).Jul 3 2017, 11:53 AM

@Kévin Dietrich (kevindietrich) (or @Fabio Russo (ruesp83) even), is there interest in reviving this?

This is of course everything but a trivial change. We might want to look at bigger implications and the usability side of this before moving forward. We can do that now, but obviously there's no point in doing that if the patch is abandoned anyway.

ogierm added a subscriber: ogierm.Feb 25 2020, 4:12 PM

@Julian Eisel (Severin), I would be interested in reviving this, however I do not really have the time for it...

As for usability, the biggest problem that I know of with the approach in this patch was compositing the various layers for display. With just a few of layers, things got really slow, especially if the image was high resolution (which we kind of want for production).

I think that Blender would need a tiled image buffer (unless it is already here), so that we would only composite and rerender tiles that have changed through painting. (We could also only allocate tiles as needed when painting, so memory usage is kept low.)

Apart from image tiling, maybe there are some tricks to render the various layers separately on the GPU and doing the composite there, but this might also be slow for large amounts of layers.

Another concern was how images are saved. I don't know the current situation in Blender, but this patch made it so the images are saved as datablocks in the .blend file.

(The patch also contains a few image operations which could be implemented separately.)

Simon (SimonH) added a subscriber: Simon (SimonH).May 8 2021, 12:32 PM

Closing this as it unlikely to be applicable with all the changes that happened throughout the years.

Large Diff

This large diff affects 180 files. Files without inline comments have been collapsed. Expand All Files

Revision Contents
Changeset List

Path

Size

intern/

ghost/

intern/

GHOST_EventDragnDrop.h

2 lines

release/

scripts/

startup/

bl_ui/

space_image.py

284 lines

space_userpref.py

81 lines

space_view3d_toolbar.py

50 lines

source/

blender/

blenkernel/

2 lines

19 lines

100 lines

2 lines

intern/

2 lines

2 lines

2 lines

2 lines

171 lines

945 lines

2 lines

2 lines

2 lines

2 lines

2 lines

2 lines

2 lines

2 lines

tracking_region_tracker.c

2 lines

tracking_stabilize.c

2 lines

tracking_util.c

2 lines

blenlib/

BLI_math_color.h

1 line

intern/

math_color_inline.c

7 lines

blenloader/

intern/

readfile.c

17 lines

writefile.c

29 lines

collada/

ImageExporter.cpp

4 lines

compositor/

nodes/

COM_ImageNode.cpp

2 lines

operations/

COM_ImageOperation.cpp

10 lines

COM_KeyingScreenOperation.cpp

2 lines

COM_MaskOperation.h

2 lines

COM_MovieClipOperation.h

2 lines

COM_MultilayerImageOperation.cpp

4 lines

COM_OutputFileOperation.cpp

2 lines

COM_PreviewOperation.cpp

2 lines

COM_SplitOperation.cpp

2 lines

COM_ViewerOperation.cpp

4 lines

editors/

include/

ED_image.h

2 lines

UI_resources.h

4 lines

interface/

interface_draw.c

2 lines

interface_icons.c

7 lines

resources.c

23 lines

mesh/

editface.c

2 lines

editmesh_select.c

2 lines

object/

object_bake.c

8 lines

object_bake_api.c

8 lines

object_edit.c

4 lines

render/

render_internal.c

6 lines

render_opengl.c

6 lines

render_preview.c

4 lines

screen/

glutil.c

2 lines

screendump.c

2 lines

sculpt_paint/

4 lines

23 lines

39 lines

12 lines

4 lines

2 lines

4 lines

2 lines

space_clip/

2 lines

4 lines

2 lines

2 lines

2 lines

2 lines

space_file/

file_draw.c

2 lines

filelist.c

2 lines

space_file.c

2 lines

space_image/

29 lines

440 lines

9 lines

39 lines

2931 lines

62 lines

space_info/

info_ops.c

4 lines

space_node/

drawnode.c

12 lines

node_edit.c

4 lines

node_view.c

12 lines

space_sequencer/

sequencer_draw.c

2 lines

sequencer_scopes.c

2 lines

sequencer_view.c

4 lines

space_view3d/

2 lines

4 lines

4 lines

2 lines

util/

undo.c

16 lines

freestyle/

intern/

application/

AppView.cpp

2 lines

stroke/

BasicStrokeShaders.cpp

2 lines

Canvas.cpp

2 lines

view_map/

SteerableViewMap.cpp

2 lines

gpu/

intern/

gpu_draw.c

8 lines

gpu_material.c

4 lines

imbuf/

2 lines

19 lines

intern/

2 lines

4 lines

2 lines

2 lines

2 lines

cineon/

cineon_dpx.c

2 lines

colormanagement.c

2 lines

dds/

2 lines

2 lines

10 lines

2 lines

2 lines

427 lines

2 lines

2 lines

2 lines

2 lines

2 lines

191 lines

oiio/

openimageio_api.cpp

2 lines

openexr/

2 lines

2 lines

2 lines

2 lines

66 lines

132 lines

2 lines

2 lines

2 lines

2 lines

2 lines

2 lines

2 lines

2 lines

makesdna/

1 line

107 lines

294 lines

10 lines

intern/

makesdna.c

2 lines

makesrna/

RNA_access.h

2 lines

RNA_enum_types.h

1 line

intern/

245 lines

10 lines

2 lines

2 lines

31 lines

2 lines

2 lines

2 lines

17 lines

nodes/

composite/

node_composite_util.h

3 lines

nodes/

node_composite_image.c

30 lines

shader/

node_shader_util.h

2 lines

nodes/

node_shader_tex_environment.c

2 lines

node_shader_tex_image.c

2 lines

node_shader_texture.c

2 lines

texture/

node_texture_util.h

2 lines

nodes/

node_texture_image.c

2 lines

python/

intern/

bpy_path.c

2 lines

quicktime/

apple/

qtkit_export.m

2 lines

quicktime_import.h

2 lines

render/

intern/

source/

10 lines

4 lines

4 lines

10 lines

10 lines

2 lines

2 lines

18 lines

8 lines

windowmanager/

intern/

2 lines

2 lines

2 lines

2 lines

gameengine/

BlenderRoutines/

KX_BlenderCanvas.cpp

2 lines

Converter/

BL_BlenderDataConversion.cpp

2 lines

GamePlayer/

common/

GPC_Canvas.cpp

2 lines

Ketsji/

BL_Material.cpp

2 lines

BL_Texture.cpp

8 lines

VideoTexture/

ImageBuff.cpp

6 lines

Texture.cpp

2 lines

Initial support for an image layers system in Blender.AbandonedPublicActions

Details

Diff Detail

Event Timeline

Large Diff

Revision ContentsChangeset List

Diff 3599

intern/ghost/intern/GHOST_EventDragnDrop.h

release/scripts/startup/bl_ui/space_image.py

release/scripts/startup/bl_ui/space_userpref.py

release/scripts/startup/bl_ui/space_view3d_toolbar.py

source/blender/blenkernel/BKE_bmfont_types.h

source/blender/blenkernel/BKE_image.h

source/blender/blenkernel/BKE_layer.h

source/blender/blenkernel/CMakeLists.txt

source/blender/blenkernel/intern/bmfont.c

source/blender/blenkernel/intern/brush.c

source/blender/blenkernel/intern/colortools.c

source/blender/blenkernel/intern/dynamicpaint.c

source/blender/blenkernel/intern/image.c

source/blender/blenkernel/intern/layer.c

source/blender/blenkernel/intern/movieclip.c

source/blender/blenkernel/intern/ocean.c

source/blender/blenkernel/intern/seqcache.c

source/blender/blenkernel/intern/seqeffects.c

source/blender/blenkernel/intern/seqmodifier.c

source/blender/blenkernel/intern/sequencer.c

source/blender/blenkernel/intern/tracking.c

source/blender/blenkernel/intern/tracking_detect.c

source/blender/blenkernel/intern/tracking_region_tracker.c

source/blender/blenkernel/intern/tracking_stabilize.c

source/blender/blenkernel/intern/tracking_util.c

source/blender/blenlib/BLI_math_color.h

source/blender/blenlib/intern/math_color_inline.c

source/blender/blenloader/intern/readfile.c

source/blender/blenloader/intern/writefile.c

source/blender/collada/ImageExporter.cpp

source/blender/compositor/nodes/COM_ImageNode.cpp

source/blender/compositor/operations/COM_ImageOperation.cpp

source/blender/compositor/operations/COM_KeyingScreenOperation.cpp

source/blender/compositor/operations/COM_MaskOperation.h

source/blender/compositor/operations/COM_MovieClipOperation.h

source/blender/compositor/operations/COM_MultilayerImageOperation.cpp

source/blender/compositor/operations/COM_OutputFileOperation.cpp

source/blender/compositor/operations/COM_PreviewOperation.cpp

source/blender/compositor/operations/COM_SplitOperation.cpp

source/blender/compositor/operations/COM_ViewerOperation.cpp

source/blender/editors/include/ED_image.h

source/blender/editors/include/UI_resources.h

source/blender/editors/interface/interface_draw.c

source/blender/editors/interface/interface_icons.c

source/blender/editors/interface/resources.c

source/blender/editors/mesh/editface.c

source/blender/editors/mesh/editmesh_select.c

source/blender/editors/object/object_bake.c

source/blender/editors/object/object_bake_api.c

source/blender/editors/object/object_edit.c

source/blender/editors/render/render_internal.c

source/blender/editors/render/render_opengl.c

source/blender/editors/render/render_preview.c

source/blender/editors/screen/glutil.c

source/blender/editors/screen/screendump.c

source/blender/editors/sculpt_paint/paint_cursor.c

source/blender/editors/sculpt_paint/paint_image.c

source/blender/editors/sculpt_paint/paint_image_2d.c

source/blender/editors/sculpt_paint/paint_image_proj.c

source/blender/editors/sculpt_paint/paint_stroke.c

source/blender/editors/sculpt_paint/paint_undo.c

source/blender/editors/sculpt_paint/paint_utils.c

source/blender/editors/sculpt_paint/paint_vertex.c

source/blender/editors/space_clip/clip_buttons.c

source/blender/editors/space_clip/clip_draw.c

source/blender/editors/space_clip/clip_editor.c

source/blender/editors/space_clip/clip_ops.c

source/blender/editors/space_clip/space_clip.c

source/blender/editors/space_clip/tracking_ops.c

source/blender/editors/space_file/file_draw.c

source/blender/editors/space_file/filelist.c

source/blender/editors/space_file/space_file.c

source/blender/editors/space_image/image_buttons.c

Initial support for an image layers system in Blender.
AbandonedPublic
Actions

Revision Contents
Changeset List