Merge branch 'master' into blender2.8

build_files/build_environment/patches/cmake/modules/SelectLibraryConfigurations.cmake

@@ -79,4 +79,3 @@ macro( select_library_configurations basename )
         ${basename}_LIBRARY_DEBUG
     )
 endmacro( select_library_configurations )
-

extern/rangetree/CMakeLists.txt

@@ -28,4 +28,3 @@ set(SRC
 )
 
 blender_add_lib(extern_rangetree "${SRC}" "${INC}" "")
-

intern/cycles/CMakeLists.txt

@@ -355,4 +355,3 @@ endif()
 if(NOT WITH_BLENDER AND WITH_CYCLES_STANDALONE)
 	delayed_do_install(${CMAKE_BINARY_DIR}/bin)
 endif()
-

intern/cycles/blender/CMakeLists.txt

@@ -63,4 +63,3 @@ endif()
 add_dependencies(bf_intern_cycles bf_rna)
 
 delayed_install(${CMAKE_CURRENT_SOURCE_DIR} "${ADDON_FILES}" ${CYCLES_INSTALL_PATH})
-

intern/cycles/graph/CMakeLists.txt

@@ -20,4 +20,3 @@ include_directories(${INC})
 include_directories(SYSTEM ${INC_SYS})
 
 cycles_add_library(cycles_graph ${SRC} ${SRC_HEADERS})
-

intern/cycles/kernel/CMakeLists.txt

@@ -520,4 +520,3 @@ delayed_install(${CMAKE_CURRENT_SOURCE_DIR} "${SRC_SVM_HEADERS}" ${CYCLES_INSTAL
 delayed_install(${CMAKE_CURRENT_SOURCE_DIR} "${SRC_GEOM_HEADERS}" ${CYCLES_INSTALL_PATH}/source/kernel/geom)
 delayed_install(${CMAKE_CURRENT_SOURCE_DIR} "${SRC_UTIL_HEADERS}" ${CYCLES_INSTALL_PATH}/source/util)
 delayed_install(${CMAKE_CURRENT_SOURCE_DIR} "${SRC_SPLIT_HEADERS}" ${CYCLES_INSTALL_PATH}/source/kernel/split)
-

intern/cycles/kernel/osl/CMakeLists.txt

@@ -31,4 +31,3 @@ include_directories(${INC})
 include_directories(SYSTEM ${INC_SYS})
 
 cycles_add_library(cycles_kernel_osl ${SRC} ${HEADER_SRC})
-

intern/cycles/kernel/shaders/CMakeLists.txt

@@ -127,4 +127,3 @@ cycles_set_solution_folder(cycles_osl_shaders)
 # CMAKE_CURRENT_SOURCE_DIR is already included in OSO paths
 delayed_install("" "${SRC_OSO}" ${CYCLES_INSTALL_PATH}/shader)
 delayed_install("${CMAKE_CURRENT_SOURCE_DIR}" "${SRC_OSL_HEADERS}" ${CYCLES_INSTALL_PATH}/shader)
-

intern/dualcon/CMakeLists.txt

@@ -46,4 +46,3 @@ set(SRC
 )
 
 blender_add_lib(bf_intern_dualcon "${SRC}" "${INC}" "${INC_SYS}")
-

intern/mikktspace/CMakeLists.txt

@@ -45,4 +45,3 @@ set(SRC
 )
 
 blender_add_lib(bf_intern_mikktspace "${SRC}" "${INC}" "${INC_SYS}")
-

intern/smoke/CMakeLists.txt

@@ -99,4 +99,3 @@ if(WITH_FFTW3)
 endif()
 
 blender_add_lib(bf_intern_smoke "${SRC}" "${INC}" "${INC_SYS}")
-

source/CMakeLists.txt

@@ -28,4 +28,3 @@ if(WITH_LEGACY_OPENGL)
 endif()
 
 add_subdirectory(blender)
-

source/blender/avi/intern/avi_intern.h

@@ -67,4 +67,3 @@ int avi_get_format_fcc(AviFormat format);
 int avi_get_format_compression(AviFormat format);
 
 #endif
-

source/blender/avi/intern/avi_options.c

@@ -129,4 +129,3 @@ AviError AVI_set_compress_option(AviMovie *movie, int option_type, int stream, A
 
 	return AVI_ERROR_NONE;
 }
-

source/blender/blenkernel/BKE_action.h

@@ -214,4 +214,3 @@ void BKE_pose_tag_recalc(struct Main *bmain, struct bPose *pose);
 #endif
 
 #endif
-

source/blender/blenkernel/BKE_armature.h

@@ -240,4 +240,3 @@ void BKE_pose_eval_proxy_copy(
 #endif
 
 #endif
-

source/blender/blenkernel/BKE_bmfont.h

@@ -59,4 +59,3 @@ void matrixGlyph(struct ImBuf *ibuf, unsigned short unicode,
 #endif
 
 #endif
-

source/blender/blenkernel/BKE_bmfont_types.h

@@ -56,4 +56,3 @@ typedef struct bmFont {
 } bmFont;
 
 #endif
-

source/blender/blenkernel/BKE_brush.h

@@ -121,4 +121,3 @@ void BKE_brush_scale_size(
 void BKE_brush_debug_print_state(struct Brush *br);
 
 #endif
-

source/blender/blenkernel/BKE_cdderivedmesh.h

@@ -179,4 +179,3 @@ void CDDM_set_mloop(struct DerivedMesh *dm, struct MLoop *mloop);
 void CDDM_set_mpoly(struct DerivedMesh *dm, struct MPoly *mpoly);
 
 #endif
-

source/blender/blenkernel/BKE_cloth.h

@@ -244,4 +244,3 @@ void cloth_parallel_transport_hair_frame(float mat[3][3], const float dir_old[3]
 ////////////////////////////////////////////////
 
 #endif
-

source/blender/blenkernel/BKE_collision.h

@@ -187,4 +187,3 @@ void BKE_collider_cache_free(struct ListBase **colliders);
 /////////////////////////////////////////////////
 
 #endif
-

source/blender/blenkernel/BKE_constraint.h

@@ -161,4 +161,3 @@ void BKE_constraints_solve(struct Depsgraph *depsgraph, struct ListBase *conlist
 #endif
 
 #endif
-

source/blender/blenkernel/BKE_context.h

@@ -332,4 +332,3 @@ struct Depsgraph *CTX_data_depsgraph_on_load(const bContext *C);
 #endif
 
 #endif
-

source/blender/blenkernel/BKE_customdata.h

@@ -492,4 +492,3 @@ void CustomData_data_transfer(const struct MeshPairRemap *me_remap, const Custom
 #endif
 
 #endif
-

source/blender/blenkernel/BKE_customdata_file.h

@@ -58,4 +58,3 @@ CDataFileLayer *cdf_layer_find(CDataFile *cdf, int type, const char *name);
 CDataFileLayer *cdf_layer_add(CDataFile *cdf, int type, const char *name, size_t datasize);
 
 #endif /* __BKE_CUSTOMDATA_FILE_H__ */
-

source/blender/blenkernel/BKE_effect.h

@@ -253,4 +253,3 @@ void BKE_sim_debug_data_clear(void);
 void BKE_sim_debug_data_clear_category(const char *category);
 
 #endif
-

source/blender/blenkernel/BKE_fluidsim.h

@@ -52,4 +52,3 @@ void fluid_get_bb(struct MVert *mvert, int totvert, float obmat[4][4],
 void fluid_estimate_memory(struct Object *ob, struct FluidsimSettings *fss, char *value);
 
 #endif
-

source/blender/blenkernel/BKE_font.h

@@ -108,4 +108,3 @@ void BKE_vfont_clipboard_get(
 #endif
 
 #endif
-

source/blender/blenkernel/BKE_freestyle.h

@@ -70,4 +70,3 @@ void BKE_freestyle_lineset_unique_name(FreestyleConfig *config, FreestyleLineSet
 #endif
 
 #endif
-

source/blender/blenkernel/BKE_image.h

@@ -307,4 +307,3 @@ bool BKE_image_clear_renderslot(struct Image *ima, struct ImageUser *iuser, int
 #endif
 
 #endif
-

source/blender/blenkernel/BKE_ipo.h

@@ -52,4 +52,3 @@ void BKE_ipo_free(struct Ipo *ipo);
 #endif
 
 #endif
-

source/blender/blenkernel/BKE_mesh_tangent.h

@@ -58,4 +58,3 @@ void BKE_mesh_calc_loop_tangent_step_0(
         char *ract_uv_name, char *rren_uv_name, short *rtangent_mask);
 
 #endif /* __BKE_MESH_TANGENT_H__ */
-

source/blender/blenkernel/BKE_modifier.h

@@ -561,4 +561,3 @@ struct Mesh *BKE_modifier_get_evaluated_mesh_from_evaluated_object(
         struct Object *ob_eval, bool *r_free_mesh);
 
 #endif
-

source/blender/blenkernel/BKE_nla.h

@@ -141,4 +141,3 @@ enum eNlaTime_ConvertModes {
 float BKE_nla_tweakedit_remap(struct AnimData *adt, float cframe, short mode);
 
 #endif
-

source/blender/blenkernel/BKE_packedFile.h

@@ -83,4 +83,3 @@ bool BKE_pack_check(struct ID *id);
 void BKE_unpack_id(struct Main *bmain, struct ID *id, struct ReportList *reports, int how);
 
 #endif
-

source/blender/blenkernel/BKE_report.h

@@ -76,4 +76,3 @@ bool BKE_report_write_file(const char *filepath, ReportList *reports, const char
 #endif
 
 #endif
-

source/blender/blenkernel/BKE_softbody.h

@@ -74,4 +74,3 @@ extern void             SB_estimate_transform(Object *ob, float lloc[3], float l
 
 
 #endif
-

source/blender/blenkernel/BKE_texture.h

@@ -118,4 +118,3 @@ void BKE_texture_fetch_images_for_pool(struct Tex *texture, struct ImagePool *po
 #endif
 
 #endif
-

source/blender/blenkernel/BKE_world.h

@@ -51,4 +51,3 @@ struct Depsgraph;
 void BKE_world_eval(struct Depsgraph *depsgraph, struct World *world);
 
 #endif
-

source/blender/blenkernel/BKE_writeavi.h

@@ -63,4 +63,3 @@ void BKE_context_create(bMovieHandle *mh);
 #endif
 
 #endif
-

source/blender/blenkernel/BKE_writeffmpeg.h

@@ -92,4 +92,3 @@ void BKE_ffmpeg_context_free(void *context_v);
 #endif
 
 #endif
-

source/blender/blenkernel/intern/action.c

@@ -1459,4 +1459,3 @@ void what_does_obaction(Object *ob, Object *workob, bPose *pose, bAction *act, c
 		BKE_animsys_evaluate_animdata(NULL, NULL, &workob->id, &adt, cframe, ADT_RECALC_ANIM);
 	}
 }
-

source/blender/blenkernel/intern/boids.c

@@ -1618,4 +1618,3 @@ BoidState *boid_get_current_state(BoidSettings *boids)
 
 	return state;
 }
-

source/blender/blenkernel/intern/cloth.c

@@ -1508,4 +1508,3 @@ static int cloth_build_springs ( ClothModifierData *clmd, Mesh *mesh )
 /***************************************************************************************
  * SPRING NETWORK GWN_BATCH_BUILDING IMPLEMENTATION END
  ***************************************************************************************/
-

source/blender/blenkernel/intern/customdata_file.c

@@ -449,4 +449,3 @@ CDataFileLayer *cdf_layer_add(CDataFile *cdf, int type, const char *name, size_t
 
 	return layer;
 }
-

source/blender/blenkernel/intern/fcurve.c

@@ -2775,4 +2775,3 @@ float calculate_fcurve(PathResolvedRNA *anim_rna, FCurve *fcu, float evaltime)
 		return 0.0f;
 	}
 }
-

source/blender/blenkernel/intern/fluidsim.c

@@ -104,4 +104,3 @@ void initElbeemMesh(struct Depsgraph *depsgraph, struct Scene *scene, struct Obj
 
 	dm->release(dm);
 }
-

source/blender/blenkernel/intern/icons.c

@@ -820,4 +820,3 @@ int BKE_icon_ensure_studio_light(struct StudioLight *sl, int id_type)
 	return icon_id;
 }
 /** \} */
-

source/blender/blenkernel/intern/idprop.c

@@ -1106,4 +1106,3 @@ void IDP_Reset(IDProperty *prop, const IDProperty *reference)
 }
 
 /** \} */
-

source/blender/blenkernel/intern/ipo.c

@@ -2091,4 +2091,3 @@ void do_versions_ipos_to_animato(Main *bmain)
 	if (G.debug & G_DEBUG)
 		printf("INFO: Animato convert done\n");
 }
-

source/blender/blenkernel/intern/object_deform.c

@@ -784,4 +784,3 @@ void BKE_object_defgroup_subset_to_index_array(
 		}
 	}
 }
-

source/blender/blenkernel/intern/softbody.c

@@ -3718,4 +3718,3 @@ void sbObjectStep(struct Depsgraph *depsgraph, Scene *scene, Object *ob, float c
 
 	sb->last_frame = framenr;
 }
-

source/blender/blenkernel/intern/workspace.c

@@ -538,4 +538,3 @@ bool BKE_workspace_owner_id_check(
 		return BLI_findstring(&workspace->owner_ids, owner_id, offsetof(wmOwnerID, name)) != NULL;
 	}
 }
-

source/blender/blenloader/BLO_runtime.h

@@ -51,4 +51,3 @@ bool BLO_main_validate_libraries(struct Main *bmain, struct ReportList *reports)
 #endif
 
 #endif /* __BLO_RUNTIME_H__ */
-

source/blender/blenloader/BLO_undofile.h

@@ -69,4 +69,3 @@ extern struct Main *BLO_memfile_main_get(struct MemFile *memfile, struct Main *b
 extern bool BLO_memfile_write_file(struct MemFile *memfile, const char *filename);
 
 #endif  /* __BLO_UNDOFILE_H__ */
-

source/blender/blenloader/BLO_writefile.h

@@ -45,4 +45,3 @@ extern bool BLO_write_file_mem(
         struct Main *mainvar, struct MemFile *compare, struct MemFile *current, int write_flags);
 
 #endif
-

source/blender/blenloader/intern/readblenentry.c

@@ -474,4 +474,3 @@ void BLO_blendfiledata_free(BlendFileData *bfd)
 
 	MEM_freeN(bfd);
 }
-

source/blender/blenloader/intern/readfile.h

@@ -179,4 +179,3 @@ void do_versions_after_linking_270(struct Main *bmain);
 void do_versions_after_linking_280(struct Main *bmain);
 
 #endif
-

source/blender/blenloader/intern/runtime.c

@@ -139,4 +139,3 @@ cleanup:
 
 	return bfd;
 }
-

source/blender/compositor/intern/COM_CPUDevice.cpp

@@ -40,4 +40,3 @@ void CPUDevice::execute(WorkPackage *work)
 
 	executionGroup->finalizeChunkExecution(chunkNumber, NULL);
 }
-

source/blender/compositor/intern/COM_Device.cpp

@@ -21,4 +21,3 @@
  */
 
 #include "COM_Device.h"
-

source/blender/compositor/intern/COM_MemoryProxy.cpp

@@ -48,4 +48,3 @@ void MemoryProxy::free()
 		this->m_buffer = NULL;
 	}
 }
-

source/blender/compositor/intern/COM_SocketReader.cpp

@@ -21,5 +21,3 @@
  */
 
 #include "COM_SocketReader.h"
-
-

source/blender/compositor/nodes/COM_CropNode.h

@@ -36,5 +36,3 @@ public:
 };
 
 #endif
-
-

source/blender/compositor/nodes/COM_ImageNode.cpp

@@ -271,4 +271,3 @@ void ImageNode::convertToOperations(NodeConverter &converter, const CompositorCo
 		}
 	}
 }
-

source/blender/compositor/nodes/COM_TranslateNode.cpp

@@ -71,4 +71,3 @@ void TranslateNode::convertToOperations(NodeConverter &converter, const Composit
 		converter.mapInputSocket(inputSocket, operation->getInputSocket(0));
 	}
 }
-

source/blender/compositor/operations/COM_AlphaOverMixedOperation.cpp

@@ -54,4 +54,3 @@ void AlphaOverMixedOperation::executePixelSampled(float output[4], float x, floa
 		output[3] = (mul * inputColor1[3]) + value[0] * inputOverColor[3];
 	}
 }
-

source/blender/compositor/operations/COM_AlphaOverPremultiplyOperation.cpp

@@ -53,4 +53,3 @@ void AlphaOverPremultiplyOperation::executePixelSampled(float output[4], float x
 		output[3] = (mul * inputColor1[3]) + value[0] * inputOverColor[3];
 	}
 }
-

source/blender/compositor/operations/COM_BrightnessOperation.cpp

@@ -89,4 +89,3 @@ void BrightnessOperation::deinitExecution()
 	this->m_inputBrightnessProgram = NULL;
 	this->m_inputContrastProgram = NULL;
 }
-

source/blender/compositor/operations/COM_ChangeHSVOperation.cpp

@@ -65,4 +65,3 @@ void ChangeHSVOperation::executePixelSampled(float output[4], float x, float y,
 	output[2] = inputColor1[2] * value[0];
 	output[3] = inputColor1[3];
 }
-

source/blender/compositor/operations/COM_ChannelMatteOperation.cpp

@@ -123,4 +123,3 @@ void ChannelMatteOperation::executePixelSampled(float output[4], float x, float
 	/* don't make something that was more transparent less transparent */
 	output[0] = min(alpha, inColor[3]);
 }
-

source/blender/compositor/operations/COM_ChromaMatteOperation.cpp

@@ -108,4 +108,3 @@ void ChromaMatteOperation::executePixelSampled(float output[4], float x, float y
 		output[0] = inImage[3]; /* make pixel just as transparent as it was before */
 	}
 }
-

source/blender/compositor/operations/COM_ColorCorrectionOperation.cpp

@@ -144,4 +144,3 @@ void ColorCorrectionOperation::deinitExecution()
 	this->m_inputImage = NULL;
 	this->m_inputMask = NULL;
 }
-

source/blender/compositor/operations/COM_ColorMatteOperation.cpp

@@ -82,4 +82,3 @@ void ColorMatteOperation::executePixelSampled(float output[4], float x, float y,
 		output[0] = inColor[3]; /* make pixel just as transparent as it was before */
 	}
 }
-

source/blender/compositor/operations/COM_CompositorOperation.h

@@ -100,4 +100,3 @@ public:
 	void setActive(bool active) { this->m_active = active; }
 };
 #endif
-

source/blender/compositor/operations/COM_DifferenceMatteOperation.cpp

@@ -85,4 +85,3 @@ void DifferenceMatteOperation::executePixelSampled(float output[4], float x, flo
 		output[0] = inColor1[3];
 	}
 }
-

source/blender/compositor/operations/COM_DisplaceOperation.cpp

@@ -190,4 +190,3 @@ bool DisplaceOperation::determineDependingAreaOfInterest(rcti *input, ReadBuffer
 
 	return false;
 }
-

source/blender/compositor/operations/COM_DisplaceSimpleOperation.cpp

@@ -128,4 +128,3 @@ bool DisplaceSimpleOperation::determineDependingAreaOfInterest(rcti *input, Read
 
 	return false;
 }
-

source/blender/compositor/operations/COM_DistanceYCCMatteOperation.cpp

@@ -32,4 +32,3 @@ float DistanceYCCMatteOperation::calculateDistance(float key[4], float image[4])
 	/* only measure the second 2 values */
 	return len_v2v2(key + 1, image + 1);
 }
-

source/blender/compositor/operations/COM_DoubleEdgeMaskOperation.cpp

@@ -1298,4 +1298,3 @@ void DoubleEdgeMaskOperation::deinitExecution()
 		this->m_cachedInstance = NULL;
 	}
 }
-

source/blender/compositor/operations/COM_EllipseMaskOperation.cpp

@@ -118,4 +118,3 @@ void EllipseMaskOperation::deinitExecution()
 	this->m_inputMask = NULL;
 	this->m_inputValue = NULL;
 }
-

source/blender/compositor/operations/COM_FastGaussianBlurOperation.cpp

@@ -322,4 +322,3 @@ void *FastGaussianBlurValueOperation::initializeTileData(rcti *rect)
 	unlockMutex();
 	return this->m_iirgaus;
 }
-

source/blender/compositor/operations/COM_FastGaussianBlurOperation.h

@@ -74,4 +74,3 @@ public:
 };
 
 #endif
-

source/blender/compositor/operations/COM_GaussianBokehBlurOperation.cpp

@@ -354,4 +354,3 @@ bool GaussianBlurReferenceOperation::determineDependingAreaOfInterest(rcti *inpu
 		return NodeOperation::determineDependingAreaOfInterest(&newInput, readOperation, output);
 	}
 }
-

source/blender/compositor/operations/COM_InpaintOperation.cpp

@@ -284,4 +284,3 @@ bool InpaintSimpleOperation::determineDependingAreaOfInterest(rcti * /*input*/,
 		return NodeOperation::determineDependingAreaOfInterest(&newInput, readOperation, output);
 	}
 }
-

source/blender/compositor/operations/COM_InvertOperation.cpp

@@ -70,4 +70,3 @@ void InvertOperation::deinitExecution()
 	this->m_inputValueProgram = NULL;
 	this->m_inputColorProgram = NULL;
 }
-

source/blender/compositor/operations/COM_LuminanceMatteOperation.cpp

@@ -77,4 +77,3 @@ void LuminanceMatteOperation::executePixelSampled(float output[4], float x, floa
 	/* don't make something that was more transparent less transparent */
 	output[0] = min_ff(alpha, inColor[3]);
 }
-

source/blender/compositor/operations/COM_MapUVOperation.cpp

@@ -174,4 +174,3 @@ bool MapUVOperation::determineDependingAreaOfInterest(rcti *input, ReadBufferOpe
 
 	return false;
 }
-

source/blender/compositor/operations/COM_MovieClipAttributeOperation.cpp

@@ -87,4 +87,3 @@ void MovieClipAttributeOperation::determineResolution(
 	resolution[0] = preferredResolution[0];
 	resolution[1] = preferredResolution[1];
 }
-

source/blender/compositor/operations/COM_OutputFileOperation.cpp

@@ -311,4 +311,3 @@ void OutputOpenExrMultiLayerOperation::deinitExecution()
 		}
 	}
 }
-

source/blender/compositor/operations/COM_PixelateOperation.cpp

@@ -46,4 +46,3 @@ void PixelateOperation::executePixelSampled(float output[4], float x, float y, P
 	float ny = round(y);
 	this->m_inputOperation->readSampled(output, nx, ny, sampler);
 }
-

source/blender/compositor/operations/COM_QualityStepHelper.cpp

@@ -68,4 +68,3 @@ void QualityStepHelper::initExecution(QualityHelper helper)
 			break;
 	}
 }
-

source/blender/compositor/operations/COM_SunBeamsOperation.cpp

@@ -335,4 +335,3 @@ bool SunBeamsOperation::determineDependingAreaOfInterest(rcti *input, ReadBuffer
 
 	return NodeOperation::determineDependingAreaOfInterest(&rect, readOperation, output);
 }
-

source/blender/compositor/operations/COM_TranslateOperation.cpp

@@ -81,4 +81,3 @@ void TranslateOperation::setFactorXY(float factorX, float factorY)
 	m_factorX = factorX;
 	m_factorY = factorY;
 }
-

source/blender/draw/engines/workbench/workbench_materials.c

@@ -191,4 +191,4 @@ void workbench_material_copy(WORKBENCH_MaterialData *dest_material, const WORKBE
 	copy_v4_v4(dest_material->specular_color, source_material->specular_color);
 	dest_material->roughness = source_material->roughness;
 	dest_material->ima = source_material->ima;
-}
+}

source/blender/imbuf/IMB_thumbs.h

@@ -102,4 +102,3 @@ void IMB_thumb_path_unlock(const char *path);
 #endif /* __cplusplus */
 
 #endif /* __IMB_THUMBS_H__ */
-

source/blender/imbuf/intern/IMB_allocimbuf.h

@@ -54,4 +54,3 @@ bool imb_addencodedbufferImBuf(struct ImBuf *ibuf);
 bool imb_enlargeencodedbufferImBuf(struct ImBuf *ibuf);
 
 #endif
-

source/blender/imbuf/intern/IMB_filetype.h

@@ -119,4 +119,3 @@ void imb_loadtiletiff(struct ImBuf *ibuf, const unsigned char *mem, size_t size,
 int imb_savetiff(struct ImBuf *ibuf, const char *name, int flags);
 
 #endif	/* __IMB_FILETYPE_H__ */
-

source/blender/imbuf/intern/IMB_filter.h

@@ -47,4 +47,3 @@ void IMB_unpremultiply_rect_float(float *rect_float, int channels, int w, int h)
 void imb_onehalf_no_alloc(struct ImBuf *ibuf2, struct ImBuf *ibuf1);
 
 #endif
-