Blender Git Loki

Merge remote-tracking branch 'origin/master' into multiview

Fix assert issue from recent RNA changes to prevent non 0/1 values

Merge remote-tracking branch 'origin/master' into multiview

Merge remote-tracking branch 'origin/master' into multiview

Conflicts:
source/blender/blenkernel/intern/image.c
source/blender/editors/space_sequencer/sequencer_draw.c

Merge remote-tracking branch 'origin/master' into multiview

So many conflicts ;) well, we survived the Viewport Shader project
merge

Conflicts:
source/blender/blenkernel/BKE_camera.h
source/blender/blenkernel/intern/camera.c
source/blender/blenloader/intern/versioning_270.c
source/blender/compositor/nodes/COM_ImageNode.cpp
source/blender/editors/include/ED_view3d.h
source/blender/editors/render/render_opengl.c
source/blender/editors/space_view3d/view3d_draw.c
source/blender/makesdna/DNA_scene_types.h
source/blender/makesdna/DNA_view3d_types.h
source/blender/makesrna/intern/rna_camera.c
source/blender/makesrna/intern/rna_scene.c
source/blender/makesrna/intern/rna_space.c

Remove Left/Right commented out code in UI, until we handle this correctly

Image: refactor image_load_sequence_file() function as suggested on review

small cleanup on image.c

Image: refactor image_load_movie_file() function as suggested on review

Merge remote-tracking branch 'origin/master' into multiview

Conflicts:
source/blender/blenkernel/intern/image.c
source/blender/editors/space_node/drawnode.c
source/blender/makesrna/intern/rna_image_api.c

Image: refactor image_load_image_file() function as suggested on review

I still need to do the same treatment for image_load_movie_file()
(and potentially for image_load_sequence_file() I have to check if it's
also the case)

Some of the image loading routines in the sequencer could have this
treatment as well.

Also I think that the whole:

"image is an ID block which might be used by multiple users. it should be
self-contained in terms what it is."

Is not a problem anymore. But I need to dig further, because I don't
remmeber if we are using ImageView elsewhere or not.

ouch, typo on bitflag operation on image update views format

This should be causing issues, but I have not noticed any. Better fixed than not anyways.

Code cleanup: create image_add_view function

Merge remote-tracking branch 'origin/master' into multiview

(aka the typo fix commit in master, just to prevent having to solve this
conflict if someone else had fixed this first ;)

Conflicts:
source/blender/blenkernel/intern/sequencer.c

Merge commit 'origin/master~' into multiview

Conflicts:
source/blender/blenkernel/intern/sequencer.c

Fix for unfreed memory after bad merge (re: sequencer proxies)

Merge remote-tracking branch 'origin/master' into multiview

The conflict solving included a change in openexr_api.cpp (to have
COMBINED always on head) that I'm not sure I should go ahead with.

So this little bit may be reverted later.

Conflicts:
intern/cycles/blender/blender_camera.cpp
source/blender/blenkernel/BKE_sequencer.h
source/blender/blenkernel/intern/image.c
source/blender/blenkernel/intern/sequencer.c
source/blender/blenkernel/intern/writeframeserver.c
source/blender/editors/include/ED_view3d.h
source/blender/editors/sculpt_paint/paint_image_proj.c
source/blender/editors/space_sequencer/sequencer_edit.c
source/blender/imbuf/IMB_imbuf_types.h
source/blender/imbuf/intern/openexr/openexr_api.cpp
source/blender/makesdna/DNA_image_types.h
source/blender/makesrna/intern/rna_image.c
source/blender/render/intern/source/render_result.c
source/blender/windowmanager/intern/wm_files.c

Fix missing panels (likely removed in a oerge conflict "fix")

Merge branch 'master' into multiview

Conflicts:
source/blender/blenkernel/BKE_image.h
source/blender/blenkernel/intern/image.c
source/blender/blenkernel/intern/ocean.c
source/blender/blenkernel/intern/writeavi.c
source/blender/compositor/operations/COM_OutputFileOperation.cpp
source/blender/editors/object/object_bake_api.c
source/blender/editors/render/render_opengl.c
source/blender/editors/screen/screendump.c
source/blender/makesrna/intern/rna_scene_api.c
source/blender/render/intern/source/pipeline.c

cleanup: strict warnings