Differential D4587 Diff 14400 source/blender/blenkernel/intern/material.c

Changeset View

Standalone View

source/blender/blenkernel/intern/material.c

Context not available.
	#include "BLI_listbase.h"	#include "BLI_listbase.h"
	#include "BLI_utildefines.h"	#include "BLI_utildefines.h"
	#include "BLI_array_utils.h"	#include "BLI_array_utils.h"
		#include "BLI_string.h"

	#include "BKE_animsys.h"	#include "BKE_animsys.h"
	#include "BKE_brush.h"	#include "BKE_brush.h"
Context not available.
	return;	return;
	}	}

	GHash *gh_mat_map = BLI_ghash_ptr_new_ex(__func__, ob_src->totcol);	GHash *gh_mat_map = BLI_ghash_new(BLI_ghashutil_strhash_p, BLI_ghashutil_strcmp, __func__);

	for (int i = 0; i < ob_dst->totcol; i++) {	for (int i = 0; i < ob_dst->totcol; i++) {
	Material *ma_src = give_current_material(ob_dst, i + 1);	Material *ma_src = give_current_material(ob_dst, i + 1);
	BLI_ghash_reinsert(gh_mat_map, ma_src, POINTER_FROM_INT(i), NULL, NULL);	BLI_ghash_insert(gh_mat_map, BLI_strdup(ma_src->id.name), POINTER_FROM_INT(i));
	}	}

	/* setup default mapping (when materials don't match) */	/* setup default mapping (when materials don't match) */
Context not available.
	/* when objects have exact matching materials - keep existing index */	/* when objects have exact matching materials - keep existing index */
	}	}
	else {	else {
	void **index_src_p = BLI_ghash_lookup_p(gh_mat_map, ma_src);	void *index_src_p = BLI_ghash_lookup(gh_mat_map, ma_src->id.name);
	if (index_src_p) {	if (index_src_p) {
	remap_src_to_dst[i] = POINTER_AS_INT(*index_src_p);	remap_src_to_dst[i] = POINTER_AS_INT(index_src_p);
		mont29Unsubmitted Not Done Inline Actions Pretty certain those two changes are fully wrong… mont29: Pretty certain those two changes are fully wrong…
	}	}
	}	}
	}	}

	BLI_ghash_free(gh_mat_map, NULL, NULL);	BLI_ghash_free(gh_mat_map, MEM_freeN, NULL);
	}	}


Context not available.