[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [50132] trunk/blender/source/blender: Fixed regression introduced in 50107
Sergey Sharybin
sergey.vfx at gmail.com
Wed Aug 22 19:22:04 CEST 2012
Revision: 50132
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=50132
Author: nazgul
Date: 2012-08-22 17:22:04 +0000 (Wed, 22 Aug 2012)
Log Message:
-----------
Fixed regression introduced in 50107
Shader preview job localizes material without referencing it as a user,
so don't need to unreference itself as a user from this material.
Added BKE_material_free_ex function which could skip user dereferencing.
This also removed old hack with mtex users.
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/BKE_material.h
trunk/blender/source/blender/blenkernel/intern/material.c
trunk/blender/source/blender/editors/render/render_preview.c
Modified: trunk/blender/source/blender/blenkernel/BKE_material.h
===================================================================
--- trunk/blender/source/blender/blenkernel/BKE_material.h 2012-08-22 16:48:22 UTC (rev 50131)
+++ trunk/blender/source/blender/blenkernel/BKE_material.h 2012-08-22 17:22:04 UTC (rev 50132)
@@ -48,6 +48,7 @@
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);
Modified: trunk/blender/source/blender/blenkernel/intern/material.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/material.c 2012-08-22 16:48:22 UTC (rev 50131)
+++ trunk/blender/source/blender/blenkernel/intern/material.c 2012-08-22 17:22:04 UTC (rev 50132)
@@ -80,12 +80,18 @@
/* not material itself */
void BKE_material_free(Material *ma)
{
+ BKE_material_free_ex(ma, TRUE);
+}
+
+/* not material itself */
+void BKE_material_free_ex(Material *ma, int do_id_user)
+{
MTex *mtex;
int a;
for (a = 0; a < MAX_MTEX; a++) {
mtex = ma->mtex[a];
- if (mtex && mtex->tex) mtex->tex->id.us--;
+ if (do_id_user && mtex && mtex->tex) mtex->tex->id.us--;
if (mtex) MEM_freeN(mtex);
}
@@ -101,7 +107,7 @@
/* is no lib link block, but material extension */
if (ma->nodetree) {
- ntreeFreeTree(ma->nodetree);
+ ntreeFreeTree_ex(ma->nodetree, do_id_user);
MEM_freeN(ma->nodetree);
}
Modified: trunk/blender/source/blender/editors/render/render_preview.c
===================================================================
--- trunk/blender/source/blender/editors/render/render_preview.c 2012-08-22 16:48:22 UTC (rev 50131)
+++ trunk/blender/source/blender/editors/render/render_preview.c 2012-08-22 17:22:04 UTC (rev 50132)
@@ -749,7 +749,6 @@
if (sp->matcopy) {
struct IDProperty *properties;
- int a;
/* node previews */
shader_preview_updatejob(sp);
@@ -757,13 +756,7 @@
/* get rid of copied material */
BLI_remlink(&pr_main->mat, sp->matcopy);
- /* BKE_material_free decrements texture, prevent this. hack alert! */
- for (a = 0; a < MAX_MTEX; a++) {
- MTex *mtex = sp->matcopy->mtex[a];
- if (mtex && mtex->tex) mtex->tex = NULL;
- }
-
- BKE_material_free(sp->matcopy);
+ BKE_material_free_ex(sp->matcopy, FALSE);
properties = IDP_GetProperties((ID *)sp->matcopy, FALSE);
if (properties) {
More information about the Bf-blender-cvs
mailing list