Sergey Sharybin
fdfa5910b5
Issue was caused by couple of circumstances: - Normal Map node requires tesselated faces to compute tangent space - All temporary meshes needed for Cycles export were adding to G.main - Undo pushes would temporary set meshes tessfaces to NULL - Moving node will cause undo push and tree re-evaluate fr preview All this leads to threading conflict between preview render and undo system. Solved it in way that all temporary meshes are adding to that exact Main which was passed to Cycles via BlendData. This required couple of mechanic changes like adding extra parameter to *_add() functions and adding some *_ex() functions to make it possible RNA adds objects to Main passed to new() RNA function. This was tricky to pass Main to RNA function and IMO that's not so nice to pass main to function, so ended up with such decision: - Object.to_mesh() will add temp mesh to G.main - Added Main.meshes.new_from_object() which does the same as to_mesh, but adds temporary mesh to specified Main. So now all temporary meshes needed for preview render would be added to preview_main which does not conflict with undo pushes. Viewport render shall not be an issue because object sync happens from main thread in this case. It could be some issues with final render, but that's not so much likely to happen, so shall be fine. Thanks to Brecht for review!
120 lines
3.8 KiB
C++
120 lines
3.8 KiB
C++
/*
|
|
* ***** BEGIN GPL LICENSE BLOCK *****
|
|
*
|
|
* This program is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU General Public License
|
|
* as published by the Free Software Foundation; either version 2
|
|
* of the License, or (at your option) any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program; if not, write to the Free Software Foundation,
|
|
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
|
*
|
|
* The Original Code is Copyright (C) 2001-2002 by NaN Holding BV.
|
|
* All rights reserved.
|
|
*
|
|
* The Original Code is: all of this file.
|
|
*
|
|
* Contributor(s): none yet.
|
|
*
|
|
* ***** END GPL LICENSE BLOCK *****
|
|
*/
|
|
|
|
#ifndef __BKE_MATERIAL_H__
|
|
#define __BKE_MATERIAL_H__
|
|
|
|
/** \file BKE_material.h
|
|
* \ingroup bke
|
|
* \brief General operations, lookup, etc. for materials.
|
|
*/
|
|
#ifdef __cplusplus
|
|
extern "C" {
|
|
#endif
|
|
|
|
struct Main;
|
|
struct Material;
|
|
struct ID;
|
|
struct Object;
|
|
struct Mesh;
|
|
struct MTFace;
|
|
struct Scene;
|
|
|
|
/* materials */
|
|
|
|
void init_def_material(void);
|
|
void BKE_material_free(struct Material *sc);
|
|
void BKE_material_free_ex(struct Material *ma, int do_id_user);
|
|
void test_object_materials(struct ID *id);
|
|
void resize_object_material(struct Object *ob, const short totcol);
|
|
void init_material(struct Material *ma);
|
|
struct Material *BKE_material_add(struct Main *bmain, const char *name);
|
|
struct Material *BKE_material_copy(struct Material *ma);
|
|
struct Material *localize_material(struct Material *ma);
|
|
struct Material *give_node_material(struct Material *ma); /* returns node material or self */
|
|
void BKE_material_make_local(struct Material *ma);
|
|
void extern_local_matarar(struct Material **matar, short totcol);
|
|
|
|
void automatname(struct Material *);
|
|
|
|
/* material slots */
|
|
|
|
struct Material ***give_matarar(struct Object *ob);
|
|
short *give_totcolp(struct Object *ob);
|
|
struct Material ***give_matarar_id(struct ID *id); /* same but for ID's */
|
|
short *give_totcolp_id(struct ID *id);
|
|
|
|
enum {
|
|
BKE_MAT_ASSIGN_USERPREF,
|
|
BKE_MAT_ASSIGN_OBDATA,
|
|
BKE_MAT_ASSIGN_OBJECT
|
|
};
|
|
|
|
struct Material *give_current_material(struct Object *ob, short act);
|
|
struct ID *material_from(struct Object *ob, short act);
|
|
void assign_material_id(struct ID *id, struct Material *ma, short act);
|
|
void assign_material(struct Object *ob, struct Material *ma, short act, int assign_type);
|
|
void assign_matarar(struct Object *ob, struct Material ***matar, short totcol);
|
|
|
|
short find_material_index(struct Object *ob, struct Material *ma);
|
|
|
|
int object_add_material_slot(struct Object *ob);
|
|
int object_remove_material_slot(struct Object *ob);
|
|
|
|
/* rna api */
|
|
void material_append_id(struct ID *id, struct Material *ma);
|
|
struct Material *material_pop_id(struct ID *id, int index, int remove_material_slot); /* index is an int because of RNA */
|
|
|
|
/* rendering */
|
|
|
|
void init_render_material(struct Material *, int, float *);
|
|
void init_render_materials(struct Main *, int, float *);
|
|
void end_render_material(struct Material *);
|
|
void end_render_materials(struct Main *);
|
|
|
|
int material_in_material(struct Material *parmat, struct Material *mat);
|
|
|
|
void ramp_blend(int type, float r_col[3], const float fac, const float col[3]);
|
|
|
|
/* driver update hacks */
|
|
void material_drivers_update(struct Scene *scene, struct Material *mat, float ctime);
|
|
|
|
/* copy/paste */
|
|
void clear_matcopybuf(void);
|
|
void free_matcopybuf(void);
|
|
void copy_matcopybuf(struct Material *ma);
|
|
void paste_matcopybuf(struct Material *ma);
|
|
|
|
/* handle backward compatibility for tface/materials called from doversion (fileload=1) or Help Menu (fileload=0) */
|
|
int do_version_tface(struct Main *main, int fileload);
|
|
|
|
#ifdef __cplusplus
|
|
}
|
|
#endif
|
|
|
|
#endif
|