February 23, 2015, 15:35 (GMT) |
Merge remote-tracking branch 'origin/master' into multiview |
February 23, 2015, 14:53 (GMT) |
Fix assert issue from recent RNA changes to prevent non 0/1 values |
February 23, 2015, 13:17 (GMT) |
Merge remote-tracking branch 'origin/master' into multiview |
February 20, 2015, 20:35 (GMT) |
Merge remote-tracking branch 'origin/master' into multiview Conflicts: source/blender/blenkernel/intern/image.c source/blender/editors/space_sequencer/sequencer_draw.c |
February 13, 2015, 19:16 (GMT) |
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 |
February 10, 2015, 04:18 (GMT) |
Remove Left/Right commented out code in UI, until we handle this correctly |
February 10, 2015, 04:09 (GMT) |
Image: refactor image_load_sequence_file() function as suggested on review |
February 10, 2015, 04:08 (GMT) |
small cleanup on image.c |
February 10, 2015, 02:54 (GMT) |
Image: refactor image_load_movie_file() function as suggested on review |
February 10, 2015, 00:36 (GMT) |
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 |
February 6, 2015, 01:33 (GMT) |
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. |
February 6, 2015, 01:24 (GMT) |
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. |
February 6, 2015, 01:24 (GMT) |
Code cleanup: create image_add_view function |
February 4, 2015, 19:43 (GMT) |
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 |
February 4, 2015, 19:41 (GMT) |
Merge commit 'origin/master~' into multiview Conflicts: source/blender/blenkernel/intern/sequencer.c |
February 4, 2015, 19:06 (GMT) |
Fix for unfreed memory after bad merge (re: sequencer proxies) |
February 4, 2015, 13:19 (GMT) |
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 |
February 4, 2015, 11:46 (GMT) |
Fix missing panels (likely removed in a oerge conflict "fix") |
January 24, 2015, 08:21 (GMT) |
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 |
January 24, 2015, 06:07 (GMT) |
cleanup: strict warnings |
|