← Back to branch summary

~ubuntu-branches/ubuntu/trusty/blender/trusty-proposed

« back to all changes in this revision

Viewing changes to source/blender/render/intern/source/bake.c

  • Committer: Package Import Robot
  • Author(s): Matteo F. Vescovi
  • Date: 2013-08-14 10:43:49 UTC
  • mfrom: (14.2.19 sid)
  • Revision ID: package-import@ubuntu.com-20130814104349-t1d5mtwkphp12dyj
Tags: 2.68a-3
* Upload to unstable
* debian/: python3.3 Depends simplified
  - debian/control: python3.3 Depends dropped
    for blender-data package
  - 0001-blender_thumbnailer.patch refreshed
* debian/control: libavcodec b-dep versioning dropped

Show diffs side-by-side

added added

removed removed

Lines of Context:
source/blender/render/intern/source/bake.c
15
15
 * along with this program; if not, write to the Free Software Foundation,
16
16
 * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
17
17
 *
18
 
 * The Original Code is Copyright (C) 2001-2002 by NaN Holding BV.
19
 
 * All rights reserved.
20
 
 *
21
18
 * Contributors: 2004/2005/2006 Blender Foundation, full recode
22
19
 * Contributors: Vertex color baking, Copyright 2011 AutoCRC
23
20
 *
47
44
#include "DNA_meshdata_types.h"
48
45
 
49
46
#include "BKE_customdata.h"
50
 
#include "BKE_depsgraph.h"
51
47
#include "BKE_global.h"
52
48
#include "BKE_image.h"
53
49
#include "BKE_main.h"
54
50
#include "BKE_node.h"
55
51
#include "BKE_scene.h"
 
52
#include "BKE_library.h"
56
53
 
57
54
#include "IMB_imbuf_types.h"
58
55
#include "IMB_imbuf.h"
622
619
                                                continue;
623
620
                                        if (*origindex >= me->totpoly) {
624
621
                                                /* Small hack for Array modifier, which gives false
625
 
                                                   original indices - z0r */
 
622
                                                 * original indices - z0r */
626
623
                                                continue;
627
624
                                        }
628
625
#if 0
641
638
                                        bs->mloop = me->mloop + bs->mpoly->loopstart;
642
639
 
643
640
                                        /* Tag mesh for reevaluation. */
644
 
                                        DAG_id_tag_update(&me->id, 0);
 
641
                                        me->id.flag |= LIB_DOIT;
645
642
                                }
646
643
                                else {
647
644
                                        Image *ima = NULL;
1000
997
                }
1001
998
        }
1002
999
 
 
1000
        if (R.r.bake_flag & R_BAKE_VCOL) {
 
1001
                /* untag all meshes */
 
1002
                tag_main_lb(&G.main->mesh, false);
 
1003
        }
 
1004
 
1003
1005
        BLI_init_threads(&threads, do_bake_thread, re->r.threads);
1004
1006
 
1005
1007
        handles = MEM_callocN(sizeof(BakeShade) * re->r.threads, "BakeShade");