svn merge ^/trunk/blender -r48674:48681
authorCampbell Barton <ideasman42@gmail.com>
Fri, 6 Jul 2012 14:25:49 +0000 (14:25 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Fri, 6 Jul 2012 14:25:49 +0000 (14:25 +0000)
1  2 
SConstruct
source/blender/editors/space_node/drawnode.c
source/blender/makesrna/intern/rna_space.c
source/blender/render/intern/source/external_engine.c

diff --cc SConstruct
Simple merge
index 8b0264da4fa9b41a0e9cbc5e6f5149220448075d,218d11f30359e75d974430988773dce874446fa5..625d2343dff49fd744c838b5200a734e8d8e0cdc
@@@ -3014,12 -2974,14 +3016,14 @@@ void draw_nodespace_back_pix(const bCon
                                else if (snode->flag & SNODE_SHOW_ALPHA) {
                                        glPixelZoom(snode->zoom, snode->zoom);
                                        /* swap bytes, so alpha is most significant one, then just draw it as luminance int */
-                                       if (ENDIAN_ORDER == B_ENDIAN)
-                                               glPixelStorei(GL_UNPACK_SWAP_BYTES, 1);
-                                       
+ #ifdef __BIG_ENDIAN__
+                                       glPixelStorei(GL_UNPACK_SWAP_BYTES, 1);
+ #endif
 -                                      glaDrawPixelsSafe(x, y, ibuf->x, ibuf->y, ibuf->x, GL_LUMINANCE, GL_UNSIGNED_INT, ibuf->rect);
 +                                      glaDrawPixelsSafe(x, y, ibuf->x, ibuf->y, ibuf->x, GL_LUMINANCE, GL_UNSIGNED_INT, display_buffer);
-                                       
+ #ifdef __BIG_ENDIAN__
                                        glPixelStorei(GL_UNPACK_SWAP_BYTES, 0);
+ #endif
                                        glPixelZoom(1.0f, 1.0f);
                                }
                                else if (snode->flag & SNODE_USE_ALPHA) {
index 52ac5b1325f39ad4109f2ea2c8b471e8cc0aa0bb,e3eab0c3b345a97f5b7ab5bfa02a3d7eae4e54c6..2b5ccae7df715415fb6be4d72a4d562acba6b112
@@@ -173,15 -172,17 +173,19 @@@ RenderResult *RE_engine_begin_result(Re
        disprect.ymin = y;
        disprect.ymax = y + h;
  
 -      result = render_result_new(re, &disprect, 0, RR_USE_MEM);
 +      result = render_result_new(re, &disprect, 0, RR_USE_MEM, layername);
 +
 +      /* todo: make this thread safe */
-       BLI_addtail(&engine->fullresult, result);
-       
-       result->tilerect.xmin += re->disprect.xmin;
-       result->tilerect.xmax += re->disprect.xmin;
-       result->tilerect.ymin += re->disprect.ymin;
-       result->tilerect.ymax += re->disprect.ymin;
+       /* can be NULL if we CLAMP the width or height to 0 */
+       if (result) {
+               BLI_addtail(&engine->fullresult, result);
+               result->tilerect.xmin += re->disprect.xmin;
+               result->tilerect.xmax += re->disprect.xmin;
+               result->tilerect.ymin += re->disprect.ymin;
+               result->tilerect.ymax += re->disprect.ymin;
+       }
  
        return result;
  }